Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

131 files changed, 22418 insertions, 14410 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index e7a8cd058efb..e90d103e177e 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -152,10 +152,16 @@ config SND_AZT3328
         select SND_MPU401_UART
         select SND_PCM
         select SND_RAWMIDI
+        select SND_AC97_CODEC
         help
           Say Y here to include support for Aztech AZF3328 (PCI168)
           soundcards.
 
+          Supported features: AC97-"conformant" mixer, MPU401/OPL3, analog I/O
+          (16bit/8bit, many sample rates [<= 66.2kHz], NO hardware mixing),
+          Digital Enhanced Game Port, 1.024MHz multimedia sequencer timer,
+          ext. codec (I2S port), onboard amp (4W/4Ohms/ch), suspend/resume.
+
           To compile this driver as a module, choose M here: the module
           will be called snd-azt3328.
 
@@ -207,23 +213,28 @@ config SND_CMIPCI
 
 config SND_OXYGEN_LIB
         tristate
-        select SND_PCM
-        select SND_MPU401_UART
 
 config SND_OXYGEN
-        tristate "C-Media 8788 (Oxygen)"
+        tristate "C-Media 8786, 8787, 8788 (Oxygen)"
         select SND_OXYGEN_LIB
+        select SND_PCM
+        select SND_MPU401_UART
         help
           Say Y here to include support for sound cards based on the
           C-Media CMI8788 (Oxygen HD Audio) chip:
            * Asound A-8788
+           * Asus Xonar DG
            * AuzenTech X-Meridian
+           * AuzenTech X-Meridian 2G
            * Bgears b-Enspirer
            * Club3D Theatron DTS
            * HT-Omega Claro (plus)
            * HT-Omega Claro halo (XT)
+           * Kuroutoshikou CMI8787-HG2PCI
            * Razer Barracuda AC-1
            * Sondigo Inferno
+           * TempoTec/MediaTek HiFier Fantasia
+           * TempoTec/MediaTek HiFier Serenade
 
           To compile this driver as a module, choose M here: the module
           will be called snd-oxygen.
@@ -523,6 +534,14 @@ config SND_ES1968_INPUT
           If you say N the buttons will directly control the master volume.
           It is recommended to say Y.
 
+config SND_ES1968_RADIO
+        bool "Enable TEA5757 radio tuner support for es1968"
+        depends on SND_ES1968
+        depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_ES1968
+        help
+          Say Y here to include support for TEA5757 radio tuner integrated on
+          some MediaForte cards (e.g. SF64-PCE2).
+
 config SND_FM801
         tristate "ForteMedia FM801"
         select SND_OPL3_LIB
@@ -541,13 +560,13 @@ config SND_FM801_TEA575X_BOOL
         depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801
         help
           Say Y here to include support for soundcards based on the ForteMedia
-          FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
-          Forte SF256-PCS-02) into the snd-fm801 driver.
+          FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
+          SF64-PCR) into the snd-fm801 driver.
 
-config SND_FM801_TEA575X
+config SND_TEA575X
         tristate
-        depends on SND_FM801_TEA575X_BOOL
-        default SND_FM801
+        depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO
+        default SND_FM801 || SND_ES1968
 
 source "sound/pci/hda/Kconfig"
 
@@ -567,27 +586,17 @@ comment "Don't forget to add built-in firmwares for HDSP driver"
         depends on SND_HDSP=y
 
 config SND_HDSPM
-        tristate "RME Hammerfall DSP MADI"
+        tristate "RME Hammerfall DSP MADI/RayDAT/AIO"
         select SND_HWDEP
         select SND_RAWMIDI
         select SND_PCM
         help
-          Say Y here to include support for RME Hammerfall DSP MADI
-          soundcards.
+          Say Y here to include support for RME Hammerfall DSP MADI,
+          RayDAT and AIO soundcards.
 
           To compile this driver as a module, choose M here: the module
           will be called snd-hdspm.
 
-config SND_HIFIER
-        tristate "TempoTec HiFier Fantasia"
-        select SND_OXYGEN_LIB
-        help
-          Say Y here to include support for the MediaTek/TempoTec HiFier
-          Fantasia sound card.
-
-          To compile this driver as a module, choose M here: the module
-          will be called snd-hifier.
-
 config SND_ICE1712
         tristate "ICEnsemble ICE1712 (Envy24)"
         select SND_MPU401_UART
@@ -657,6 +666,15 @@ config SND_KORG1212
           To compile this driver as a module, choose M here: the module
           will be called snd-korg1212.
 
+config SND_LOLA
+        tristate "Digigram Lola"
+        select SND_PCM
+        help
+          Say Y to include support for Digigram Lola boards.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-lola.
+
 config SND_LX6464ES
         tristate "Digigram LX6464ES"
         select SND_PCM
@@ -815,14 +833,17 @@ config SND_VIA82XX_MODEM
           will be called snd-via82xx-modem.
 
 config SND_VIRTUOSO
-        tristate "Asus Virtuoso 100/200 (Xonar)"
+        tristate "Asus Virtuoso 66/100/200 (Xonar)"
         select SND_OXYGEN_LIB
+        select SND_PCM
+        select SND_MPU401_UART
+        select SND_JACK if INPUT=y || INPUT=SND
         help
           Say Y here to include support for sound cards based on the
-          Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X,
+          Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,
           Essence ST (Deluxe), and Essence STX.
-          Support for the DS is experimental.
-          Support for the HDAV1.3 (Deluxe) is very experimental.
+          Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental;
+          for the Xense, missing.
 
           To compile this driver as a module, choose M here: the module
           will be called snd-virtuoso.
diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index 9cf4348ec137..54fe325e3aa5 100644
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_SND) += \
         ca0106/ \
         cs46xx/ \
         cs5535audio/ \
+        lola/ \
         lx6464es/ \
         echoaudio/ \
         emu10k1/ \
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index a7630e9edf8a..7f4d619f4ddb 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -71,6 +71,12 @@ static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {
 { 0x414b4d00, 0xffffff00, "Asahi Kasei",        NULL,   NULL },
 { 0x414c4300, 0xffffff00, "Realtek",            NULL,   NULL },
 { 0x414c4700, 0xffffff00, "Realtek",            NULL,   NULL },
+/*
+ * This is an _inofficial_ Aztech Labs entry
+ * (value might differ from unknown official Aztech ID),
+ * currently used by the AC97 emulation of the almost-AC97 PCI168 card.
+ */
+{ 0x415a5400, 0xffffff00, "Aztech Labs (emulated)",     NULL,   NULL },
 { 0x434d4900, 0xffffff00, "C-Media Electronics", NULL,  NULL },
 { 0x43525900, 0xffffff00, "Cirrus Logic",       NULL,   NULL },
 { 0x43585400, 0xffffff00, "Conexant",           NULL,   NULL },
@@ -127,6 +133,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x414c4781, 0xffffffff, "ALC658D",            NULL,   NULL }, /* already patched */
 { 0x414c4780, 0xfffffff0, "ALC658",             patch_alc655,   NULL },
 { 0x414c4790, 0xfffffff0, "ALC850",             patch_alc850,   NULL },
+{ 0x415a5401, 0xffffffff, "AZF3328",            patch_aztech_azf3328,   NULL },
 { 0x434d4941, 0xffffffff, "CMI9738",            patch_cm9738,   NULL },
 { 0x434d4961, 0xffffffff, "CMI9739",            patch_cm9739,   NULL },
 { 0x434d4969, 0xffffffff, "CMI9780",            patch_cm9780,   NULL },
@@ -590,9 +597,9 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol,
         snd_ac97_page_restore(ac97, page_save);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
         /* check analog mixer power-down */
-        if ((val_mask & 0x8000) &&
+        if ((val_mask & AC97_PD_EAPD) &&
             (kcontrol->private_value & (1<<30))) {
-                if (val & 0x8000)
+                if (val & AC97_PD_EAPD)
                         ac97->power_up &= ~(1 << (reg>>1));
                 else
                         ac97->power_up |= 1 << (reg>>1);
@@ -1014,8 +1021,7 @@ static int snd_ac97_free(struct snd_ac97 *ac97)
 {
         if (ac97) {
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-                cancel_delayed_work(&ac97->power_work);
-                flush_scheduled_work();
+                cancel_delayed_work_sync(&ac97->power_work);
 #endif
                 snd_ac97_proc_done(ac97);
                 if (ac97->bus)
@@ -1036,20 +1042,20 @@ static int snd_ac97_dev_free(struct snd_device *device)
 
 static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)
 {
-        unsigned short val, mask = 0x8000;
+        unsigned short val, mask = AC97_MUTE_MASK_MONO;
 
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
         switch (reg) {
         case AC97_MASTER_TONE:
-                return ac97->caps & 0x04 ? 1 : 0;
+                return ac97->caps & AC97_BC_BASS_TREBLE ? 1 : 0;
         case AC97_HEADPHONE:
-                return ac97->caps & 0x10 ? 1 : 0;
+                return ac97->caps & AC97_BC_HEADPHONE ? 1 : 0;
         case AC97_REC_GAIN_MIC:
-                return ac97->caps & 0x01 ? 1 : 0;
+                return ac97->caps & AC97_BC_DEDICATED_MIC ? 1 : 0;
         case AC97_3D_CONTROL:
-                if (ac97->caps & 0x7c00) {
+                if (ac97->caps & AC97_BC_3D_TECH_ID_MASK) {
                         val = snd_ac97_read(ac97, reg);
                         /* if nonzero - fixed and we can't set it */
                         return val == 0;
@@ -1105,7 +1111,10 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha
         *lo_max = *hi_max = 0;
         for (i = 0 ; i < ARRAY_SIZE(cbit); i++) {
                 unsigned short val;
-                snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8));
+                snd_ac97_write(
+                        ac97, reg,
+                        AC97_MUTE_MASK_STEREO | cbit[i] | (cbit[i] << 8)
+                );
                 /* Do the read twice due to buffers on some ac97 codecs.
                  * e.g. The STAC9704 returns exactly what you wrote to the register
                  * if you read it immediately. This causes the detect routine to fail.
@@ -1140,14 +1149,14 @@ static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int
         unsigned short val, val1;
 
         *max = 63;
-        val = 0x8080 | (0x20 << shift);
+        val = AC97_MUTE_MASK_STEREO | (0x20 << shift);
         snd_ac97_write(ac97, reg, val);
         val1 = snd_ac97_read(ac97, reg);
         if (val != val1) {
                 *max = 31;
         }
         /* reset volume to zero */
-        snd_ac97_write_cache(ac97, reg, 0x8080);
+        snd_ac97_write_cache(ac97, reg, AC97_MUTE_MASK_STEREO);
 }
 
 static inline int printable(unsigned int x)
@@ -1184,16 +1193,16 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
-        mute_mask = 0x8000;
+        mute_mask = AC97_MUTE_MASK_MONO;
         val = snd_ac97_read(ac97, reg);
         if (check_stereo || (ac97->flags & AC97_STEREO_MUTES)) {
                 /* check whether both mute bits work */
-                val1 = val | 0x8080;
+                val1 = val | AC97_MUTE_MASK_STEREO;
                 snd_ac97_write(ac97, reg, val1);
                 if (val1 == snd_ac97_read(ac97, reg))
-                        mute_mask = 0x8080;
+                        mute_mask = AC97_MUTE_MASK_STEREO;
         }
-        if (mute_mask == 0x8080) {
+        if (mute_mask == AC97_MUTE_MASK_STEREO) {
                 struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);
                 if (check_amix)
                         tmp.private_value |= (1 << 30);
@@ -1269,9 +1278,11 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne
         err = snd_ctl_add(card, kctl);
         if (err < 0)
                 return err;
-        snd_ac97_write_cache(ac97, reg,
-                             (snd_ac97_read(ac97, reg) & 0x8080) |
-                             lo_max | (hi_max << 8));
+        snd_ac97_write_cache(
+                ac97, reg,
+                (snd_ac97_read(ac97, reg) & AC97_MUTE_MASK_STEREO)
+                | lo_max | (hi_max << 8)
+        );
         return 0;
 }
 
@@ -1333,7 +1344,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         return err;
         }
 
-        ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080;
+        ac97->regs[AC97_CENTER_LFE_MASTER] = AC97_MUTE_MASK_STEREO;
 
         /* build center controls */
         if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) 
@@ -1411,8 +1422,12 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_pc_beep[idx], ac97))) < 0)
                                 return err;
                 set_tlv_db_scale(kctl, db_scale_4bit);
-                snd_ac97_write_cache(ac97, AC97_PC_BEEP,
-                                     snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e);
+                snd_ac97_write_cache(
+                        ac97,
+                        AC97_PC_BEEP,
+                        (snd_ac97_read(ac97, AC97_PC_BEEP)
+                                | AC97_MUTE_MASK_MONO | 0x001e)
+                );
         }
         
         /* build Phone controls */
@@ -1546,7 +1561,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Simulated Stereo Enhancement control */
-        if (ac97->caps & 0x0008) {
+        if (ac97->caps & AC97_BC_SIM_STEREO) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_STEREO_ENHANCEMENT], ac97))) < 0)
                         return err;
         }
@@ -1558,7 +1573,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Loudness control */
-        if (ac97->caps & 0x0020) {
+        if (ac97->caps & AC97_BC_LOUDNESS) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_LOUDNESS], ac97))) < 0)
                         return err;
         }
@@ -1962,7 +1977,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
 }
 
 /* build_ops to do nothing */
-static struct snd_ac97_build_ops null_build_ops;
+static const struct snd_ac97_build_ops null_build_ops;
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
 static void do_update_power(struct work_struct *work)
@@ -2456,8 +2471,7 @@ void snd_ac97_suspend(struct snd_ac97 *ac97)
         if (ac97->build_ops->suspend)
                 ac97->build_ops->suspend(ac97);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-        cancel_delayed_work(&ac97->power_work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&ac97->power_work);
 #endif
         snd_ac97_powerdown(ac97);
 }
@@ -2544,8 +2558,8 @@ void snd_ac97_resume(struct snd_ac97 *ac97)
                         schedule_timeout_uninterruptible(1);
                 } while (time_after_eq(end_time, jiffies));
                 /* FIXME: extra delay */
-                ac97->bus->ops->write(ac97, AC97_MASTER, 0x8000);
-                if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000)
+                ac97->bus->ops->write(ac97, AC97_MASTER, AC97_MUTE_MASK_MONO);
+                if (snd_ac97_read(ac97, AC97_MASTER) != AC97_MUTE_MASK_MONO)
                         msleep(250);
         } else {
                 end_time = jiffies + msecs_to_jiffies(100);
@@ -2749,12 +2763,12 @@ static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2767,7 +2781,10 @@ static int tune_mute_led(struct snd_ac97 *ac97)
                 return -ENOENT;
         msw->put = master_mute_sw_put;
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(
+                ac97, AC97_POWERDOWN,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         ac97->scaps |= AC97_SCAP_EAPD_LED;
         return 0;
 }
@@ -2782,12 +2799,12 @@ static int hp_master_mute_sw_put(struct snd_kcontrol *kcontrol,
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2803,7 +2820,10 @@ static int tune_hp_mute_led(struct snd_ac97 *ac97)
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Switch");
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Volume");
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(
+                ac97, AC97_POWERDOWN,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         return 0;
 }
 
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index e68c98ef4041..200c9a1d48b7 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -27,6 +27,15 @@
 #include "ac97_patch.h"
 
 /*
+ *  Forward declarations
+ */
+
+static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
+                                                    const char *name);
+static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
+                                const unsigned int *tlv, const char **slaves);
+
+/*
  *  Chip specific initialization
  */
 
@@ -371,7 +380,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
+static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
         .build_spdif    = patch_yamaha_ymf743_build_spdif,
         .build_3d       = patch_yamaha_ymf7x3_3d,
 };
@@ -455,7 +464,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
+static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
         .build_3d       = patch_yamaha_ymf7x3_3d,
         .build_post_spdif = patch_yamaha_ymf753_post_spdif
 };
@@ -502,7 +511,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
         .build_specific = patch_wolfson_wm9703_specific,
 };
 
@@ -533,7 +542,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
         .build_specific = patch_wolfson_wm9704_specific,
 };
 
@@ -677,7 +686,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
         .build_specific = patch_wolfson_wm9711_specific,
 };
 
@@ -871,7 +880,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
 }
 #endif
 
-static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
+static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
         .build_specific = patch_wolfson_wm9713_specific,
         .build_3d = patch_wolfson_wm9713_3d,
 #ifdef CONFIG_PM        
@@ -976,7 +985,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
         .build_3d       = patch_sigmatel_stac9700_3d,
         .build_specific = patch_sigmatel_stac97xx_specific
 };
@@ -1023,7 +1032,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
         return patch_sigmatel_stac97xx_specific(ac97);
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
         .build_3d       = patch_sigmatel_stac9708_3d,
         .build_specific = patch_sigmatel_stac9708_specific
 };
@@ -1252,7 +1261,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
+static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
         .build_3d       = patch_sigmatel_stac9700_3d,
         .build_specific = patch_sigmatel_stac9758_specific
 };
@@ -1327,7 +1336,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_cirrus_ops = {
+static const struct snd_ac97_build_ops patch_cirrus_ops = {
         .build_spdif = patch_cirrus_build_spdif
 };
 
@@ -1384,7 +1393,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_conexant_ops = {
+static const struct snd_ac97_build_ops patch_conexant_ops = {
         .build_spdif = patch_conexant_build_spdif
 };
 
@@ -1560,7 +1569,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
         }
 }
 
-static struct snd_ac97_build_ops patch_ad1881_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1881_build_ops = {
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
 #endif
@@ -1647,7 +1656,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ad1885_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1885_build_ops = {
         .build_specific = &patch_ad1885_specific,
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
@@ -1674,7 +1683,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ad1886_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1886_build_ops = {
         .build_specific = &patch_ad1886_specific,
 #ifdef CONFIG_PM
         .resume = ad18xx_resume
@@ -1881,7 +1890,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97)
                                     ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
 }
 
-static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1981a_specific,
 #ifdef CONFIG_PM
@@ -1936,7 +1945,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
 }
 
-static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1981b_specific,
 #ifdef CONFIG_PM
@@ -2075,7 +2084,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1888_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1888_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1888_specific,
 #ifdef CONFIG_PM
@@ -2124,7 +2133,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
 }
 
-static struct snd_ac97_build_ops patch_ad1980_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1980_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1980_specific,
 #ifdef CONFIG_PM
@@ -2239,7 +2248,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1985_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1985_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1985_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1985_specific,
 #ifdef CONFIG_PM
@@ -2531,7 +2540,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)
                                     ARRAY_SIZE(snd_ac97_ad1985_controls));
 }
 
-static struct snd_ac97_build_ops patch_ad1986_build_ops = {
+static const struct snd_ac97_build_ops patch_ad1986_build_ops = {
         .build_post_spdif = patch_ad198x_post_spdif,
         .build_specific = patch_ad1986_specific,
 #ifdef CONFIG_PM
@@ -2636,7 +2645,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc650_ops = {
+static const struct snd_ac97_build_ops patch_alc650_ops = {
         .build_specific = patch_alc650_specific,
         .update_jacks = alc650_update_jacks
 };
@@ -2788,7 +2797,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc655_ops = {
+static const struct snd_ac97_build_ops patch_alc655_ops = {
         .build_specific = patch_alc655_specific,
         .update_jacks = alc655_update_jacks
 };
@@ -2900,7 +2909,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_alc850_ops = {
+static const struct snd_ac97_build_ops patch_alc850_ops = {
         .build_specific = patch_alc850_specific,
         .update_jacks = alc850_update_jacks
 };
@@ -2940,6 +2949,49 @@ static int patch_alc850(struct snd_ac97 *ac97)
         return 0;
 }
 
+static int patch_aztech_azf3328_specific(struct snd_ac97 *ac97)
+{
+        struct snd_kcontrol *kctl_3d_center =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Center");
+        struct snd_kcontrol *kctl_3d_depth =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Depth");
+
+        /*
+         * 3D register is different from AC97 standard layout
+         * (also do some renaming, to resemble Windows driver naming)
+         */
+        if (kctl_3d_center) {
+                kctl_3d_center->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 1, 0x07, 0);
+                snd_ac97_rename_vol_ctl(ac97,
+                        "3D Control - Center", "3D Control - Width"
+                );
+        }
+        if (kctl_3d_depth)
+                kctl_3d_depth->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 8, 0x03, 0);
+
+        /* Aztech Windows driver calls the
+           equivalent control "Modem Playback", thus rename it: */
+        snd_ac97_rename_vol_ctl(ac97,
+                "Master Mono Playback", "Modem Playback"
+        );
+        snd_ac97_rename_vol_ctl(ac97,
+                "Headphone Playback", "FM Synth Playback"
+        );
+
+        return 0;
+}
+
+static const struct snd_ac97_build_ops patch_aztech_azf3328_ops = {
+        .build_specific = patch_aztech_azf3328_specific
+};
+
+static int patch_aztech_azf3328(struct snd_ac97 *ac97)
+{
+        ac97->build_ops = &patch_aztech_azf3328_ops;
+        return 0;
+}
 
 /*
  * C-Media CM97xx codecs
@@ -2962,7 +3014,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9738_ops = {
+static const struct snd_ac97_build_ops patch_cm9738_ops = {
         .build_specific = patch_cm9738_specific,
         .update_jacks = cm9738_update_jacks
 };
@@ -3053,7 +3105,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
 }
 
-static struct snd_ac97_build_ops patch_cm9739_ops = {
+static const struct snd_ac97_build_ops patch_cm9739_ops = {
         .build_specific = patch_cm9739_specific,
         .build_post_spdif = patch_cm9739_post_spdif,
         .update_jacks = cm9739_update_jacks
@@ -3227,7 +3279,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)
         return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9761_ops = {
+static const struct snd_ac97_build_ops patch_cm9761_ops = {
         .build_specific = patch_cm9761_specific,
         .build_post_spdif = patch_cm9761_post_spdif,
         .update_jacks = cm9761_update_jacks
@@ -3323,7 +3375,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)
         return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
 }
 
-static struct snd_ac97_build_ops patch_cm9780_ops = {
+static const struct snd_ac97_build_ops patch_cm9780_ops = {
         .build_specific = patch_cm9780_specific,
         .build_post_spdif = patch_cm9761_post_spdif     /* identical with CM9761 */
 };
@@ -3443,7 +3495,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_vt1616_ops = {
+static const struct snd_ac97_build_ops patch_vt1616_ops = {
         .build_specific = patch_vt1616_specific
 };
 
@@ -3797,7 +3849,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_it2646_ops = {
+static const struct snd_ac97_build_ops patch_it2646_ops = {
         .build_specific = patch_it2646_specific,
         .update_jacks = it2646_update_jacks
 };
@@ -3831,7 +3883,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_si3036_ops = {
+static const struct snd_ac97_build_ops patch_si3036_ops = {
         .build_specific = patch_si3036_specific,
 };
 
@@ -3898,7 +3950,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97)
         return 0;
 }
 
-static struct snd_ac97_build_ops patch_ucb1400_ops = {
+static const struct snd_ac97_build_ops patch_ucb1400_ops = {
         .build_specific = patch_ucb1400_specific,
 };
 
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 4382d0fa6b9a..d8f6fd65ebbb 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -29,7 +29,7 @@
  *      PM support
  *      MIDI support
  *      Game Port support
- *      SG DMA support (this will need *alot* of work)
+ *      SG DMA support (this will need *a lot* of work)
  */
 
 #include <linux/init.h>
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index c80b0b863c54..e3569bdd3b64 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -21,25 +21,6 @@
  *  would appreciate it if you grant us the right to use those modifications
  *  for any purpose including commercial applications.
  */
-/* >0: print Hw params, timer vars. >1: print stream write/copy sizes  */
-#define REALLY_VERBOSE_LOGGING 0
-
-#if REALLY_VERBOSE_LOGGING
-#define VPRINTK1 snd_printd
-#else
-#define VPRINTK1(...)
-#endif
-
-#if REALLY_VERBOSE_LOGGING > 1
-#define VPRINTK2 snd_printd
-#else
-#define VPRINTK2(...)
-#endif
-
-#ifndef ASI_STYLE_NAMES
-/* not sure how ALSA style name should look */
-#define ASI_STYLE_NAMES 1
-#endif
 
 #include "hpi_internal.h"
 #include "hpimsginit.h"
@@ -65,6 +46,39 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("AudioScience inc. <support@audioscience.com>");
 MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx");
 
+#if defined CONFIG_SND_DEBUG
+/* copied from pcm_lib.c, hope later patch will make that version public
+and this copy can be removed */
+static void pcm_debug_name(struct snd_pcm_substream *substream,
+                           char *name, size_t len)
+{
+        snprintf(name, len, "pcmC%dD%d%c:%d",
+                 substream->pcm->card->number,
+                 substream->pcm->device,
+                 substream->stream ? 'c' : 'p',
+                 substream->number);
+}
+#define DEBUG_NAME(substream, name) char name[16]; pcm_debug_name(substream, name, sizeof(name))
+#else
+#define pcm_debug_name(s, n, l) do { } while (0)
+#define DEBUG_NAME(name, substream) do { } while (0)
+#endif
+
+#if defined CONFIG_SND_DEBUG_VERBOSE
+/**
+ * snd_printddd - very verbose debug printk
+ * @format: format string
+ *
+ * Works like snd_printk() for debugging purposes.
+ * Ignored when CONFIG_SND_DEBUG_VERBOSE is not set.
+ * Must set snd module debug parameter to 3 to enable at runtime.
+ */
+#define snd_printddd(format, args...) \
+        __snd_printk(3, __FILE__, __LINE__, format, ##args)
+#else
+#define snd_printddd(format, args...) do { } while (0)
+#endif
+
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
@@ -85,11 +99,11 @@ MODULE_PARM_DESC(enable_hpi_hwdep,
 
 /* identify driver */
 #ifdef KERNEL_ALSA_BUILD
-static char *build_info = "built using headers from kernel source";
+static char *build_info = "Built using headers from kernel source";
 module_param(build_info, charp, S_IRUGO);
 MODULE_PARM_DESC(build_info, "built using headers from kernel source");
 #else
-static char *build_info = "built within ALSA source";
+static char *build_info = "Built within ALSA source";
 module_param(build_info, charp, S_IRUGO);
 MODULE_PARM_DESC(build_info, "built within ALSA source");
 #endif
@@ -100,17 +114,11 @@ static const int mixer_dump;
 #define DEFAULT_SAMPLERATE 44100
 static int adapter_fs = DEFAULT_SAMPLERATE;
 
-static struct hpi_hsubsys *ss;  /* handle to HPI audio subsystem */
-
 /* defaults */
 #define PERIODS_MIN 2
-#define PERIOD_BYTES_MIN  2304
+#define PERIOD_BYTES_MIN  2048
 #define BUFFER_BYTES_MAX (512 * 1024)
 
-/*#define TIMER_MILLISECONDS 20
-#define FORCE_TIMER_JIFFIES ((TIMER_MILLISECONDS * HZ + 999)/1000)
-*/
-
 #define MAX_CLOCKSOURCES (HPI_SAMPLECLOCK_SOURCE_LAST + 1 + 7)
 
 struct clk_source {
@@ -139,7 +147,7 @@ struct snd_card_asihpi {
         u32 h_mixer;
         struct clk_cache cc;
 
-        u16 support_mmap;
+        u16 can_dma;
         u16 support_grouping;
         u16 support_mrx;
         u16 update_interval_frames;
@@ -152,11 +160,13 @@ struct snd_card_asihpi_pcm {
         struct timer_list timer;
         unsigned int respawn_timer;
         unsigned int hpi_buffer_attached;
-        unsigned int pcm_size;
-        unsigned int pcm_count;
+        unsigned int buffer_bytes;
+        unsigned int period_bytes;
         unsigned int bytes_per_sec;
-        unsigned int pcm_irq_pos;       /* IRQ position */
-        unsigned int pcm_buf_pos;       /* position in buffer */
+        unsigned int pcm_buf_host_rw_ofs; /* Host R/W pos */
+        unsigned int pcm_buf_dma_ofs;   /* DMA R/W offset in buffer */
+        unsigned int pcm_buf_elapsed_dma_ofs;   /* DMA R/W offset in buffer */
+        unsigned int drained_count;
         struct snd_pcm_substream *substream;
         u32 h_stream;
         struct hpi_format format;
@@ -167,7 +177,6 @@ struct snd_card_asihpi_pcm {
 /* Functions to allow driver to give a buffer to HPI for busmastering */
 
 static u16 hpi_stream_host_buffer_attach(
-        struct hpi_hsubsys *hS,
         u32 h_stream,   /* handle to outstream. */
         u32 size_in_bytes, /* size in bytes of bus mastering buffer */
         u32 pci_address
@@ -194,10 +203,7 @@ static u16 hpi_stream_host_buffer_attach(
         return hr.error;
 }
 
-static u16 hpi_stream_host_buffer_detach(
-        struct hpi_hsubsys *hS,
-        u32  h_stream
-)
+static u16 hpi_stream_host_buffer_detach(u32  h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -218,24 +224,23 @@ static u16 hpi_stream_host_buffer_detach(
         return hr.error;
 }
 
-static inline u16 hpi_stream_start(struct hpi_hsubsys *hS, u32 h_stream)
+static inline u16 hpi_stream_start(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_start(hS, h_stream);
+                return hpi_outstream_start(h_stream);
         else
-                return hpi_instream_start(hS, h_stream);
+                return hpi_instream_start(h_stream);
 }
 
-static inline u16 hpi_stream_stop(struct hpi_hsubsys *hS, u32 h_stream)
+static inline u16 hpi_stream_stop(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_stop(hS, h_stream);
+                return hpi_outstream_stop(h_stream);
         else
-                return hpi_instream_stop(hS, h_stream);
+                return hpi_instream_stop(h_stream);
 }
 
 static inline u16 hpi_stream_get_info_ex(
-    struct hpi_hsubsys *hS,
     u32 h_stream,
     u16        *pw_state,
     u32        *pbuffer_size,
@@ -244,42 +249,43 @@ static inline u16 hpi_stream_get_info_ex(
     u32        *pauxiliary_data
 )
 {
+        u16 e;
         if (hpi_handle_object(h_stream)  ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_get_info_ex(hS, h_stream, pw_state,
+                e = hpi_outstream_get_info_ex(h_stream, pw_state,
                                         pbuffer_size, pdata_in_buffer,
                                         psample_count, pauxiliary_data);
         else
-                return hpi_instream_get_info_ex(hS, h_stream, pw_state,
+                e = hpi_instream_get_info_ex(h_stream, pw_state,
                                         pbuffer_size, pdata_in_buffer,
                                         psample_count, pauxiliary_data);
+        return e;
 }
 
-static inline u16 hpi_stream_group_add(struct hpi_hsubsys *hS,
+static inline u16 hpi_stream_group_add(
                                         u32 h_master,
                                         u32 h_stream)
 {
         if (hpi_handle_object(h_master) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_add(hS, h_master, h_stream);
+                return hpi_outstream_group_add(h_master, h_stream);
         else
-                return hpi_instream_group_add(hS, h_master, h_stream);
+                return hpi_instream_group_add(h_master, h_stream);
 }
 
-static inline u16 hpi_stream_group_reset(struct hpi_hsubsys *hS,
-                                                u32 h_stream)
+static inline u16 hpi_stream_group_reset(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_reset(hS, h_stream);
+                return hpi_outstream_group_reset(h_stream);
         else
-                return hpi_instream_group_reset(hS, h_stream);
+                return hpi_instream_group_reset(h_stream);
 }
 
-static inline u16 hpi_stream_group_get_map(struct hpi_hsubsys *hS,
+static inline u16 hpi_stream_group_get_map(
                                 u32 h_stream, u32 *mo, u32 *mi)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_get_map(hS, h_stream, mo, mi);
+                return hpi_outstream_group_get_map(h_stream, mo, mi);
         else
-                return hpi_instream_group_get_map(hS, h_stream, mo, mi);
+                return hpi_instream_group_get_map(h_stream, mo, mi);
 }
 
 static u16 handle_error(u16 err, int line, char *filename)
@@ -294,24 +300,27 @@ static u16 handle_error(u16 err, int line, char *filename)
 #define hpi_handle_error(x)  handle_error(x, __LINE__, __FILE__)
 
 /***************************** GENERAL PCM ****************/
-#if REALLY_VERBOSE_LOGGING
-static void print_hwparams(struct snd_pcm_hw_params *p)
-{
-        snd_printd("HWPARAMS \n");
-        snd_printd("samplerate %d \n", params_rate(p));
-        snd_printd("channels %d \n", params_channels(p));
-        snd_printd("format %d \n", params_format(p));
-        snd_printd("subformat %d \n", params_subformat(p));
-        snd_printd("buffer bytes %d \n", params_buffer_bytes(p));
-        snd_printd("period bytes %d \n", params_period_bytes(p));
-        snd_printd("access %d \n", params_access(p));
-        snd_printd("period_size %d \n", params_period_size(p));
-        snd_printd("periods %d \n", params_periods(p));
-        snd_printd("buffer_size %d \n", params_buffer_size(p));
+
+static void print_hwparams(struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *p)
+{
+        DEBUG_NAME(substream, name);
+        snd_printd("%s HWPARAMS\n", name);
+        snd_printd(" samplerate %d Hz\n", params_rate(p));
+        snd_printd(" channels %d\n", params_channels(p));
+        snd_printd(" format %d\n", params_format(p));
+        snd_printd(" subformat %d\n", params_subformat(p));
+        snd_printd(" buffer %d B\n", params_buffer_bytes(p));
+        snd_printd(" period %d B\n", params_period_bytes(p));
+        snd_printd(" access %d\n", params_access(p));
+        snd_printd(" period_size %d\n", params_period_size(p));
+        snd_printd(" periods %d\n", params_periods(p));
+        snd_printd(" buffer_size %d\n", params_buffer_size(p));
+        snd_printd(" %d B/s\n", params_rate(p) *
+                params_channels(p) *
+                snd_pcm_format_width(params_format(p)) / 8);
+
 }
-#else
-#define print_hwparams(x)
-#endif
 
 static snd_pcm_format_t hpi_to_alsa_formats[] = {
         -1,                     /* INVALID */
@@ -335,7 +344,7 @@ static snd_pcm_format_t hpi_to_alsa_formats[] = {
          */
         -1
 #else
-        /* SNDRV_PCM_FORMAT_S24_3LE */  /* { HPI_FORMAT_PCM24_SIGNED        15 */
+        /* SNDRV_PCM_FORMAT_S24_3LE */ /* HPI_FORMAT_PCM24_SIGNED 15 */
 #endif
 };
 
@@ -378,21 +387,21 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,
         } else {
                 /* on cards without SRC,
                    valid rates are determined by sampleclock */
-                err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+                err = hpi_mixer_get_control(asihpi->h_mixer,
                                           HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                           HPI_CONTROL_SAMPLECLOCK, &h_control);
                 if (err) {
                         snd_printk(KERN_ERR
-                                "no local sampleclock, err %d\n", err);
+                                "No local sampleclock, err %d\n", err);
                 }
 
-                for (idx = 0; idx < 100; idx++) {
-                        if (hpi_sample_clock_query_local_rate(ss,
-                                h_control, idx, &sample_rate)) {
-                                if (!idx)
-                                        snd_printk(KERN_ERR
-                                                "local rate query failed\n");
-
+                for (idx = -1; idx < 100; idx++) {
+                        if (idx == -1) {
+                                if (hpi_sample_clock_get_sample_rate(h_control,
+                                                                &sample_rate))
+                                        continue;
+                        } else if (hpi_sample_clock_query_local_rate(h_control,
+                                                        idx, &sample_rate)) {
                                 break;
                         }
 
@@ -445,8 +454,6 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,
                 }
         }
 
-        /* printk(KERN_INFO "Supported rates %X %d %d\n",
-           rates, rate_min, rate_max); */
         pcmhw->rates = rates;
         pcmhw->rate_min = rate_min;
         pcmhw->rate_max = rate_max;
@@ -463,7 +470,7 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
         int width;
         unsigned int bytes_per_sec;
 
-        print_hwparams(params);
+        print_hwparams(substream, params);
         err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
         if (err < 0)
                 return err;
@@ -471,45 +478,39 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
         if (err)
                 return err;
 
-        VPRINTK1(KERN_INFO "format %d, %d chans, %d_hz\n",
-                                format, params_channels(params),
-                                params_rate(params));
-
         hpi_handle_error(hpi_format_create(&dpcm->format,
                         params_channels(params),
                         format, params_rate(params), 0, 0));
 
         if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
-                if (hpi_instream_reset(ss, dpcm->h_stream) != 0)
+                if (hpi_instream_reset(dpcm->h_stream) != 0)
                         return -EINVAL;
 
-                if (hpi_instream_set_format(ss,
+                if (hpi_instream_set_format(
                         dpcm->h_stream, &dpcm->format) != 0)
                         return -EINVAL;
         }
 
         dpcm->hpi_buffer_attached = 0;
-        if (card->support_mmap) {
-
-                err = hpi_stream_host_buffer_attach(ss, dpcm->h_stream,
+        if (card->can_dma) {
+                err = hpi_stream_host_buffer_attach(dpcm->h_stream,
                         params_buffer_bytes(params),  runtime->dma_addr);
                 if (err == 0) {
-                        snd_printd(KERN_INFO
+                        snd_printdd(
                                 "stream_host_buffer_attach succeeded %u %lu\n",
                                 params_buffer_bytes(params),
                                 (unsigned long)runtime->dma_addr);
                 } else {
-                        snd_printd(KERN_INFO
-                                        "stream_host_buffer_attach error %d\n",
+                        snd_printd("stream_host_buffer_attach error %d\n",
                                         err);
                         return -ENOMEM;
                 }
 
-                err = hpi_stream_get_info_ex(ss, dpcm->h_stream, NULL,
+                err = hpi_stream_get_info_ex(dpcm->h_stream, NULL,
                                                 &dpcm->hpi_buffer_attached,
                                                 NULL, NULL, NULL);
 
-                snd_printd(KERN_INFO "stream_host_buffer_attach status 0x%x\n",
+                snd_printdd("stream_host_buffer_attach status 0x%x\n",
                                 dpcm->hpi_buffer_attached);
         }
         bytes_per_sec = params_rate(params) * params_channels(params);
@@ -520,16 +521,30 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
 
         dpcm->bytes_per_sec = bytes_per_sec;
-        dpcm->pcm_size = params_buffer_bytes(params);
-        dpcm->pcm_count = params_period_bytes(params);
-        snd_printd(KERN_INFO "pcm_size=%d, pcm_count=%d, bps=%d\n",
-                        dpcm->pcm_size, dpcm->pcm_count, bytes_per_sec);
+        dpcm->buffer_bytes = params_buffer_bytes(params);
+        dpcm->period_bytes = params_period_bytes(params);
 
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
         return 0;
 }
 
+static int
+snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
+        if (dpcm->hpi_buffer_attached)
+                hpi_stream_host_buffer_detach(dpcm->h_stream);
+
+        snd_pcm_lib_free_pages(substream);
+        return 0;
+}
+
+static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)
+{
+        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
+        kfree(dpcm);
+}
+
 static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *
                                             substream)
 {
@@ -537,9 +552,9 @@ static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
         int expiry;
 
-        expiry = (dpcm->pcm_count * HZ / dpcm->bytes_per_sec);
-        /* wait longer the first time, for samples to propagate */
-        expiry = max(expiry, 20);
+        expiry = HZ / 200;
+        /*? (dpcm->period_bytes * HZ / dpcm->bytes_per_sec); */
+        expiry = max(expiry, 1); /* don't let it be zero! */
         dpcm->timer.expires = jiffies + expiry;
         dpcm->respawn_timer = 1;
         add_timer(&dpcm->timer);
@@ -561,38 +576,44 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
         struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);
         struct snd_pcm_substream *s;
         u16 e;
+        DEBUG_NAME(substream, name);
+
+        snd_printdd("%s trigger\n", name);
 
-        snd_printd("trigger %dstream %d\n",
-                        substream->stream, substream->number);
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 snd_pcm_group_for_each_entry(s, substream) {
-                        struct snd_card_asihpi_pcm *ds;
-                        ds = s->runtime->private_data;
+                        struct snd_pcm_runtime *runtime = s->runtime;
+                        struct snd_card_asihpi_pcm *ds = runtime->private_data;
 
                         if (snd_pcm_substream_chip(s) != card)
                                 continue;
 
-                        if ((s->stream == SNDRV_PCM_STREAM_PLAYBACK) &&
-                                (card->support_mmap)) {
+                        /* don't link Cap and Play */
+                        if (substream->stream != s->stream)
+                                continue;
+
+                        ds->drained_count = 0;
+                        if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                                 /* How do I know how much valid data is present
-                                * in buffer? Just guessing 2 periods, but if
+                                * in buffer? Must be at least one period!
+                                * Guessing 2 periods, but if
                                 * buffer is bigger it may contain even more
                                 * data??
                                 */
-                                unsigned int preload = ds->pcm_count * 2;
-                                VPRINTK2("preload %d\n", preload);
+                                unsigned int preload = ds->period_bytes * 1;
+                                snd_printddd("%d preload x%x\n", s->number, preload);
                                 hpi_handle_error(hpi_outstream_write_buf(
-                                                ss, ds->h_stream,
-                                                &s->runtime->dma_area[0],
+                                                ds->h_stream,
+                                                &runtime->dma_area[0],
                                                 preload,
                                                 &ds->format));
+                                ds->pcm_buf_host_rw_ofs = preload;
                         }
 
                         if (card->support_grouping) {
-                                VPRINTK1("\t_group %dstream %d\n", s->stream,
-                                                s->number);
-                                e = hpi_stream_group_add(ss,
+                                snd_printdd("%d group\n", s->number);
+                                e = hpi_stream_group_add(
                                         dpcm->h_stream,
                                         ds->h_stream);
                                 if (!e) {
@@ -604,10 +625,12 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
                         } else
                                 break;
                 }
-                snd_printd("start\n");
+                snd_printdd("start\n");
                 /* start the master stream */
                 snd_card_asihpi_pcm_timer_start(substream);
-                hpi_handle_error(hpi_stream_start(ss, dpcm->h_stream));
+                if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE) ||
+                        !card->can_dma)
+                        hpi_handle_error(hpi_stream_start(dpcm->h_stream));
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
@@ -615,88 +638,71 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
                 snd_pcm_group_for_each_entry(s, substream) {
                         if (snd_pcm_substream_chip(s) != card)
                                 continue;
+                        /* don't link Cap and Play */
+                        if (substream->stream != s->stream)
+                                continue;
 
                         /*? workaround linked streams don't
                         transition to SETUP 20070706*/
                         s->runtime->status->state = SNDRV_PCM_STATE_SETUP;
 
                         if (card->support_grouping) {
-                                VPRINTK1("\t_group %dstream %d\n", s->stream,
-                                        s->number);
+                                snd_printdd("%d group\n", s->number);
                                 snd_pcm_trigger_done(s, substream);
                         } else
                                 break;
                 }
-                snd_printd("stop\n");
+                snd_printdd("stop\n");
 
                 /* _prepare and _hwparams reset the stream */
-                hpi_handle_error(hpi_stream_stop(ss, dpcm->h_stream));
+                hpi_handle_error(hpi_stream_stop(dpcm->h_stream));
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         hpi_handle_error(
-                                hpi_outstream_reset(ss, dpcm->h_stream));
+                                hpi_outstream_reset(dpcm->h_stream));
 
                 if (card->support_grouping)
-                        hpi_handle_error(hpi_stream_group_reset(ss,
-                                                dpcm->h_stream));
+                        hpi_handle_error(hpi_stream_group_reset(dpcm->h_stream));
                 break;
 
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                snd_printd("pause release\n");
-                hpi_handle_error(hpi_stream_start(ss, dpcm->h_stream));
+                snd_printdd("pause release\n");
+                hpi_handle_error(hpi_stream_start(dpcm->h_stream));
                 snd_card_asihpi_pcm_timer_start(substream);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                snd_printd("pause\n");
+                snd_printdd("pause\n");
                 snd_card_asihpi_pcm_timer_stop(substream);
-                hpi_handle_error(hpi_stream_stop(ss, dpcm->h_stream));
+                hpi_handle_error(hpi_stream_stop(dpcm->h_stream));
                 break;
         default:
-                snd_printd("\tINVALID\n");
+                snd_printd(KERN_ERR "\tINVALID\n");
                 return -EINVAL;
         }
 
         return 0;
 }
 
-static int
-snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        if (dpcm->hpi_buffer_attached)
-                hpi_stream_host_buffer_detach(ss, dpcm->h_stream);
-
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
-static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)
-{
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        kfree(dpcm);
-}
-
 /*algorithm outline
  Without linking degenerates to getting single stream pos etc
  Without mmap 2nd loop degenerates to snd_pcm_period_elapsed
 */
 /*
-buf_pos=get_buf_pos(s);
+pcm_buf_dma_ofs=get_buf_pos(s);
 for_each_linked_stream(s) {
-        buf_pos=get_buf_pos(s);
-        min_buf_pos = modulo_min(min_buf_pos, buf_pos, pcm_size)
-        new_data = min(new_data, calc_new_data(buf_pos,irq_pos)
+        pcm_buf_dma_ofs=get_buf_pos(s);
+        min_buf_pos = modulo_min(min_buf_pos, pcm_buf_dma_ofs, buffer_bytes)
+        new_data = min(new_data, calc_new_data(pcm_buf_dma_ofs,irq_pos)
 }
 timer.expires = jiffies + predict_next_period_ready(min_buf_pos);
 for_each_linked_stream(s) {
-        s->buf_pos = min_buf_pos;
-        if (new_data > pcm_count) {
+        s->pcm_buf_dma_ofs = min_buf_pos;
+        if (new_data > period_bytes) {
                 if (mmap) {
-                        irq_pos = (irq_pos + pcm_count) % pcm_size;
+                        irq_pos = (irq_pos + period_bytes) % buffer_bytes;
                         if (playback) {
-                                write(pcm_count);
+                                write(period_bytes);
                         } else {
-                                read(pcm_count);
+                                read(period_bytes);
                         }
                 }
                 snd_pcm_period_elapsed(s);
@@ -724,105 +730,180 @@ static inline unsigned int modulo_min(unsigned int a, unsigned int b,
 static void snd_card_asihpi_timer_function(unsigned long data)
 {
         struct snd_card_asihpi_pcm *dpcm = (struct snd_card_asihpi_pcm *)data;
-        struct snd_card_asihpi *card = snd_pcm_substream_chip(dpcm->substream);
+        struct snd_pcm_substream *substream = dpcm->substream;
+        struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime;
         struct snd_pcm_substream *s;
         unsigned int newdata = 0;
-        unsigned int buf_pos, min_buf_pos = 0;
+        unsigned int pcm_buf_dma_ofs, min_buf_pos = 0;
         unsigned int remdata, xfercount, next_jiffies;
         int first = 1;
+        int loops = 0;
         u16 state;
-        u32 buffer_size, data_avail, samples_played, aux;
+        u32 buffer_size, bytes_avail, samples_played, on_card_bytes;
+        DEBUG_NAME(substream, name);
+
+        snd_printdd("%s snd_card_asihpi_timer_function\n", name);
 
         /* find minimum newdata and buffer pos in group */
-        snd_pcm_group_for_each_entry(s, dpcm->substream) {
+        snd_pcm_group_for_each_entry(s, substream) {
                 struct snd_card_asihpi_pcm *ds = s->runtime->private_data;
                 runtime = s->runtime;
 
                 if (snd_pcm_substream_chip(s) != card)
                         continue;
 
-                hpi_handle_error(hpi_stream_get_info_ex(ss,
+                /* don't link Cap and Play */
+                if (substream->stream != s->stream)
+                        continue;
+
+                hpi_handle_error(hpi_stream_get_info_ex(
                                         ds->h_stream, &state,
-                                        &buffer_size, &data_avail,
-                                        &samples_played, &aux));
+                                        &buffer_size, &bytes_avail,
+                                        &samples_played, &on_card_bytes));
 
                 /* number of bytes in on-card buffer */
-                runtime->delay = aux;
+                runtime->delay = on_card_bytes;
 
-                if (state == HPI_STATE_DRAINED) {
-                        snd_printd(KERN_WARNING  "outstream %d drained\n",
-                                        s->number);
-                        snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
-                        return;
-                }
+                if (!card->can_dma)
+                        on_card_bytes = bytes_avail;
 
                 if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                        buf_pos = frames_to_bytes(runtime, samples_played);
-                } else {
-                        buf_pos = data_avail + ds->pcm_irq_pos;
-                }
+                        pcm_buf_dma_ofs = ds->pcm_buf_host_rw_ofs - bytes_avail;
+                        if (state == HPI_STATE_STOPPED) {
+                                if ((bytes_avail == 0) &&
+                                    (on_card_bytes < ds->pcm_buf_host_rw_ofs)) {
+                                        hpi_handle_error(hpi_stream_start(ds->h_stream));
+                                        snd_printdd("P%d start\n", s->number);
+                                        ds->drained_count = 0;
+                                }
+                        } else if (state == HPI_STATE_DRAINED) {
+                                snd_printd(KERN_WARNING "P%d drained\n",
+                                                s->number);
+                                ds->drained_count++;
+                                if (ds->drained_count > 2) {
+                                        snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
+                                        continue;
+                                }
+                        } else {
+                                ds->drained_count = 0;
+                        }
+                } else
+                        pcm_buf_dma_ofs = bytes_avail + ds->pcm_buf_host_rw_ofs;
 
                 if (first) {
                         /* can't statically init min when wrap is involved */
-                        min_buf_pos = buf_pos;
-                        newdata = (buf_pos - ds->pcm_irq_pos) % ds->pcm_size;
+                        min_buf_pos = pcm_buf_dma_ofs;
+                        newdata = (pcm_buf_dma_ofs - ds->pcm_buf_elapsed_dma_ofs) % ds->buffer_bytes;
                         first = 0;
                 } else {
                         min_buf_pos =
-                                modulo_min(min_buf_pos, buf_pos, UINT_MAX+1L);
+                                modulo_min(min_buf_pos, pcm_buf_dma_ofs, UINT_MAX+1L);
                         newdata = min(
-                                (buf_pos - ds->pcm_irq_pos) % ds->pcm_size,
+                                (pcm_buf_dma_ofs - ds->pcm_buf_elapsed_dma_ofs) % ds->buffer_bytes,
                                 newdata);
                 }
 
-                VPRINTK1("PB timer hw_ptr x%04lX, appl_ptr x%04lX\n",
+                snd_printdd("hw_ptr 0x%04lX, appl_ptr 0x%04lX\n",
                         (unsigned long)frames_to_bytes(runtime,
                                                 runtime->status->hw_ptr),
                         (unsigned long)frames_to_bytes(runtime,
                                                 runtime->control->appl_ptr));
-                VPRINTK1("%d S=%d, irq=%04X, pos=x%04X, left=x%04X,"
-                        " aux=x%04X space=x%04X\n", s->number,
-                        state,  ds->pcm_irq_pos, buf_pos, (int)data_avail,
-                        (int)aux, buffer_size-data_avail);
+
+                snd_printdd("%d S=%d, "
+                        "rw=0x%04X, dma=0x%04X, left=0x%04X, "
+                        "aux=0x%04X space=0x%04X\n",
+                        s->number, state,
+                        ds->pcm_buf_host_rw_ofs, pcm_buf_dma_ofs,
+                        (int)bytes_avail,
+                        (int)on_card_bytes, buffer_size-bytes_avail);
+                loops++;
         }
+        pcm_buf_dma_ofs = min_buf_pos;
+
+        remdata = newdata % dpcm->period_bytes;
+        xfercount = newdata - remdata; /* a multiple of period_bytes */
+        /* come back when on_card_bytes has decreased enough to allow
+           write to happen, or when data has been consumed to make another
+           period
+        */
+        if (xfercount && (on_card_bytes  > dpcm->period_bytes))
+                next_jiffies = ((on_card_bytes - dpcm->period_bytes) * HZ / dpcm->bytes_per_sec);
+        else
+                next_jiffies = ((dpcm->period_bytes - remdata) * HZ / dpcm->bytes_per_sec);
 
-        remdata = newdata % dpcm->pcm_count;
-        xfercount = newdata - remdata; /* a multiple of pcm_count */
-        next_jiffies = ((dpcm->pcm_count-remdata) * HZ / dpcm->bytes_per_sec)+1;
-        next_jiffies = max(next_jiffies, 2U * HZ / 1000U);
+        next_jiffies = max(next_jiffies, 1U);
         dpcm->timer.expires = jiffies + next_jiffies;
-        VPRINTK1("jif %d buf pos x%04X newdata x%04X xc x%04X\n",
-                        next_jiffies, min_buf_pos, newdata, xfercount);
+        snd_printdd("jif %d buf pos 0x%04X newdata 0x%04X xfer 0x%04X\n",
+                        next_jiffies, pcm_buf_dma_ofs, newdata, xfercount);
 
-        snd_pcm_group_for_each_entry(s, dpcm->substream) {
+        snd_pcm_group_for_each_entry(s, substream) {
                 struct snd_card_asihpi_pcm *ds = s->runtime->private_data;
-                ds->pcm_buf_pos = min_buf_pos;
 
-                if (xfercount) {
-                        if (card->support_mmap) {
-                                ds->pcm_irq_pos = ds->pcm_irq_pos + xfercount;
-                                if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                                        VPRINTK2("write OS%d x%04x\n",
+                /* don't link Cap and Play */
+                if (substream->stream != s->stream)
+                        continue;
+
+                ds->pcm_buf_dma_ofs = pcm_buf_dma_ofs;
+
+                if (xfercount &&
+                        /* Limit use of on card fifo for playback */
+                        ((on_card_bytes <= ds->period_bytes) ||
+                        (s->stream == SNDRV_PCM_STREAM_CAPTURE)))
+
+                {
+
+                        unsigned int buf_ofs = ds->pcm_buf_host_rw_ofs % ds->buffer_bytes;
+                        unsigned int xfer1, xfer2;
+                        char *pd = &s->runtime->dma_area[buf_ofs];
+
+                        if (card->can_dma) { /* buffer wrap is handled at lower level */
+                                xfer1 = xfercount;
+                                xfer2 = 0;
+                        } else {
+                                xfer1 = min(xfercount, ds->buffer_bytes - buf_ofs);
+                                xfer2 = xfercount - xfer1;
+                        }
+
+                        if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                                snd_printddd("P%d write1 0x%04X 0x%04X\n",
+                                        s->number, xfer1, buf_ofs);
+                                hpi_handle_error(
+                                        hpi_outstream_write_buf(
+                                                ds->h_stream, pd, xfer1,
+                                                &ds->format));
+
+                                if (xfer2) {
+                                        pd = s->runtime->dma_area;
+
+                                        snd_printddd("P%d write2 0x%04X 0x%04X\n",
                                                         s->number,
-                                                        ds->pcm_count);
+                                                        xfercount - xfer1, buf_ofs);
                                         hpi_handle_error(
                                                 hpi_outstream_write_buf(
-                                                        ss, ds->h_stream,
-                                                        &s->runtime->
-                                                                dma_area[0],
-                                                        xfercount,
+                                                        ds->h_stream, pd,
+                                                        xfercount - xfer1,
                                                         &ds->format));
-                                } else {
-                                        VPRINTK2("read IS%d x%04x\n",
-                                                s->number,
-                                                dpcm->pcm_count);
+                                }
+                        } else {
+                                snd_printddd("C%d read1 0x%04x\n",
+                                        s->number, xfer1);
+                                hpi_handle_error(
+                                        hpi_instream_read_buf(
+                                                ds->h_stream,
+                                                pd, xfer1));
+                                if (xfer2) {
+                                        pd = s->runtime->dma_area;
+                                        snd_printddd("C%d read2 0x%04x\n",
+                                                s->number, xfer2);
                                         hpi_handle_error(
                                                 hpi_instream_read_buf(
-                                                        ss, ds->h_stream,
-                                                        NULL, xfercount));
+                                                        ds->h_stream,
+                                                        pd, xfer2));
                                 }
-                        } /* else R/W will be handled by read/write callbacks */
+                        }
+                        ds->pcm_buf_host_rw_ofs = ds->pcm_buf_host_rw_ofs + xfercount;
+                        ds->pcm_buf_elapsed_dma_ofs = pcm_buf_dma_ofs;
                         snd_pcm_period_elapsed(s);
                 }
         }
@@ -835,7 +916,7 @@ static void snd_card_asihpi_timer_function(unsigned long data)
 static int snd_card_asihpi_playback_ioctl(struct snd_pcm_substream *substream,
                                           unsigned int cmd, void *arg)
 {
-        /* snd_printd(KERN_INFO "Playback ioctl %d\n", cmd); */
+        snd_printddd(KERN_INFO "P%d ioctl %d\n", substream->number, cmd);
         return snd_pcm_lib_ioctl(substream, cmd, arg);
 }
 
@@ -845,12 +926,12 @@ static int snd_card_asihpi_playback_prepare(struct snd_pcm_substream *
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        snd_printd(KERN_INFO "playback prepare %d\n", substream->number);
-
-        hpi_handle_error(hpi_outstream_reset(ss, dpcm->h_stream));
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
+        snd_printdd("P%d prepare\n", substream->number);
 
+        hpi_handle_error(hpi_outstream_reset(dpcm->h_stream));
+        dpcm->pcm_buf_host_rw_ofs = 0;
+        dpcm->pcm_buf_dma_ofs = 0;
+        dpcm->pcm_buf_elapsed_dma_ofs = 0;
         return 0;
 }
 
@@ -861,27 +942,8 @@ snd_card_asihpi_playback_pointer(struct snd_pcm_substream *substream)
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
         snd_pcm_uframes_t ptr;
 
-        u32 samples_played;
-        u16 err;
-
-        if (!snd_pcm_stream_linked(substream)) {
-                /* NOTE, can use samples played for playback position here and
-                * in timer fn because it LAGS the actual read pointer, and is a
-                * better representation of actual playout position
-                */
-                err = hpi_outstream_get_info_ex(ss, dpcm->h_stream, NULL,
-                                        NULL, NULL,
-                                        &samples_played, NULL);
-                hpi_handle_error(err);
-
-                dpcm->pcm_buf_pos = frames_to_bytes(runtime, samples_played);
-        }
-        /* else must return most conservative value found in timer func
-         * by looping over all streams
-         */
-
-        ptr = bytes_to_frames(runtime, dpcm->pcm_buf_pos  % dpcm->pcm_size);
-        VPRINTK2("playback_pointer=%04ld\n", (unsigned long)ptr);
+        ptr = bytes_to_frames(runtime, dpcm->pcm_buf_dma_ofs  % dpcm->buffer_bytes);
+        snd_printddd("P%d pointer = 0x%04lx\n", substream->number, (unsigned long)ptr);
         return ptr;
 }
 
@@ -898,12 +960,12 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
         /* on cards without SRC, must query at valid rate,
         * maybe set by external sync
         */
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
-                err = hpi_sample_clock_get_sample_rate(ss, h_control,
+                err = hpi_sample_clock_get_sample_rate(h_control,
                                 &sample_rate);
 
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
@@ -911,7 +973,7 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
                 err = hpi_format_create(&hpi_format,
                                         2, format, sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_outstream_query_format(ss, h_stream,
+                        err = hpi_outstream_query_format(h_stream,
                                                         &hpi_format);
                 if (!err && (hpi_to_alsa_formats[format] != -1))
                         pcmhw->formats |=
@@ -942,7 +1004,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
                 return -ENOMEM;
 
         err =
-            hpi_outstream_open(ss, card->adapter_index,
+            hpi_outstream_open(card->adapter_index,
                               substream->number, &dpcm->h_stream);
         hpi_handle_error(err);
         if (err)
@@ -954,7 +1016,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
 
         /*? also check ASI5000 samplerate source
             If external, only support external rate.
-            If internal and other stream playing, cant switch
+            If internal and other stream playing, can't switch
         */
 
         init_timer(&dpcm->timer);
@@ -977,11 +1039,9 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
                                         SNDRV_PCM_INFO_DOUBLE |
                                         SNDRV_PCM_INFO_BATCH |
                                         SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                        SNDRV_PCM_INFO_PAUSE;
-
-        if (card->support_mmap)
-                snd_card_asihpi_playback.info |= SNDRV_PCM_INFO_MMAP |
-                                                SNDRV_PCM_INFO_MMAP_VALID;
+                                        SNDRV_PCM_INFO_PAUSE |
+                                        SNDRV_PCM_INFO_MMAP |
+                                        SNDRV_PCM_INFO_MMAP_VALID;
 
         if (card->support_grouping)
                 snd_card_asihpi_playback.info |= SNDRV_PCM_INFO_SYNC_START;
@@ -989,7 +1049,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
         /* struct is copied, so can create initializer dynamically */
         runtime->hw = snd_card_asihpi_playback;
 
-        if (card->support_mmap)
+        if (card->can_dma)
                 err = snd_pcm_hw_constraint_pow2(runtime, 0,
                                         SNDRV_PCM_HW_PARAM_BUFFER_BYTES);
         if (err < 0)
@@ -997,12 +1057,13 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
 
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                 card->update_interval_frames);
+
         snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                card->update_interval_frames * 4, UINT_MAX);
+                card->update_interval_frames * 2, UINT_MAX);
 
         snd_pcm_set_sync(substream);
 
-        snd_printd(KERN_INFO "playback open\n");
+        snd_printdd("playback open\n");
 
         return 0;
 }
@@ -1012,67 +1073,12 @@ static int snd_card_asihpi_playback_close(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        hpi_handle_error(hpi_outstream_close(ss, dpcm->h_stream));
-        snd_printd(KERN_INFO "playback close\n");
-
-        return 0;
-}
-
-static int snd_card_asihpi_playback_copy(struct snd_pcm_substream *substream,
-                                        int channel,
-                                        snd_pcm_uframes_t pos,
-                                        void __user *src,
-                                        snd_pcm_uframes_t count)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        unsigned int len;
-
-        len = frames_to_bytes(runtime, count);
-
-        if (copy_from_user(runtime->dma_area, src, len))
-                return -EFAULT;
-
-        VPRINTK2(KERN_DEBUG "playback copy%d %u bytes\n",
-                        substream->number, len);
-
-        hpi_handle_error(hpi_outstream_write_buf(ss, dpcm->h_stream,
-                                runtime->dma_area, len, &dpcm->format));
-
-        return 0;
-}
-
-static int snd_card_asihpi_playback_silence(struct snd_pcm_substream *
-                                            substream, int channel,
-                                            snd_pcm_uframes_t pos,
-                                            snd_pcm_uframes_t count)
-{
-        unsigned int len;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-
-        len = frames_to_bytes(runtime, count);
-        snd_printd(KERN_INFO "playback silence  %u bytes\n", len);
+        hpi_handle_error(hpi_outstream_close(dpcm->h_stream));
+        snd_printdd("playback close\n");
 
-        memset(runtime->dma_area, 0, len);
-        hpi_handle_error(hpi_outstream_write_buf(ss, dpcm->h_stream,
-                                runtime->dma_area, len, &dpcm->format));
         return 0;
 }
 
-static struct snd_pcm_ops snd_card_asihpi_playback_ops = {
-        .open = snd_card_asihpi_playback_open,
-        .close = snd_card_asihpi_playback_close,
-        .ioctl = snd_card_asihpi_playback_ioctl,
-        .hw_params = snd_card_asihpi_pcm_hw_params,
-        .hw_free = snd_card_asihpi_hw_free,
-        .prepare = snd_card_asihpi_playback_prepare,
-        .trigger = snd_card_asihpi_trigger,
-        .pointer = snd_card_asihpi_playback_pointer,
-        .copy = snd_card_asihpi_playback_copy,
-        .silence = snd_card_asihpi_playback_silence,
-};
-
 static struct snd_pcm_ops snd_card_asihpi_playback_mmap_ops = {
         .open = snd_card_asihpi_playback_open,
         .close = snd_card_asihpi_playback_close,
@@ -1091,13 +1097,13 @@ snd_card_asihpi_capture_pointer(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        VPRINTK2("capture pointer %d=%d\n",
-                        substream->number, dpcm->pcm_buf_pos);
-        /* NOTE Unlike playback can't use actual dwSamplesPlayed
+        snd_printddd("capture pointer %d=%d\n",
+                        substream->number, dpcm->pcm_buf_dma_ofs);
+        /* NOTE Unlike playback can't use actual samples_played
                 for the capture position, because those samples aren't yet in
                 the local buffer available for reading.
         */
-        return bytes_to_frames(runtime, dpcm->pcm_buf_pos % dpcm->pcm_size);
+        return bytes_to_frames(runtime, dpcm->pcm_buf_dma_ofs % dpcm->buffer_bytes);
 }
 
 static int snd_card_asihpi_capture_ioctl(struct snd_pcm_substream *substream,
@@ -1111,11 +1117,12 @@ static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        hpi_handle_error(hpi_instream_reset(ss, dpcm->h_stream));
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
+        hpi_handle_error(hpi_instream_reset(dpcm->h_stream));
+        dpcm->pcm_buf_host_rw_ofs = 0;
+        dpcm->pcm_buf_dma_ofs = 0;
+        dpcm->pcm_buf_elapsed_dma_ofs = 0;
 
-        snd_printd("capture prepare %d\n", substream->number);
+        snd_printdd("Capture Prepare %d\n", substream->number);
         return 0;
 }
 
@@ -1133,12 +1140,12 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
 
         /* on cards without SRC, must query at valid rate,
                 maybe set by external sync */
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
-                err = hpi_sample_clock_get_sample_rate(ss, h_control,
+                err = hpi_sample_clock_get_sample_rate(h_control,
                         &sample_rate);
 
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
@@ -1147,7 +1154,7 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
                 err = hpi_format_create(&hpi_format, 2, format,
                                 sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_instream_query_format(ss, h_stream,
+                        err = hpi_instream_query_format(h_stream,
                                             &hpi_format);
                 if (!err)
                         pcmhw->formats |=
@@ -1178,11 +1185,11 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         if (dpcm == NULL)
                 return -ENOMEM;
 
-        snd_printd("hpi_instream_open adapter %d stream %d\n",
+        snd_printdd("capture open adapter %d stream %d\n",
                    card->adapter_index, substream->number);
 
         err = hpi_handle_error(
-            hpi_instream_open(ss, card->adapter_index,
+            hpi_instream_open(card->adapter_index,
                              substream->number, &dpcm->h_stream));
         if (err)
                 kfree(dpcm);
@@ -1203,15 +1210,16 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         snd_card_asihpi_capture_format(card, dpcm->h_stream,
                                        &snd_card_asihpi_capture);
         snd_card_asihpi_pcm_samplerates(card,  &snd_card_asihpi_capture);
-        snd_card_asihpi_capture.info = SNDRV_PCM_INFO_INTERLEAVED;
+        snd_card_asihpi_capture.info = SNDRV_PCM_INFO_INTERLEAVED |
+                                        SNDRV_PCM_INFO_MMAP |
+                                        SNDRV_PCM_INFO_MMAP_VALID;
 
-        if (card->support_mmap)
-                snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_MMAP |
-                                                SNDRV_PCM_INFO_MMAP_VALID;
+        if (card->support_grouping)
+                snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_SYNC_START;
 
         runtime->hw = snd_card_asihpi_capture;
 
-        if (card->support_mmap)
+        if (card->can_dma)
                 err = snd_pcm_hw_constraint_pow2(runtime, 0,
                                         SNDRV_PCM_HW_PARAM_BUFFER_BYTES);
         if (err < 0)
@@ -1231,30 +1239,7 @@ static int snd_card_asihpi_capture_close(struct snd_pcm_substream *substream)
 {
         struct snd_card_asihpi_pcm *dpcm = substream->runtime->private_data;
 
-        hpi_handle_error(hpi_instream_close(ss, dpcm->h_stream));
-        return 0;
-}
-
-static int snd_card_asihpi_capture_copy(struct snd_pcm_substream *substream,
-                                int channel, snd_pcm_uframes_t pos,
-                                void __user *dst, snd_pcm_uframes_t count)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        u32 data_size;
-
-        data_size = frames_to_bytes(runtime, count);
-
-        VPRINTK2("capture copy%d %d bytes\n", substream->number, data_size);
-        hpi_handle_error(hpi_instream_read_buf(ss, dpcm->h_stream,
-                                runtime->dma_area, data_size));
-
-        /* Used by capture_pointer */
-        dpcm->pcm_irq_pos = dpcm->pcm_irq_pos + data_size;
-
-        if (copy_to_user(dst, runtime->dma_area, data_size))
-                return -EFAULT;
-
+        hpi_handle_error(hpi_instream_close(dpcm->h_stream));
         return 0;
 }
 
@@ -1269,45 +1254,26 @@ static struct snd_pcm_ops snd_card_asihpi_capture_mmap_ops = {
         .pointer = snd_card_asihpi_capture_pointer,
 };
 
-static struct snd_pcm_ops snd_card_asihpi_capture_ops = {
-        .open = snd_card_asihpi_capture_open,
-        .close = snd_card_asihpi_capture_close,
-        .ioctl = snd_card_asihpi_capture_ioctl,
-        .hw_params = snd_card_asihpi_pcm_hw_params,
-        .hw_free = snd_card_asihpi_hw_free,
-        .prepare = snd_card_asihpi_capture_prepare,
-        .trigger = snd_card_asihpi_trigger,
-        .pointer = snd_card_asihpi_capture_pointer,
-        .copy = snd_card_asihpi_capture_copy
-};
-
 static int __devinit snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi,
                                       int device, int substreams)
 {
         struct snd_pcm *pcm;
         int err;
 
-        err = snd_pcm_new(asihpi->card, "asihpi PCM", device,
+        err = snd_pcm_new(asihpi->card, "Asihpi PCM", device,
                          asihpi->num_outstreams, asihpi->num_instreams,
                          &pcm);
         if (err < 0)
                 return err;
         /* pointer to ops struct is stored, dont change ops afterwards! */
-        if (asihpi->support_mmap) {
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
                                 &snd_card_asihpi_playback_mmap_ops);
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                                 &snd_card_asihpi_capture_mmap_ops);
-        } else {
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
-                                &snd_card_asihpi_playback_ops);
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
-                                &snd_card_asihpi_capture_ops);
-        }
 
         pcm->private_data = asihpi;
         pcm->info_flags = 0;
-        strcpy(pcm->name, "asihpi PCM");
+        strcpy(pcm->name, "Asihpi PCM");
 
         /*? do we want to emulate MMAP for non-BBM cards?
         Jack doesn't work with ALSAs MMAP emulation - WHY NOT? */
@@ -1330,8 +1296,7 @@ struct hpi_control {
         char name[44]; /* copied to snd_ctl_elem_id.name[44]; */
 };
 
-static char *asihpi_tuner_band_names[] =
-{
+static const char * const asihpi_tuner_band_names[] = {
         "invalid",
         "AM",
         "FM mono",
@@ -1349,70 +1314,36 @@ compile_time_assert(
                 (HPI_TUNER_BAND_LAST+1)),
         assert_tuner_band_names_size);
 
-#if ASI_STYLE_NAMES
-static char *asihpi_src_names[] =
-{
-        "no source",
-        "outstream",
-        "line_in",
-        "aes_in",
-        "tuner",
-        "RF",
-        "clock",
-        "bitstr",
-        "mic",
-        "cobranet",
-        "analog_in",
-        "adapter",
-};
-#else
-static char *asihpi_src_names[] =
-{
+static const char * const asihpi_src_names[] = {
         "no source",
-        "PCM playback",
-        "line in",
-        "digital in",
-        "tuner",
+        "PCM",
+        "Line",
+        "Digital",
+        "Tuner",
         "RF",
-        "clock",
-        "bitstream",
-        "mic",
-        "cobranet in",
-        "analog in",
-        "adapter",
+        "Clock",
+        "Bitstream",
+        "Microphone",
+        "Cobranet",
+        "Analog",
+        "Adapter",
 };
-#endif
 
 compile_time_assert(
         (ARRAY_SIZE(asihpi_src_names) ==
                 (HPI_SOURCENODE_LAST_INDEX-HPI_SOURCENODE_NONE+1)),
         assert_src_names_size);
 
-#if ASI_STYLE_NAMES
-static char *asihpi_dst_names[] =
-{
+static const char * const asihpi_dst_names[] = {
         "no destination",
-        "instream",
-        "line_out",
-        "aes_out",
+        "PCM",
+        "Line",
+        "Digital",
         "RF",
-        "speaker" ,
-        "cobranet",
-        "analog_out",
+        "Speaker",
+        "Cobranet Out",
+        "Analog"
 };
-#else
-static char *asihpi_dst_names[] =
-{
-        "no destination",
-        "PCM capture",
-        "line out",
-        "digital out",
-        "RF",
-        "speaker",
-        "cobranet out",
-        "analog out"
-};
-#endif
 
 compile_time_assert(
         (ARRAY_SIZE(asihpi_dst_names) ==
@@ -1438,30 +1369,47 @@ static void asihpi_ctl_init(struct snd_kcontrol_new *snd_control,
                                 struct hpi_control *hpi_ctl,
                                 char *name)
 {
+        char *dir;
         memset(snd_control, 0, sizeof(*snd_control));
         snd_control->name = hpi_ctl->name;
         snd_control->private_value = hpi_ctl->h_control;
         snd_control->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         snd_control->index = 0;
 
+        if (hpi_ctl->src_node_type + HPI_SOURCENODE_NONE == HPI_SOURCENODE_CLOCK_SOURCE)
+                dir = ""; /* clock is neither capture nor playback */
+        else if (hpi_ctl->dst_node_type + HPI_DESTNODE_NONE == HPI_DESTNODE_ISTREAM)
+                dir = "Capture ";  /* On or towards a PCM capture destination*/
+        else if ((hpi_ctl->src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &&
+                (!hpi_ctl->dst_node_type))
+                dir = "Capture "; /* On a source node that is not PCM playback */
+        else if (hpi_ctl->src_node_type &&
+                (hpi_ctl->src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &&
+                (hpi_ctl->dst_node_type))
+                dir = "Monitor Playback "; /* Between an input and an output */
+        else
+                dir = "Playback "; /* PCM Playback source, or  output node */
+
         if (hpi_ctl->src_node_type && hpi_ctl->dst_node_type)
-                sprintf(hpi_ctl->name, "%s%d to %s%d %s",
+                sprintf(hpi_ctl->name, "%s %d %s %d %s%s",
                         asihpi_src_names[hpi_ctl->src_node_type],
                         hpi_ctl->src_node_index,
                         asihpi_dst_names[hpi_ctl->dst_node_type],
                         hpi_ctl->dst_node_index,
-                        name);
+                        dir, name);
         else if (hpi_ctl->dst_node_type) {
-                sprintf(hpi_ctl->name, "%s%d %s",
+                sprintf(hpi_ctl->name, "%s %d %s%s",
                 asihpi_dst_names[hpi_ctl->dst_node_type],
                 hpi_ctl->dst_node_index,
-                name);
+                dir, name);
         } else {
-                sprintf(hpi_ctl->name, "%s%d %s",
+                sprintf(hpi_ctl->name, "%s %d %s%s",
                 asihpi_src_names[hpi_ctl->src_node_type],
                 hpi_ctl->src_node_index,
-                name);
+                dir, name);
         }
+        /* printk(KERN_INFO "Adding %s %d to %d ",  hpi_ctl->name,
+                hpi_ctl->wSrcNodeType, hpi_ctl->wDstNodeType); */
 }
 
 /*------------------------------------------------------------
@@ -1478,7 +1426,7 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
         short max_gain_mB;
         short step_gain_mB;
 
-        err = hpi_volume_query_range(ss, h_control,
+        err = hpi_volume_query_range(h_control,
                         &min_gain_mB, &max_gain_mB, &step_gain_mB);
         if (err) {
                 max_gain_mB = 0;
@@ -1500,7 +1448,7 @@ static int snd_asihpi_volume_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short an_gain_mB[HPI_MAX_CHANNELS];
 
-        hpi_handle_error(hpi_volume_get_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_volume_get_gain(h_control, an_gain_mB));
         ucontrol->value.integer.value[0] = an_gain_mB[0] / VOL_STEP_mB;
         ucontrol->value.integer.value[1] = an_gain_mB[1] / VOL_STEP_mB;
 
@@ -1522,7 +1470,7 @@ static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_volume[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_volume_set_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_volume_set_gain(h_control, an_gain_mB));
         return change;
 }
 
@@ -1534,7 +1482,7 @@ static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "volume");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Volume");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                 SNDRV_CTL_ELEM_ACCESS_TLV_READ;
         snd_control.info = snd_asihpi_volume_info;
@@ -1558,7 +1506,7 @@ static int snd_asihpi_level_info(struct snd_kcontrol *kcontrol,
         short step_gain_mB;
 
         err =
-            hpi_level_query_range(ss, h_control, &min_gain_mB,
+            hpi_level_query_range(h_control, &min_gain_mB,
                                &max_gain_mB, &step_gain_mB);
         if (err) {
                 max_gain_mB = 2400;
@@ -1580,7 +1528,7 @@ static int snd_asihpi_level_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short an_gain_mB[HPI_MAX_CHANNELS];
 
-        hpi_handle_error(hpi_level_get_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_level_get_gain(h_control, an_gain_mB));
         ucontrol->value.integer.value[0] =
             an_gain_mB[0] / HPI_UNITS_PER_dB;
         ucontrol->value.integer.value[1] =
@@ -1604,7 +1552,7 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_level[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_level_set_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_level_set_gain(h_control, an_gain_mB));
         return change;
 }
 
@@ -1617,7 +1565,7 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,
         struct snd_kcontrol_new snd_control;
 
         /* can't use 'volume' cos some nodes have volume as well */
-        asihpi_ctl_init(&snd_control, hpi_ctl, "level");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Level");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                 SNDRV_CTL_ELEM_ACCESS_TLV_READ;
         snd_control.info = snd_asihpi_level_info;
@@ -1633,12 +1581,8 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,
  ------------------------------------------------------------*/
 
 /* AESEBU format */
-static char *asihpi_aesebu_format_names[] =
-{
-        "N/A",
-        "S/PDIF",
-        "AES/EBU",
-};
+static const char * const asihpi_aesebu_format_names[] = {
+        "N/A", "S/PDIF", "AES/EBU" };
 
 static int snd_asihpi_aesebu_format_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
@@ -1659,12 +1603,12 @@ static int snd_asihpi_aesebu_format_info(struct snd_kcontrol *kcontrol,
 
 static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol,
-                        u16 (*func)(const struct hpi_hsubsys *, u32, u16 *))
+                        u16 (*func)(u32, u16 *))
 {
         u32 h_control = kcontrol->private_value;
         u16 source, err;
 
-        err = func(ss, h_control, &source);
+        err = func(h_control, &source);
 
         /* default to N/A */
         ucontrol->value.enumerated.item[0] = 0;
@@ -1681,7 +1625,7 @@ static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,
 
 static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol,
-                         u16 (*func)(const struct hpi_hsubsys *, u32, u16))
+                         u16 (*func)(u32, u16))
 {
         u32 h_control = kcontrol->private_value;
 
@@ -1693,7 +1637,7 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
         if (ucontrol->value.enumerated.item[0] == 2)
                 source = HPI_AESEBU_FORMAT_AESEBU;
 
-        if (func(ss, h_control, source) != 0)
+        if (func(h_control, source) != 0)
                 return -EINVAL;
 
         return 1;
@@ -1702,13 +1646,13 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
 static int snd_asihpi_aesebu_rx_format_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,
-                                        HPI_AESEBU__receiver_get_format);
+                                        hpi_aesebu_receiver_get_format);
 }
 
 static int snd_asihpi_aesebu_rx_format_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,
-                                        HPI_AESEBU__receiver_set_format);
+                                        hpi_aesebu_receiver_set_format);
 }
 
 static int snd_asihpi_aesebu_rxstatus_info(struct snd_kcontrol *kcontrol,
@@ -1730,8 +1674,8 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u16 status;
 
-        hpi_handle_error(HPI_AESEBU__receiver_get_error_status(
-                                ss, h_control, &status));
+        hpi_handle_error(hpi_aesebu_receiver_get_error_status(
+                                         h_control, &status));
         ucontrol->value.integer.value[0] = status;
         return 0;
 }
@@ -1742,7 +1686,7 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "format");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Format");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_aesebu_format_info;
         snd_control.get = snd_asihpi_aesebu_rx_format_get;
@@ -1752,7 +1696,7 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
         if (ctl_add(card, &snd_control, asihpi) < 0)
                 return -EINVAL;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "status");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Status");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_aesebu_rxstatus_info;
@@ -1764,13 +1708,13 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
 static int snd_asihpi_aesebu_tx_format_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,
-                                        HPI_AESEBU__transmitter_get_format);
+                                        hpi_aesebu_transmitter_get_format);
 }
 
 static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,
-                                        HPI_AESEBU__transmitter_set_format);
+                                        hpi_aesebu_transmitter_set_format);
 }
 
 
@@ -1780,7 +1724,7 @@ static int __devinit snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "format");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Format");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_aesebu_format_info;
         snd_control.get = snd_asihpi_aesebu_tx_format_get;
@@ -1804,7 +1748,7 @@ static int snd_asihpi_tuner_gain_info(struct snd_kcontrol *kcontrol,
         u16 gain_range[3];
 
         for (idx = 0; idx < 3; idx++) {
-                err = hpi_tuner_query_gain(ss, h_control,
+                err = hpi_tuner_query_gain(h_control,
                                           idx, &gain_range[idx]);
                 if (err != 0)
                         return err;
@@ -1827,7 +1771,7 @@ static int snd_asihpi_tuner_gain_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short gain;
 
-        hpi_handle_error(hpi_tuner_get_gain(ss, h_control, &gain));
+        hpi_handle_error(hpi_tuner_get_gain(h_control, &gain));
         ucontrol->value.integer.value[0] = gain / HPI_UNITS_PER_dB;
 
         return 0;
@@ -1843,7 +1787,7 @@ static int snd_asihpi_tuner_gain_put(struct snd_kcontrol *kcontrol,
         short gain;
 
         gain = (ucontrol->value.integer.value[0]) * HPI_UNITS_PER_dB;
-        hpi_handle_error(hpi_tuner_set_gain(ss, h_control, gain));
+        hpi_handle_error(hpi_tuner_set_gain(h_control, gain));
 
         return 1;
 }
@@ -1857,7 +1801,7 @@ static int asihpi_tuner_band_query(struct snd_kcontrol *kcontrol,
         u32 i;
 
         for (i = 0; i < len; i++) {
-                err = hpi_tuner_query_band(ss,
+                err = hpi_tuner_query_band(
                                 h_control, i, &band_list[i]);
                 if (err != 0)
                         break;
@@ -1913,7 +1857,7 @@ static int snd_asihpi_tuner_band_get(struct snd_kcontrol *kcontrol,
         num_bands = asihpi_tuner_band_query(kcontrol, tuner_bands,
                                 HPI_TUNER_BAND_LAST);
 
-        hpi_handle_error(hpi_tuner_get_band(ss, h_control, &band));
+        hpi_handle_error(hpi_tuner_get_band(h_control, &band));
 
         ucontrol->value.enumerated.item[0] = -1;
         for (idx = 0; idx < HPI_TUNER_BAND_LAST; idx++)
@@ -1940,7 +1884,7 @@ static int snd_asihpi_tuner_band_put(struct snd_kcontrol *kcontrol,
                         HPI_TUNER_BAND_LAST);
 
         band = tuner_bands[ucontrol->value.enumerated.item[0]];
-        hpi_handle_error(hpi_tuner_set_band(ss, h_control, band));
+        hpi_handle_error(hpi_tuner_set_band(h_control, band));
 
         return 1;
 }
@@ -1965,7 +1909,7 @@ static int snd_asihpi_tuner_freq_info(struct snd_kcontrol *kcontrol,
 
         for (band_iter = 0; band_iter < num_bands; band_iter++) {
                 for (idx = 0; idx < 3; idx++) {
-                        err = hpi_tuner_query_frequency(ss, h_control,
+                        err = hpi_tuner_query_frequency(h_control,
                                 idx, tuner_bands[band_iter],
                                 &temp_freq_range[idx]);
                         if (err != 0)
@@ -1998,7 +1942,7 @@ static int snd_asihpi_tuner_freq_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u32 freq;
 
-        hpi_handle_error(hpi_tuner_get_frequency(ss, h_control, &freq));
+        hpi_handle_error(hpi_tuner_get_frequency(h_control, &freq));
         ucontrol->value.integer.value[0] = freq;
 
         return 0;
@@ -2011,7 +1955,7 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol,
         u32 freq;
 
         freq = ucontrol->value.integer.value[0];
-        hpi_handle_error(hpi_tuner_set_frequency(ss, h_control, freq));
+        hpi_handle_error(hpi_tuner_set_frequency(h_control, freq));
 
         return 1;
 }
@@ -2026,8 +1970,8 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
         snd_control.private_value = hpi_ctl->h_control;
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
 
-        if (!hpi_tuner_get_gain(ss, hpi_ctl->h_control, NULL)) {
-                asihpi_ctl_init(&snd_control, hpi_ctl, "gain");
+        if (!hpi_tuner_get_gain(hpi_ctl->h_control, NULL)) {
+                asihpi_ctl_init(&snd_control, hpi_ctl, "Gain");
                 snd_control.info = snd_asihpi_tuner_gain_info;
                 snd_control.get = snd_asihpi_tuner_gain_get;
                 snd_control.put = snd_asihpi_tuner_gain_put;
@@ -2036,7 +1980,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
                         return -EINVAL;
         }
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "band");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Band");
         snd_control.info = snd_asihpi_tuner_band_info;
         snd_control.get = snd_asihpi_tuner_band_get;
         snd_control.put = snd_asihpi_tuner_band_put;
@@ -2044,7 +1988,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
         if (ctl_add(card, &snd_control, asihpi) < 0)
                 return -EINVAL;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "freq");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Freq");
         snd_control.info = snd_asihpi_tuner_freq_info;
         snd_control.get = snd_asihpi_tuner_freq_get;
         snd_control.put = snd_asihpi_tuner_freq_put;
@@ -2095,7 +2039,7 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,
         short an_gain_mB[HPI_MAX_CHANNELS], i;
         u16 err;
 
-        err = hpi_meter_get_peak(ss, h_control, an_gain_mB);
+        err = hpi_meter_get_peak(h_control, an_gain_mB);
 
         for (i = 0; i < HPI_MAX_CHANNELS; i++) {
                 if (err) {
@@ -2120,7 +2064,7 @@ static int __devinit snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "meter");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Meter");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_meter_info;
@@ -2140,7 +2084,7 @@ static int snd_card_asihpi_mux_count_sources(struct snd_kcontrol *snd_control)
         struct hpi_control hpi_ctl;
         int s, err;
         for (s = 0; s < 32; s++) {
-                err = hpi_multiplexer_query_source(ss, h_control, s,
+                err = hpi_multiplexer_query_source(h_control, s,
                                                   &hpi_ctl.
                                                   src_node_type,
                                                   &hpi_ctl.
@@ -2168,7 +2112,7 @@ static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol,
                     uinfo->value.enumerated.items - 1;
 
         err =
-            hpi_multiplexer_query_source(ss, h_control,
+            hpi_multiplexer_query_source(h_control,
                                         uinfo->value.enumerated.item,
                                         &src_node_type, &src_node_index);
 
@@ -2186,11 +2130,11 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
         u16 src_node_type, src_node_index;
         int s;
 
-        hpi_handle_error(hpi_multiplexer_get_source(ss, h_control,
+        hpi_handle_error(hpi_multiplexer_get_source(h_control,
                                 &source_type, &source_index));
         /* Should cache this search result! */
         for (s = 0; s < 256; s++) {
-                if (hpi_multiplexer_query_source(ss, h_control, s,
+                if (hpi_multiplexer_query_source(h_control, s,
                                             &src_node_type, &src_node_index))
                         break;
 
@@ -2201,7 +2145,7 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
                 }
         }
         snd_printd(KERN_WARNING
-                "control %x failed to match mux source %hu %hu\n",
+                "Control %x failed to match mux source %hu %hu\n",
                 h_control, source_type, source_index);
         ucontrol->value.enumerated.item[0] = 0;
         return 0;
@@ -2217,12 +2161,12 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol,
 
         change = 1;
 
-        e = hpi_multiplexer_query_source(ss, h_control,
+        e = hpi_multiplexer_query_source(h_control,
                                     ucontrol->value.enumerated.item[0],
                                     &source_type, &source_index);
         if (!e)
                 hpi_handle_error(
-                        hpi_multiplexer_set_source(ss, h_control,
+                        hpi_multiplexer_set_source(h_control,
                                                 source_type, source_index));
         return change;
 }
@@ -2234,11 +2178,7 @@ static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-#if ASI_STYLE_NAMES
-        asihpi_ctl_init(&snd_control, hpi_ctl, "multiplexer");
-#else
-        asihpi_ctl_init(&snd_control, hpi_ctl, "route");
-#endif
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Route");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_mux_info;
         snd_control.get = snd_asihpi_mux_get;
@@ -2254,33 +2194,38 @@ static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,
 static int snd_asihpi_cmode_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
 {
-        static char *mode_names[HPI_CHANNEL_MODE_LAST] = {
-                "normal", "swap",
-                "from_left", "from_right",
-                "to_left", "to_right"
+        static const char * const mode_names[HPI_CHANNEL_MODE_LAST + 1] = {
+                "invalid",
+                "Normal", "Swap",
+                "From Left", "From Right",
+                "To Left", "To Right"
         };
 
         u32 h_control = kcontrol->private_value;
         u16 mode;
         int i;
+        u16 mode_map[6];
+        int valid_modes = 0;
 
         /* HPI channel mode values can be from 1 to 6
         Some adapters only support a contiguous subset
         */
         for (i = 0; i < HPI_CHANNEL_MODE_LAST; i++)
-                if (hpi_channel_mode_query_mode(
-                        ss,  h_control, i, &mode))
-                        break;
+                if (!hpi_channel_mode_query_mode(
+                        h_control, i, &mode)) {
+                        mode_map[valid_modes] = mode;
+                        valid_modes++;
+                        }
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = i;
+        uinfo->value.enumerated.items = valid_modes;
 
-        if (uinfo->value.enumerated.item >= i)
-                uinfo->value.enumerated.item = i - 1;
+        if (uinfo->value.enumerated.item >= valid_modes)
+                uinfo->value.enumerated.item = valid_modes - 1;
 
         strcpy(uinfo->value.enumerated.name,
-               mode_names[uinfo->value.enumerated.item]);
+               mode_names[mode_map[uinfo->value.enumerated.item]]);
 
         return 0;
 }
@@ -2291,7 +2236,7 @@ static int snd_asihpi_cmode_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u16 mode;
 
-        if (hpi_channel_mode_get(ss, h_control, &mode))
+        if (hpi_channel_mode_get(h_control, &mode))
                 mode = 1;
 
         ucontrol->value.enumerated.item[0] = mode - 1;
@@ -2307,7 +2252,7 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol,
 
         change = 1;
 
-        hpi_handle_error(hpi_channel_mode_set(ss, h_control,
+        hpi_handle_error(hpi_channel_mode_set(h_control,
                            ucontrol->value.enumerated.item[0] + 1));
         return change;
 }
@@ -2319,7 +2264,7 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "channel mode");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Mode");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_cmode_info;
         snd_control.get = snd_asihpi_cmode_get;
@@ -2331,15 +2276,12 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,
 /*------------------------------------------------------------
    Sampleclock source  controls
  ------------------------------------------------------------*/
-
-static char *sampleclock_sources[MAX_CLOCKSOURCES] =
-    { "N/A", "local PLL", "AES/EBU sync", "word external", "word header",
-          "SMPTE", "AES/EBU in1", "auto", "network", "invalid",
-          "prev module",
-          "AES/EBU in2", "AES/EBU in3", "AES/EBU in4", "AES/EBU in5",
-          "AES/EBU in6", "AES/EBU in7", "AES/EBU in8"};
-
-
+static char *sampleclock_sources[MAX_CLOCKSOURCES] = {
+        "N/A", "Local PLL", "Digital Sync", "Word External", "Word Header",
+        "SMPTE", "Digital1", "Auto", "Network", "Invalid",
+        "Prev Module",
+        "Digital2", "Digital3", "Digital4", "Digital5",
+        "Digital6", "Digital7", "Digital8"};
 
 static int snd_asihpi_clksrc_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
@@ -2371,11 +2313,11 @@ static int snd_asihpi_clksrc_get(struct snd_kcontrol *kcontrol,
         int i;
 
         ucontrol->value.enumerated.item[0] = 0;
-        if (hpi_sample_clock_get_source(ss, h_control, &source))
+        if (hpi_sample_clock_get_source(h_control, &source))
                 source = 0;
 
         if (source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)
-                if (hpi_sample_clock_get_source_index(ss, h_control, &srcindex))
+                if (hpi_sample_clock_get_source_index(h_control, &srcindex))
                         srcindex = 0;
 
         for (i = 0; i < clkcache->count; i++)
@@ -2402,11 +2344,11 @@ static int snd_asihpi_clksrc_put(struct snd_kcontrol *kcontrol,
         if (item >= clkcache->count)
                 item = clkcache->count-1;
 
-        hpi_handle_error(hpi_sample_clock_set_source(ss,
+        hpi_handle_error(hpi_sample_clock_set_source(
                                 h_control, clkcache->s[item].source));
 
         if (clkcache->s[item].source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)
-                hpi_handle_error(hpi_sample_clock_set_source_index(ss,
+                hpi_handle_error(hpi_sample_clock_set_source_index(
                                 h_control, clkcache->s[item].index));
         return change;
 }
@@ -2434,7 +2376,7 @@ static int snd_asihpi_clklocal_get(struct snd_kcontrol *kcontrol,
         u32 rate;
         u16 e;
 
-        e = hpi_sample_clock_get_local_rate(ss, h_control, &rate);
+        e = hpi_sample_clock_get_local_rate(h_control, &rate);
         if (!e)
                 ucontrol->value.integer.value[0] = rate;
         else
@@ -2452,7 +2394,7 @@ static int snd_asihpi_clklocal_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_clkrate[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_sample_clock_set_local_rate(ss, h_control,
+        hpi_handle_error(hpi_sample_clock_set_local_rate(h_control,
                                       ucontrol->value.integer.value[0]));
         return change;
 }
@@ -2476,7 +2418,7 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,
         u32 rate;
         u16 e;
 
-        e = hpi_sample_clock_get_sample_rate(ss, h_control, &rate);
+        e = hpi_sample_clock_get_sample_rate(h_control, &rate);
         if (!e)
                 ucontrol->value.integer.value[0] = rate;
         else
@@ -2501,7 +2443,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
         clkcache->has_local = 0;
 
         for (i = 0; i <= HPI_SAMPLECLOCK_SOURCE_LAST; i++) {
-                if  (hpi_sample_clock_query_source(ss, hSC,
+                if  (hpi_sample_clock_query_source(hSC,
                                 i, &source))
                         break;
                 clkcache->s[i].source = source;
@@ -2515,7 +2457,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
         if (has_aes_in)
                 /* already will have picked up index 0 above */
                 for (j = 1; j < 8; j++) {
-                        if (hpi_sample_clock_query_source_index(ss, hSC,
+                        if (hpi_sample_clock_query_source_index(hSC,
                                 j, HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT,
                                 &source))
                                 break;
@@ -2528,7 +2470,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
                 }
         clkcache->count = i;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "source");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Source");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;
         snd_control.info = snd_asihpi_clksrc_info;
         snd_control.get = snd_asihpi_clksrc_get;
@@ -2538,7 +2480,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
 
 
         if (clkcache->has_local) {
-                asihpi_ctl_init(&snd_control, hpi_ctl, "local_rate");
+                asihpi_ctl_init(&snd_control, hpi_ctl, "Localrate");
                 snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;
                 snd_control.info = snd_asihpi_clklocal_info;
                 snd_control.get = snd_asihpi_clklocal_get;
@@ -2549,7 +2491,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
                         return -EINVAL;
         }
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "rate");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Rate");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_clkrate_info;
@@ -2571,10 +2513,10 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
 
         if (snd_BUG_ON(!asihpi))
                 return -EINVAL;
-        strcpy(card->mixername, "asihpi mixer");
+        strcpy(card->mixername, "Asihpi Mixer");
 
         err =
-            hpi_mixer_open(ss, asihpi->adapter_index,
+            hpi_mixer_open(asihpi->adapter_index,
                           &asihpi->h_mixer);
         hpi_handle_error(err);
         if (err)
@@ -2585,7 +2527,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
 
         for (idx = 0; idx < 2000; idx++) {
                 err = hpi_mixer_get_control_by_index(
-                                ss, asihpi->h_mixer,
+                                asihpi->h_mixer,
                                 idx,
                                 &hpi_ctl.src_node_type,
                                 &hpi_ctl.src_node_index,
@@ -2597,7 +2539,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
                         if (err == HPI_ERROR_CONTROL_DISABLED) {
                                 if (mixer_dump)
                                         snd_printk(KERN_INFO
-                                                   "disabled HPI control(%d)\n",
+                                                   "Disabled HPI Control(%d)\n",
                                                    idx);
                                 continue;
                         } else
@@ -2662,7 +2604,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
                 default:
                         if (mixer_dump)
                                 snd_printk(KERN_INFO
-                                        "untranslated HPI control"
+                                        "Untranslated HPI Control"
                                         "(%d) %d %d %d %d %d\n",
                                         idx,
                                         hpi_ctl.control_type,
@@ -2712,14 +2654,14 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,
                 version & 0x7,
                 ((version >> 13) * 100) + ((version >> 7) & 0x3f));
 
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err) {
-                err = hpi_sample_clock_get_sample_rate(ss,
+                err = hpi_sample_clock_get_sample_rate(
                                         h_control, &rate);
-                err += hpi_sample_clock_get_source(ss, h_control, &source);
+                err += hpi_sample_clock_get_source(h_control, &source);
 
                 if (!err)
                         snd_iprintf(buffer, "sample_clock=%d_hz, source %s\n",
@@ -2841,15 +2783,17 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 if (err < 0)
                         return err;
                 snd_printk(KERN_WARNING
-                        "**** WARNING **** adapter index %d->ALSA index %d\n",
+                        "**** WARNING **** Adapter index %d->ALSA index %d\n",
                         hpi_card->index, card->number);
         }
 
+        snd_card_set_dev(card, &pci_dev->dev);
+
         asihpi = (struct snd_card_asihpi *) card->private_data;
         asihpi->card = card;
-        asihpi->pci = hpi_card->pci;
+        asihpi->pci = pci_dev;
         asihpi->adapter_index = hpi_card->index;
-        hpi_handle_error(hpi_adapter_get_info(ss,
+        hpi_handle_error(hpi_adapter_get_info(
                                  asihpi->adapter_index,
                                  &asihpi->num_outstreams,
                                  &asihpi->num_instreams,
@@ -2859,7 +2803,7 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
         version = asihpi->version;
         snd_printk(KERN_INFO "adapter ID=%4X index=%d num_outstreams=%d "
                         "num_instreams=%d S/N=%d\n"
-                        "hw version %c%d DSP code version %03d\n",
+                        "Hw Version %c%d DSP code version %03d\n",
                         asihpi->type, asihpi->adapter_index,
                         asihpi->num_outstreams,
                         asihpi->num_instreams, asihpi->serial_number,
@@ -2871,33 +2815,36 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
         if (pcm_substreams < asihpi->num_instreams)
                 pcm_substreams = asihpi->num_instreams;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS1,
                 NULL, &asihpi->support_grouping);
         if (err)
                 asihpi->support_grouping = 0;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS2,
                 &asihpi->support_mrx, NULL);
         if (err)
                 asihpi->support_mrx = 0;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_INTERVAL,
                 NULL, &asihpi->update_interval_frames);
         if (err)
                 asihpi->update_interval_frames = 512;
 
-        hpi_handle_error(hpi_instream_open(ss, asihpi->adapter_index,
+        if (!asihpi->can_dma)
+                asihpi->update_interval_frames *= 2;
+
+        hpi_handle_error(hpi_instream_open(asihpi->adapter_index,
                              0, &h_stream));
 
-        err = hpi_instream_host_buffer_free(ss, h_stream);
-        asihpi->support_mmap = (!err);
+        err = hpi_instream_host_buffer_free(h_stream);
+        asihpi->can_dma = (!err);
 
-        hpi_handle_error(hpi_instream_close(ss, h_stream));
+        hpi_handle_error(hpi_instream_close(h_stream));
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CURCHANNELS,
                 &asihpi->in_max_chans, &asihpi->out_max_chans);
         if (err) {
@@ -2905,13 +2852,12 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 asihpi->out_max_chans = 2;
         }
 
-        snd_printk(KERN_INFO "supports mmap:%d grouping:%d mrx:%d\n",
-                        asihpi->support_mmap,
+        snd_printk(KERN_INFO "has dma:%d, grouping:%d, mrx:%d\n",
+                        asihpi->can_dma,
                         asihpi->support_grouping,
                         asihpi->support_mrx
               );
 
-
         err = snd_card_asihpi_pcm_new(asihpi, 0, pcm_substreams);
         if (err < 0) {
                 snd_printk(KERN_ERR "pcm_new failed\n");
@@ -2923,13 +2869,13 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 goto __nodev;
         }
 
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
                 err = hpi_sample_clock_set_local_rate(
-                        ss, h_control, adapter_fs);
+                        h_control, adapter_fs);
 
         snd_asihpi_proc_init(asihpi);
 
@@ -2937,15 +2883,13 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
             by enable_hwdep  module param*/
         snd_asihpi_hpi_new(asihpi, 0, NULL);
 
-        if (asihpi->support_mmap)
-                strcpy(card->driver, "ASIHPI-MMAP");
-        else
-                strcpy(card->driver, "ASIHPI");
+        strcpy(card->driver, "ASIHPI");
 
         sprintf(card->shortname, "AudioScience ASI%4X", asihpi->type);
         sprintf(card->longname, "%s %i",
                         card->shortname, asihpi->adapter_index);
         err = snd_card_register(card);
+
         if (!err) {
                 hpi_card->snd_card_asihpi = card;
                 dev++;
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 23399d02f666..255429c32c1c 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -24,17 +24,10 @@
 
  The HPI is a low-level hardware abstraction layer to all
  AudioScience digital audio adapters
-*/
-/*
- You must define one operating system that the HPI is to be compiled under
- HPI_OS_WIN32_USER   32bit Windows
- HPI_OS_DSP_C6000    DSP TI C6000  (automatically set)
- HPI_OS_WDM          Windows WDM kernel driver
- HPI_OS_LINUX        Linux userspace
- HPI_OS_LINUX_KERNEL Linux kernel (automatically set)
 
 (C) Copyright AudioScience Inc. 1998-2010
-******************************************************************************/
+*/
+
 #ifndef _HPI_H_
 #define _HPI_H_
 /* HPI Version
@@ -50,20 +43,20 @@ i.e 3.05.02 is a development version
 #define HPI_VER_RELEASE(v) ((int)(v & 0xFF))
 
 /* Use single digits for versions less that 10 to avoid octal. */
-#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 4, 1)
-#define HPI_VER_STRING "4.04.01"
+#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 6, 0)
+#define HPI_VER_STRING "4.06.00"
 
 /* Library version as documented in hpi-api-versions.txt */
 #define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(9, 0, 0)
 
 #include <linux/types.h>
-#define HPI_EXCLUDE_DEPRECATED
+#define HPI_BUILD_EXCLUDE_DEPRECATED
+#define HPI_BUILD_KERNEL_MODE
 
 /******************************************************************************/
-/******************************************************************************/
 /********       HPI API DEFINITIONS                                       *****/
 /******************************************************************************/
-/******************************************************************************/
+
 /*******************************************/
 /**  Audio format types
 \ingroup stream
@@ -174,7 +167,6 @@ The range is +1.0 to -1.0, which corresponds to digital fullscale.
         HPI_FORMAT_UNDEFINED = 0xffff
 };
 
-/******************************************* in/out Stream states */
 /*******************************************/
 /** Stream States
 \ingroup stream
@@ -194,7 +186,7 @@ enum HPI_STREAM_STATES {
                 cards to be ready. */
         HPI_STATE_WAIT = 6
 };
-/******************************************* mixer source node types */
+/*******************************************/
 /** Source node types
 \ingroup mixer
 */
@@ -224,7 +216,7 @@ enum HPI_SOURCENODES {
                 /* AX6 max sourcenode types = 15 */
 };
 
-/******************************************* mixer dest node types */
+/*******************************************/
 /** Destination node types
 \ingroup mixer
 */
@@ -262,11 +254,11 @@ enum HPI_CONTROLS {
         HPI_CONTROL_MUTE = 4,   /*mute control - not used at present. */
         HPI_CONTROL_MULTIPLEXER = 5,    /**< multiplexer control. */
 
-        HPI_CONTROL_AESEBU_TRANSMITTER = 6,     /**< AES/EBU transmitter control. */
-        HPI_CONTROL_AESEBUTX = HPI_CONTROL_AESEBU_TRANSMITTER,
+        HPI_CONTROL_AESEBU_TRANSMITTER = 6, /**< AES/EBU transmitter control */
+        HPI_CONTROL_AESEBUTX = 6,       /* HPI_CONTROL_AESEBU_TRANSMITTER */
 
         HPI_CONTROL_AESEBU_RECEIVER = 7, /**< AES/EBU receiver control. */
-        HPI_CONTROL_AESEBURX = HPI_CONTROL_AESEBU_RECEIVER,
+        HPI_CONTROL_AESEBURX = 7,       /* HPI_CONTROL_AESEBU_RECEIVER */
 
         HPI_CONTROL_LEVEL = 8, /**< level/trim control - works in d_bu. */
         HPI_CONTROL_TUNER = 9,  /**< tuner control. */
@@ -281,7 +273,7 @@ enum HPI_CONTROLS {
         HPI_CONTROL_SAMPLECLOCK = 17,   /**< sample clock control. */
         HPI_CONTROL_MICROPHONE = 18,    /**< microphone control. */
         HPI_CONTROL_PARAMETRIC_EQ = 19, /**< parametric EQ control. */
-        HPI_CONTROL_EQUALIZER = HPI_CONTROL_PARAMETRIC_EQ,
+        HPI_CONTROL_EQUALIZER = 19,     /*HPI_CONTROL_PARAMETRIC_EQ */
 
         HPI_CONTROL_COMPANDER = 20,     /**< compander control. */
         HPI_CONTROL_COBRANET = 21,      /**< cobranet control. */
@@ -296,10 +288,7 @@ enum HPI_CONTROLS {
 /* WARNING types 256 or greater impact bit packing in all AX6 DSP code */
 };
 
-/* Shorthand names that match attribute names */
-
-/******************************************* ADAPTER ATTRIBUTES ****/
-
+/*******************************************/
 /** Adapter properties
 These are used in HPI_AdapterSetProperty() and HPI_AdapterGetProperty()
 \ingroup adapter
@@ -330,12 +319,21 @@ by the driver and is not passed on to the DSP at all.
 Indicates the state of the adapter's SSX2 setting. This setting is stored in
 non-volatile memory on the adapter. A typical call sequence would be to use
 HPI_ADAPTER_PROPERTY_SSX2_SETTING to set SSX2 on the adapter and then to reload
-the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during startup
-and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2 to enable
-SSX2 stream mapping within the kernel level of the driver.
+the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during
+startup and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2
+to enable SSX2 stream mapping within the kernel level of the driver.
 */
         HPI_ADAPTER_PROPERTY_SSX2_SETTING = 4,
 
+/** Enables/disables PCI(e) IRQ.
+A setting of 0 indicates that no interrupts are being generated. A DSP boot
+this property is set to 0. Setting to a non-zero value specifies the number
+of frames of audio that should be processed between interrupts. This property
+should be set to multiple of the mixer interval as read back from the
+HPI_ADAPTER_PROPERTY_INTERVAL property.
+*/
+        HPI_ADAPTER_PROPERTY_IRQ_RATE = 5,
+
 /** Base number for readonly properties */
         HPI_ADAPTER_PROPERTY_READONLYBASE = 256,
 
@@ -440,21 +438,30 @@ return value is true (1) or false (0). If the current adapter
 mode is MONO SSX2 is disabled, even though this property will
 return true.
 */
-        HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271
+        HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271,
+/** Readonly supports PCI(e) IRQ.
+Indicates that the adapter in it's current mode supports interrupts
+across the host bus. Note, this does not imply that interrupts are
+enabled. Instead it indicates that they can be enabled.
+*/
+        HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ = 272
 };
 
 /** Adapter mode commands
 
-Used in wQueryOrSet field of HPI_AdapterSetModeEx().
+Used in wQueryOrSet parameter of HPI_AdapterSetModeEx().
 \ingroup adapter
 */
 enum HPI_ADAPTER_MODE_CMDS {
+        /** Set the mode to the given parameter */
         HPI_ADAPTER_MODE_SET = 0,
+        /** Return 0 or error depending whether mode is valid,
+        but don't set the mode */
         HPI_ADAPTER_MODE_QUERY = 1
 };
 
 /** Adapter Modes
-        These are used by HPI_AdapterSetModeEx()
+ These are used by HPI_AdapterSetModeEx()
 
 \warning - more than 16 possible modes breaks
 a bitmask in the Windows WAVE DLL
@@ -629,10 +636,13 @@ enum HPI_MIXER_STORE_COMMAND {
         HPI_MIXER_STORE_SAVE_SINGLE = 6
 };
 
-/************************************* CONTROL ATTRIBUTE VALUES ****/
+/****************************/
+/* CONTROL ATTRIBUTE VALUES */
+/****************************/
+
 /** Used by mixer plugin enable functions
 
-E.g. HPI_ParametricEQ_SetState()
+E.g. HPI_ParametricEq_SetState()
 \ingroup mixer
 */
 enum HPI_SWITCH_STATES {
@@ -641,6 +651,7 @@ enum HPI_SWITCH_STATES {
 };
 
 /* Volume control special gain values */
+
 /** volumes units are 100ths of a dB
 \ingroup volume
 */
@@ -650,6 +661,11 @@ enum HPI_SWITCH_STATES {
 */
 #define HPI_GAIN_OFF                    (-100 * HPI_UNITS_PER_dB)
 
+/** channel mask specifying all channels
+\ingroup volume
+*/
+#define HPI_BITMASK_ALL_CHANNELS        (0xFFFFFFFF)
+
 /** value returned for no signal
 \ingroup meter
 */
@@ -667,7 +683,7 @@ enum HPI_VOLUME_AUTOFADES {
 
 /** The physical encoding format of the AESEBU I/O.
 
-Used in HPI_AESEBU_Transmitter_SetFormat(), HPI_AESEBU_Receiver_SetFormat()
+Used in HPI_Aesebu_Transmitter_SetFormat(), HPI_Aesebu_Receiver_SetFormat()
 along with related Get and Query functions
 \ingroup aestx
 */
@@ -680,7 +696,7 @@ enum HPI_AESEBU_FORMATS {
 
 /** AES/EBU error status bits
 
-Returned by HPI_AESEBU_Receiver_GetErrorStatus()
+Returned by HPI_Aesebu_Receiver_GetErrorStatus()
 \ingroup aesrx
 */
 enum HPI_AESEBU_ERRORS {
@@ -709,7 +725,7 @@ enum HPI_AESEBU_ERRORS {
 #define HPI_PAD_TITLE_LEN               64
 /** The text string containing the comment. */
 #define HPI_PAD_COMMENT_LEN             256
-/** The PTY when the tuner has not recieved any PTY. */
+/** The PTY when the tuner has not received any PTY. */
 #define HPI_PAD_PROGRAM_TYPE_INVALID    0xffff
 /** \} */
 
@@ -767,14 +783,6 @@ enum HPI_TUNER_MODE_VALUES {
         HPI_TUNER_MODE_RDS_RBDS = 2 /**<  RDS - RBDS mode */
 };
 
-/** Tuner Level settings
-\ingroup tuner
-*/
-enum HPI_TUNER_LEVEL {
-        HPI_TUNER_LEVEL_AVERAGE = 0,
-        HPI_TUNER_LEVEL_RAW = 1
-};
-
 /** Tuner Status Bits
 
 These bitfield values are returned by a call to HPI_Tuner_GetStatus().
@@ -783,13 +791,13 @@ Multiple fields are returned from a single call.
 */
 enum HPI_TUNER_STATUS_BITS {
         HPI_TUNER_VIDEO_COLOR_PRESENT = 0x0001, /**< video color is present. */
-        HPI_TUNER_VIDEO_IS_60HZ = 0x0020,       /**< 60 hz video detected. */
-        HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040,     /**< video HSYNC is missing. */
-        HPI_TUNER_VIDEO_STATUS_VALID = 0x0100,  /**< video status is valid. */
-        HPI_TUNER_PLL_LOCKED = 0x1000,          /**< the tuner's PLL is locked. */
-        HPI_TUNER_FM_STEREO = 0x2000,           /**< tuner reports back FM stereo. */
-        HPI_TUNER_DIGITAL = 0x0200,             /**< tuner reports digital programming. */
-        HPI_TUNER_MULTIPROGRAM = 0x0400         /**< tuner reports multiple programs. */
+        HPI_TUNER_VIDEO_IS_60HZ = 0x0020, /**< 60 hz video detected. */
+        HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040, /**< video HSYNC is missing. */
+        HPI_TUNER_VIDEO_STATUS_VALID = 0x0100, /**< video status is valid. */
+        HPI_TUNER_DIGITAL = 0x0200, /**< tuner reports digital programming. */
+        HPI_TUNER_MULTIPROGRAM = 0x0400, /**< tuner reports multiple programs. */
+        HPI_TUNER_PLL_LOCKED = 0x1000, /**< the tuner's PLL is locked. */
+        HPI_TUNER_FM_STEREO = 0x2000 /**< tuner reports back FM stereo. */
 };
 
 /** Channel Modes
@@ -839,7 +847,7 @@ enum HPI_SAMPLECLOCK_SOURCES {
         HPI_SAMPLECLOCK_SOURCE_LAST = 10
 };
 
-/** Equalizer filter types. Used by HPI_ParametricEQ_SetBand()
+/** Equalizer filter types. Used by HPI_ParametricEq_SetBand()
 \ingroup parmeq
 */
 enum HPI_FILTER_TYPE {
@@ -882,7 +890,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_INVALID_OBJ = 101,
         /** Function does not exist. */
         HPI_ERROR_INVALID_FUNC = 102,
-        /** The specified object (adapter/Stream) does not exist. */
+        /** The specified object does not exist. */
         HPI_ERROR_INVALID_OBJ_INDEX = 103,
         /** Trying to access an object that has not been opened yet. */
         HPI_ERROR_OBJ_NOT_OPEN = 104,
@@ -890,8 +898,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_OBJ_ALREADY_OPEN = 105,
         /** PCI, ISA resource not valid. */
         HPI_ERROR_INVALID_RESOURCE = 106,
-        /** GetInfo call from SubSysFindAdapters failed. */
-        HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO = 107,
+        /* HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO= 107 */
         /** Default response was never updated with actual error code. */
         HPI_ERROR_INVALID_RESPONSE = 108,
         /** wSize field of response was not updated,
@@ -899,38 +906,44 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_PROCESSING_MESSAGE = 109,
         /** The network did not respond in a timely manner. */
         HPI_ERROR_NETWORK_TIMEOUT = 110,
-        /** An HPI handle is invalid (uninitialised?). */
+        /* An HPI handle is invalid (uninitialised?). */
         HPI_ERROR_INVALID_HANDLE = 111,
         /** A function or attribute has not been implemented yet. */
         HPI_ERROR_UNIMPLEMENTED = 112,
-        /** There are too many clients attempting to access a network resource. */
+        /** There are too many clients attempting
+            to access a network resource. */
         HPI_ERROR_NETWORK_TOO_MANY_CLIENTS = 113,
-        /** Response buffer passed to HPI_Message was smaller than returned response */
+        /** Response buffer passed to HPI_Message
+            was smaller than returned response.
+            wSpecificError field of hpi response contains the required size.
+        */
         HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL = 114,
         /** The returned response did not match the sent message */
         HPI_ERROR_RESPONSE_MISMATCH = 115,
+        /** A control setting that should have been cached was not. */
+        HPI_ERROR_CONTROL_CACHING = 116,
+        /** A message buffer in the path to the adapter was smaller
+            than the message size.
+            wSpecificError field of hpi response contains the actual size.
+        */
+        HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL = 117,
 
-        /** Too many adapters.*/
-        HPI_ERROR_TOO_MANY_ADAPTERS = 200,
+        /* HPI_ERROR_TOO_MANY_ADAPTERS= 200 */
         /** Bad adpater. */
         HPI_ERROR_BAD_ADAPTER = 201,
         /** Adapter number out of range or not set properly. */
         HPI_ERROR_BAD_ADAPTER_NUMBER = 202,
         /** 2 adapters with the same adapter number. */
-        HPI_DUPLICATE_ADAPTER_NUMBER = 203,
-        /** DSP code failed to bootload. */
+        HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,
+        /** DSP code failed to bootload. (unused?) */
         HPI_ERROR_DSP_BOOTLOAD = 204,
-        /** Adapter failed DSP code self test. */
-        HPI_ERROR_DSP_SELFTEST = 205,
         /** Couldn't find or open the DSP code file. */
         HPI_ERROR_DSP_FILE_NOT_FOUND = 206,
         /** Internal DSP hardware error. */
         HPI_ERROR_DSP_HARDWARE = 207,
-        /** Could not allocate memory in DOS. */
-        HPI_ERROR_DOS_MEMORY_ALLOC = 208,
         /** Could not allocate memory */
         HPI_ERROR_MEMORY_ALLOC = 208,
-        /** Failed to correctly load/config PLD .*/
+        /** Failed to correctly load/config PLD. (unused) */
         HPI_ERROR_PLD_LOAD = 209,
         /** Unexpected end of file, block length too big etc. */
         HPI_ERROR_DSP_FILE_FORMAT = 210,
@@ -939,8 +952,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_DSP_FILE_ACCESS_DENIED = 211,
         /** First DSP code section header not found in DSP file. */
         HPI_ERROR_DSP_FILE_NO_HEADER = 212,
-        /** File read operation on DSP code file failed. */
-        HPI_ERROR_DSP_FILE_READ_ERROR = 213,
+        /* HPI_ERROR_DSP_FILE_READ_ERROR= 213, */
         /** DSP code for adapter family not found. */
         HPI_ERROR_DSP_SECTION_NOT_FOUND = 214,
         /** Other OS specific error opening DSP file. */
@@ -950,23 +962,21 @@ enum HPI_ERROR_CODES {
         /** DSP code section header had size == 0. */
         HPI_ERROR_DSP_FILE_NULL_HEADER = 217,
 
-        /** Base number for flash errors. */
-        HPI_ERROR_FLASH = 220,
+        /* HPI_ERROR_FLASH = 220, */
 
         /** Flash has bad checksum */
-        HPI_ERROR_BAD_CHECKSUM = (HPI_ERROR_FLASH + 1),
-        HPI_ERROR_BAD_SEQUENCE = (HPI_ERROR_FLASH + 2),
-        HPI_ERROR_FLASH_ERASE = (HPI_ERROR_FLASH + 3),
-        HPI_ERROR_FLASH_PROGRAM = (HPI_ERROR_FLASH + 4),
-        HPI_ERROR_FLASH_VERIFY = (HPI_ERROR_FLASH + 5),
-        HPI_ERROR_FLASH_TYPE = (HPI_ERROR_FLASH + 6),
-        HPI_ERROR_FLASH_START = (HPI_ERROR_FLASH + 7),
+        HPI_ERROR_BAD_CHECKSUM = 221,
+        HPI_ERROR_BAD_SEQUENCE = 222,
+        HPI_ERROR_FLASH_ERASE = 223,
+        HPI_ERROR_FLASH_PROGRAM = 224,
+        HPI_ERROR_FLASH_VERIFY = 225,
+        HPI_ERROR_FLASH_TYPE = 226,
+        HPI_ERROR_FLASH_START = 227,
 
         /** Reserved for OEMs. */
         HPI_ERROR_RESERVED_1 = 290,
 
-        /** Stream does not exist. */
-        HPI_ERROR_INVALID_STREAM = 300,
+        /* HPI_ERROR_INVALID_STREAM = 300 use HPI_ERROR_INVALID_OBJ_INDEX */
         /** Invalid compression format. */
         HPI_ERROR_INVALID_FORMAT = 301,
         /** Invalid format samplerate */
@@ -977,21 +987,19 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_INVALID_BITRATE = 304,
         /** Invalid datasize used for stream read/write. */
         HPI_ERROR_INVALID_DATASIZE = 305,
-        /** Stream buffer is full during stream write. */
-        HPI_ERROR_BUFFER_FULL = 306,
-        /** Stream buffer is empty during stream read. */
-        HPI_ERROR_BUFFER_EMPTY = 307,
-        /** Invalid datasize used for stream read/write. */
-        HPI_ERROR_INVALID_DATA_TRANSFER = 308,
+        /* HPI_ERROR_BUFFER_FULL = 306 use HPI_ERROR_INVALID_DATASIZE */
+        /* HPI_ERROR_BUFFER_EMPTY = 307 use HPI_ERROR_INVALID_DATASIZE */
+        /** Null data pointer used for stream read/write. */
+        HPI_ERROR_INVALID_DATA_POINTER = 308,
         /** Packet ordering error for stream read/write. */
         HPI_ERROR_INVALID_PACKET_ORDER = 309,
 
         /** Object can't do requested operation in its current
-        state, eg set format, change rec mux state while recording.*/
+            state, eg set format, change rec mux state while recording.*/
         HPI_ERROR_INVALID_OPERATION = 310,
 
-        /** Where an SRG is shared amongst streams, an incompatible samplerate is one
-        that is different to any currently playing or recording stream. */
+        /** Where a SRG is shared amongst streams, an incompatible samplerate
+            is one that is different to any currently active stream. */
         HPI_ERROR_INCOMPATIBLE_SAMPLERATE = 311,
         /** Adapter mode is illegal.*/
         HPI_ERROR_BAD_ADAPTER_MODE = 312,
@@ -1004,6 +1012,8 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_NO_INTERADAPTER_GROUPS = 314,
         /** Streams on different DSPs cannot be grouped. */
         HPI_ERROR_NO_INTERDSP_GROUPS = 315,
+        /** Stream wait cancelled before threshold reached. */
+        HPI_ERROR_WAIT_CANCELLED = 316,
 
         /** Invalid mixer node for this adapter. */
         HPI_ERROR_INVALID_NODE = 400,
@@ -1017,6 +1027,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_CONTROL_DISABLED = 404,
         /** I2C transaction failed due to a missing ACK. */
         HPI_ERROR_CONTROL_I2C_MISSING_ACK = 405,
+        HPI_ERROR_I2C_MISSING_ACK = 405,
         /** Control is busy, or coming out of
         reset and cannot be accessed at this time. */
         HPI_ERROR_CONTROL_NOT_READY = 407,
@@ -1027,7 +1038,6 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_NVMEM_FAIL = 452,
 
         /** I2C */
-        HPI_ERROR_I2C_MISSING_ACK = HPI_ERROR_CONTROL_I2C_MISSING_ACK,
         HPI_ERROR_I2C_BAD_ADR = 460,
 
         /** Entity errors */
@@ -1035,6 +1045,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_ENTITY_ITEM_COUNT = 471,
         HPI_ERROR_ENTITY_TYPE_INVALID = 472,
         HPI_ERROR_ENTITY_ROLE_INVALID = 473,
+        HPI_ERROR_ENTITY_SIZE_MISMATCH = 474,
 
         /* AES18 specific errors were 500..507 */
 
@@ -1044,11 +1055,18 @@ enum HPI_ERROR_CODES {
         /** hpioct32.c can't obtain mutex */
         HPI_ERROR_MUTEX_TIMEOUT = 700,
 
-        /** errors from HPI backends have values >= this */
+        /** Backend errors used to be greater than this.
+            \deprecated Now, all backends return only errors defined here in hpi.h
+        */
         HPI_ERROR_BACKEND_BASE = 900,
 
-        /** indicates a cached u16 value is invalid. */
-        HPI_ERROR_ILLEGAL_CACHE_VALUE = 0xffff
+        /** Communication with DSP failed */
+        HPI_ERROR_DSP_COMMUNICATION = 900
+                /* Note that the dsp communication error is set to this value so that
+                   it remains compatible with any software that expects such errors
+                   to be backend errors i.e. >= 900.
+                   Do not define any new error codes with values > 900.
+                 */
 };
 
 /** \defgroup maximums HPI maximum values
@@ -1075,7 +1093,7 @@ enum HPI_ERROR_CODES {
 
 /**\}*/
 
-/* ////////////////////////////////////////////////////////////////////// */
+/**************/
 /* STRUCTURES */
 #ifndef DISABLE_PRAGMA_PACK1
 #pragma pack(push, 1)
@@ -1092,7 +1110,7 @@ struct hpi_format {
                                 /**< Stereo/JointStereo/Mono */
         u16 mode_legacy;
                                 /**< Legacy ancillary mode or idle bit  */
-        u16 unused;           /**< unused */
+        u16 unused;           /**< Unused */
         u16 channels; /**< 1,2..., (or ancillary mode or idle bit */
         u16 format;   /**< HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */
 };
@@ -1106,930 +1124,594 @@ struct hpi_anc_frame {
 */
 struct hpi_async_event {
         u16 event_type; /**< type of event. \sa async_event  */
-        u16 sequence;  /**< sequence number, allows lost event detection */
-        u32 state;    /**< new state */
-        u32 h_object;    /**< handle to the object returning the event. */
+        u16 sequence; /**< Sequence number, allows lost event detection */
+        u32 state; /**< New state */
+        u32 h_object; /**< handle to the object returning the event. */
         union {
                 struct {
                         u16 index; /**< GPIO bit index. */
                 } gpio;
                 struct {
                         u16 node_index; /**< what node is the control on ? */
-                        u16 node_type;  /**< what type of node is the control on ? */
+                        u16 node_type; /**< what type of node is the control on ? */
                 } control;
         } u;
 };
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* Public HPI Entity related definitions                                     */
-
-struct hpi_entity;
-
-enum e_entity_type {
-        entity_type_null,
-        entity_type_sequence,   /* sequence of potentially heterogeneous TLV entities */
-
-        entity_type_reference,  /* refers to a TLV entity or NULL */
-
-        entity_type_int,        /* 32 bit */
-        entity_type_float,      /* ieee754 binary 32 bit encoding */
-        entity_type_double,
-
-        entity_type_cstring,
-        entity_type_octet,
-        entity_type_ip4_address,
-        entity_type_ip6_address,
-        entity_type_mac_address,
-
-        LAST_ENTITY_TYPE
-};
-
-enum e_entity_role {
-        entity_role_null,
-        entity_role_value,
-        entity_role_classname,
-
-        entity_role_units,
-        entity_role_flags,
-        entity_role_range,
-
-        entity_role_mapping,
-        entity_role_enum,
-
-        entity_role_instance_of,
-        entity_role_depends_on,
-        entity_role_member_of_group,
-        entity_role_value_constraint,
-        entity_role_parameter_port,
-
-        entity_role_block,
-        entity_role_node_group,
-        entity_role_audio_port,
-        entity_role_clock_port,
-        LAST_ENTITY_ROLE
-};
-
 /* skip host side function declarations for
    DSP compile and documentation extraction */
 
-struct hpi_hsubsys {
-        int not_really_used;
-};
-
 #ifndef DISABLE_PRAGMA_PACK1
 #pragma pack(pop)
 #endif
 
-/*////////////////////////////////////////////////////////////////////////// */
+/*****************/
 /* HPI FUNCTIONS */
+/*****************/
 
-/*/////////////////////////// */
-/* DATA and FORMAT and STREAM */
-
+/* Stream */
 u16 hpi_stream_estimate_buffer_size(struct hpi_format *pF,
         u32 host_polling_rate_in_milli_seconds, u32 *recommended_buffer_size);
 
-/*/////////// */
-/* SUB SYSTEM */
-struct hpi_hsubsys *hpi_subsys_create(void
-        );
-
-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys);
-
-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion);
-
-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion_ex);
-
-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);
-
-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);
-
-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
-        int *pn_num_adapters);
-
-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,
-        u32 *padapter_index, u16 *pw_adapter_type);
-
-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass);
+/*************/
+/* SubSystem */
+/*************/
 
-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,
-        const char *sz_interface);
+u16 hpi_subsys_get_version_ex(u32 *pversion_ex);
 
-/*///////// */
-/* ADAPTER */
+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters);
 
-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);
+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,
+        u16 *pw_adapter_type);
 
-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);
+/***********/
+/* Adapter */
+/***********/
 
-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,
-        u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type);
+u16 hpi_adapter_open(u16 adapter_index);
 
-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 module_index, u16 *pw_num_outputs,
-        u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,
-        u16 *pw_module_type, u32 *ph_module);
+u16 hpi_adapter_close(u16 adapter_index);
 
-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode);
+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,
+        u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,
+        u16 *pw_adapter_type);
 
-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode, u16 query_or_set);
-
-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *padapter_mode);
-
-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u16 *pw_line_number);
-
-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u32 *pline_number, u16 *pw_assert_on_dsp);
-
-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 assert_id);
-
-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 capability, u32 key);
-
-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index);
-
-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 dsp_address, char *p_bytes, int *count_bytes);
-
-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 paramter1, u16 paramter2);
-
-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 *pw_paramter1,
-        u16 *pw_paramter2);
-
-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 index, u16 what_to_enumerate,
-        u16 property_index, u32 *psetting);
-
-/*////////////// */
-/* NonVol Memory */
-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_nv_memory, u16 *pw_size_in_bytes);
-
-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 *pw_data);
-
-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 data);
-
-/*////////////// */
-/* Digital I/O */
-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits);
-
-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 *pw_bit_data);
-
-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        );
+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,
+        u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,
+        u32 *pserial_number, u16 *pw_module_type, u32 *ph_module);
 
-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 bit_data);
+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode);
 
-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        );
+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,
+        u16 query_or_set);
 
-/**********************/
-/* Async Event Object */
-/**********************/
-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *ph_async);
+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode);
 
-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async);
+u16 hpi_adapter_get_assert2(u16 adapter_index, u16 *p_assert_count,
+        char *psz_assert, u32 *p_param1, u32 *p_param2,
+        u32 *p_dsp_string_addr, u16 *p_processor_id);
 
-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned);
+u16 hpi_adapter_test_assert(u16 adapter_index, u16 assert_id);
 
-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,
-        u32 h_async, u16 *pw_count);
+u16 hpi_adapter_enable_capability(u16 adapter_index, u16 capability, u32 key);
 
-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned);
+u16 hpi_adapter_self_test(u16 adapter_index);
 
-/*/////////// */
-/* WATCH-DOG  */
-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_watchdog);
+u16 hpi_adapter_debug_read(u16 adapter_index, u32 dsp_address, char *p_bytes,
+        int *count_bytes);
 
-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,
-        u32 time_millisec);
+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 paramter1,
+        u16 paramter2);
 
-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog);
+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,
+        u16 *pw_paramter1, u16 *pw_paramter2);
 
-/**************/
-/* OUT STREAM */
-/**************/
-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 outstream_index, u32 *ph_outstream);
+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,
+        u16 what_to_enumerate, u16 property_index, u32 *psetting);
+/*************/
+/* OutStream */
+/*************/
+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,
+        u32 *ph_outstream);
 
-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_close(u32 h_outstream);
 
-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,
-        u32 *psamples_played, u32 *pauxiliary_data_to_play);
+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,
+        u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,
+        u32 *pauxiliary_data_to_play);
 
-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, const u8 *pb_write_buf, u32 bytes_to_write,
-        const struct hpi_format *p_format);
+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_write_buf,
+        u32 bytes_to_write, const struct hpi_format *p_format);
 
-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_start(u32 h_outstream);
 
-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_wait_start(u32 h_outstream);
 
-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_stop(u32 h_outstream);
 
-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_sinegen(u32 h_outstream);
 
-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_reset(u32 h_outstream);
 
-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format);
+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format);
 
-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format);
+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format);
 
-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample);
+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,
+        u32 punch_out_sample);
 
-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, short velocity);
+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity);
 
-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 mode);
+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode);
 
-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *pframes_available);
+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available);
 
-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_outstream_ancillary_read(u32 h_outstream,
+        struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_read);
 
-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 time_scaleX10000);
+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scaleX10000);
 
-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 size_in_bytes);
+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes);
 
-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_host_buffer_free(u32 h_outstream);
 
-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 h_stream);
+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream);
 
-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map);
+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,
+        u32 *pinstream_map);
 
-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_group_reset(u32 h_outstream);
 
-/*////////// */
-/* IN_STREAM */
-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 instream_index, u32 *ph_instream);
+/************/
+/* InStream */
+/************/
+u16 hpi_instream_open(u16 adapter_index, u16 instream_index,
+        u32 *ph_instream);
 
-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_close(u32 h_instream);
 
-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format);
+u16 hpi_instream_query_format(u32 h_instream,
+        const struct hpi_format *p_format);
 
-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format);
+u16 hpi_instream_set_format(u32 h_instream,
+        const struct hpi_format *p_format);
 
-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
-        u8 *pb_read_buf, u32 bytes_to_read);
+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_read_buf, u32 bytes_to_read);
 
-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_start(u32 h_instream);
 
-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_wait_start(u32 h_instream);
 
-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_stop(u32 h_instream);
 
-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_reset(u32 h_instream);
 
-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,
-        u32 *psamples_recorded, u32 *pauxiliary_data_recorded);
+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,
+        u32 *pdata_recorded, u32 *psamples_recorded,
+        u32 *pauxiliary_data_recorded);
 
-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,
-        u16 idle_bit);
+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,
+        u16 mode, u16 alignment, u16 idle_bit);
 
-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *pframe_space);
+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space);
 
-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_instream_ancillary_write(u32 h_instream,
+        const struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_write);
 
-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 size_in_bytes);
+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes);
 
-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_host_buffer_free(u32 h_instream);
 
-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 h_stream);
+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream);
 
-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *poutstream_map, u32 *pinstream_map);
+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,
+        u32 *pinstream_map);
 
-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_group_reset(u32 h_instream);
 
 /*********/
-/* MIXER */
+/* Mixer */
 /*********/
-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_mixer);
-
-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer);
-
-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,
-        u16 dst_node_type_index, u16 control_type, u32 *ph_control);
-
-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_mixer, u16 control_index, u16 *pw_src_node_type,
-        u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,
-        u16 *pw_control_type, u32 *ph_control);
-
-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        enum HPI_MIXER_STORE_COMMAND command, u16 index);
-/*************************/
-/* mixer CONTROLS                */
-/*************************/
-/*************************/
-/* volume control                */
-/*************************/
-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer);
+
+u16 hpi_mixer_close(u32 h_mixer);
+
+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,
+        u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,
+        u16 control_type, u32 *ph_control);
+
+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,
+        u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,
+        u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control);
+
+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,
+        u16 index);
+/************/
+/* Controls */
+/************/
+/******************/
+/* Volume control */
+/******************/
+u16 hpi_volume_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_get_gain(u32 h_control,
         short an_gain0_01dB_out[HPI_MAX_CHANNELS]
         );
 
+u16 hpi_volume_set_mute(u32 h_control, u32 mute);
+
+u16 hpi_volume_get_mute(u32 h_control, u32 *mute);
+
 #define hpi_volume_get_range hpi_volume_query_range
-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);
+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB);
 
-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_volume, u32 *p_channels);
+u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels);
 
-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_auto_fade(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms);
 
-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],
-        u32 duration_ms, u16 profile);
+u16 hpi_volume_auto_fade_profile(u32 h_control,
+        short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,
+        u16 profile);
 
-/*************************/
-/* level control         */
-/*************************/
-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);
+/*****************/
+/* Level control */
+/*****************/
+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB);
 
-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_level_get_gain(u32 h_control,
         short an_gain0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-/*************************/
-/* meter control                 */
-/*************************/
-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_meter, u32 *p_channels);
+/*****************/
+/* Meter control */
+/*****************/
+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels);
 
-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_meter_get_peak(u32 h_control,
         short an_peak0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_peak0_01dB_out[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_rms(u32 h_control, short an_peak0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay);
+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay);
 
-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay);
+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay);
 
-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *attack, u16 *decay);
+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *attack, u16 *decay);
 
-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *attack, u16 *decay);
+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *attack, u16 *decay);
 
-/*************************/
-/* channel mode control  */
-/*************************/
-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_mode, const u32 index, u16 *pw_mode);
+/************************/
+/* ChannelMode control */
+/************************/
+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,
+        u16 *pw_mode);
 
-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 mode);
+u16 hpi_channel_mode_set(u32 h_control, u16 mode);
 
-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *mode);
+u16 hpi_channel_mode_get(u32 h_control, u16 *mode);
 
-/*************************/
-/* Tuner control                 */
-/*************************/
-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_band);
+/*****************/
+/* Tuner control */
+/*****************/
+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band);
 
-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 band);
+u16 hpi_tuner_set_band(u32 h_control, u16 band);
 
-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_band);
+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band);
 
-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq);
+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pfreq);
 
-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 freq_ink_hz);
+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz);
 
-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pw_freq_ink_hz);
+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz);
 
-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pw_level);
+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level);
 
-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pw_level);
+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level);
 
-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_gain);
+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain);
 
-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short gain);
+u16 hpi_tuner_set_gain(u32 h_control, short gain);
 
-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pn_gain);
+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain);
 
-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_status_mask, u16 *pw_status);
+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status);
 
-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 value);
+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value);
 
-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 *pn_value);
+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value);
 
-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *p_rds_data);
+u16 hpi_tuner_get_rds(u32 h_control, char *p_rds_data);
 
-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis);
+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pdeemphasis);
 
-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 deemphasis);
-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pdeemphasis);
+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis);
+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis);
 
-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, u32 *pbitmap_program);
+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program);
 
-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 program);
+u16 hpi_tuner_set_program(u32 h_control, u32 program);
 
-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *pprogram);
+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram);
 
-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_dsp_version, const u32 string_size);
+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,
+        const u32 string_size);
 
-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_sdk_version, const u32 string_size);
+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,
+        const u32 string_size);
 
-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pquality);
+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality);
 
-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pblend);
+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend);
 
-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 blend);
+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend);
 
-/****************************/
-/* PADs control             */
-/****************************/
+/***************/
+/* PAD control */
+/***************/
 
-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_string, const u32 string_length);
+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_artist(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_title(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *ppTY);
+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY);
 
-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *ppI);
+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI);
 
-u16 HPI_PAD__get_program_type_string(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 data_type, const u32 pTY, char *psz_string,
-        const u32 string_length);
+u16 hpi_pad_get_program_type_string(u32 h_control, const u32 data_type,
+        const u32 pTY, char *psz_string, const u32 string_length);
 
 /****************************/
 /* AES/EBU Receiver control */
 /****************************/
-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_rx, const u32 index, u16 *pw_format);
+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,
+        u16 *pw_format);
 
-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source);
+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 source);
 
-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source);
+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_source);
 
-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate);
 
-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data);
 
-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data);
 
-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_error_data);
+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data);
 
 /*******************************/
 /* AES/EBU Transmitter control */
 /*******************************/
-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 sample_rate);
+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate);
 
-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 data);
+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data);
 
-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 data);
+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,
+        u16 data);
 
-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data);
 
-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_tx, const u32 index, u16 *pw_format);
+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,
+        u16 *pw_format);
 
-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 output_format);
+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format);
 
-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_output_format);
+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format);
 
 /***********************/
-/* multiplexer control */
+/* Multiplexer control */
 /***********************/
-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_node_type, u16 source_node_index);
-
-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *source_node_type, u16 *source_node_index);
+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,
+        u16 source_node_index);
 
-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *source_node_type,
+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,
         u16 *source_node_index);
 
+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,
+        u16 *source_node_type, u16 *source_node_index);
+
 /***************/
-/* VOX control */
+/* Vox control */
 /***************/
-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB);
+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB);
 
-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *an_gain0_01dB);
+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB);
 
 /*********************/
 /* Bitstream control */
 /*********************/
-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 edge_type);
+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type);
 
-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 polarity);
+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity);
 
-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity);
+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,
+        u16 *pw_data_activity);
 
 /***********************/
 /* SampleClock control */
 /***********************/
 
-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u16 *pw_source);
+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,
+        u16 *pw_source);
 
-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source);
+u16 hpi_sample_clock_set_source(u32 h_control, u16 source);
 
-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source);
+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source);
 
-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, const u32 source,
-        u16 *pw_source_index);
+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,
+        const u32 source, u16 *pw_source_index);
 
-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_index);
+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index);
 
-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source_index);
+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index);
 
-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate);
 
-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u32 *psource);
+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,
+        u32 *psource);
 
-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 sample_rate);
+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate);
 
-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate);
 
-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable);
+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable);
 
-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *penable);
+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable);
 
-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 lock);
+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock);
 
-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *plock);
+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock);
 
 /***********************/
 /* Microphone control */
 /***********************/
-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off);
+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off);
 
-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_on_off);
+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off);
 
-/*******************************
-  Parametric Equalizer control
-*******************************/
-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_number_of_bands, u16 *pw_enabled);
+/********************************/
+/* Parametric Equalizer control */
+/********************************/
+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,
+        u16 *pw_enabled);
 
-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off);
+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off);
 
-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,
-        short gain0_01dB);
+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,
+        u32 frequency_hz, short q100, short gain0_01dB);
 
-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,
-        short *pnQ100, short *pn_gain0_01dB);
+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,
+        u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB);
 
-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, short coeffs[5]
+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]
         );
 
-/*******************************
-  Compressor Expander control
-*******************************/
-
-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 on);
-
-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pon);
-
-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short makeup_gain0_01dB);
-
-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pn_makeup_gain0_01dB);
-
-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 index, u32 attack);
-
-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 index, u32 *pw_attack);
-
-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 decay);
-
-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *pw_decay);
-
-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, short threshold0_01dB);
-
-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, short *pn_threshold0_01dB);
-
-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 ratio100);
-
-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *pw_ratio100);
-
-/*******************************
-  Cobranet HMI control
-*******************************/
-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 byte_count, u8 *pb_data);
-
-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data);
-
-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pstatus, u32 *preadable_size,
-        u32 *pwriteable_size);
-
-/*Read the current IP address
-*/
-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress);
-
-/* Write the current IP address
-*/
-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress);
-
-/* Read the static IP address
-*/
-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress);
+/*******************************/
+/* Compressor Expander control */
+/*******************************/
 
-/* Write the static IP address
-*/
-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress);
+u16 hpi_compander_set_enable(u32 h_control, u32 on);
 
-/* Read the MAC address
-*/
-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs);
+u16 hpi_compander_get_enable(u32 h_control, u32 *pon);
 
-/*******************************
-  Tone Detector control
-*******************************/
-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 *state);
+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB);
 
-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 enable);
+u16 hpi_compander_get_makeup_gain(u32 h_control, short *pn_makeup_gain0_01dB);
 
-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 *enable);
+u16 hpi_compander_set_attack_time_constant(u32 h_control, u32 index,
+        u32 attack);
 
-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 event_enable);
+u16 hpi_compander_get_attack_time_constant(u32 h_control, u32 index,
+        u32 *pw_attack);
 
-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *event_enable);
+u16 hpi_compander_set_decay_time_constant(u32 h_control, u32 index,
+        u32 decay);
 
-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int threshold);
+u16 hpi_compander_get_decay_time_constant(u32 h_control, u32 index,
+        u32 *pw_decay);
 
-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int *threshold);
+u16 hpi_compander_set_threshold(u32 h_control, u32 index,
+        short threshold0_01dB);
 
-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 index, u32 *frequency);
+u16 hpi_compander_get_threshold(u32 h_control, u32 index,
+        short *pn_threshold0_01dB);
 
-/*******************************
-  Silence Detector control
-*******************************/
-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *state);
+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100);
 
-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 enable);
+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *pw_ratio100);
 
-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *enable);
+/********************/
+/* Cobranet control */
+/********************/
+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,
+        u8 *pb_data);
 
-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 event_enable);
+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,
+        u32 *pbyte_count, u8 *pb_data);
 
-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *event_enable);
+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,
+        u32 *preadable_size, u32 *pwriteable_size);
 
-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 delay);
+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address);
 
-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *delay);
+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address);
 
-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int threshold);
+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address);
 
-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int *threshold);
+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address);
 
-/*******************************
-  Universal control
-*******************************/
-u16 hpi_entity_find_next(struct hpi_entity *container_entity,
-        enum e_entity_type type, enum e_entity_role role, int recursive_flag,
-        struct hpi_entity **current_match);
+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,
+        u32 *p_mac_lsbs);
 
-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,
-        enum e_entity_type type, size_t item_count, void *value_dst_p);
+/*************************/
+/* Tone Detector control */
+/*************************/
+u16 hpi_tone_detector_get_state(u32 hC, u32 *state);
 
-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,
-        size_t *items, enum e_entity_role *role, void **value);
+u16 hpi_tone_detector_set_enable(u32 hC, u32 enable);
 
-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,
-        const size_t item_count, const enum e_entity_role role, void *value,
-        struct hpi_entity **entity);
+u16 hpi_tone_detector_get_enable(u32 hC, u32 *enable);
 
-void hpi_entity_free(struct hpi_entity *entity);
+u16 hpi_tone_detector_set_event_enable(u32 hC, u32 event_enable);
 
-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **info);
+u16 hpi_tone_detector_get_event_enable(u32 hC, u32 *event_enable);
 
-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **value);
+u16 hpi_tone_detector_set_threshold(u32 hC, int threshold);
 
-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity *value);
+u16 hpi_tone_detector_get_threshold(u32 hC, int *threshold);
 
-/*/////////// */
-/* DSP CLOCK  */
-/*/////////// */
-u16 hpi_clock_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_dsp_clock);
+u16 hpi_tone_detector_get_frequency(u32 hC, u32 index, u32 *frequency);
 
-u16 hpi_clock_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,
-        u16 hour, u16 minute, u16 second, u16 milli_second);
+/****************************/
+/* Silence Detector control */
+/****************************/
+u16 hpi_silence_detector_get_state(u32 hC, u32 *state);
 
-u16 hpi_clock_get_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,
-        u16 *pw_hour, u16 *pw_minute, u16 *pw_second, u16 *pw_milli_second);
+u16 hpi_silence_detector_set_enable(u32 hC, u32 enable);
 
-/*/////////// */
-/* PROFILE        */
-/*/////////// */
-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 profile_index, u32 *ph_profile,
-        u16 *pw_max_profiles);
+u16 hpi_silence_detector_get_enable(u32 hC, u32 *enable);
 
-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,
-        u32 *pmax_micro_seconds, u32 *pmin_micro_seconds);
+u16 hpi_silence_detector_set_event_enable(u32 hC, u32 event_enable);
 
-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);
+u16 hpi_silence_detector_get_event_enable(u32 hC, u32 *event_enable);
 
-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);
+u16 hpi_silence_detector_set_delay(u32 hC, u32 delay);
 
-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 index, char *sz_profile_name, u16 profile_name_length);
+u16 hpi_silence_detector_get_delay(u32 hC, u32 *delay);
 
-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,
-        u32 h_profile, u32 *putilization);
+u16 hpi_silence_detector_set_threshold(u32 hC, int threshold);
 
-/*//////////////////// */
-/* UTILITY functions */
+u16 hpi_silence_detector_get_threshold(u32 hC, int *threshold);
+/*********************/
+/* Utility functions */
+/*********************/
 
 u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         u32 sample_rate, u32 bit_rate, u32 attributes);
 
-/* Until it's verified, this function is for Windows OSs only */
-
-#endif   /*_H_HPI_ */
-/*
-///////////////////////////////////////////////////////////////////////////////
-// See CVS for history.  Last complete set in rev 1.146
-////////////////////////////////////////////////////////////////////////////////
-*/
+#endif   /*_HPI_H_ */
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index f7e374ec4414..df4aed5295dd 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -43,16 +43,17 @@
 #define HPI_HIF_ERROR_MASK      0x4000
 
 /* HPI6000 specific error codes */
+#define HPI6000_ERROR_BASE 900  /* not actually used anywhere */
 
-#define HPI6000_ERROR_BASE                              900
+/* operational/messaging errors */
 #define HPI6000_ERROR_MSG_RESP_IDLE_TIMEOUT             901
-#define HPI6000_ERROR_MSG_RESP_SEND_MSG_ACK             902
+
 #define HPI6000_ERROR_MSG_RESP_GET_RESP_ACK             903
 #define HPI6000_ERROR_MSG_GET_ADR                       904
 #define HPI6000_ERROR_RESP_GET_ADR                      905
 #define HPI6000_ERROR_MSG_RESP_BLOCKWRITE32             906
 #define HPI6000_ERROR_MSG_RESP_BLOCKREAD32              907
-#define HPI6000_ERROR_MSG_INVALID_DSP_INDEX             908
+
 #define HPI6000_ERROR_CONTROL_CACHE_PARAMS              909
 
 #define HPI6000_ERROR_SEND_DATA_IDLE_TIMEOUT            911
@@ -62,7 +63,6 @@
 #define HPI6000_ERROR_SEND_DATA_CMD                     915
 #define HPI6000_ERROR_SEND_DATA_WRITE                   916
 #define HPI6000_ERROR_SEND_DATA_IDLECMD                 917
-#define HPI6000_ERROR_SEND_DATA_VERIFY                  918
 
 #define HPI6000_ERROR_GET_DATA_IDLE_TIMEOUT             921
 #define HPI6000_ERROR_GET_DATA_ACK                      922
@@ -76,9 +76,8 @@
 
 #define HPI6000_ERROR_MSG_RESP_GETRESPCMD               961
 #define HPI6000_ERROR_MSG_RESP_IDLECMD                  962
-#define HPI6000_ERROR_MSG_RESP_BLOCKVERIFY32            963
 
-/* adapter init errors */
+/* Initialisation/bootload errors */
 #define HPI6000_ERROR_UNHANDLED_SUBSYS_ID               930
 
 /* can't access PCI2040 */
@@ -201,8 +200,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,
 static void subsys_create_adapter(struct hpi_message *phm,
         struct hpi_response *phr);
 
-static void subsys_delete_adapter(struct hpi_message *phm,
-        struct hpi_response *phr);
+static void adapter_delete(struct hpi_adapter_obj *pao,
+        struct hpi_message *phm, struct hpi_response *phr);
 
 static void adapter_get_asserts(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr);
@@ -210,6 +209,8 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 *pos_error_code);
 
+static void delete_adapter_obj(struct hpi_adapter_obj *pao);
+
 /* local globals */
 
 static u16 gw_pci_read_asserts; /* used to count PCI2040 errors */
@@ -217,23 +218,10 @@ static u16 gw_pci_write_asserts;	/* used to count PCI2040 errors */
 
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
-        case HPI_SUBSYS_OPEN:
-        case HPI_SUBSYS_CLOSE:
-        case HPI_SUBSYS_GET_INFO:
-        case HPI_SUBSYS_DRIVER_UNLOAD:
-        case HPI_SUBSYS_DRIVER_LOAD:
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                /* messages that should not get here */
-                phr->error = HPI_ERROR_UNIMPLEMENTED;
-                break;
         case HPI_SUBSYS_CREATE_ADAPTER:
                 subsys_create_adapter(phm, phr);
                 break;
-        case HPI_SUBSYS_DELETE_ADAPTER:
-                subsys_delete_adapter(phm, phr);
-                break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
                 break;
@@ -243,7 +231,6 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 static void control_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
@@ -251,7 +238,13 @@ static void control_message(struct hpi_adapter_obj *pao,
                         err = hpi6000_update_control_cache(pao, phm);
 
                         if (err) {
-                                phr->error = err;
+                                if (err >= HPI_ERROR_BACKEND_BASE) {
+                                        phr->error =
+                                                HPI_ERROR_CONTROL_CACHING;
+                                        phr->specific_error = err;
+                                } else {
+                                        phr->error = err;
+                                }
                                 break;
                         }
 
@@ -262,16 +255,15 @@ static void control_message(struct hpi_adapter_obj *pao,
                 }
                 hw_message(pao, phm, phr);
                 break;
-        case HPI_CONTROL_GET_INFO:
-                hw_message(pao, phm, phr);
-                break;
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
-                hpi_sync_control_cache(((struct hpi_hw_obj *)pao->priv)->
-                        p_cache, phm, phr);
+                hpi_cmn_control_cache_sync_to_msg(((struct hpi_hw_obj *)pao->
+                                priv)->p_cache, phm, phr);
                 break;
+
+        case HPI_CONTROL_GET_INFO:
         default:
-                phr->error = HPI_ERROR_INVALID_FUNC;
+                hw_message(pao, phm, phr);
                 break;
         }
 }
@@ -280,26 +272,16 @@ static void adapter_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
         switch (phm->function) {
-        case HPI_ADAPTER_GET_INFO:
-                hw_message(pao, phm, phr);
-                break;
         case HPI_ADAPTER_GET_ASSERT:
                 adapter_get_asserts(pao, phm, phr);
                 break;
-        case HPI_ADAPTER_OPEN:
-        case HPI_ADAPTER_CLOSE:
-        case HPI_ADAPTER_TEST_ASSERT:
-        case HPI_ADAPTER_SELFTEST:
-        case HPI_ADAPTER_GET_MODE:
-        case HPI_ADAPTER_SET_MODE:
-        case HPI_ADAPTER_FIND_OBJECT:
-        case HPI_ADAPTER_GET_PROPERTY:
-        case HPI_ADAPTER_SET_PROPERTY:
-        case HPI_ADAPTER_ENUM_PROPERTY:
-                hw_message(pao, phm, phr);
+
+        case HPI_ADAPTER_DELETE:
+                adapter_delete(pao, phm, phr);
                 break;
+
         default:
-                phr->error = HPI_ERROR_INVALID_FUNC;
+                hw_message(pao, phm, phr);
                 break;
         }
 }
@@ -311,7 +293,7 @@ static void outstream_message(struct hpi_adapter_obj *pao,
         case HPI_OSTREAM_HOSTBUFFER_ALLOC:
         case HPI_OSTREAM_HOSTBUFFER_FREE:
                 /* Don't let these messages go to the HW function because
-                 * they're called without allocating the spinlock.
+                 * they're called without locking the spinlock.
                  * For the HPI6000 adapters the HW would return
                  * HPI_ERROR_INVALID_FUNC anyway.
                  */
@@ -331,7 +313,7 @@ static void instream_message(struct hpi_adapter_obj *pao,
         case HPI_ISTREAM_HOSTBUFFER_ALLOC:
         case HPI_ISTREAM_HOSTBUFFER_FREE:
                 /* Don't let these messages go to the HW function because
-                 * they're called without allocating the spinlock.
+                 * they're called without locking the spinlock.
                  * For the HPI6000 adapters the HW would return
                  * HPI_ERROR_INVALID_FUNC anyway.
                  */
@@ -352,26 +334,22 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)
 {
         struct hpi_adapter_obj *pao = NULL;
 
-        /* subsytem messages get executed by every HPI. */
-        /* All other messages are ignored unless the adapter index matches */
-        /* an adapter in the HPI */
-        HPI_DEBUG_LOG(DEBUG, "O %d,F %x\n", phm->object, phm->function);
-
-        /* if Dsp has crashed then do not communicate with it any more */
         if (phm->object != HPI_OBJ_SUBSYSTEM) {
                 pao = hpi_find_adapter(phm->adapter_index);
                 if (!pao) {
-                        HPI_DEBUG_LOG(DEBUG,
-                                " %d,%d refused, for another HPI?\n",
-                                phm->object, phm->function);
+                        hpi_init_response(phr, phm->object, phm->function,
+                                HPI_ERROR_BAD_ADAPTER_NUMBER);
+                        HPI_DEBUG_LOG(DEBUG, "invalid adapter index: %d \n",
+                                phm->adapter_index);
                         return;
                 }
 
+                /* Don't even try to communicate with crashed DSP */
                 if (pao->dsp_crashed >= 10) {
                         hpi_init_response(phr, phm->object, phm->function,
                                 HPI_ERROR_DSP_HARDWARE);
-                        HPI_DEBUG_LOG(DEBUG, " %d,%d dsp crashed.\n",
-                                phm->object, phm->function);
+                        HPI_DEBUG_LOG(DEBUG, "adapter %d dsp crashed\n",
+                                phm->adapter_index);
                         return;
                 }
         }
@@ -433,39 +411,34 @@ static void subsys_create_adapter(struct hpi_message *phm,
         struct hpi_adapter_obj ao;
         struct hpi_adapter_obj *pao;
         u32 os_error_code;
-        short error = 0;
+        u16 err = 0;
         u32 dsp_index = 0;
 
         HPI_DEBUG_LOG(VERBOSE, "subsys_create_adapter\n");
 
         memset(&ao, 0, sizeof(ao));
 
-        /* this HPI only creates adapters for TI/PCI2040 based devices */
-        if (phm->u.s.resource.bus_type != HPI_BUS_PCI)
-                return;
-        if (phm->u.s.resource.r.pci->vendor_id != HPI_PCI_VENDOR_ID_TI)
-                return;
-        if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_PCI2040)
-                return;
-
         ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
         if (!ao.priv) {
-                HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
+                HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
                 phr->error = HPI_ERROR_MEMORY_ALLOC;
                 return;
         }
 
         /* create the adapter object based on the resource information */
-        /*? memcpy(&ao.Pci,&phm->u.s.Resource.r.Pci,sizeof(ao.Pci)); */
         ao.pci = *phm->u.s.resource.r.pci;
 
-        error = create_adapter_obj(&ao, &os_error_code);
-        if (!error)
-                error = hpi_add_adapter(&ao);
-        if (error) {
+        err = create_adapter_obj(&ao, &os_error_code);
+        if (err) {
+                delete_adapter_obj(&ao);
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_BOOTLOAD;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+
                 phr->u.s.data = os_error_code;
-                kfree(ao.priv);
-                phr->error = error;
                 return;
         }
         /* need to update paParentAdapter */
@@ -473,7 +446,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
         if (!pao) {
                 /* We just added this adapter, why can't we find it!? */
                 HPI_DEBUG_LOG(ERROR, "lost adapter after boot\n");
-                phr->error = 950;
+                phr->error = HPI_ERROR_BAD_ADAPTER;
                 return;
         }
 
@@ -482,30 +455,16 @@ static void subsys_create_adapter(struct hpi_message *phm,
                 phw->ado[dsp_index].pa_parent_adapter = pao;
         }
 
-        phr->u.s.aw_adapter_list[ao.index] = ao.adapter_type;
+        phr->u.s.adapter_type = ao.adapter_type;
         phr->u.s.adapter_index = ao.index;
-        phr->u.s.num_adapters++;
         phr->error = 0;
 }
 
-static void subsys_delete_adapter(struct hpi_message *phm,
-        struct hpi_response *phr)
+static void adapter_delete(struct hpi_adapter_obj *pao,
+        struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct hpi_adapter_obj *pao = NULL;
-        struct hpi_hw_obj *phw;
-
-        pao = hpi_find_adapter(phm->adapter_index);
-        if (!pao)
-                return;
-
-        phw = (struct hpi_hw_obj *)pao->priv;
-
-        if (pao->has_control_cache)
-                hpi_free_control_cache(phw->p_cache);
-
+        delete_adapter_obj(pao);
         hpi_delete_adapter(pao);
-        kfree(phw);
-
         phr->error = 0;
 }
 
@@ -519,9 +478,6 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 control_cache_count = 0;
         struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
 
-        /* init error reporting */
-        pao->dsp_crashed = 0;
-
         /* The PCI2040 has the following address map */
         /* BAR0 - 4K = HPI control and status registers on PCI2040 (HPI CSR) */
         /* BAR1 - 32K = HPI registers on DSP */
@@ -575,36 +531,36 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         /* get info about the adapter by asking the adapter */
         /* send a HPI_ADAPTER_GET_INFO message */
         {
-                struct hpi_message hM;
-                struct hpi_response hR0;        /* response from DSP 0 */
-                struct hpi_response hR1;        /* response from DSP 1 */
+                struct hpi_message hm;
+                struct hpi_response hr0;        /* response from DSP 0 */
+                struct hpi_response hr1;        /* response from DSP 1 */
                 u16 error = 0;
 
                 HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n");
-                memset(&hM, 0, sizeof(hM));
-                hM.type = HPI_TYPE_MESSAGE;
-                hM.size = sizeof(struct hpi_message);
-                hM.object = HPI_OBJ_ADAPTER;
-                hM.function = HPI_ADAPTER_GET_INFO;
-                hM.adapter_index = 0;
-                memset(&hR0, 0, sizeof(hR0));
-                memset(&hR1, 0, sizeof(hR1));
-                hR0.size = sizeof(hR0);
-                hR1.size = sizeof(hR1);
-
-                error = hpi6000_message_response_sequence(pao, 0, &hM, &hR0);
-                if (hR0.error) {
-                        HPI_DEBUG_LOG(DEBUG, "message error %d\n", hR0.error);
-                        return hR0.error;
+                memset(&hm, 0, sizeof(hm));
+                hm.type = HPI_TYPE_MESSAGE;
+                hm.size = sizeof(struct hpi_message);
+                hm.object = HPI_OBJ_ADAPTER;
+                hm.function = HPI_ADAPTER_GET_INFO;
+                hm.adapter_index = 0;
+                memset(&hr0, 0, sizeof(hr0));
+                memset(&hr1, 0, sizeof(hr1));
+                hr0.size = sizeof(hr0);
+                hr1.size = sizeof(hr1);
+
+                error = hpi6000_message_response_sequence(pao, 0, &hm, &hr0);
+                if (hr0.error) {
+                        HPI_DEBUG_LOG(DEBUG, "message error %d\n", hr0.error);
+                        return hr0.error;
                 }
                 if (phw->num_dsp == 2) {
-                        error = hpi6000_message_response_sequence(pao, 1, &hM,
-                                &hR1);
+                        error = hpi6000_message_response_sequence(pao, 1, &hm,
+                                &hr1);
                         if (error)
                                 return error;
                 }
-                pao->adapter_type = hR0.u.a.adapter_type;
-                pao->index = hR0.u.a.adapter_index;
+                pao->adapter_type = hr0.u.ax.info.adapter_type;
+                pao->index = hr0.u.ax.info.adapter_index;
         }
 
         memset(&phw->control_cache[0], 0,
@@ -618,20 +574,37 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                 control_cache_count =
                         hpi_read_word(&phw->ado[0],
                         HPI_HIF_ADDR(control_cache_count));
-                pao->has_control_cache = 1;
 
                 phw->p_cache =
                         hpi_alloc_control_cache(control_cache_count,
-                        control_cache_size, (struct hpi_control_cache_info *)
+                        control_cache_size, (unsigned char *)
                         &phw->control_cache[0]
                         );
-        } else
-                pao->has_control_cache = 0;
+                if (phw->p_cache)
+                        pao->has_control_cache = 1;
+        }
 
         HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n",
                 pao->adapter_type, pao->index);
         pao->open = 0;  /* upon creation the adapter is closed */
-        return 0;
+
+        if (phw->p_cache)
+                phw->p_cache->adap_idx = pao->index;
+
+        return hpi_add_adapter(pao);
+}
+
+static void delete_adapter_obj(struct hpi_adapter_obj *pao)
+{
+        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+
+        if (pao->has_control_cache)
+                hpi_free_control_cache(phw->p_cache);
+
+        /* reset DSPs on adapter */
+        iowrite32(0x0003000F, phw->dw2040_HPICSR + HPI_RESET);
+
+        kfree(phw);
 }
 
 /************************************************************************/
@@ -643,11 +616,13 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 #ifndef HIDE_PCI_ASSERTS
         /* if we have PCI2040 asserts then collect them */
         if ((gw_pci_read_asserts > 0) || (gw_pci_write_asserts > 0)) {
-                phr->u.a.serial_number =
+                phr->u.ax.assert.p1 =
                         gw_pci_read_asserts * 100 + gw_pci_write_asserts;
-                phr->u.a.adapter_index = 1;     /* assert count */
-                phr->u.a.adapter_type = -1;     /* "dsp index" */
-                strcpy(phr->u.a.sz_adapter_assert, "PCI2040 error");
+                phr->u.ax.assert.p2 = 0;
+                phr->u.ax.assert.count = 1;     /* assert count */
+                phr->u.ax.assert.dsp_index = -1;        /* "dsp index" */
+                strcpy(phr->u.ax.assert.sz_message, "PCI2040 error");
+                phr->u.ax.assert.dsp_msg_addr = 0;
                 gw_pci_read_asserts = 0;
                 gw_pci_write_asserts = 0;
                 phr->error = 0;
@@ -684,10 +659,10 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
         /* NOTE don't use wAdapterType in this routine. It is not setup yet */
 
-        switch (pao->pci.subsys_device_id) {
+        switch (pao->pci.pci_dev->subsystem_device) {
         case 0x5100:
         case 0x5110:    /* ASI5100 revB or higher with C6711D */
-        case 0x5200:    /* ASI5200 PC_ie version of ASI5100 */
+        case 0x5200:    /* ASI5200 PCIe version of ASI5100 */
         case 0x6100:
         case 0x6200:
                 boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x6200);
@@ -707,8 +682,9 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
          * note that bits 4..15 are read-only and so should always return zero,
          * even though we wrote 1 to them
          */
-        for (i = 0; i < 1000; i++)
-                delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+        hpios_delay_micro_seconds(1000);
+        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+
         if (delay != dw2040_reset) {
                 HPI_DEBUG_LOG(ERROR, "INIT_PCI2040 %x %x\n", dw2040_reset,
                         delay);
@@ -741,8 +717,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         dw2040_reset = dw2040_reset & (~0x00000008);
         iowrite32(dw2040_reset, phw->dw2040_HPICSR + HPI_RESET);
         /*delay to allow DSP to get going */
-        for (i = 0; i < 100; i++)
-                delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+        hpios_delay_micro_seconds(100);
 
         /* loop through all DSPs, downloading DSP code */
         for (dsp_index = 0; dsp_index < phw->num_dsp; dsp_index++) {
@@ -781,27 +756,27 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                          */
                         /* bypass PLL */
                         hpi_write_word(pdo, 0x01B7C100, 0x0000);
-                        for (i = 0; i < 100; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+                        hpios_delay_micro_seconds(100);
 
                         /*  ** use default of PLL  x7 ** */
                         /* EMIF = 225/3=75MHz */
                         hpi_write_word(pdo, 0x01B7C120, 0x8002);
+                        hpios_delay_micro_seconds(100);
+
                         /* peri = 225/2 */
                         hpi_write_word(pdo, 0x01B7C11C, 0x8001);
+                        hpios_delay_micro_seconds(100);
+
                         /* cpu  = 225/1 */
                         hpi_write_word(pdo, 0x01B7C118, 0x8000);
-                        /* ~200us delay */
-                        for (i = 0; i < 2000; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+
+                        /* ~2ms delay */
+                        hpios_delay_micro_seconds(2000);
+
                         /* PLL not bypassed */
                         hpi_write_word(pdo, 0x01B7C100, 0x0001);
-                        /* ~200us delay */
-                        for (i = 0; i < 2000; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+                        /* ~2ms delay */
+                        hpios_delay_micro_seconds(2000);
                 }
 
                 /* test r/w to internal DSP memory
@@ -925,9 +900,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                 }
 
                 /* delay a little to allow SDRAM and DSP to "get going" */
-
-                for (i = 0; i < 1000; i++)
-                        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+                hpios_delay_micro_seconds(1000);
 
                 /* test access to SDRAM */
                 {
@@ -974,7 +947,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
                 /* write the DSP code down into the DSPs memory */
                 /*HpiDspCode_Open(nBootLoadFamily,&DspCode,pdwOsErrorCode); */
-                dsp_code.ps_dev = pao->pci.p_os_data;
+                dsp_code.ps_dev = pao->pci.pci_dev;
 
                 error = hpi_dsp_code_open(boot_load_family, &dsp_code,
                         pos_error_code);
@@ -1071,8 +1044,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
                 /* step 3. Start code by sending interrupt */
                 iowrite32(0x00030003, pdo->prHPI_control);
-                for (i = 0; i < 10000; i++)
-                        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+                hpios_delay_micro_seconds(10000);
 
                 /* wait for a non-zero value in hostcmd -
                  * indicating initialization is complete
@@ -1099,7 +1071,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                          * locks up with a bluescreen (NOT GPF or pagefault).
                          */
                         else
-                                hpios_delay_micro_seconds(1000);
+                                hpios_delay_micro_seconds(10000);
                 }
                 if (timeout == 0)
                         return HPI6000_ERROR_INIT_NOACK;
@@ -1130,14 +1102,14 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                                 mask = 0xFFFFFF00L;
                                 /* ASI5100 uses AX6 code, */
                                 /* but has no PLD r/w register to test */
-                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.
-                                                subsys_device_id) ==
+                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.pci_dev->
+                                                subsystem_device) ==
                                         HPI_ADAPTER_FAMILY_ASI(0x5100))
                                         mask = 0x00000000L;
                                 /* ASI5200 uses AX6 code, */
                                 /* but has no PLD r/w register to test */
-                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.
-                                                subsys_device_id) ==
+                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.pci_dev->
+                                                subsystem_device) ==
                                         HPI_ADAPTER_FAMILY_ASI(0x5200))
                                         mask = 0x00000000L;
                                 break;
@@ -1202,7 +1174,7 @@ static u32 hpi_read_word(struct dsp_obj *pdo, u32 address)
         u32 data = 0;
 
         if (hpi_set_address(pdo, address))
-                return 0;       /*? no way to return error */
+                return 0;       /*? No way to return error */
 
         /* take care of errata in revB DSP (2.0.1) */
         data = ioread32(pdo->prHPI_data);
@@ -1338,10 +1310,6 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         u32 *p_data;
         u16 error = 0;
 
-        /* does the DSP we are referencing exist? */
-        if (dsp_index >= phw->num_dsp)
-                return HPI6000_ERROR_MSG_INVALID_DSP_INDEX;
-
         ack = hpi6000_wait_dsp_ack(pao, dsp_index, HPI_HIF_IDLE);
         if (ack & HPI_HIF_ERROR_MASK) {
                 pao->dsp_crashed++;
@@ -1349,9 +1317,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         }
         pao->dsp_crashed = 0;
 
-        /* send the message */
-
-        /* get the address and size */
+        /* get the message address and size */
         if (phw->message_buffer_address_on_dsp == 0) {
                 timeout = TIMEOUT;
                 do {
@@ -1366,10 +1332,9 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         } else
                 address = phw->message_buffer_address_on_dsp;
 
-        /*        dwLength = sizeof(struct hpi_message); */
         length = phm->size;
 
-        /* send it */
+        /* send the message */
         p_data = (u32 *)phm;
         if (hpi6000_dsp_block_write32(pao, dsp_index, address, p_data,
                         (u16)length / 4))
@@ -1383,7 +1348,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         if (ack & HPI_HIF_ERROR_MASK)
                 return HPI6000_ERROR_MSG_RESP_GET_RESP_ACK;
 
-        /* get the address and size */
+        /* get the response address */
         if (phw->response_buffer_address_on_dsp == 0) {
                 timeout = TIMEOUT;
                 do {
@@ -1407,7 +1372,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         if (!timeout)
                 length = sizeof(struct hpi_response);
 
-        /* get it */
+        /* get the response */
         p_data = (u32 *)phr;
         if (hpi6000_dsp_block_read32(pao, dsp_index, address, p_data,
                         (u16)length / 4))
@@ -1803,17 +1768,11 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
         hpios_dsplock_lock(pao);
         error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);
 
-        /* maybe an error response */
-        if (error) {
-                /* something failed in the HPI/DSP interface */
-                phr->error = error;
-                /* just the header of the response is valid */
-                phr->size = sizeof(struct hpi_response_header);
+        if (error)      /* something failed in the HPI/DSP interface */
                 goto err;
-        }
 
-        if (phr->error != 0)    /* something failed in the DSP */
-                goto err;
+        if (phr->error) /* something failed in the DSP */
+                goto out;
 
         switch (phm->function) {
         case HPI_OSTREAM_WRITE:
@@ -1825,21 +1784,30 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
                 error = hpi6000_get_data(pao, dsp_index, phm, phr);
                 break;
         case HPI_ADAPTER_GET_ASSERT:
-                phr->u.a.adapter_index = 0;     /* dsp 0 default */
+                phr->u.ax.assert.dsp_index = 0; /* dsp 0 default */
                 if (num_dsp == 2) {
-                        if (!phr->u.a.adapter_type) {
+                        if (!phr->u.ax.assert.count) {
                                 /* no assert from dsp 0, check dsp 1 */
                                 error = hpi6000_message_response_sequence(pao,
                                         1, phm, phr);
-                                phr->u.a.adapter_index = 1;
+                                phr->u.ax.assert.dsp_index = 1;
                         }
                 }
         }
 
-        if (error)
-                phr->error = error;
-
 err:
+        if (error) {
+                if (error >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_COMMUNICATION;
+                        phr->specific_error = error;
+                } else {
+                        phr->error = error;
+                }
+
+                /* just the header of the response is valid */
+                phr->size = sizeof(struct hpi_response_header);
+        }
+out:
         hpios_dsplock_unlock(pao);
         return;
 }
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index 22c5fc625533..9d5df54a6b46 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -38,27 +38,26 @@
 
 /*****************************************************************************/
 /* HPI6205 specific error codes */
-#define HPI6205_ERROR_BASE                      1000
-/*#define HPI6205_ERROR_MEM_ALLOC 1001 */
+#define HPI6205_ERROR_BASE 1000 /* not actually used anywhere */
+
+/* operational/messaging errors */
+#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT     1015
+#define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016
+
+/* initialization/bootload errors */
 #define HPI6205_ERROR_6205_NO_IRQ               1002
 #define HPI6205_ERROR_6205_INIT_FAILED          1003
-/*#define HPI6205_ERROR_MISSING_DSPCODE 1004 */
-#define HPI6205_ERROR_UNKNOWN_PCI_DEVICE        1005
 #define HPI6205_ERROR_6205_REG                  1006
 #define HPI6205_ERROR_6205_DSPPAGE              1007
-#define HPI6205_ERROR_BAD_DSPINDEX              1008
 #define HPI6205_ERROR_C6713_HPIC                1009
 #define HPI6205_ERROR_C6713_HPIA                1010
 #define HPI6205_ERROR_C6713_PLL                 1011
 #define HPI6205_ERROR_DSP_INTMEM                1012
 #define HPI6205_ERROR_DSP_EXTMEM                1013
 #define HPI6205_ERROR_DSP_PLD                   1014
-#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT     1015
-#define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016
 #define HPI6205_ERROR_6205_EEPROM               1017
 #define HPI6205_ERROR_DSP_EMIF                  1018
 
-#define hpi6205_error(dsp_index, err) (err)
 /*****************************************************************************/
 /* for C6205 PCI i/f */
 /* Host Status Register (HSR) bitfields */
@@ -128,9 +127,6 @@ struct hpi_hw_obj {
         u32 outstream_host_buffer_size[HPI_MAX_STREAMS];
 
         struct consistent_dma_area h_control_cache;
-        struct consistent_dma_area h_async_event_buffer;
-/*      struct hpi_control_cache_single *pControlCache; */
-        struct hpi_async_event *p_async_event_buffer;
         struct hpi_control_cache *p_cache;
 };
 
@@ -156,8 +152,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
 
 static void subsys_create_adapter(struct hpi_message *phm,
         struct hpi_response *phr);
-static void subsys_delete_adapter(struct hpi_message *phm,
-        struct hpi_response *phr);
+static void adapter_delete(struct hpi_adapter_obj *pao,
+        struct hpi_message *phm, struct hpi_response *phr);
 
 static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 *pos_error_code);
@@ -208,8 +204,8 @@ static void instream_start(struct hpi_adapter_obj *pao,
 static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,
         u32 address);
 
-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
-        u32 address, u32 data);
+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,
+        int dsp_index, u32 address, u32 data);
 
 static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao,
         int dsp_index);
@@ -227,25 +223,13 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index);
 
 /*****************************************************************************/
 
-static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
+static void subsys_message(struct hpi_adapter_obj *pao,
+        struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
-        case HPI_SUBSYS_OPEN:
-        case HPI_SUBSYS_CLOSE:
-        case HPI_SUBSYS_GET_INFO:
-        case HPI_SUBSYS_DRIVER_UNLOAD:
-        case HPI_SUBSYS_DRIVER_LOAD:
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                /* messages that should not get here */
-                phr->error = HPI_ERROR_UNIMPLEMENTED;
-                break;
         case HPI_SUBSYS_CREATE_ADAPTER:
                 subsys_create_adapter(phm, phr);
                 break;
-        case HPI_SUBSYS_DELETE_ADAPTER:
-                subsys_delete_adapter(phm, phr);
-                break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
                 break;
@@ -257,15 +241,22 @@ static void control_message(struct hpi_adapter_obj *pao,
 {
 
         struct hpi_hw_obj *phw = pao->priv;
+        u16 pending_cache_error = 0;
 
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
-                        rmb();  /* make sure we see updates DM_aed from DSP */
-                        if (hpi_check_control_cache(phw->p_cache, phm, phr))
+                        rmb();  /* make sure we see updates DMAed from DSP */
+                        if (hpi_check_control_cache(phw->p_cache, phm, phr)) {
                                 break;
+                        } else if (phm->u.c.attribute == HPI_METER_PEAK) {
+                                pending_cache_error =
+                                        HPI_ERROR_CONTROL_CACHING;
+                        }
                 }
                 hw_message(pao, phm, phr);
+                if (pending_cache_error && !phr->error)
+                        phr->error = pending_cache_error;
                 break;
         case HPI_CONTROL_GET_INFO:
                 hw_message(pao, phm, phr);
@@ -273,7 +264,8 @@ static void control_message(struct hpi_adapter_obj *pao,
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
                 if (pao->has_control_cache)
-                        hpi_sync_control_cache(phw->p_cache, phm, phr);
+                        hpi_cmn_control_cache_sync_to_msg(phw->p_cache, phm,
+                                phr);
                 break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
@@ -285,6 +277,10 @@ static void adapter_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
         switch (phm->function) {
+        case HPI_ADAPTER_DELETE:
+                adapter_delete(pao, phm, phr);
+                break;
+
         default:
                 hw_message(pao, phm, phr);
                 break;
@@ -296,9 +292,9 @@ static void outstream_message(struct hpi_adapter_obj *pao,
 {
 
         if (phm->obj_index >= HPI_MAX_STREAMS) {
-                phr->error = HPI_ERROR_INVALID_STREAM;
+                phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 HPI_DEBUG_LOG(WARNING,
-                        "message referencing invalid stream %d "
+                        "Message referencing invalid stream %d "
                         "on adapter index %d\n", phm->obj_index,
                         phm->adapter_index);
                 return;
@@ -340,9 +336,9 @@ static void instream_message(struct hpi_adapter_obj *pao,
 {
 
         if (phm->obj_index >= HPI_MAX_STREAMS) {
-                phr->error = HPI_ERROR_INVALID_STREAM;
+                phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 HPI_DEBUG_LOG(WARNING,
-                        "message referencing invalid stream %d "
+                        "Message referencing invalid stream %d "
                         "on adapter index %d\n", phm->obj_index,
                         phm->adapter_index);
                 return;
@@ -377,55 +373,32 @@ static void instream_message(struct hpi_adapter_obj *pao,
 /** Entry point to this HPI backend
  * All calls to the HPI start here
  */
-void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
+void _HPI_6205(struct hpi_adapter_obj *pao, struct hpi_message *phm,
+        struct hpi_response *phr)
 {
-        struct hpi_adapter_obj *pao = NULL;
-
-        /* subsytem messages are processed by every HPI.
-         * All other messages are ignored unless the adapter index matches
-         * an adapter in the HPI
-         */
-        HPI_DEBUG_LOG(DEBUG, "HPI obj=%d, func=%d\n", phm->object,
-                phm->function);
-
-        /* if Dsp has crashed then do not communicate with it any more */
-        if (phm->object != HPI_OBJ_SUBSYSTEM) {
-                pao = hpi_find_adapter(phm->adapter_index);
-                if (!pao) {
-                        HPI_DEBUG_LOG(DEBUG,
-                                " %d,%d refused, for another HPI?\n",
-                                phm->object, phm->function);
-                        return;
-                }
-
-                if ((pao->dsp_crashed >= 10)
-                        && (phm->function != HPI_ADAPTER_DEBUG_READ)) {
-                        /* allow last resort debug read even after crash */
-                        hpi_init_response(phr, phm->object, phm->function,
-                                HPI_ERROR_DSP_HARDWARE);
-                        HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n",
-                                phm->object, phm->function);
-                        return;
-                }
+        if (pao && (pao->dsp_crashed >= 10)
+                && (phm->function != HPI_ADAPTER_DEBUG_READ)) {
+                /* allow last resort debug read even after crash */
+                hpi_init_response(phr, phm->object, phm->function,
+                        HPI_ERROR_DSP_HARDWARE);
+                HPI_DEBUG_LOG(WARNING, " %d,%d dsp crashed.\n", phm->object,
+                        phm->function);
+                return;
         }
 
         /* Init default response  */
         if (phm->function != HPI_SUBSYS_CREATE_ADAPTER)
-                hpi_init_response(phr, phm->object, phm->function,
-                        HPI_ERROR_PROCESSING_MESSAGE);
+                phr->error = HPI_ERROR_PROCESSING_MESSAGE;
 
         HPI_DEBUG_LOG(VERBOSE, "start of switch\n");
         switch (phm->type) {
         case HPI_TYPE_MESSAGE:
                 switch (phm->object) {
                 case HPI_OBJ_SUBSYSTEM:
-                        subsys_message(phm, phr);
+                        subsys_message(pao, phm, phr);
                         break;
 
                 case HPI_OBJ_ADAPTER:
-                        phr->size =
-                                sizeof(struct hpi_response_header) +
-                                sizeof(struct hpi_adapter_res);
                         adapter_message(pao, phm, phr);
                         break;
 
@@ -454,6 +427,26 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
         }
 }
 
+void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
+{
+        struct hpi_adapter_obj *pao = NULL;
+
+        if (phm->object != HPI_OBJ_SUBSYSTEM) {
+                /* normal messages must have valid adapter index */
+                pao = hpi_find_adapter(phm->adapter_index);
+        } else {
+                /* subsys messages don't address an adapter */
+                _HPI_6205(NULL, phm, phr);
+                return;
+        }
+
+        if (pao)
+                _HPI_6205(pao, phm, phr);
+        else
+                hpi_init_response(phr, phm->object, phm->function,
+                        HPI_ERROR_BAD_ADAPTER_NUMBER);
+}
+
 /*****************************************************************************/
 /* SUBSYSTEM */
 
@@ -474,46 +467,38 @@ static void subsys_create_adapter(struct hpi_message *phm,
 
         memset(&ao, 0, sizeof(ao));
 
-        /* this HPI only creates adapters for TI/PCI devices */
-        if (phm->u.s.resource.bus_type != HPI_BUS_PCI)
-                return;
-        if (phm->u.s.resource.r.pci->vendor_id != HPI_PCI_VENDOR_ID_TI)
-                return;
-        if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_DSP6205)
-                return;
-
         ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
         if (!ao.priv) {
-                HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
+                HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
                 phr->error = HPI_ERROR_MEMORY_ALLOC;
                 return;
         }
 
         ao.pci = *phm->u.s.resource.r.pci;
         err = create_adapter_obj(&ao, &os_error_code);
-        if (!err)
-                err = hpi_add_adapter(&ao);
         if (err) {
-                phr->u.s.data = os_error_code;
                 delete_adapter_obj(&ao);
-                phr->error = err;
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_BOOTLOAD;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+                phr->u.s.data = os_error_code;
                 return;
         }
 
-        phr->u.s.aw_adapter_list[ao.index] = ao.adapter_type;
+        phr->u.s.adapter_type = ao.adapter_type;
         phr->u.s.adapter_index = ao.index;
-        phr->u.s.num_adapters++;
         phr->error = 0;
 }
 
 /** delete an adapter - required by WDM driver */
-static void subsys_delete_adapter(struct hpi_message *phm,
-        struct hpi_response *phr)
+static void adapter_delete(struct hpi_adapter_obj *pao,
+        struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct hpi_adapter_obj *pao;
         struct hpi_hw_obj *phw;
 
-        pao = hpi_find_adapter(phm->adapter_index);
         if (!pao) {
                 phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 return;
@@ -526,6 +511,7 @@ static void subsys_delete_adapter(struct hpi_message *phm,
         iowrite32(C6205_HDCR_WARMRESET, phw->prHDCR);
 
         delete_adapter_obj(pao);
+        hpi_delete_adapter(pao);
         phr->error = 0;
 }
 
@@ -538,10 +524,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
         struct hpi_hw_obj *phw = pao->priv;
         struct bus_master_interface *interface;
         u32 phys_addr;
-#ifndef HPI6205_NO_HSR_POLL
-        u32 time_out = HPI6205_TIMEOUT;
-        u32 temp1;
-#endif
         int i;
         u16 err;
 
@@ -566,7 +548,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
 
         if (hpios_locked_mem_alloc(&phw->h_locked_mem,
                         sizeof(struct bus_master_interface),
-                        pao->pci.p_os_data))
+                        pao->pci.pci_dev))
                 phw->p_interface_buffer = NULL;
         else if (hpios_locked_mem_get_virt_addr(&phw->h_locked_mem,
                         (void *)&phw->p_interface_buffer))
@@ -582,58 +564,39 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
         }
 
         err = adapter_boot_load_dsp(pao, pos_error_code);
-        if (err)
+        if (err) {
+                HPI_DEBUG_LOG(ERROR, "DSP code load failed\n");
                 /* no need to clean up as SubSysCreateAdapter */
                 /* calls DeleteAdapter on error. */
                 return err;
-
+        }
         HPI_DEBUG_LOG(INFO, "load DSP code OK\n");
 
         /* allow boot load even if mem alloc wont work */
         if (!phw->p_interface_buffer)
-                return hpi6205_error(0, HPI_ERROR_MEMORY_ALLOC);
+                return HPI_ERROR_MEMORY_ALLOC;
 
         interface = phw->p_interface_buffer;
 
-#ifndef HPI6205_NO_HSR_POLL
-        /* wait for first interrupt indicating the DSP init is done */
-        time_out = HPI6205_TIMEOUT * 10;
-        temp1 = 0;
-        while (((temp1 & C6205_HSR_INTSRC) == 0) && --time_out)
-                temp1 = ioread32(phw->prHSR);
-
-        if (temp1 & C6205_HSR_INTSRC)
-                HPI_DEBUG_LOG(INFO,
-                        "interrupt confirming DSP code running OK\n");
-        else {
-                HPI_DEBUG_LOG(ERROR,
-                        "timed out waiting for interrupt "
-                        "confirming DSP code running\n");
-                return hpi6205_error(0, HPI6205_ERROR_6205_NO_IRQ);
-        }
-
-        /* reset the interrupt */
-        iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
-
         /* make sure the DSP has started ok */
         if (!wait_dsp_ack(phw, H620_HIF_RESET, HPI6205_TIMEOUT * 10)) {
                 HPI_DEBUG_LOG(ERROR, "timed out waiting reset state \n");
-                return hpi6205_error(0, HPI6205_ERROR_6205_INIT_FAILED);
+                return HPI6205_ERROR_6205_INIT_FAILED;
         }
         /* Note that *pao, *phw are zeroed after allocation,
          * so pointers and flags are NULL by default.
          * Allocate bus mastering control cache buffer and tell the DSP about it
          */
         if (interface->control_cache.number_of_controls) {
-                void *p_control_cache_virtual;
+                u8 *p_control_cache_virtual;
 
                 err = hpios_locked_mem_alloc(&phw->h_control_cache,
                         interface->control_cache.size_in_bytes,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
                 if (!err)
                         err = hpios_locked_mem_get_virt_addr(&phw->
-                                h_control_cache, &p_control_cache_virtual);
+                                h_control_cache,
+                                (void *)&p_control_cache_virtual);
                 if (!err) {
                         memset(p_control_cache_virtual, 0,
                                 interface->control_cache.size_in_bytes);
@@ -642,8 +605,10 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                                 hpi_alloc_control_cache(interface->
                                 control_cache.number_of_controls,
                                 interface->control_cache.size_in_bytes,
-                                (struct hpi_control_cache_info *)
                                 p_control_cache_virtual);
+
+                        if (!phw->p_cache)
+                                err = HPI_ERROR_MEMORY_ALLOC;
                 }
                 if (!err) {
                         err = hpios_locked_mem_get_phys_addr(&phw->
@@ -660,96 +625,67 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                         pao->has_control_cache = 0;
                 }
         }
-        /* allocate bus mastering async buffer and tell the DSP about it */
-        if (interface->async_buffer.b.size) {
-                err = hpios_locked_mem_alloc(&phw->h_async_event_buffer,
-                        interface->async_buffer.b.size *
-                        sizeof(struct hpi_async_event), pao->pci.p_os_data);
-                if (!err)
-                        err = hpios_locked_mem_get_virt_addr
-                                (&phw->h_async_event_buffer, (void *)
-                                &phw->p_async_event_buffer);
-                if (!err)
-                        memset((void *)phw->p_async_event_buffer, 0,
-                                interface->async_buffer.b.size *
-                                sizeof(struct hpi_async_event));
-                if (!err) {
-                        err = hpios_locked_mem_get_phys_addr
-                                (&phw->h_async_event_buffer, &phys_addr);
-                        interface->async_buffer.physical_address32 =
-                                phys_addr;
-                }
-                if (err) {
-                        if (hpios_locked_mem_valid(&phw->
-                                        h_async_event_buffer)) {
-                                hpios_locked_mem_free
-                                        (&phw->h_async_event_buffer);
-                                phw->p_async_event_buffer = NULL;
-                        }
-                }
-        }
         send_dsp_command(phw, H620_HIF_IDLE);
 
         {
-                struct hpi_message hM;
-                struct hpi_response hR;
+                struct hpi_message hm;
+                struct hpi_response hr;
                 u32 max_streams;
 
                 HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n");
-                memset(&hM, 0, sizeof(hM));
-                hM.type = HPI_TYPE_MESSAGE;
-                hM.size = sizeof(hM);
-                hM.object = HPI_OBJ_ADAPTER;
-                hM.function = HPI_ADAPTER_GET_INFO;
-                hM.adapter_index = 0;
-                memset(&hR, 0, sizeof(hR));
-                hR.size = sizeof(hR);
-
-                err = message_response_sequence(pao, &hM, &hR);
+                memset(&hm, 0, sizeof(hm));
+                hm.type = HPI_TYPE_MESSAGE;
+                hm.size = sizeof(hm);
+                hm.object = HPI_OBJ_ADAPTER;
+                hm.function = HPI_ADAPTER_GET_INFO;
+                hm.adapter_index = 0;
+                memset(&hr, 0, sizeof(hr));
+                hr.size = sizeof(hr);
+
+                err = message_response_sequence(pao, &hm, &hr);
                 if (err) {
                         HPI_DEBUG_LOG(ERROR, "message transport error %d\n",
                                 err);
                         return err;
                 }
-                if (hR.error)
-                        return hR.error;
+                if (hr.error)
+                        return hr.error;
 
-                pao->adapter_type = hR.u.a.adapter_type;
-                pao->index = hR.u.a.adapter_index;
+                pao->adapter_type = hr.u.ax.info.adapter_type;
+                pao->index = hr.u.ax.info.adapter_index;
 
-                max_streams = hR.u.a.num_outstreams + hR.u.a.num_instreams;
+                max_streams =
+                        hr.u.ax.info.num_outstreams +
+                        hr.u.ax.info.num_instreams;
 
                 hpios_locked_mem_prepare((max_streams * 6) / 10, max_streams,
-                        65536, pao->pci.p_os_data);
+                        65536, pao->pci.pci_dev);
 
                 HPI_DEBUG_LOG(VERBOSE,
                         "got adapter info type %x index %d serial %d\n",
-                        hR.u.a.adapter_type, hR.u.a.adapter_index,
-                        hR.u.a.serial_number);
+                        hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index,
+                        hr.u.ax.info.serial_number);
         }
 
         pao->open = 0;  /* upon creation the adapter is closed */
 
+        if (phw->p_cache)
+                phw->p_cache->adap_idx = pao->index;
+
         HPI_DEBUG_LOG(INFO, "bootload DSP OK\n");
-        return 0;
+
+        return hpi_add_adapter(pao);
 }
 
 /** Free memory areas allocated by adapter
- * this routine is called from SubSysDeleteAdapter,
+ * this routine is called from AdapterDelete,
   * and SubSysCreateAdapter if duplicate index
 */
 static void delete_adapter_obj(struct hpi_adapter_obj *pao)
 {
-        struct hpi_hw_obj *phw;
+        struct hpi_hw_obj *phw = pao->priv;
         int i;
 
-        phw = pao->priv;
-
-        if (hpios_locked_mem_valid(&phw->h_async_event_buffer)) {
-                hpios_locked_mem_free(&phw->h_async_event_buffer);
-                phw->p_async_event_buffer = NULL;
-        }
-
         if (hpios_locked_mem_valid(&phw->h_control_cache)) {
                 hpios_locked_mem_free(&phw->h_control_cache);
                 hpi_free_control_cache(phw->p_cache);
@@ -774,13 +710,15 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao)
                         phw->outstream_host_buffer_size[i] = 0;
                 }
 
-        hpios_locked_mem_unprepare(pao->pci.p_os_data);
+        hpios_locked_mem_unprepare(pao->pci.pci_dev);
 
-        hpi_delete_adapter(pao);
         kfree(phw);
 }
 
 /*****************************************************************************/
+/* Adapter functions */
+
+/*****************************************************************************/
 /* OutStream Host buffer functions */
 
 /** Allocate or attach buffer for busmastering
@@ -822,7 +760,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
 
                 err = hpios_locked_mem_alloc(&phw->outstream_host_buffers
                         [phm->obj_index], phm->u.d.u.buffer.buffer_size,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
 
                 if (err) {
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -859,7 +797,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 if (phm->u.d.u.buffer.buffer_size & (phm->u.d.u.buffer.
                                 buffer_size - 1)) {
                         HPI_DEBUG_LOG(ERROR,
-                                "buffer size must be 2^N not %d\n",
+                                "Buffer size must be 2^N not %d\n",
                                 phm->u.d.u.buffer.buffer_size);
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
                         return;
@@ -873,6 +811,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 status->dSP_index = 0;
                 status->host_index = status->dSP_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
+                status->auxiliary_data_available = 0;
 
                 hw_message(pao, phm, phr);
 
@@ -964,51 +903,6 @@ static void outstream_write(struct hpi_adapter_obj *pao,
         hpi_init_response(phr, phm->object, phm->function, 0);
         status = &interface->outstream_host_buffer_status[phm->obj_index];
 
-        if (phw->flag_outstream_just_reset[phm->obj_index]) {
-                /* First OutStremWrite() call following reset will write data to the
-                   adapter's buffers, reducing delay before stream can start. The DSP
-                   takes care of setting the stream data format using format information
-                   embedded in phm.
-                 */
-                int partial_write = 0;
-                unsigned int original_size = 0;
-
-                phw->flag_outstream_just_reset[phm->obj_index] = 0;
-
-                /* Send the first buffer to the DSP the old way. */
-                /* Limit size of first transfer - */
-                /* expect that this will not usually be triggered. */
-                if (phm->u.d.u.data.data_size > HPI6205_SIZEOF_DATA) {
-                        partial_write = 1;
-                        original_size = phm->u.d.u.data.data_size;
-                        phm->u.d.u.data.data_size = HPI6205_SIZEOF_DATA;
-                }
-                /* write it */
-                phm->function = HPI_OSTREAM_WRITE;
-                hw_message(pao, phm, phr);
-
-                if (phr->error)
-                        return;
-
-                /* update status information that the DSP would typically
-                 * update (and will update next time the DSP
-                 * buffer update task reads data from the host BBM buffer)
-                 */
-                status->auxiliary_data_available = phm->u.d.u.data.data_size;
-                status->host_index += phm->u.d.u.data.data_size;
-                status->dSP_index += phm->u.d.u.data.data_size;
-
-                /* if we did a full write, we can return from here. */
-                if (!partial_write)
-                        return;
-
-                /* tweak buffer parameters and let the rest of the */
-                /* buffer land in internal BBM buffer */
-                phm->u.d.u.data.data_size =
-                        original_size - HPI6205_SIZEOF_DATA;
-                phm->u.d.u.data.pb_data += HPI6205_SIZEOF_DATA;
-        }
-
         space_available = outstream_get_space_available(status);
         if (space_available < phm->u.d.u.data.data_size) {
                 phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -1045,6 +939,24 @@ static void outstream_write(struct hpi_adapter_obj *pao,
                 memcpy(p_bbm_data, p_app_data + l_first_write,
                         phm->u.d.u.data.data_size - l_first_write);
         }
+
+        /*
+         * This version relies on the DSP code triggering an OStream buffer
+         * update immediately following a SET_FORMAT call. The host has
+         * already written data into the BBM buffer, but the DSP won't know
+         * about it until dwHostIndex is adjusted.
+         */
+        if (phw->flag_outstream_just_reset[phm->obj_index]) {
+                /* Format can only change after reset. Must tell DSP. */
+                u16 function = phm->function;
+                phw->flag_outstream_just_reset[phm->obj_index] = 0;
+                phm->function = HPI_OSTREAM_SET_FORMAT;
+                hw_message(pao, phm, phr);      /* send the format to the DSP */
+                phm->function = function;
+                if (phr->error)
+                        return;
+        }
+
         status->host_index += phm->u.d.u.data.data_size;
 }
 
@@ -1130,7 +1042,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
 
                 err = hpios_locked_mem_alloc(&phw->instream_host_buffers[phm->
                                 obj_index], phm->u.d.u.buffer.buffer_size,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
 
                 if (err) {
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -1161,7 +1073,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 if (phm->u.d.u.buffer.buffer_size & (phm->u.d.u.buffer.
                                 buffer_size - 1)) {
                         HPI_DEBUG_LOG(ERROR,
-                                "buffer size must be 2^N not %d\n",
+                                "Buffer size must be 2^N not %d\n",
                                 phm->u.d.u.buffer.buffer_size);
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
                         return;
@@ -1176,8 +1088,10 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 status->dSP_index = 0;
                 status->host_index = status->dSP_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
+                status->auxiliary_data_available = 0;
 
                 hw_message(pao, phm, phr);
+
                 if (phr->error
                         && hpios_locked_mem_valid(&phw->
                                 instream_host_buffers[phm->obj_index])) {
@@ -1342,33 +1256,37 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         struct hpi_hw_obj *phw = pao->priv;
         struct dsp_code dsp_code;
         u16 boot_code_id[HPI6205_MAX_FILES_TO_LOAD];
-        u16 firmware_id = pao->pci.subsys_device_id;
         u32 temp;
         int dsp = 0, i = 0;
         u16 err = 0;
 
         boot_code_id[0] = HPI_ADAPTER_ASI(0x6205);
 
-        /* special cases where firmware_id != subsys ID */
-        switch (firmware_id) {
+        boot_code_id[1] = pao->pci.pci_dev->subsystem_device;
+        boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(boot_code_id[1]);
+
+        /* fix up cases where bootcode id[1] != subsys id */
+        switch (boot_code_id[1]) {
         case HPI_ADAPTER_FAMILY_ASI(0x5000):
-                boot_code_id[0] = firmware_id;
-                firmware_id = 0;
+                boot_code_id[0] = boot_code_id[1];
+                boot_code_id[1] = 0;
                 break;
         case HPI_ADAPTER_FAMILY_ASI(0x5300):
         case HPI_ADAPTER_FAMILY_ASI(0x5400):
         case HPI_ADAPTER_FAMILY_ASI(0x6300):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6400);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6400);
                 break;
+        case HPI_ADAPTER_FAMILY_ASI(0x5500):
         case HPI_ADAPTER_FAMILY_ASI(0x5600):
         case HPI_ADAPTER_FAMILY_ASI(0x6500):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6600);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6600);
                 break;
         case HPI_ADAPTER_FAMILY_ASI(0x8800):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x8900);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x8900);
+                break;
+        default:
                 break;
         }
-        boot_code_id[1] = firmware_id;
 
         /* reset DSP by writing a 1 to the WARMRESET bit */
         temp = C6205_HDCR_WARMRESET;
@@ -1379,7 +1297,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         temp = ioread32(phw->prHSR);
         if ((temp & (C6205_HSR_CFGERR | C6205_HSR_EEREAD)) !=
                 C6205_HSR_EEREAD)
-                return hpi6205_error(0, HPI6205_ERROR_6205_EEPROM);
+                return HPI6205_ERROR_6205_EEPROM;
         temp |= 0x04;
         /* disable PINTA interrupt */
         iowrite32(temp, phw->prHSR);
@@ -1387,27 +1305,27 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         /* check control register reports PCI boot mode */
         temp = ioread32(phw->prHDCR);
         if (!(temp & C6205_HDCR_PCIBOOT))
-                return hpi6205_error(0, HPI6205_ERROR_6205_REG);
+                return HPI6205_ERROR_6205_REG;
 
-        /* try writing a couple of numbers to the DSP page register */
+        /* try writing a few numbers to the DSP page register */
         /* and reading them back. */
-        temp = 1;
+        temp = 3;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         temp = 2;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
-        temp = 3;
+                return HPI6205_ERROR_6205_DSPPAGE;
+        temp = 1;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         /* reset DSP page to the correct number */
         temp = 0;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         phw->dsp_page = 0;
 
         /* release 6713 from reset before 6205 is bootloaded.
@@ -1453,7 +1371,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                         return err;
 
                 /* write the DSP code down into the DSPs memory */
-                dsp_code.ps_dev = pao->pci.p_os_data;
+                dsp_code.ps_dev = pao->pci.pci_dev;
                 err = hpi_dsp_code_open(boot_code_id[dsp], &dsp_code,
                         pos_error_code);
                 if (err)
@@ -1482,10 +1400,8 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                         if (err)
                                 break;
                         for (i = 0; i < (int)length; i++) {
-                                err = boot_loader_write_mem32(pao, dsp,
-                                        address, *pcode);
-                                if (err)
-                                        break;
+                                boot_loader_write_mem32(pao, dsp, address,
+                                        *pcode);
                                 /* dummy read every 4 words */
                                 /* for 6205 advisory 1.4.4 */
                                 if (i % 4 == 0)
@@ -1559,7 +1475,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                 host_mailbox_address_on_dsp = 0x80000000;
                 while ((physicalPC_iaddress != physicalPC_iaddress_verify)
                         && time_out--) {
-                        err = boot_loader_write_mem32(pao, 0,
+                        boot_loader_write_mem32(pao, 0,
                                 host_mailbox_address_on_dsp,
                                 physicalPC_iaddress);
                         physicalPC_iaddress_verify =
@@ -1629,11 +1545,10 @@ static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,
         return data;
 }
 
-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
-        u32 address, u32 data)
+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,
+        int dsp_index, u32 address, u32 data)
 {
         struct hpi_hw_obj *phw = pao->priv;
-        u16 err = 0;
         __iomem u32 *p_data;
         /*      u32 dwVerifyData=0; */
 
@@ -1673,15 +1588,11 @@ static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
 
                 /* dummy read every 4 words for 6205 advisory 1.4.4 */
                 boot_loader_read_mem32(pao, 0, 0);
-        } else
-                err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
-        return err;
+        }
 }
 
 static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
 {
-        u16 err = 0;
-
         if (dsp_index == 0) {
                 u32 setting;
 
@@ -1709,8 +1620,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800008, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800008))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE1 setup - 32 bit async. This is 6713 #1 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1723,8 +1633,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800004, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800004))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE2 setup - 32 bit async. This is 6713 #2 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1736,8 +1645,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800010, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800010))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE3 setup - 32 bit async. */
                 /* This is the PLD on the ASI5000 cards only */
@@ -1748,8 +1656,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800014, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800014))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* set EMIF SDRAM control for 2Mx32 SDRAM (512x32x4 bank) */
                 /*  need to use this else DSP code crashes? */
@@ -1773,12 +1680,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 read_data =
                         0xFFF7 & boot_loader_read_mem32(pao, 0, HPICL_ADDR);
                 if (write_data != read_data) {
-                        err = hpi6205_error(dsp_index,
-                                HPI6205_ERROR_C6713_HPIC);
                         HPI_DEBUG_LOG(ERROR, "HPICL %x %x\n", write_data,
                                 read_data);
-
-                        return err;
+                        return HPI6205_ERROR_C6713_HPIC;
                 }
                 /* HPIA - walking ones test */
                 write_data = 1;
@@ -1796,11 +1700,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                                                 HPIAH_ADDR))
                                 << 16);
                         if (read_data != write_data) {
-                                err = hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_C6713_HPIA);
                                 HPI_DEBUG_LOG(ERROR, "HPIA %x %x\n",
                                         write_data, read_data);
-                                return err;
+                                return HPI6205_ERROR_C6713_HPIA;
                         }
                         write_data = write_data << 1;
                 }
@@ -1845,30 +1747,81 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 /* PLL should not be bypassed! */
                 if ((boot_loader_read_mem32(pao, dsp_index, 0x01B7C100) & 0xF)
                         != 0x0001) {
-                        err = hpi6205_error(dsp_index,
-                                HPI6205_ERROR_C6713_PLL);
-                        return err;
+                        return HPI6205_ERROR_C6713_PLL;
                 }
                 /* setup C67x EMIF  (note this is the only use of
                    BAR1 via BootLoader_WriteMem32) */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_GCTL,
                         0x000034A8);
+
+                /* EMIF CE0 setup - 2Mx32 Sync DRAM
+                   31..28       Wr setup
+                   27..22       Wr strobe
+                   21..20       Wr hold
+                   19..16       Rd setup
+                   15..14       -
+                   13..8        Rd strobe
+                   7..4         MTYPE   0011            Sync DRAM 32bits
+                   3            Wr hold MSB
+                   2..0         Rd hold
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_CE0,
                         0x00000030);
+
+                /* EMIF SDRAM Extension
+                   0x00
+                   31-21        0000b 0000b 000b
+                   20           WR2RD = 2cycles-1  = 1b
+
+                   19-18        WR2DEAC = 3cycle-1 = 10b
+                   17           WR2WR = 2cycle-1   = 1b
+                   16-15        R2WDQM = 4cycle-1  = 11b
+                   14-12        RD2WR = 6cycles-1  = 101b
+
+                   11-10        RD2DEAC = 4cycle-1 = 11b
+                   9            RD2RD = 2cycle-1   = 1b
+                   8-7          THZP = 3cycle-1    = 10b
+                   6-5          TWR  = 2cycle-1    = 01b (tWR = 17ns)
+                   4            TRRD = 2cycle      = 0b  (tRRD = 14ns)
+                   3-1          TRAS = 5cycle-1    = 100b (Tras=42ns)
+                   1            CAS latency = 3cyc = 1b
+                   (for Micron 2M32-7 operating at 100MHz)
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMEXT,
                         0x001BDF29);
+
+                /* EMIF SDRAM control - set up for a 2Mx32 SDRAM (512x32x4 bank)
+                   31           -       0b       -
+                   30           SDBSZ   1b              4 bank
+                   29..28       SDRSZ   00b             11 row address pins
+
+                   27..26       SDCSZ   01b             8 column address pins
+                   25           RFEN    1b              refersh enabled
+                   24           INIT    1b              init SDRAM!
+
+                   23..20       TRCD    0001b                   (Trcd/Tcyc)-1 = (20/10)-1 = 1
+
+                   19..16       TRP     0001b                   (Trp/Tcyc)-1 = (20/10)-1 = 1
+
+                   15..12       TRC     0110b                   (Trc/Tcyc)-1 = (70/10)-1 = 6
+
+                   11..0        -       0000b 0000b 0000b
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMCTL,
-                        0x47117000);
+                        0x47116000);
+
+                /* SDRAM refresh timing
+                   Need 4,096 refresh cycles every 64ms = 15.625us = 1562cycles of 100MHz = 0x61A
+                 */
                 boot_loader_write_mem32(pao, dsp_index,
                         C6713_EMIF_SDRAMTIMING, 0x00000410);
 
                 hpios_delay_micro_seconds(1000);
         } else if (dsp_index == 2) {
                 /* DSP 2 is a C6713 */
+        }
 
-        } else
-                err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
-        return err;
+        return 0;
 }
 
 static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
@@ -1894,7 +1847,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
                                 test_addr);
                         if (data != test_data) {
                                 HPI_DEBUG_LOG(VERBOSE,
-                                        "memtest error details  "
+                                        "Memtest error details  "
                                         "%08x %08x %08x %i\n", test_addr,
                                         test_data, data, dsp_index);
                                 return 1;       /* error */
@@ -1914,7 +1867,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
                 data = boot_loader_read_mem32(pao, dsp_index, test_addr);
                 if (data != test_data) {
                         HPI_DEBUG_LOG(VERBOSE,
-                                "memtest error details  "
+                                "Memtest error details  "
                                 "%08x %08x %08x %i\n", test_addr, test_data,
                                 data, dsp_index);
                         return 1;       /* error */
@@ -1944,8 +1897,8 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,
                         /* 64K data mem */
                         err = boot_loader_test_memory(pao, dsp_index,
                                 0x80000000, 0x10000);
-        } else if ((dsp_index == 1) || (dsp_index == 2)) {
-                /* DSP 1&2 are a C6713 */
+        } else if (dsp_index == 1) {
+                /* DSP 1 is a C6713 */
                 /* 192K internal mem */
                 err = boot_loader_test_memory(pao, dsp_index, 0x00000000,
                         0x30000);
@@ -1953,11 +1906,10 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,
                         /* 64K internal mem / L2 cache */
                         err = boot_loader_test_memory(pao, dsp_index,
                                 0x00030000, 0x10000);
-        } else
-                return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
+        }
 
         if (err)
-                return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_INTMEM);
+                return HPI6205_ERROR_DSP_INTMEM;
         else
                 return 0;
 }
@@ -1970,24 +1922,23 @@ static u16 boot_loader_test_external_memory(struct hpi_adapter_obj *pao,
 
         if (dsp_index == 0) {
                 /* only test for SDRAM if an ASI5000 card */
-                if (pao->pci.subsys_device_id == 0x5000) {
+                if (pao->pci.pci_dev->subsystem_device == 0x5000) {
                         /* DSP 0 is always C6205 */
                         dRAM_start_address = 0x00400000;
                         dRAM_size = 0x200000;
                         /*dwDRAMinc=1024; */
                 } else
                         return 0;
-        } else if ((dsp_index == 1) || (dsp_index == 2)) {
+        } else if (dsp_index == 1) {
                 /* DSP 1 is a C6713 */
                 dRAM_start_address = 0x80000000;
                 dRAM_size = 0x200000;
                 /*dwDRAMinc=1024; */
-        } else
-                return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
+        }
 
         if (boot_loader_test_memory(pao, dsp_index, dRAM_start_address,
                         dRAM_size))
-                return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_EXTMEM);
+                return HPI6205_ERROR_DSP_EXTMEM;
         return 0;
 }
 
@@ -1996,28 +1947,25 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index)
         u32 data = 0;
         if (dsp_index == 0) {
                 /* only test for DSP0 PLD on ASI5000 card */
-                if (pao->pci.subsys_device_id == 0x5000) {
+                if (pao->pci.pci_dev->subsystem_device == 0x5000) {
                         /* PLD is located at CE3=0x03000000 */
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x03000008);
                         if ((data & 0xF) != 0x5)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x0300000C);
                         if ((data & 0xF) != 0xA)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                 }
         } else if (dsp_index == 1) {
                 /* DSP 1 is a C6713 */
-                if (pao->pci.subsys_device_id == 0x8700) {
+                if (pao->pci.pci_dev->subsystem_device == 0x8700) {
                         /* PLD is located at CE1=0x90000000 */
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x90000010);
                         if ((data & 0xFF) != 0xAA)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                         /* 8713 - LED on */
                         boot_loader_write_mem32(pao, dsp_index, 0x90000000,
                                 0x02);
@@ -2035,14 +1983,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
         struct hpi_hw_obj *phw = pao->priv;
         u32 data_transferred = 0;
         u16 err = 0;
-#ifndef HPI6205_NO_HSR_POLL
-        u32 time_out;
-#endif
         u32 temp2;
         struct bus_master_interface *interface = phw->p_interface_buffer;
 
         if (!p_data)
-                return HPI_ERROR_INVALID_DATA_TRANSFER;
+                return HPI_ERROR_INVALID_DATA_POINTER;
 
         data_size &= ~3L;       /* round data_size down to nearest 4 bytes */
 
@@ -2062,14 +2007,10 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
 
                 interface->transfer_size_in_bytes = this_copy;
 
-#ifdef HPI6205_NO_HSR_POLL
                 /* DSP must change this back to nOperation */
                 interface->dsp_ack = H620_HIF_IDLE;
-#endif
-
                 send_dsp_command(phw, operation);
 
-#ifdef HPI6205_NO_HSR_POLL
                 temp2 = wait_dsp_ack(phw, operation, HPI6205_TIMEOUT);
                 HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",
                         HPI6205_TIMEOUT - temp2, this_copy);
@@ -2077,45 +2018,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
                 if (!temp2) {
                         /* timed out */
                         HPI_DEBUG_LOG(ERROR,
-                                "timed out waiting for " "state %d got %d\n",
+                                "Timed out waiting for " "state %d got %d\n",
                                 operation, interface->dsp_ack);
 
                         break;
                 }
-#else
-                /* spin waiting on the result */
-                time_out = HPI6205_TIMEOUT;
-                temp2 = 0;
-                while ((temp2 == 0) && time_out--) {
-                        /* give 16k bus mastering transfer time to happen */
-                        /*(16k / 132Mbytes/s = 122usec) */
-                        hpios_delay_micro_seconds(20);
-                        temp2 = ioread32(phw->prHSR);
-                        temp2 &= C6205_HSR_INTSRC;
-                }
-                HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",
-                        HPI6205_TIMEOUT - time_out, this_copy);
-                if (temp2 == C6205_HSR_INTSRC) {
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "interrupt from HIF <data> OK\n");
-                        /*
-                           if(interface->dwDspAck != nOperation) {
-                           HPI_DEBUG_LOG(DEBUG("interface->dwDspAck=%d,
-                           expected %d \n",
-                           interface->dwDspAck,nOperation);
-                           }
-                         */
-                }
-/* need to handle this differently... */
-                else {
-                        HPI_DEBUG_LOG(ERROR,
-                                "interrupt from HIF <data> BAD\n");
-                        err = HPI_ERROR_DSP_HARDWARE;
-                }
-
-                /* reset the interrupt from the DSP */
-                iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
                 if (operation == H620_HIF_GET_DATA)
                         memcpy(&p_data[data_transferred],
                                 (void *)&interface->u.b_data[0], this_copy);
@@ -2154,7 +2061,6 @@ static int wait_dsp_ack(struct hpi_hw_obj *phw, int state, int timeout_us)
 static void send_dsp_command(struct hpi_hw_obj *phw, int cmd)
 {
         struct bus_master_interface *interface = phw->p_interface_buffer;
-
         u32 r;
 
         interface->host_cmd = cmd;
@@ -2172,31 +2078,39 @@ static unsigned int message_count;
 static u16 message_response_sequence(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-#ifndef HPI6205_NO_HSR_POLL
-        u32 temp2;
-#endif
         u32 time_out, time_out2;
         struct hpi_hw_obj *phw = pao->priv;
         struct bus_master_interface *interface = phw->p_interface_buffer;
         u16 err = 0;
 
         message_count++;
+        if (phm->size > sizeof(interface->u)) {
+                phr->error = HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL;
+                phr->specific_error = sizeof(interface->u);
+                phr->size = sizeof(struct hpi_response_header);
+                HPI_DEBUG_LOG(ERROR,
+                        "message len %d too big for buffer %zd \n", phm->size,
+                        sizeof(interface->u));
+                return 0;
+        }
+
         /* Assume buffer of type struct bus_master_interface
            is allocated "noncacheable" */
 
         if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {
                 HPI_DEBUG_LOG(DEBUG, "timeout waiting for idle\n");
-                return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);
+                return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;
         }
-        interface->u.message_buffer = *phm;
+
+        memcpy(&interface->u.message_buffer, phm, phm->size);
         /* signal we want a response */
         send_dsp_command(phw, H620_HIF_GET_RESP);
 
         time_out2 = wait_dsp_ack(phw, H620_HIF_GET_RESP, HPI6205_TIMEOUT);
 
-        if (time_out2 == 0) {
+        if (!time_out2) {
                 HPI_DEBUG_LOG(ERROR,
-                        "(%u) timed out waiting for " "GET_RESP state [%x]\n",
+                        "(%u) Timed out waiting for " "GET_RESP state [%x]\n",
                         message_count, interface->dsp_ack);
         } else {
                 HPI_DEBUG_LOG(VERBOSE,
@@ -2206,58 +2120,38 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao,
         /* spin waiting on HIF interrupt flag (end of msg process) */
         time_out = HPI6205_TIMEOUT;
 
-#ifndef HPI6205_NO_HSR_POLL
-        temp2 = 0;
-        while ((temp2 == 0) && --time_out) {
-                temp2 = ioread32(phw->prHSR);
-                temp2 &= C6205_HSR_INTSRC;
-                hpios_delay_micro_seconds(1);
-        }
-        if (temp2 == C6205_HSR_INTSRC) {
-                rmb();  /* ensure we see latest value for dsp_ack */
-                if ((interface->dsp_ack != H620_HIF_GET_RESP)) {
-                        HPI_DEBUG_LOG(DEBUG,
-                                "(%u)interface->dsp_ack(0x%x) != "
-                                "H620_HIF_GET_RESP, t=%u\n", message_count,
-                                interface->dsp_ack,
-                                HPI6205_TIMEOUT - time_out);
-                } else {
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "(%u)int with GET_RESP after %u\n",
-                                message_count, HPI6205_TIMEOUT - time_out);
+        /* read the result */
+        if (time_out) {
+                if (interface->u.response_buffer.size <= phr->size)
+                        memcpy(phr, &interface->u.response_buffer,
+                                interface->u.response_buffer.size);
+                else {
+                        HPI_DEBUG_LOG(ERROR,
+                                "response len %d too big for buffer %d\n",
+                                interface->u.response_buffer.size, phr->size);
+                        memcpy(phr, &interface->u.response_buffer,
+                                sizeof(struct hpi_response_header));
+                        phr->error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;
+                        phr->specific_error =
+                                interface->u.response_buffer.size;
+                        phr->size = sizeof(struct hpi_response_header);
                 }
-
-        } else {
-                /* can we do anything else in response to the error ? */
-                HPI_DEBUG_LOG(ERROR,
-                        "interrupt from HIF module BAD (function %x)\n",
-                        phm->function);
         }
-
-        /* reset the interrupt from the DSP */
-        iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
-
-        /* read the result */
-        if (time_out != 0)
-                *phr = interface->u.response_buffer;
-
         /* set interface back to idle */
         send_dsp_command(phw, H620_HIF_IDLE);
 
-        if ((time_out == 0) || (time_out2 == 0)) {
+        if (!time_out || !time_out2) {
                 HPI_DEBUG_LOG(DEBUG, "something timed out!\n");
-                return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_TIMEOUT);
+                return HPI6205_ERROR_MSG_RESP_TIMEOUT;
         }
         /* special case for adapter close - */
         /* wait for the DSP to indicate it is idle */
         if (phm->function == HPI_ADAPTER_CLOSE) {
                 if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {
                         HPI_DEBUG_LOG(DEBUG,
-                                "timeout waiting for idle "
+                                "Timeout waiting for idle "
                                 "(on adapter_close)\n");
-                        return hpi6205_error(0,
-                                HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);
+                        return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;
                 }
         }
         err = hpi_validate_response(phm, phr);
@@ -2277,7 +2171,13 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
         /* maybe an error response */
         if (err) {
                 /* something failed in the HPI/DSP interface */
-                phr->error = err;
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_COMMUNICATION;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+
                 pao->dsp_crashed++;
 
                 /* just the header of the response is valid */
diff --git a/sound/pci/asihpi/hpi6205.h b/sound/pci/asihpi/hpi6205.h
index 1adae0857cda..df2f02c0c7b4 100644
--- a/sound/pci/asihpi/hpi6205.h
+++ b/sound/pci/asihpi/hpi6205.h
@@ -25,9 +25,6 @@ Copyright AudioScience, Inc., 2003
 #ifndef _HPI6205_H_
 #define _HPI6205_H_
 
-/* transitional conditional compile shared between host and DSP */
-/* #define HPI6205_NO_HSR_POLL */
-
 #include "hpi_internal.h"
 
 /***********************************************************
@@ -78,8 +75,8 @@ struct bus_master_interface {
         u32 dsp_ack;
         u32 transfer_size_in_bytes;
         union {
-                struct hpi_message message_buffer;
-                struct hpi_response response_buffer;
+                struct hpi_message_header message_buffer;
+                struct hpi_response_header response_buffer;
                 u8 b_data[HPI6205_SIZEOF_DATA];
         } u;
         struct controlcache_6205 control_cache;
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index 16f502d459de..bf5eced76bac 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -28,7 +28,7 @@ HPI internal definitions
 /** maximum number of memory regions mapped to an adapter */
 #define HPI_MAX_ADAPTER_MEM_SPACES (2)
 
-/* Each OS needs its own hpios.h, or specific define as above */
+/* Each OS needs its own hpios.h */
 #include "hpios.h"
 
 /* physical memory allocation */
@@ -49,7 +49,7 @@ HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.
 */
 u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
                                                            /**< memory handle */
-        u32 size, /**< size in bytes to allocate */
+        u32 size, /**< Size in bytes to allocate */
         struct pci_dev *p_os_reference
         /**< OS specific data required for memory allocation */
         );
@@ -96,41 +96,6 @@ typedef void hpi_handler_func(struct hpi_message *, struct hpi_response *);
 #define compile_time_assert(cond, msg) \
     typedef char ASSERT_##msg[(cond) ? 1 : -1]
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* Private HPI Entity related definitions                                     */
-
-#define STR_SIZE_FIELD_MAX 65535U
-#define STR_TYPE_FIELD_MAX 255U
-#define STR_ROLE_FIELD_MAX 255U
-
-struct hpi_entity_str {
-        u16 size;
-        u8 type;
-        u8 role;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4200)
-#endif
-
-struct hpi_entity {
-        struct hpi_entity_str header;
-#if ! defined(HPI_OS_DSP_C6000) || (defined(HPI_OS_DSP_C6000) && (__TI_COMPILER_VERSION__ > 6000008))
-        /* DSP C6000 compiler v6.0.8 and lower
-           do not support  flexible array member */
-        u8 value[];
-#else
-        /* NOTE! Using sizeof(struct hpi_entity) will give erroneous results */
-#define HPI_INTERNAL_WARN_ABOUT_ENTITY_VALUE
-        u8 value[1];
-#endif
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 /******************************************* bus types */
 enum HPI_BUSES {
         HPI_BUS_ISAPNP = 1,
@@ -139,206 +104,155 @@ enum HPI_BUSES {
         HPI_BUS_NET = 4
 };
 
+enum HPI_SUBSYS_OPTIONS {
+        /* 0, 256 are invalid, 1..255 reserved for global options */
+        HPI_SUBSYS_OPT_NET_ENABLE = 257,
+        HPI_SUBSYS_OPT_NET_BROADCAST = 258,
+        HPI_SUBSYS_OPT_NET_UNICAST = 259,
+        HPI_SUBSYS_OPT_NET_ADDR = 260,
+        HPI_SUBSYS_OPT_NET_MASK = 261,
+        HPI_SUBSYS_OPT_NET_ADAPTER_ADDRESS_ADD = 262
+};
+
+/** Volume flags
+*/
+enum HPI_VOLUME_FLAGS {
+        /** Set if the volume control is muted */
+        HPI_VOLUME_FLAG_MUTED = (1 << 0),
+        /** Set if the volume control has a mute function */
+        HPI_VOLUME_FLAG_HAS_MUTE = (1 << 1),
+        /** Set if volume control can do autofading */
+        HPI_VOLUME_FLAG_HAS_AUTOFADE = (1 << 2)
+                /* Note Flags >= (1<<8) are for DSP internal use only */
+};
+
 /******************************************* CONTROL ATTRIBUTES ****/
 /* (in order of control type ID */
 
 /* This allows for 255 control types, 256 unique attributes each */
-#define HPI_CTL_ATTR(ctl, ai) (HPI_CONTROL_##ctl * 0x100 + ai)
+#define HPI_CTL_ATTR(ctl, ai) ((HPI_CONTROL_##ctl << 8) + ai)
 
 /* Get the sub-index of the attribute for a control type */
-#define HPI_CTL_ATTR_INDEX(i) (i&0xff)
+#define HPI_CTL_ATTR_INDEX(i) (i & 0xff)
 
 /* Extract the control from the control attribute */
-#define HPI_CTL_ATTR_CONTROL(i) (i>>8)
-
-/* Generic control attributes.  */
-
-/** Enable a control.
-0=disable, 1=enable
-\note generic to all mixer plugins?
-*/
-#define HPI_GENERIC_ENABLE HPI_CTL_ATTR(GENERIC, 1)
+#define HPI_CTL_ATTR_CONTROL(i) (i >> 8)
 
 /** Enable event generation for a control.
 0=disable, 1=enable
 \note generic to all controls that can generate events
 */
-#define HPI_GENERIC_EVENT_ENABLE HPI_CTL_ATTR(GENERIC, 2)
-
-/* Volume Control attributes */
-#define HPI_VOLUME_GAIN                 HPI_CTL_ATTR(VOLUME, 1)
-#define HPI_VOLUME_AUTOFADE             HPI_CTL_ATTR(VOLUME, 2)
-
-/** For HPI_ControlQuery() to get the number of channels of a volume control*/
-#define HPI_VOLUME_NUM_CHANNELS         HPI_CTL_ATTR(VOLUME, 6)
-#define HPI_VOLUME_RANGE                HPI_CTL_ATTR(VOLUME, 10)
-
-/** Level Control attributes */
-#define HPI_LEVEL_GAIN                  HPI_CTL_ATTR(LEVEL, 1)
-#define HPI_LEVEL_RANGE                 HPI_CTL_ATTR(LEVEL, 10)
-
-/* Meter Control attributes */
-/** return RMS signal level */
-#define HPI_METER_RMS                   HPI_CTL_ATTR(METER, 1)
-/** return peak signal level */
-#define HPI_METER_PEAK                  HPI_CTL_ATTR(METER, 2)
-/** ballistics for ALL rms meters on adapter */
-#define HPI_METER_RMS_BALLISTICS        HPI_CTL_ATTR(METER, 3)
-/** ballistics for ALL peak meters on adapter */
-#define HPI_METER_PEAK_BALLISTICS       HPI_CTL_ATTR(METER, 4)
-
-/** For HPI_ControlQuery() to get the number of channels of a meter control*/
-#define HPI_METER_NUM_CHANNELS          HPI_CTL_ATTR(METER, 5)
-
-/* Multiplexer control attributes */
-#define HPI_MULTIPLEXER_SOURCE          HPI_CTL_ATTR(MULTIPLEXER, 1)
-#define HPI_MULTIPLEXER_QUERYSOURCE     HPI_CTL_ATTR(MULTIPLEXER, 2)
-
-/** AES/EBU transmitter control attributes */
-/** AESEBU or SPDIF */
-#define HPI_AESEBUTX_FORMAT             HPI_CTL_ATTR(AESEBUTX, 1)
-#define HPI_AESEBUTX_SAMPLERATE         HPI_CTL_ATTR(AESEBUTX, 3)
-#define HPI_AESEBUTX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBUTX, 4)
-#define HPI_AESEBUTX_USERDATA           HPI_CTL_ATTR(AESEBUTX, 5)
-
-/** AES/EBU receiver control attributes */
-#define HPI_AESEBURX_FORMAT             HPI_CTL_ATTR(AESEBURX, 1)
-#define HPI_AESEBURX_ERRORSTATUS        HPI_CTL_ATTR(AESEBURX, 2)
-#define HPI_AESEBURX_SAMPLERATE         HPI_CTL_ATTR(AESEBURX, 3)
-#define HPI_AESEBURX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBURX, 4)
-#define HPI_AESEBURX_USERDATA           HPI_CTL_ATTR(AESEBURX, 5)
-
-/** \defgroup tuner_defs Tuners
-\{
-*/
-/** \defgroup tuner_attrs Tuner control attributes
-\{
-*/
-#define HPI_TUNER_BAND                  HPI_CTL_ATTR(TUNER, 1)
-#define HPI_TUNER_FREQ                  HPI_CTL_ATTR(TUNER, 2)
-#define HPI_TUNER_LEVEL                 HPI_CTL_ATTR(TUNER, 3)
-#define HPI_TUNER_AUDIOMUTE             HPI_CTL_ATTR(TUNER, 4)
-/* use TUNER_STATUS instead */
-#define HPI_TUNER_VIDEO_STATUS          HPI_CTL_ATTR(TUNER, 5)
-#define HPI_TUNER_GAIN                  HPI_CTL_ATTR(TUNER, 6)
-#define HPI_TUNER_STATUS                HPI_CTL_ATTR(TUNER, 7)
-#define HPI_TUNER_MODE                  HPI_CTL_ATTR(TUNER, 8)
-/** RDS data. */
-#define HPI_TUNER_RDS                   HPI_CTL_ATTR(TUNER, 9)
-/** Audio pre-emphasis. */
-#define HPI_TUNER_DEEMPHASIS            HPI_CTL_ATTR(TUNER, 10)
-/** HD Radio tuner program control. */
-#define HPI_TUNER_PROGRAM               HPI_CTL_ATTR(TUNER, 11)
-/** HD Radio tuner digital signal quality. */
-#define HPI_TUNER_HDRADIO_SIGNAL_QUALITY        HPI_CTL_ATTR(TUNER, 12)
-/** HD Radio SDK firmware version. */
-#define HPI_TUNER_HDRADIO_SDK_VERSION   HPI_CTL_ATTR(TUNER, 13)
-/** HD Radio DSP firmware version. */
-#define HPI_TUNER_HDRADIO_DSP_VERSION   HPI_CTL_ATTR(TUNER, 14)
-/** HD Radio signal blend (force analog, or automatic). */
-#define HPI_TUNER_HDRADIO_BLEND         HPI_CTL_ATTR(TUNER, 15)
-
-/** \} */
-
-/** \defgroup pads_attrs Tuner PADs control attributes
-\{
-*/
-/** The text string containing the station/channel combination. */
-#define HPI_PAD_CHANNEL_NAME            HPI_CTL_ATTR(PAD, 1)
-/** The text string containing the artist. */
-#define HPI_PAD_ARTIST                  HPI_CTL_ATTR(PAD, 2)
-/** The text string containing the title. */
-#define HPI_PAD_TITLE                   HPI_CTL_ATTR(PAD, 3)
-/** The text string containing the comment. */
-#define HPI_PAD_COMMENT                 HPI_CTL_ATTR(PAD, 4)
-/** The integer containing the PTY code. */
-#define HPI_PAD_PROGRAM_TYPE            HPI_CTL_ATTR(PAD, 5)
-/** The integer containing the program identification. */
-#define HPI_PAD_PROGRAM_ID              HPI_CTL_ATTR(PAD, 6)
-/** The integer containing whether traffic information is supported.
-Contains either 1 or 0. */
-#define HPI_PAD_TA_SUPPORT              HPI_CTL_ATTR(PAD, 7)
-/** The integer containing whether traffic announcement is in progress.
-Contains either 1 or 0. */
-#define HPI_PAD_TA_ACTIVE               HPI_CTL_ATTR(PAD, 8)
-/** \} */
-/** \} */
-
-/* VOX control attributes */
-#define HPI_VOX_THRESHOLD               HPI_CTL_ATTR(VOX, 1)
-
-/*?? channel mode used hpi_multiplexer_source attribute == 1 */
-#define HPI_CHANNEL_MODE_MODE HPI_CTL_ATTR(CHANNEL_MODE, 1)
-
-/** \defgroup channel_modes Channel Modes
-Used for HPI_ChannelModeSet/Get()
-\{
+
+/** Unique identifiers for every control attribute
 */
-/** Left channel out = left channel in, Right channel out = right channel in. */
-#define HPI_CHANNEL_MODE_NORMAL                 1
-/** Left channel out = right channel in, Right channel out = left channel in. */
-#define HPI_CHANNEL_MODE_SWAP                   2
-/** Left channel out = left channel in, Right channel out = left channel in. */
-#define HPI_CHANNEL_MODE_LEFT_TO_STEREO         3
-/** Left channel out = right channel in, Right channel out = right channel in.*/
-#define HPI_CHANNEL_MODE_RIGHT_TO_STEREO        4
-/** Left channel out = (left channel in + right channel in)/2,
-    Right channel out = mute. */
-#define HPI_CHANNEL_MODE_STEREO_TO_LEFT         5
-/** Left channel out = mute,
-    Right channel out = (right channel in + left channel in)/2. */
-#define HPI_CHANNEL_MODE_STEREO_TO_RIGHT        6
-#define HPI_CHANNEL_MODE_LAST                   6
-/** \} */
-
-/* Bitstream control set attributes */
-#define HPI_BITSTREAM_DATA_POLARITY     HPI_CTL_ATTR(BITSTREAM, 1)
-#define HPI_BITSTREAM_CLOCK_EDGE        HPI_CTL_ATTR(BITSTREAM, 2)
-#define HPI_BITSTREAM_CLOCK_SOURCE      HPI_CTL_ATTR(BITSTREAM, 3)
+enum HPI_CONTROL_ATTRIBUTES {
+        HPI_GENERIC_ENABLE = HPI_CTL_ATTR(GENERIC, 1),
+        HPI_GENERIC_EVENT_ENABLE = HPI_CTL_ATTR(GENERIC, 2),
+
+        HPI_VOLUME_GAIN = HPI_CTL_ATTR(VOLUME, 1),
+        HPI_VOLUME_AUTOFADE = HPI_CTL_ATTR(VOLUME, 2),
+        HPI_VOLUME_MUTE = HPI_CTL_ATTR(VOLUME, 3),
+        HPI_VOLUME_GAIN_AND_FLAGS = HPI_CTL_ATTR(VOLUME, 4),
+        HPI_VOLUME_NUM_CHANNELS = HPI_CTL_ATTR(VOLUME, 6),
+        HPI_VOLUME_RANGE = HPI_CTL_ATTR(VOLUME, 10),
+
+        HPI_METER_RMS = HPI_CTL_ATTR(METER, 1),
+        HPI_METER_PEAK = HPI_CTL_ATTR(METER, 2),
+        HPI_METER_RMS_BALLISTICS = HPI_CTL_ATTR(METER, 3),
+        HPI_METER_PEAK_BALLISTICS = HPI_CTL_ATTR(METER, 4),
+        HPI_METER_NUM_CHANNELS = HPI_CTL_ATTR(METER, 5),
+
+        HPI_MULTIPLEXER_SOURCE = HPI_CTL_ATTR(MULTIPLEXER, 1),
+        HPI_MULTIPLEXER_QUERYSOURCE = HPI_CTL_ATTR(MULTIPLEXER, 2),
+
+        HPI_AESEBUTX_FORMAT = HPI_CTL_ATTR(AESEBUTX, 1),
+        HPI_AESEBUTX_SAMPLERATE = HPI_CTL_ATTR(AESEBUTX, 3),
+        HPI_AESEBUTX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBUTX, 4),
+        HPI_AESEBUTX_USERDATA = HPI_CTL_ATTR(AESEBUTX, 5),
+
+        HPI_AESEBURX_FORMAT = HPI_CTL_ATTR(AESEBURX, 1),
+        HPI_AESEBURX_ERRORSTATUS = HPI_CTL_ATTR(AESEBURX, 2),
+        HPI_AESEBURX_SAMPLERATE = HPI_CTL_ATTR(AESEBURX, 3),
+        HPI_AESEBURX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBURX, 4),
+        HPI_AESEBURX_USERDATA = HPI_CTL_ATTR(AESEBURX, 5),
+
+        HPI_LEVEL_GAIN = HPI_CTL_ATTR(LEVEL, 1),
+        HPI_LEVEL_RANGE = HPI_CTL_ATTR(LEVEL, 10),
+
+        HPI_TUNER_BAND = HPI_CTL_ATTR(TUNER, 1),
+        HPI_TUNER_FREQ = HPI_CTL_ATTR(TUNER, 2),
+        HPI_TUNER_LEVEL_AVG = HPI_CTL_ATTR(TUNER, 3),
+        HPI_TUNER_LEVEL_RAW = HPI_CTL_ATTR(TUNER, 4),
+        HPI_TUNER_SNR = HPI_CTL_ATTR(TUNER, 5),
+        HPI_TUNER_GAIN = HPI_CTL_ATTR(TUNER, 6),
+        HPI_TUNER_STATUS = HPI_CTL_ATTR(TUNER, 7),
+        HPI_TUNER_MODE = HPI_CTL_ATTR(TUNER, 8),
+        HPI_TUNER_RDS = HPI_CTL_ATTR(TUNER, 9),
+        HPI_TUNER_DEEMPHASIS = HPI_CTL_ATTR(TUNER, 10),
+        HPI_TUNER_PROGRAM = HPI_CTL_ATTR(TUNER, 11),
+        HPI_TUNER_HDRADIO_SIGNAL_QUALITY = HPI_CTL_ATTR(TUNER, 12),
+        HPI_TUNER_HDRADIO_SDK_VERSION = HPI_CTL_ATTR(TUNER, 13),
+        HPI_TUNER_HDRADIO_DSP_VERSION = HPI_CTL_ATTR(TUNER, 14),
+        HPI_TUNER_HDRADIO_BLEND = HPI_CTL_ATTR(TUNER, 15),
+
+        HPI_VOX_THRESHOLD = HPI_CTL_ATTR(VOX, 1),
+
+        HPI_CHANNEL_MODE_MODE = HPI_CTL_ATTR(CHANNEL_MODE, 1),
+
+        HPI_BITSTREAM_DATA_POLARITY = HPI_CTL_ATTR(BITSTREAM, 1),
+        HPI_BITSTREAM_CLOCK_EDGE = HPI_CTL_ATTR(BITSTREAM, 2),
+        HPI_BITSTREAM_CLOCK_SOURCE = HPI_CTL_ATTR(BITSTREAM, 3),
+        HPI_BITSTREAM_ACTIVITY = HPI_CTL_ATTR(BITSTREAM, 4),
+
+        HPI_SAMPLECLOCK_SOURCE = HPI_CTL_ATTR(SAMPLECLOCK, 1),
+        HPI_SAMPLECLOCK_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 2),
+        HPI_SAMPLECLOCK_SOURCE_INDEX = HPI_CTL_ATTR(SAMPLECLOCK, 3),
+        HPI_SAMPLECLOCK_LOCAL_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 4),
+        HPI_SAMPLECLOCK_AUTO = HPI_CTL_ATTR(SAMPLECLOCK, 5),
+        HPI_SAMPLECLOCK_LOCAL_LOCK = HPI_CTL_ATTR(SAMPLECLOCK, 6),
+
+        HPI_MICROPHONE_PHANTOM_POWER = HPI_CTL_ATTR(MICROPHONE, 1),
+
+        HPI_EQUALIZER_NUM_FILTERS = HPI_CTL_ATTR(EQUALIZER, 1),
+        HPI_EQUALIZER_FILTER = HPI_CTL_ATTR(EQUALIZER, 2),
+        HPI_EQUALIZER_COEFFICIENTS = HPI_CTL_ATTR(EQUALIZER, 3),
+
+        HPI_COMPANDER_PARAMS = HPI_CTL_ATTR(COMPANDER, 1),
+        HPI_COMPANDER_MAKEUPGAIN = HPI_CTL_ATTR(COMPANDER, 2),
+        HPI_COMPANDER_THRESHOLD = HPI_CTL_ATTR(COMPANDER, 3),
+        HPI_COMPANDER_RATIO = HPI_CTL_ATTR(COMPANDER, 4),
+        HPI_COMPANDER_ATTACK = HPI_CTL_ATTR(COMPANDER, 5),
+        HPI_COMPANDER_DECAY = HPI_CTL_ATTR(COMPANDER, 6),
+
+        HPI_COBRANET_SET = HPI_CTL_ATTR(COBRANET, 1),
+        HPI_COBRANET_GET = HPI_CTL_ATTR(COBRANET, 2),
+        HPI_COBRANET_SET_DATA = HPI_CTL_ATTR(COBRANET, 3),
+        HPI_COBRANET_GET_DATA = HPI_CTL_ATTR(COBRANET, 4),
+        HPI_COBRANET_GET_STATUS = HPI_CTL_ATTR(COBRANET, 5),
+        HPI_COBRANET_SEND_PACKET = HPI_CTL_ATTR(COBRANET, 6),
+        HPI_COBRANET_GET_PACKET = HPI_CTL_ATTR(COBRANET, 7),
+
+        HPI_TONEDETECTOR_THRESHOLD = HPI_CTL_ATTR(TONEDETECTOR, 1),
+        HPI_TONEDETECTOR_STATE = HPI_CTL_ATTR(TONEDETECTOR, 2),
+        HPI_TONEDETECTOR_FREQUENCY = HPI_CTL_ATTR(TONEDETECTOR, 3),
+
+        HPI_SILENCEDETECTOR_THRESHOLD = HPI_CTL_ATTR(SILENCEDETECTOR, 1),
+        HPI_SILENCEDETECTOR_STATE = HPI_CTL_ATTR(SILENCEDETECTOR, 2),
+        HPI_SILENCEDETECTOR_DELAY = HPI_CTL_ATTR(SILENCEDETECTOR, 3),
+
+        HPI_PAD_CHANNEL_NAME = HPI_CTL_ATTR(PAD, 1),
+        HPI_PAD_ARTIST = HPI_CTL_ATTR(PAD, 2),
+        HPI_PAD_TITLE = HPI_CTL_ATTR(PAD, 3),
+        HPI_PAD_COMMENT = HPI_CTL_ATTR(PAD, 4),
+        HPI_PAD_PROGRAM_TYPE = HPI_CTL_ATTR(PAD, 5),
+        HPI_PAD_PROGRAM_ID = HPI_CTL_ATTR(PAD, 6),
+        HPI_PAD_TA_SUPPORT = HPI_CTL_ATTR(PAD, 7),
+        HPI_PAD_TA_ACTIVE = HPI_CTL_ATTR(PAD, 8)
+};
 
 #define HPI_POLARITY_POSITIVE           0
 #define HPI_POLARITY_NEGATIVE           1
 
-/* Bitstream control get attributes */
-#define HPI_BITSTREAM_ACTIVITY          1
-
-/* SampleClock control attributes */
-#define HPI_SAMPLECLOCK_SOURCE                  HPI_CTL_ATTR(SAMPLECLOCK, 1)
-#define HPI_SAMPLECLOCK_SAMPLERATE              HPI_CTL_ATTR(SAMPLECLOCK, 2)
-#define HPI_SAMPLECLOCK_SOURCE_INDEX            HPI_CTL_ATTR(SAMPLECLOCK, 3)
-#define HPI_SAMPLECLOCK_LOCAL_SAMPLERATE\
-        HPI_CTL_ATTR(SAMPLECLOCK, 4)
-#define HPI_SAMPLECLOCK_AUTO                    HPI_CTL_ATTR(SAMPLECLOCK, 5)
-#define HPI_SAMPLECLOCK_LOCAL_LOCK                      HPI_CTL_ATTR(SAMPLECLOCK, 6)
-
-/* Microphone control attributes */
-#define HPI_MICROPHONE_PHANTOM_POWER HPI_CTL_ATTR(MICROPHONE, 1)
-
-/** Equalizer control attributes */
-/** Used to get number of filters in an EQ. (Can't set) */
-#define HPI_EQUALIZER_NUM_FILTERS HPI_CTL_ATTR(EQUALIZER, 1)
-/** Set/get the filter by type, freq, Q, gain */
-#define HPI_EQUALIZER_FILTER HPI_CTL_ATTR(EQUALIZER, 2)
-/** Get the biquad coefficients */
-#define HPI_EQUALIZER_COEFFICIENTS HPI_CTL_ATTR(EQUALIZER, 3)
-
-/* Note compander also uses HPI_GENERIC_ENABLE */
-#define HPI_COMPANDER_PARAMS     HPI_CTL_ATTR(COMPANDER, 1)
-#define HPI_COMPANDER_MAKEUPGAIN HPI_CTL_ATTR(COMPANDER, 2)
-#define HPI_COMPANDER_THRESHOLD  HPI_CTL_ATTR(COMPANDER, 3)
-#define HPI_COMPANDER_RATIO      HPI_CTL_ATTR(COMPANDER, 4)
-#define HPI_COMPANDER_ATTACK     HPI_CTL_ATTR(COMPANDER, 5)
-#define HPI_COMPANDER_DECAY      HPI_CTL_ATTR(COMPANDER, 6)
-
-/* Cobranet control attributes. */
-#define HPI_COBRANET_SET         HPI_CTL_ATTR(COBRANET, 1)
-#define HPI_COBRANET_GET         HPI_CTL_ATTR(COBRANET, 2)
-#define HPI_COBRANET_SET_DATA    HPI_CTL_ATTR(COBRANET, 3)
-#define HPI_COBRANET_GET_DATA    HPI_CTL_ATTR(COBRANET, 4)
-#define HPI_COBRANET_GET_STATUS  HPI_CTL_ATTR(COBRANET, 5)
-#define HPI_COBRANET_SEND_PACKET HPI_CTL_ATTR(COBRANET, 6)
-#define HPI_COBRANET_GET_PACKET  HPI_CTL_ATTR(COBRANET, 7)
-
 /*------------------------------------------------------------
  Cobranet Chip Bridge - copied from HMI.H
 ------------------------------------------------------------*/
@@ -380,7 +294,7 @@ Used for HPI_ChannelModeSet/Get()
 
 /* These defines are used to fill in protocol information for an Ethernet packet
     sent using HMI on CS18102 */
-/** ID supplied by Cirrius for ASI packets. */
+/** ID supplied by Cirrus for ASI packets. */
 #define HPI_ETHERNET_PACKET_ID                  0x85
 /** Simple packet - no special routing required */
 #define HPI_ETHERNET_PACKET_V1                  0x01
@@ -393,71 +307,24 @@ Used for HPI_ChannelModeSet/Get()
 /** This packet must make its way to the host across the HPI interface */
 #define HPI_ETHERNET_PACKET_HOSTED_VIA_HPI_V1   0x41
 
-#define HPI_ETHERNET_UDP_PORT (44600)   /*!< UDP messaging port */
-
-/** Base network time out is set to 100 milli-seconds. */
-#define HPI_ETHERNET_TIMEOUT_MS      (100)
-
-/** \defgroup tonedet_attr Tonedetector attributes
-\{
-Used by HPI_ToneDetector_Set() and HPI_ToneDetector_Get()
-*/
-
-/** Set the threshold level of a tonedetector,
-Threshold is a -ve number in units of dB/100,
-*/
-#define HPI_TONEDETECTOR_THRESHOLD HPI_CTL_ATTR(TONEDETECTOR, 1)
-
-/** Get the current state of tonedetection
-The result is a bitmap of detected tones.  pairs of bits represent the left
-and right channels, with left channel in LSB.
-The lowest frequency detector state is in the LSB
-*/
-#define HPI_TONEDETECTOR_STATE HPI_CTL_ATTR(TONEDETECTOR, 2)
-
-/** Get the frequency of a tonedetector band.
-*/
-#define HPI_TONEDETECTOR_FREQUENCY HPI_CTL_ATTR(TONEDETECTOR, 3)
+#define HPI_ETHERNET_UDP_PORT 44600 /**< HPI UDP service */
 
-/**\}*/
+/** Default network timeout in milli-seconds. */
+#define HPI_ETHERNET_TIMEOUT_MS 500
 
-/** \defgroup silencedet_attr SilenceDetector attributes
-\{
-*/
-
-/** Get the current state of tonedetection
-The result is a bitmap with 1s for silent channels. Left channel is in LSB
-*/
-#define HPI_SILENCEDETECTOR_STATE \
-  HPI_CTL_ATTR(SILENCEDETECTOR, 2)
-
-/** Set the threshold level of a SilenceDetector,
-Threshold is a -ve number in units of dB/100,
-*/
-#define HPI_SILENCEDETECTOR_THRESHOLD \
-  HPI_CTL_ATTR(SILENCEDETECTOR, 1)
-
-/** get/set the silence time before the detector triggers
-*/
-#define HPI_SILENCEDETECTOR_DELAY \
-       HPI_CTL_ATTR(SILENCEDETECTOR, 3)
-
-/**\}*/
-
-/* Locked memory buffer alloc/free phases */
-/** use one message to allocate or free physical memory */
-#define HPI_BUFFER_CMD_EXTERNAL                 0
-/** alloc physical memory */
-#define HPI_BUFFER_CMD_INTERNAL_ALLOC           1
-/** send physical memory address to adapter */
-#define HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER    2
-/** notify adapter to stop using physical buffer */
-#define HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER   3
-/** free physical buffer */
-#define HPI_BUFFER_CMD_INTERNAL_FREE            4
-
-/******************************************* CONTROLX ATTRIBUTES ****/
-/* NOTE: All controlx attributes must be unique, unlike control attributes */
+/** Locked memory buffer alloc/free phases */
+enum HPI_BUFFER_CMDS {
+        /** use one message to allocate or free physical memory */
+        HPI_BUFFER_CMD_EXTERNAL = 0,
+        /** alloc physical memory */
+        HPI_BUFFER_CMD_INTERNAL_ALLOC = 1,
+        /** send physical memory address to adapter */
+        HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER = 2,
+        /** notify adapter to stop using physical buffer */
+        HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER = 3,
+        /** free physical buffer */
+        HPI_BUFFER_CMD_INTERNAL_FREE = 4
+};
 
 /*****************************************************************************/
 /*****************************************************************************/
@@ -482,6 +349,12 @@ Threshold is a -ve number in units of dB/100,
 #define HPI_USB_W2K_TAG                 0x57495341      /* "ASIW"       */
 #define HPI_USB_LINUX_TAG               0x4C495341      /* "ASIL"       */
 
+/** Invalid Adapter index
+Used in HPI messages that are not addressed to a specific adapter
+Used in DLL to indicate device not present
+*/
+#define HPI_ADAPTER_INDEX_INVALID 0xFFFF
+
 /** First 2 hex digits define the adapter family */
 #define HPI_ADAPTER_FAMILY_MASK         0xff00
 #define HPI_MODULE_FAMILY_MASK          0xfff0
@@ -490,178 +363,186 @@ Threshold is a -ve number in units of dB/100,
 #define HPI_MODULE_FAMILY_ASI(f)   (f & HPI_MODULE_FAMILY_MASK)
 #define HPI_ADAPTER_ASI(f)   (f)
 
-/******************************************* message types */
-#define HPI_TYPE_MESSAGE                        1
-#define HPI_TYPE_RESPONSE                       2
-#define HPI_TYPE_DATA                           3
-#define HPI_TYPE_SSX2BYPASS_MESSAGE             4
-
-/******************************************* object types */
-#define HPI_OBJ_SUBSYSTEM                       1
-#define HPI_OBJ_ADAPTER                         2
-#define HPI_OBJ_OSTREAM                         3
-#define HPI_OBJ_ISTREAM                         4
-#define HPI_OBJ_MIXER                           5
-#define HPI_OBJ_NODE                            6
-#define HPI_OBJ_CONTROL                         7
-#define HPI_OBJ_NVMEMORY                        8
-#define HPI_OBJ_GPIO                            9
-#define HPI_OBJ_WATCHDOG                        10
-#define HPI_OBJ_CLOCK                           11
-#define HPI_OBJ_PROFILE                         12
-#define HPI_OBJ_CONTROLEX                       13
-#define HPI_OBJ_ASYNCEVENT                      14
-
-#define HPI_OBJ_MAXINDEX                        14
-
-/******************************************* methods/functions */
-
-#define HPI_OBJ_FUNCTION_SPACING        0x100
-#define HPI_MAKE_INDEX(obj, index) (obj * HPI_OBJ_FUNCTION_SPACING + index)
+enum HPI_MESSAGE_TYPES {
+        HPI_TYPE_MESSAGE = 1,
+        HPI_TYPE_RESPONSE = 2,
+        HPI_TYPE_DATA = 3,
+        HPI_TYPE_SSX2BYPASS_MESSAGE = 4
+};
+
+enum HPI_OBJECT_TYPES {
+        HPI_OBJ_SUBSYSTEM = 1,
+        HPI_OBJ_ADAPTER = 2,
+        HPI_OBJ_OSTREAM = 3,
+        HPI_OBJ_ISTREAM = 4,
+        HPI_OBJ_MIXER = 5,
+        HPI_OBJ_NODE = 6,
+        HPI_OBJ_CONTROL = 7,
+        HPI_OBJ_NVMEMORY = 8,
+        HPI_OBJ_GPIO = 9,
+        HPI_OBJ_WATCHDOG = 10,
+        HPI_OBJ_CLOCK = 11,
+        HPI_OBJ_PROFILE = 12,
+        HPI_OBJ_CONTROLEX = 13,
+        HPI_OBJ_ASYNCEVENT = 14
+#define HPI_OBJ_MAXINDEX 14
+};
+
+#define HPI_OBJ_FUNCTION_SPACING 0x100
+#define HPI_FUNC_ID(obj, i) (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + i)
+
 #define HPI_EXTRACT_INDEX(fn) (fn & 0xff)
 
-/* SUB-SYSTEM */
-#define HPI_SUBSYS_OPEN                 HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 1)
-#define HPI_SUBSYS_GET_VERSION          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 2)
-#define HPI_SUBSYS_GET_INFO             HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 3)
-#define HPI_SUBSYS_FIND_ADAPTERS        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 4)
-#define HPI_SUBSYS_CREATE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 5)
-#define HPI_SUBSYS_CLOSE                HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 6)
-#define HPI_SUBSYS_DELETE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 7)
-#define HPI_SUBSYS_DRIVER_LOAD          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 8)
-#define HPI_SUBSYS_DRIVER_UNLOAD        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 9)
-#define HPI_SUBSYS_READ_PORT_8          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 10)
-#define HPI_SUBSYS_WRITE_PORT_8         HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 11)
-#define HPI_SUBSYS_GET_NUM_ADAPTERS     HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 12)
-#define HPI_SUBSYS_GET_ADAPTER          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 13)
-#define HPI_SUBSYS_SET_NETWORK_INTERFACE HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 14)
-#define HPI_SUBSYS_FUNCTION_COUNT 14
-/* ADAPTER */
-#define HPI_ADAPTER_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 1)
-#define HPI_ADAPTER_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 2)
-#define HPI_ADAPTER_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 3)
-#define HPI_ADAPTER_GET_ASSERT          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 4)
-#define HPI_ADAPTER_TEST_ASSERT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 5)
-#define HPI_ADAPTER_SET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 6)
-#define HPI_ADAPTER_GET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 7)
-#define HPI_ADAPTER_ENABLE_CAPABILITY   HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 8)
-#define HPI_ADAPTER_SELFTEST            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 9)
-#define HPI_ADAPTER_FIND_OBJECT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 10)
-#define HPI_ADAPTER_QUERY_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 11)
-#define HPI_ADAPTER_START_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 12)
-#define HPI_ADAPTER_PROGRAM_FLASH       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 13)
-#define HPI_ADAPTER_SET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 14)
-#define HPI_ADAPTER_GET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 15)
-#define HPI_ADAPTER_ENUM_PROPERTY       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 16)
-#define HPI_ADAPTER_MODULE_INFO         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 17)
-#define HPI_ADAPTER_DEBUG_READ          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 18)
-#define HPI_ADAPTER_FUNCTION_COUNT 18
-/* OUTPUT STREAM */
-#define HPI_OSTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 1)
-#define HPI_OSTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 2)
-#define HPI_OSTREAM_WRITE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 3)
-#define HPI_OSTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 4)
-#define HPI_OSTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 5)
-#define HPI_OSTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 6)
-#define HPI_OSTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 7)
-#define HPI_OSTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 8)
-#define HPI_OSTREAM_DATA                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 9)
-#define HPI_OSTREAM_SET_VELOCITY        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 10)
-#define HPI_OSTREAM_SET_PUNCHINOUT      HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 11)
-#define HPI_OSTREAM_SINEGEN             HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 12)
-#define HPI_OSTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 13)
-#define HPI_OSTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 14)
-#define HPI_OSTREAM_ANC_READ            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 15)
-#define HPI_OSTREAM_SET_TIMESCALE       HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 16)
-#define HPI_OSTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 17)
-#define HPI_OSTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 18)
-#define HPI_OSTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 19)
-#define HPI_OSTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 20)
-#define HPI_OSTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 21)
-#define HPI_OSTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 22)
-#define HPI_OSTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 23)
-#define HPI_OSTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 24)
-#define HPI_OSTREAM_FUNCTION_COUNT              24
-/* INPUT STREAM */
-#define HPI_ISTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 1)
-#define HPI_ISTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 2)
-#define HPI_ISTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 3)
-#define HPI_ISTREAM_READ                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 4)
-#define HPI_ISTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 5)
-#define HPI_ISTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 6)
-#define HPI_ISTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 7)
-#define HPI_ISTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 8)
-#define HPI_ISTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 9)
-#define HPI_ISTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 10)
-#define HPI_ISTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 11)
-#define HPI_ISTREAM_ANC_WRITE           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 12)
-#define HPI_ISTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 13)
-#define HPI_ISTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 14)
-#define HPI_ISTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 15)
-#define HPI_ISTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 16)
-#define HPI_ISTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 17)
-#define HPI_ISTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 18)
-#define HPI_ISTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 19)
-#define HPI_ISTREAM_FUNCTION_COUNT              19
-/* MIXER */
+enum HPI_FUNCTION_IDS {
+        HPI_SUBSYS_OPEN = HPI_FUNC_ID(SUBSYSTEM, 1),
+        HPI_SUBSYS_GET_VERSION = HPI_FUNC_ID(SUBSYSTEM, 2),
+        HPI_SUBSYS_GET_INFO = HPI_FUNC_ID(SUBSYSTEM, 3),
+        /* HPI_SUBSYS_FIND_ADAPTERS     = HPI_FUNC_ID(SUBSYSTEM, 4), */
+        HPI_SUBSYS_CREATE_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 5),
+        HPI_SUBSYS_CLOSE = HPI_FUNC_ID(SUBSYSTEM, 6),
+        /* HPI_SUBSYS_DELETE_ADAPTER    = HPI_FUNC_ID(SUBSYSTEM, 7), */
+        HPI_SUBSYS_DRIVER_LOAD = HPI_FUNC_ID(SUBSYSTEM, 8),
+        HPI_SUBSYS_DRIVER_UNLOAD = HPI_FUNC_ID(SUBSYSTEM, 9),
+        /* HPI_SUBSYS_READ_PORT_8               = HPI_FUNC_ID(SUBSYSTEM, 10), */
+        /* HPI_SUBSYS_WRITE_PORT_8              = HPI_FUNC_ID(SUBSYSTEM, 11), */
+        HPI_SUBSYS_GET_NUM_ADAPTERS = HPI_FUNC_ID(SUBSYSTEM, 12),
+        HPI_SUBSYS_GET_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 13),
+        HPI_SUBSYS_SET_NETWORK_INTERFACE = HPI_FUNC_ID(SUBSYSTEM, 14),
+        HPI_SUBSYS_OPTION_INFO = HPI_FUNC_ID(SUBSYSTEM, 15),
+        HPI_SUBSYS_OPTION_GET = HPI_FUNC_ID(SUBSYSTEM, 16),
+        HPI_SUBSYS_OPTION_SET = HPI_FUNC_ID(SUBSYSTEM, 17),
+#define HPI_SUBSYS_FUNCTION_COUNT 17
+
+        HPI_ADAPTER_OPEN = HPI_FUNC_ID(ADAPTER, 1),
+        HPI_ADAPTER_CLOSE = HPI_FUNC_ID(ADAPTER, 2),
+        HPI_ADAPTER_GET_INFO = HPI_FUNC_ID(ADAPTER, 3),
+        HPI_ADAPTER_GET_ASSERT = HPI_FUNC_ID(ADAPTER, 4),
+        HPI_ADAPTER_TEST_ASSERT = HPI_FUNC_ID(ADAPTER, 5),
+        HPI_ADAPTER_SET_MODE = HPI_FUNC_ID(ADAPTER, 6),
+        HPI_ADAPTER_GET_MODE = HPI_FUNC_ID(ADAPTER, 7),
+        HPI_ADAPTER_ENABLE_CAPABILITY = HPI_FUNC_ID(ADAPTER, 8),
+        HPI_ADAPTER_SELFTEST = HPI_FUNC_ID(ADAPTER, 9),
+        HPI_ADAPTER_FIND_OBJECT = HPI_FUNC_ID(ADAPTER, 10),
+        HPI_ADAPTER_QUERY_FLASH = HPI_FUNC_ID(ADAPTER, 11),
+        HPI_ADAPTER_START_FLASH = HPI_FUNC_ID(ADAPTER, 12),
+        HPI_ADAPTER_PROGRAM_FLASH = HPI_FUNC_ID(ADAPTER, 13),
+        HPI_ADAPTER_SET_PROPERTY = HPI_FUNC_ID(ADAPTER, 14),
+        HPI_ADAPTER_GET_PROPERTY = HPI_FUNC_ID(ADAPTER, 15),
+        HPI_ADAPTER_ENUM_PROPERTY = HPI_FUNC_ID(ADAPTER, 16),
+        HPI_ADAPTER_MODULE_INFO = HPI_FUNC_ID(ADAPTER, 17),
+        HPI_ADAPTER_DEBUG_READ = HPI_FUNC_ID(ADAPTER, 18),
+        HPI_ADAPTER_IRQ_QUERY_AND_CLEAR = HPI_FUNC_ID(ADAPTER, 19),
+        HPI_ADAPTER_IRQ_CALLBACK = HPI_FUNC_ID(ADAPTER, 20),
+        HPI_ADAPTER_DELETE = HPI_FUNC_ID(ADAPTER, 21),
+#define HPI_ADAPTER_FUNCTION_COUNT 21
+
+        HPI_OSTREAM_OPEN = HPI_FUNC_ID(OSTREAM, 1),
+        HPI_OSTREAM_CLOSE = HPI_FUNC_ID(OSTREAM, 2),
+        HPI_OSTREAM_WRITE = HPI_FUNC_ID(OSTREAM, 3),
+        HPI_OSTREAM_START = HPI_FUNC_ID(OSTREAM, 4),
+        HPI_OSTREAM_STOP = HPI_FUNC_ID(OSTREAM, 5),
+        HPI_OSTREAM_RESET = HPI_FUNC_ID(OSTREAM, 6),
+        HPI_OSTREAM_GET_INFO = HPI_FUNC_ID(OSTREAM, 7),
+        HPI_OSTREAM_QUERY_FORMAT = HPI_FUNC_ID(OSTREAM, 8),
+        HPI_OSTREAM_DATA = HPI_FUNC_ID(OSTREAM, 9),
+        HPI_OSTREAM_SET_VELOCITY = HPI_FUNC_ID(OSTREAM, 10),
+        HPI_OSTREAM_SET_PUNCHINOUT = HPI_FUNC_ID(OSTREAM, 11),
+        HPI_OSTREAM_SINEGEN = HPI_FUNC_ID(OSTREAM, 12),
+        HPI_OSTREAM_ANC_RESET = HPI_FUNC_ID(OSTREAM, 13),
+        HPI_OSTREAM_ANC_GET_INFO = HPI_FUNC_ID(OSTREAM, 14),
+        HPI_OSTREAM_ANC_READ = HPI_FUNC_ID(OSTREAM, 15),
+        HPI_OSTREAM_SET_TIMESCALE = HPI_FUNC_ID(OSTREAM, 16),
+        HPI_OSTREAM_SET_FORMAT = HPI_FUNC_ID(OSTREAM, 17),
+        HPI_OSTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(OSTREAM, 18),
+        HPI_OSTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(OSTREAM, 19),
+        HPI_OSTREAM_GROUP_ADD = HPI_FUNC_ID(OSTREAM, 20),
+        HPI_OSTREAM_GROUP_GETMAP = HPI_FUNC_ID(OSTREAM, 21),
+        HPI_OSTREAM_GROUP_RESET = HPI_FUNC_ID(OSTREAM, 22),
+        HPI_OSTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(OSTREAM, 23),
+        HPI_OSTREAM_WAIT_START = HPI_FUNC_ID(OSTREAM, 24),
+        HPI_OSTREAM_WAIT = HPI_FUNC_ID(OSTREAM, 25),
+#define HPI_OSTREAM_FUNCTION_COUNT 25
+
+        HPI_ISTREAM_OPEN = HPI_FUNC_ID(ISTREAM, 1),
+        HPI_ISTREAM_CLOSE = HPI_FUNC_ID(ISTREAM, 2),
+        HPI_ISTREAM_SET_FORMAT = HPI_FUNC_ID(ISTREAM, 3),
+        HPI_ISTREAM_READ = HPI_FUNC_ID(ISTREAM, 4),
+        HPI_ISTREAM_START = HPI_FUNC_ID(ISTREAM, 5),
+        HPI_ISTREAM_STOP = HPI_FUNC_ID(ISTREAM, 6),
+        HPI_ISTREAM_RESET = HPI_FUNC_ID(ISTREAM, 7),
+        HPI_ISTREAM_GET_INFO = HPI_FUNC_ID(ISTREAM, 8),
+        HPI_ISTREAM_QUERY_FORMAT = HPI_FUNC_ID(ISTREAM, 9),
+        HPI_ISTREAM_ANC_RESET = HPI_FUNC_ID(ISTREAM, 10),
+        HPI_ISTREAM_ANC_GET_INFO = HPI_FUNC_ID(ISTREAM, 11),
+        HPI_ISTREAM_ANC_WRITE = HPI_FUNC_ID(ISTREAM, 12),
+        HPI_ISTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(ISTREAM, 13),
+        HPI_ISTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(ISTREAM, 14),
+        HPI_ISTREAM_GROUP_ADD = HPI_FUNC_ID(ISTREAM, 15),
+        HPI_ISTREAM_GROUP_GETMAP = HPI_FUNC_ID(ISTREAM, 16),
+        HPI_ISTREAM_GROUP_RESET = HPI_FUNC_ID(ISTREAM, 17),
+        HPI_ISTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(ISTREAM, 18),
+        HPI_ISTREAM_WAIT_START = HPI_FUNC_ID(ISTREAM, 19),
+        HPI_ISTREAM_WAIT = HPI_FUNC_ID(ISTREAM, 20),
+#define HPI_ISTREAM_FUNCTION_COUNT 20
+
 /* NOTE:
    GET_NODE_INFO, SET_CONNECTION, GET_CONNECTIONS are not currently used */
-#define HPI_MIXER_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 1)
-#define HPI_MIXER_CLOSE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 2)
-#define HPI_MIXER_GET_INFO              HPI_MAKE_INDEX(HPI_OBJ_MIXER, 3)
-#define HPI_MIXER_GET_NODE_INFO         HPI_MAKE_INDEX(HPI_OBJ_MIXER, 4)
-#define HPI_MIXER_GET_CONTROL           HPI_MAKE_INDEX(HPI_OBJ_MIXER, 5)
-#define HPI_MIXER_SET_CONNECTION        HPI_MAKE_INDEX(HPI_OBJ_MIXER, 6)
-#define HPI_MIXER_GET_CONNECTIONS       HPI_MAKE_INDEX(HPI_OBJ_MIXER, 7)
-#define HPI_MIXER_GET_CONTROL_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 8)
-#define HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 9)
-#define HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES HPI_MAKE_INDEX(HPI_OBJ_MIXER, 10)
-#define HPI_MIXER_STORE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 11)
-#define HPI_MIXER_FUNCTION_COUNT        11
-/* MIXER CONTROLS */
-#define HPI_CONTROL_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 1)
-#define HPI_CONTROL_GET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 2)
-#define HPI_CONTROL_SET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 3)
+        HPI_MIXER_OPEN = HPI_FUNC_ID(MIXER, 1),
+        HPI_MIXER_CLOSE = HPI_FUNC_ID(MIXER, 2),
+        HPI_MIXER_GET_INFO = HPI_FUNC_ID(MIXER, 3),
+        HPI_MIXER_GET_NODE_INFO = HPI_FUNC_ID(MIXER, 4),
+        HPI_MIXER_GET_CONTROL = HPI_FUNC_ID(MIXER, 5),
+        HPI_MIXER_SET_CONNECTION = HPI_FUNC_ID(MIXER, 6),
+        HPI_MIXER_GET_CONNECTIONS = HPI_FUNC_ID(MIXER, 7),
+        HPI_MIXER_GET_CONTROL_BY_INDEX = HPI_FUNC_ID(MIXER, 8),
+        HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX = HPI_FUNC_ID(MIXER, 9),
+        HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES = HPI_FUNC_ID(MIXER, 10),
+        HPI_MIXER_STORE = HPI_FUNC_ID(MIXER, 11),
+        HPI_MIXER_GET_CACHE_INFO = HPI_FUNC_ID(MIXER, 12),
+#define HPI_MIXER_FUNCTION_COUNT 12
+
+        HPI_CONTROL_GET_INFO = HPI_FUNC_ID(CONTROL, 1),
+        HPI_CONTROL_GET_STATE = HPI_FUNC_ID(CONTROL, 2),
+        HPI_CONTROL_SET_STATE = HPI_FUNC_ID(CONTROL, 3),
 #define HPI_CONTROL_FUNCTION_COUNT 3
-/* NONVOL MEMORY */
-#define HPI_NVMEMORY_OPEN               HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 1)
-#define HPI_NVMEMORY_READ_BYTE          HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 2)
-#define HPI_NVMEMORY_WRITE_BYTE         HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 3)
+
+        HPI_NVMEMORY_OPEN = HPI_FUNC_ID(NVMEMORY, 1),
+        HPI_NVMEMORY_READ_BYTE = HPI_FUNC_ID(NVMEMORY, 2),
+        HPI_NVMEMORY_WRITE_BYTE = HPI_FUNC_ID(NVMEMORY, 3),
 #define HPI_NVMEMORY_FUNCTION_COUNT 3
-/* GPIO */
-#define HPI_GPIO_OPEN                   HPI_MAKE_INDEX(HPI_OBJ_GPIO, 1)
-#define HPI_GPIO_READ_BIT               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 2)
-#define HPI_GPIO_WRITE_BIT              HPI_MAKE_INDEX(HPI_OBJ_GPIO, 3)
-#define HPI_GPIO_READ_ALL               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 4)
-#define HPI_GPIO_WRITE_STATUS           HPI_MAKE_INDEX(HPI_OBJ_GPIO, 5)
+
+        HPI_GPIO_OPEN = HPI_FUNC_ID(GPIO, 1),
+        HPI_GPIO_READ_BIT = HPI_FUNC_ID(GPIO, 2),
+        HPI_GPIO_WRITE_BIT = HPI_FUNC_ID(GPIO, 3),
+        HPI_GPIO_READ_ALL = HPI_FUNC_ID(GPIO, 4),
+        HPI_GPIO_WRITE_STATUS = HPI_FUNC_ID(GPIO, 5),
 #define HPI_GPIO_FUNCTION_COUNT 5
-/* ASYNC EVENT */
-#define HPI_ASYNCEVENT_OPEN             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 1)
-#define HPI_ASYNCEVENT_CLOSE            HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 2)
-#define HPI_ASYNCEVENT_WAIT             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 3)
-#define HPI_ASYNCEVENT_GETCOUNT         HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 4)
-#define HPI_ASYNCEVENT_GET              HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 5)
-#define HPI_ASYNCEVENT_SENDEVENTS       HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 6)
+
+        HPI_ASYNCEVENT_OPEN = HPI_FUNC_ID(ASYNCEVENT, 1),
+        HPI_ASYNCEVENT_CLOSE = HPI_FUNC_ID(ASYNCEVENT, 2),
+        HPI_ASYNCEVENT_WAIT = HPI_FUNC_ID(ASYNCEVENT, 3),
+        HPI_ASYNCEVENT_GETCOUNT = HPI_FUNC_ID(ASYNCEVENT, 4),
+        HPI_ASYNCEVENT_GET = HPI_FUNC_ID(ASYNCEVENT, 5),
+        HPI_ASYNCEVENT_SENDEVENTS = HPI_FUNC_ID(ASYNCEVENT, 6),
 #define HPI_ASYNCEVENT_FUNCTION_COUNT 6
-/* WATCH-DOG */
-#define HPI_WATCHDOG_OPEN               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 1)
-#define HPI_WATCHDOG_SET_TIME           HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 2)
-#define HPI_WATCHDOG_PING               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 3)
-/* CLOCK */
-#define HPI_CLOCK_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 1)
-#define HPI_CLOCK_SET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 2)
-#define HPI_CLOCK_GET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 3)
-/* PROFILE */
-#define HPI_PROFILE_OPEN_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 1)
-#define HPI_PROFILE_START_ALL           HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 2)
-#define HPI_PROFILE_STOP_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 3)
-#define HPI_PROFILE_GET                 HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 4)
-#define HPI_PROFILE_GET_IDLECOUNT       HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 5)
-#define HPI_PROFILE_GET_NAME            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 6)
-#define HPI_PROFILE_GET_UTILIZATION     HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 7)
+
+        HPI_WATCHDOG_OPEN = HPI_FUNC_ID(WATCHDOG, 1),
+        HPI_WATCHDOG_SET_TIME = HPI_FUNC_ID(WATCHDOG, 2),
+        HPI_WATCHDOG_PING = HPI_FUNC_ID(WATCHDOG, 3),
+
+        HPI_CLOCK_OPEN = HPI_FUNC_ID(CLOCK, 1),
+        HPI_CLOCK_SET_TIME = HPI_FUNC_ID(CLOCK, 2),
+        HPI_CLOCK_GET_TIME = HPI_FUNC_ID(CLOCK, 3),
+
+        HPI_PROFILE_OPEN_ALL = HPI_FUNC_ID(PROFILE, 1),
+        HPI_PROFILE_START_ALL = HPI_FUNC_ID(PROFILE, 2),
+        HPI_PROFILE_STOP_ALL = HPI_FUNC_ID(PROFILE, 3),
+        HPI_PROFILE_GET = HPI_FUNC_ID(PROFILE, 4),
+        HPI_PROFILE_GET_IDLECOUNT = HPI_FUNC_ID(PROFILE, 5),
+        HPI_PROFILE_GET_NAME = HPI_FUNC_ID(PROFILE, 6),
+        HPI_PROFILE_GET_UTILIZATION = HPI_FUNC_ID(PROFILE, 7)
 #define HPI_PROFILE_FUNCTION_COUNT 7
-/* ////////////////////////////////////////////////////////////////////// */
-/* PRIVATE ATTRIBUTES */
+};
 
 /* ////////////////////////////////////////////////////////////////////// */
 /* STRUCTURES */
@@ -672,18 +553,7 @@ Threshold is a -ve number in units of dB/100,
 /** PCI bus resource */
 struct hpi_pci {
         u32 __iomem *ap_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];
-        struct pci_dev *p_os_data;
-
-#ifndef HPI64BIT                /* keep structure size constant */
-        u32 padding[HPI_MAX_ADAPTER_MEM_SPACES + 1];
-#endif
-        u16 vendor_id;
-        u16 device_id;
-        u16 subsys_vendor_id;
-        u16 subsys_device_id;
-        u16 bus_number;
-        u16 device_number;
-        u32 interrupt;
+        struct pci_dev *pci_dev;
 };
 
 struct hpi_resource {
@@ -702,12 +572,10 @@ struct hpi_resource {
 /** Format info used inside struct hpi_message
     Not the same as public API struct hpi_format */
 struct hpi_msg_format {
-        u32 sample_rate;
-                                /**< 11025, 32000, 44100 ... */
-        u32 bit_rate;         /**< for MPEG */
-        u32 attributes;
-                                /**< Stereo/JointStereo/Mono */
-        u16 channels;         /**< 1,2..., (or ancillary mode or idle bit */
+        u32 sample_rate; /**< 11025, 32000, 44100 etc. */
+        u32 bit_rate; /**< for MPEG */
+        u32 attributes; /**< stereo/joint_stereo/mono */
+        u16 channels; /**< 1,2..., (or ancillary mode or idle bit */
         u16 format; /**< HPI_FORMAT_PCM16, _MPEG etc. see \ref HPI_FORMATS. */
 };
 
@@ -740,9 +608,9 @@ struct hpi_data_compat32 {
 #endif
 
 struct hpi_buffer {
-  /** placehoder for backward compatability (see dwBufferSize) */
+  /** placehoder for backward compatibility (see dwBufferSize) */
         struct hpi_msg_format reserved;
-        u32 command;    /**< HPI_BUFFER_CMD_xxx*/
+        u32 command; /**< HPI_BUFFER_CMD_xxx*/
         u32 pci_address; /**< PCI physical address of buffer for DSP DMA */
         u32 buffer_size; /**< must line up with data_size of HPI_DATA*/
 };
@@ -777,30 +645,25 @@ struct hpi_subsys_msg {
 
 struct hpi_subsys_res {
         u32 version;
-        u32 data;               /* used to return extended version */
-        u16 num_adapters;       /* number of adapters */
+        u32 data;               /* extended version */
+        u16 num_adapters;
         u16 adapter_index;
-        u16 aw_adapter_list[HPI_MAX_ADAPTERS];
-};
-
-struct hpi_adapter_msg {
-        u32 adapter_mode;       /* adapter mode */
-        u16 assert_id;          /* assert number for "test assert" call
-                                   object_index for find object call
-                                   query_or_set for hpi_adapter_set_mode_ex() */
-        u16 object_type;        /* for adapter find object call */
+        u16 adapter_type;
+        u16 pad16;
 };
 
 union hpi_adapterx_msg {
-        struct hpi_adapter_msg adapter;
         struct {
-                u32 offset;
-        } query_flash;
+                u32 dsp_address;
+                u32 count_bytes;
+        } debug_read;
         struct {
-                u32 offset;
-                u32 length;
-                u32 key;
-        } start_flash;
+                u32 adapter_mode;
+                u16 query_or_set;
+        } mode;
+        struct {
+                u16 index;
+        } module_info;
         struct {
                 u32 checksum;
                 u16 sequence;
@@ -809,28 +672,41 @@ union hpi_adapterx_msg {
                 u16 unused;
         } program_flash;
         struct {
+                u16 index;
+                u16 what;
+                u16 property_index;
+        } property_enum;
+        struct {
                 u16 property;
                 u16 parameter1;
                 u16 parameter2;
         } property_set;
         struct {
-                u16 index;
-                u16 what;
-                u16 property_index;
-        } property_enum;
+                u32 offset;
+        } query_flash;
         struct {
-                u16 index;
-        } module_info;
+                u32 pad32;
+                u16 key1;
+                u16 key2;
+        } restart;
         struct {
-                u32 dsp_address;
-                u32 count_bytes;
-        } debug_read;
+                u32 offset;
+                u32 length;
+                u32 key;
+        } start_flash;
+        struct {
+                u32 pad32;
+                u16 value;
+        } test_assert;
+        struct {
+                u32 yes;
+        } irq_query;
 };
 
 struct hpi_adapter_res {
         u32 serial_number;
         u16 adapter_type;
-        u16 adapter_index;      /* is this needed? also used for dsp_index */
+        u16 adapter_index;
         u16 num_instreams;
         u16 num_outstreams;
         u16 num_mixers;
@@ -839,12 +715,18 @@ struct hpi_adapter_res {
 };
 
 union hpi_adapterx_res {
-        struct hpi_adapter_res adapter;
+        struct hpi_adapter_res info;
         struct {
-                u32 checksum;
-                u32 length;
-                u32 version;
-        } query_flash;
+                u32 p1;
+                u16 count;
+                u16 dsp_index;
+                u32 p2;
+                u32 dsp_msg_addr;
+                char sz_message[HPI_STRING_LEN];
+        } assert;
+        struct {
+                u32 adapter_mode;
+        } mode;
         struct {
                 u16 sequence;
         } program_flash;
@@ -852,6 +734,14 @@ union hpi_adapterx_res {
                 u16 parameter1;
                 u16 parameter2;
         } property_get;
+        struct {
+                u32 checksum;
+                u32 length;
+                u32 version;
+        } query_flash;
+        struct {
+                u32 yes;
+        } irq_query;
 };
 
 struct hpi_stream_msg {
@@ -863,6 +753,7 @@ struct hpi_stream_msg {
                 u32 time_scale;
                 struct hpi_buffer buffer;
                 struct hpi_streamid stream;
+                u32 threshold_bytes;
         } u;
 };
 
@@ -911,7 +802,7 @@ struct hpi_stream_res {
 struct hpi_mixer_msg {
         u16 control_index;
         u16 control_type;       /* = HPI_CONTROL_METER _VOLUME etc */
-        u16 padding1;           /* maintain alignment of subsequent fields */
+        u16 padding1;           /* Maintain alignment of subsequent fields */
         u16 node_type1;         /* = HPI_SOURCENODE_LINEIN etc */
         u16 node_index1;        /* = 0..N */
         u16 node_type2;
@@ -949,6 +840,11 @@ union hpi_mixerx_res {
                 u32 p_data;     /* pointer to data array */
                 u16 more_to_do; /* indicates if there is more to do */
         } gcabi;
+        struct {
+                u32 total_controls;     /* count of controls in the mixer */
+                u32 cache_controls;     /* count of controls in the cac */
+                u32 cache_bytes;        /* size of cache */
+        } cache_info;
 };
 
 struct hpi_control_msg {
@@ -1000,12 +896,16 @@ union hpi_control_union_res {
                 u32 band;
                 u32 frequency;
                 u32 gain;
-                u32 level;
                 u32 deemphasis;
                 struct {
                         u32 data[2];
                         u32 bLER;
                 } rds;
+                short s_level;
+                struct {
+                        u16 value;
+                        u16 mask;
+                } status;
         } tuner;
         struct {
                 char sz_data[8];
@@ -1178,11 +1078,11 @@ struct hpi_profile_res_open {
 };
 
 struct hpi_profile_res_time {
-        u32 micro_seconds;
+        u32 total_tick_count;
         u32 call_count;
-        u32 max_micro_seconds;
-        u32 min_micro_seconds;
-        u16 seconds;
+        u32 max_tick_count;
+        u32 ticks_per_millisecond;
+        u16 profile_interval;
 };
 
 struct hpi_profile_res_name {
@@ -1218,7 +1118,6 @@ struct hpi_message {
         u16 obj_index;          /*  */
         union {
                 struct hpi_subsys_msg s;
-                struct hpi_adapter_msg a;
                 union hpi_adapterx_msg ax;
                 struct hpi_stream_msg d;
                 struct hpi_mixer_msg m;
@@ -1239,7 +1138,7 @@ struct hpi_message {
 };
 
 #define HPI_MESSAGE_SIZE_BY_OBJECT { \
-        sizeof(struct hpi_message_header) ,   /* default, no object type 0 */ \
+        sizeof(struct hpi_message_header) ,   /* Default, no object type 0 */ \
         sizeof(struct hpi_message_header) + sizeof(struct hpi_subsys_msg),\
         sizeof(struct hpi_message_header) + sizeof(union hpi_adapterx_msg),\
         sizeof(struct hpi_message_header) + sizeof(struct hpi_stream_msg),\
@@ -1256,6 +1155,11 @@ struct hpi_message {
         sizeof(struct hpi_message_header) + sizeof(struct hpi_async_msg) \
 }
 
+/*
+Note that the wSpecificError error field should be inspected and potentially
+reported whenever HPI_ERROR_DSP_COMMUNICATION or HPI_ERROR_DSP_BOOTLOAD is
+returned in wError.
+*/
 struct hpi_response_header {
         u16 size;
         u8 type;                /* HPI_TYPE_RESPONSE  */
@@ -1277,7 +1181,6 @@ struct hpi_response {
         u16 specific_error;     /* adapter specific error */
         union {
                 struct hpi_subsys_res s;
-                struct hpi_adapter_res a;
                 union hpi_adapterx_res ax;
                 struct hpi_stream_res d;
                 struct hpi_mixer_res m;
@@ -1297,7 +1200,7 @@ struct hpi_response {
 };
 
 #define HPI_RESPONSE_SIZE_BY_OBJECT { \
-        sizeof(struct hpi_response_header) ,/* default, no object type 0 */ \
+        sizeof(struct hpi_response_header) ,/* Default, no object type 0 */ \
         sizeof(struct hpi_response_header) + sizeof(struct hpi_subsys_res),\
         sizeof(struct hpi_response_header) + sizeof(union  hpi_adapterx_res),\
         sizeof(struct hpi_response_header) + sizeof(struct hpi_stream_res),\
@@ -1314,7 +1217,7 @@ struct hpi_response {
         sizeof(struct hpi_response_header) + sizeof(struct hpi_async_res) \
 }
 
-/*********************** version 1 message/response *****************************/
+/*********************** version 1 message/response **************************/
 #define HPINET_ETHERNET_DATA_SIZE (1500)
 #define HPINET_IP_HDR_SIZE (20)
 #define HPINET_IP_DATA_SIZE (HPINET_ETHERNET_DATA_SIZE - HPINET_IP_HDR_SIZE)
@@ -1394,6 +1297,17 @@ struct hpi_res_adapter_program_flash {
                 sizeof(struct hpi_response_header) - sizeof(u16)];
 };
 
+struct hpi_msg_adapter_debug_read {
+        struct hpi_message_header h;
+        u32 dsp_address;
+        u32 count_bytes;
+};
+
+struct hpi_res_adapter_debug_read {
+        struct hpi_response_header h;
+        u8 bytes[256];
+};
+
 #if 1
 #define hpi_message_header_v1 hpi_message_header
 #define hpi_response_header_v1 hpi_response_header
@@ -1414,23 +1328,10 @@ struct hpi_response_header_v1 {
 };
 #endif
 
-/* STRV HPI Packet */
-struct hpi_msg_strv {
-        struct hpi_message_header h;
-        struct hpi_entity strv;
-};
-
-struct hpi_res_strv {
-        struct hpi_response_header h;
-        struct hpi_entity strv;
-};
-#define MIN_STRV_PACKET_SIZE sizeof(struct hpi_res_strv)
-
 struct hpi_msg_payload_v0 {
         struct hpi_message_header h;
         union {
                 struct hpi_subsys_msg s;
-                struct hpi_adapter_msg a;
                 union hpi_adapterx_msg ax;
                 struct hpi_stream_msg d;
                 struct hpi_mixer_msg m;
@@ -1451,7 +1352,6 @@ struct hpi_res_payload_v0 {
         struct hpi_response_header h;
         union {
                 struct hpi_subsys_res s;
-                struct hpi_adapter_res a;
                 union hpi_adapterx_res ax;
                 struct hpi_stream_res d;
                 struct hpi_mixer_res m;
@@ -1471,13 +1371,13 @@ struct hpi_res_payload_v0 {
 union hpi_message_buffer_v1 {
         struct hpi_message m0;  /* version 0 */
         struct hpi_message_header_v1 h;
-        unsigned char buf[HPI_MAX_PAYLOAD_SIZE];
+        u8 buf[HPI_MAX_PAYLOAD_SIZE];
 };
 
 union hpi_response_buffer_v1 {
         struct hpi_response r0; /* version 0 */
         struct hpi_response_header_v1 h;
-        unsigned char buf[HPI_MAX_PAYLOAD_SIZE];
+        u8 buf[HPI_MAX_PAYLOAD_SIZE];
 };
 
 compile_time_assert((sizeof(union hpi_message_buffer_v1) <=
@@ -1499,6 +1399,11 @@ struct hpi_control_defn {
 /*////////////////////////////////////////////////////////////////////////// */
 /* declarations for control caching (internal to HPI<->DSP interaction)      */
 
+/** indicates a cached u16 value is invalid. */
+#define HPI_CACHE_INVALID_UINT16 0xFFFF
+/** indicates a cached short value is invalid. */
+#define HPI_CACHE_INVALID_SHORT -32768
+
 /** A compact representation of (part of) a controls state.
 Used for efficient transfer of the control state
 between DSP and host or across a network
@@ -1512,58 +1417,104 @@ struct hpi_control_cache_info {
         u16 control_index;
 };
 
-struct hpi_control_cache_single {
+struct hpi_control_cache_vol {
         struct hpi_control_cache_info i;
+        short an_log[2];
+        unsigned short flags;
+        char padding[2];
+};
+
+struct hpi_control_cache_meter {
+        struct hpi_control_cache_info i;
+        short an_log_peak[2];
+        short an_logRMS[2];
+};
+
+struct hpi_control_cache_channelmode {
+        struct hpi_control_cache_info i;
+        u16 mode;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_mux {
+        struct hpi_control_cache_info i;
+        u16 source_node_type;
+        u16 source_node_index;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_level {
+        struct hpi_control_cache_info i;
+        short an_log[2];
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_tuner {
+        struct hpi_control_cache_info i;
+        u32 freq_ink_hz;
+        u16 band;
+        short s_level_avg;
+};
+
+struct hpi_control_cache_aes3rx {
+        struct hpi_control_cache_info i;
+        u32 error_status;
+        u32 format;
+};
+
+struct hpi_control_cache_aes3tx {
+        struct hpi_control_cache_info i;
+        u32 format;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_tonedetector {
+        struct hpi_control_cache_info i;
+        u16 state;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_silencedetector {
+        struct hpi_control_cache_info i;
+        u32 state;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_sampleclock {
+        struct hpi_control_cache_info i;
+        u16 source;
+        u16 source_index;
+        u32 sample_rate;
+};
+
+struct hpi_control_cache_microphone {
+        struct hpi_control_cache_info i;
+        u16 phantom_state;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_generic {
+        struct hpi_control_cache_info i;
+        u32 dw1;
+        u32 dw2;
+};
+
+struct hpi_control_cache_single {
         union {
-                struct {        /* volume */
-                        short an_log[2];
-                } v;
-                struct {        /* peak meter */
-                        short an_log_peak[2];
-                        short an_logRMS[2];
-                } p;
-                struct {        /* channel mode */
-                        u16 mode;
-                } m;
-                struct {        /* multiplexer */
-                        u16 source_node_type;
-                        u16 source_node_index;
-                } x;
-                struct {        /* level/trim */
-                        short an_log[2];
-                } l;
-                struct {        /* tuner - partial caching.
-                                   some attributes go to the DSP. */
-                        u32 freq_ink_hz;
-                        u16 band;
-                        u16 level;
-                } t;
-                struct {        /* AESEBU rx status */
-                        u32 error_status;
-                        u32 source;
-                } aes3rx;
-                struct {        /* AESEBU tx */
-                        u32 format;
-                } aes3tx;
-                struct {        /* tone detector */
-                        u16 state;
-                } tone;
-                struct {        /* silence detector */
-                        u32 state;
-                        u32 count;
-                } silence;
-                struct {        /* sample clock */
-                        u16 source;
-                        u16 source_index;
-                        u32 sample_rate;
-                } clk;
-                struct {        /* microphone control */
-                        u16 state;
-                } phantom_power;
-                struct {        /* generic control */
-                        u32 dw1;
-                        u32 dw2;
-                } g;
+                struct hpi_control_cache_info i;
+                struct hpi_control_cache_vol vol;
+                struct hpi_control_cache_meter meter;
+                struct hpi_control_cache_channelmode mode;
+                struct hpi_control_cache_mux mux;
+                struct hpi_control_cache_level level;
+                struct hpi_control_cache_tuner tuner;
+                struct hpi_control_cache_aes3rx aes3rx;
+                struct hpi_control_cache_aes3tx aes3tx;
+                struct hpi_control_cache_tonedetector tone;
+                struct hpi_control_cache_silencedetector silence;
+                struct hpi_control_cache_sampleclock clk;
+                struct hpi_control_cache_microphone microphone;
+                struct hpi_control_cache_generic generic;
         } u;
 };
 
@@ -1580,8 +1531,7 @@ struct hpi_control_cache_pad {
         u32 traffic_anouncement;
 };
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* declarations for 2^N sized FIFO buffer (internal to HPI<->DSP interaction) */
+/* 2^N sized FIFO buffer (internal to HPI<->DSP interaction) */
 struct hpi_fifo_buffer {
         u32 size;
         u32 dSP_index;
@@ -1606,25 +1556,16 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,
 /*////////////////////////////////////////////////////////////////////////// */
 
 /* main HPI entry point */
-hpi_handler_func hpi_send_recv;
-
-/* UDP message */
-void hpi_send_recvUDP(struct hpi_message *phm, struct hpi_response *phr,
-        const unsigned int timeout);
+void hpi_send_recv(struct hpi_message *phm, struct hpi_response *phr);
 
 /* used in PnP OS/driver */
-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,
-        const struct hpi_resource *p_resource, u16 *pw_adapter_index);
-
-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index);
+u16 hpi_subsys_create_adapter(const struct hpi_resource *p_resource,
+        u16 *pw_adapter_index);
 
-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u8 **pp_buffer,
+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status);
 
-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u8 **pp_buffer,
+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status);
 
 u16 hpi_adapter_restart(u16 adapter_index);
@@ -1642,9 +1583,7 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR);
 
 /*////////////////////////////////////////////////////////////////////////// */
 /* declarations for individual HPI entry points */
-hpi_handler_func HPI_1000;
 hpi_handler_func HPI_6000;
 hpi_handler_func HPI_6205;
-hpi_handler_func HPI_COMMON;
 
 #endif                          /* _HPI_INTERNAL_H_ */
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index dda4f1c6f658..b15a02e91f82 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -26,6 +26,8 @@
 
 #include "hpi_internal.h"
 #include "hpidebug.h"
+#include "hpimsginit.h"
+
 #include "hpicmn.h"
 
 struct hpi_adapters_list {
@@ -43,14 +45,24 @@ static struct hpi_adapters_list adapters;
 **/
 u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr)
 {
-        u16 error = 0;
+        if (phr->type != HPI_TYPE_RESPONSE) {
+                HPI_DEBUG_LOG(ERROR, "header type %d invalid\n", phr->type);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
+
+        if (phr->object != phm->object) {
+                HPI_DEBUG_LOG(ERROR, "header object %d invalid\n",
+                        phr->object);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
 
-        if ((phr->type != HPI_TYPE_RESPONSE)
-                || (phr->object != phm->object)
-                || (phr->function != phm->function))
-                error = HPI_ERROR_INVALID_RESPONSE;
+        if (phr->function != phm->function) {
+                HPI_DEBUG_LOG(ERROR, "header type %d invalid\n",
+                        phr->function);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
 
-        return error;
+        return 0;
 }
 
 u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
@@ -66,8 +78,18 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
         }
 
         if (adapters.adapter[pao->index].adapter_type) {
-                {
-                        retval = HPI_DUPLICATE_ADAPTER_NUMBER;
+                int a;
+                for (a = HPI_MAX_ADAPTERS - 1; a >= 0; a--) {
+                        if (!adapters.adapter[a].adapter_type) {
+                                HPI_DEBUG_LOG(WARNING,
+                                        "ASI%X duplicate index %d moved to %d\n",
+                                        pao->adapter_type, pao->index, a);
+                                pao->index = a;
+                                break;
+                        }
+                }
+                if (a < 0) {
+                        retval = HPI_ERROR_DUPLICATE_ADAPTER_NUMBER;
                         goto unlock;
                 }
         }
@@ -76,17 +98,22 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
         adapters.gw_num_adapters++;
 
 unlock:
-        hpios_alistlock_un_lock(&adapters);
+        hpios_alistlock_unlock(&adapters);
         return retval;
 }
 
 void hpi_delete_adapter(struct hpi_adapter_obj *pao)
 {
-        memset(pao, 0, sizeof(struct hpi_adapter_obj));
+        if (!pao->adapter_type) {
+                HPI_DEBUG_LOG(ERROR, "removing null adapter?\n");
+                return;
+        }
 
         hpios_alistlock_lock(&adapters);
-        adapters.gw_num_adapters--;     /* dec the number of adapters */
-        hpios_alistlock_un_lock(&adapters);
+        if (adapters.adapter[pao->index].adapter_type)
+                adapters.gw_num_adapters--;
+        memset(&adapters.adapter[pao->index], 0, sizeof(adapters.adapter[0]));
+        hpios_alistlock_unlock(&adapters);
 }
 
 /**
@@ -99,7 +126,7 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
         struct hpi_adapter_obj *pao = NULL;
 
         if (adapter_index >= HPI_MAX_ADAPTERS) {
-                HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d ",
+                HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d\n",
                         adapter_index);
                 return NULL;
         }
@@ -125,51 +152,34 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
 * wipe an HPI_ADAPTERS_LIST structure.
 *
 **/
-static void wipe_adapter_list(void
-        )
+static void wipe_adapter_list(void)
 {
         memset(&adapters, 0, sizeof(adapters));
 }
 
-/**
-* SubSysGetAdapters fills awAdapterList in an struct hpi_response structure
-* with all adapters in the given HPI_ADAPTERS_LIST.
-*
-*/
-static void subsys_get_adapters(struct hpi_response *phr)
+static void subsys_get_adapter(struct hpi_message *phm,
+        struct hpi_response *phr)
 {
-        /* fill in the response adapter array with the position */
-        /* identified by the adapter number/index of the adapters in */
-        /* this HPI */
-        /* i.e. if we have an A120 with it's jumper set to */
-        /* Adapter Number 2 then put an Adapter type A120 in the */
-        /* array in position 1 */
-        /* NOTE: AdapterNumber is 1..N, Index is 0..N-1 */
-
-        /* input:  NONE */
-        /* output: wNumAdapters */
-        /*                 awAdapter[] */
-        /* */
-
-        short i;
-        struct hpi_adapter_obj *pao = NULL;
-
-        HPI_DEBUG_LOG(VERBOSE, "subsys_get_adapters\n");
+        int count = phm->obj_index;
+        u16 index = 0;
 
-        /* for each adapter, place it's type in the position of the array */
-        /* corresponding to it's adapter number */
-        for (i = 0; i < adapters.gw_num_adapters; i++) {
-                pao = &adapters.adapter[i];
-                if (phr->u.s.aw_adapter_list[pao->index] != 0) {
-                        phr->error = HPI_DUPLICATE_ADAPTER_NUMBER;
-                        phr->specific_error = pao->index;
-                        return;
+        /* find the nCount'th nonzero adapter in array */
+        for (index = 0; index < HPI_MAX_ADAPTERS; index++) {
+                if (adapters.adapter[index].adapter_type) {
+                        if (!count)
+                                break;
+                        count--;
                 }
-                phr->u.s.aw_adapter_list[pao->index] = pao->adapter_type;
         }
 
-        phr->u.s.num_adapters = adapters.gw_num_adapters;
-        phr->error = 0; /* the function completed OK; */
+        if (index < HPI_MAX_ADAPTERS) {
+                phr->u.s.adapter_index = adapters.adapter[index].index;
+                phr->u.s.adapter_type = adapters.adapter[index].adapter_type;
+        } else {
+                phr->u.s.adapter_index = 0;
+                phr->u.s.adapter_type = 0;
+                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
+        }
 }
 
 static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
@@ -178,67 +188,99 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
         int cached = 0;
         if (!pC)
                 return 0;
-        if ((!pC->init) && (pC->p_cache != NULL) && (pC->control_count)
-                && (pC->cache_size_in_bytes)
-                ) {
-                u32 *p_master_cache;
-                pC->init = 1;
-
-                p_master_cache = (u32 *)pC->p_cache;
-                HPI_DEBUG_LOG(VERBOSE, "check %d controls\n",
+
+        if (pC->init)
+                return pC->init;
+
+        if (!pC->p_cache)
+                return 0;
+
+        if (pC->control_count && pC->cache_size_in_bytes) {
+                char *p_master_cache;
+                unsigned int byte_count = 0;
+
+                p_master_cache = (char *)pC->p_cache;
+                HPI_DEBUG_LOG(DEBUG, "check %d controls\n",
                         pC->control_count);
                 for (i = 0; i < pC->control_count; i++) {
                         struct hpi_control_cache_info *info =
                                 (struct hpi_control_cache_info *)
-                                p_master_cache;
+                                &p_master_cache[byte_count];
+
+                        if (!info->size_in32bit_words) {
+                                if (!i) {
+                                        HPI_DEBUG_LOG(INFO,
+                                                "adap %d cache not ready?\n",
+                                                pC->adap_idx);
+                                        return 0;
+                                }
+                                /* The cache is invalid.
+                                 * Minimum valid entry size is
+                                 * sizeof(struct hpi_control_cache_info)
+                                 */
+                                HPI_DEBUG_LOG(ERROR,
+                                        "adap %d zero size cache entry %d\n",
+                                        pC->adap_idx, i);
+                                break;
+                        }
 
                         if (info->control_type) {
-                                pC->p_info[i] = info;
+                                pC->p_info[info->control_index] = info;
                                 cached++;
-                        } else
-                                pC->p_info[i] = NULL;
+                        } else {        /* dummy cache entry */
+                                pC->p_info[info->control_index] = NULL;
+                        }
 
-                        if (info->size_in32bit_words)
-                                p_master_cache += info->size_in32bit_words;
-                        else
-                                p_master_cache +=
-                                        sizeof(struct
-                                        hpi_control_cache_single) /
-                                        sizeof(u32);
+                        byte_count += info->size_in32bit_words * 4;
 
                         HPI_DEBUG_LOG(VERBOSE,
-                                "cached %d, pinfo %p index %d type %d\n",
-                                cached, pC->p_info[i], info->control_index,
-                                info->control_type);
+                                "cached %d, pinfo %p index %d type %d size %d\n",
+                                cached, pC->p_info[info->control_index],
+                                info->control_index, info->control_type,
+                                info->size_in32bit_words);
+
+                        /* quit loop early if whole cache has been scanned.
+                         * dwControlCount is the maximum possible entries
+                         * but some may be absent from the cache
+                         */
+                        if (byte_count >= pC->cache_size_in_bytes)
+                                break;
+                        /* have seen last control index */
+                        if (info->control_index == pC->control_count - 1)
+                                break;
                 }
-                /*
-                   We didn't find anything to cache, so try again later !
-                 */
-                if (!cached)
-                        pC->init = 0;
+
+                if (byte_count != pC->cache_size_in_bytes)
+                        HPI_DEBUG_LOG(WARNING,
+                                "adap %d bytecount %d != cache size %d\n",
+                                pC->adap_idx, byte_count,
+                                pC->cache_size_in_bytes);
+                else
+                        HPI_DEBUG_LOG(DEBUG,
+                                "adap %d cache good, bytecount == cache size = %d\n",
+                                pC->adap_idx, byte_count);
+
+                pC->init = (u16)cached;
         }
         return pC->init;
 }
 
 /** Find a control.
 */
-static short find_control(struct hpi_message *phm,
-        struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI,
-        u16 *pw_control_index)
+static short find_control(u16 control_index,
+        struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI)
 {
-        *pw_control_index = phm->obj_index;
-
         if (!control_cache_alloc_check(p_cache)) {
                 HPI_DEBUG_LOG(VERBOSE,
-                        "control_cache_alloc_check() failed. adap%d ci%d\n",
-                        phm->adapter_index, *pw_control_index);
+                        "control_cache_alloc_check() failed %d\n",
+                        control_index);
                 return 0;
         }
 
-        *pI = p_cache->p_info[*pw_control_index];
+        *pI = p_cache->p_info[control_index];
         if (!*pI) {
-                HPI_DEBUG_LOG(VERBOSE, "uncached adap %d, control %d\n",
-                        phm->adapter_index, *pw_control_index);
+                HPI_DEBUG_LOG(VERBOSE, "Uncached Control %d\n",
+                        control_index);
                 return 0;
         } else {
                 HPI_DEBUG_LOG(VERBOSE, "find_control() type %d\n",
@@ -247,25 +289,6 @@ static short find_control(struct hpi_message *phm,
         return 1;
 }
 
-/** Used by the kernel driver to figure out if a buffer needs mapping.
- */
-short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,
-        struct hpi_message *phm, void **p, unsigned int *pN)
-{
-        *pN = 0;
-        *p = NULL;
-        if ((phm->function == HPI_CONTROL_GET_STATE)
-                && (phm->object == HPI_OBJ_CONTROLEX)
-                ) {
-                u16 control_index;
-                struct hpi_control_cache_info *pI;
-
-                if (!find_control(phm, p_cache, &pI, &control_index))
-                        return 0;
-        }
-        return 0;
-}
-
 /* allow unified treatment of several string fields within struct */
 #define HPICMN_PAD_OFS_AND_SIZE(m)  {\
         offsetof(struct hpi_control_cache_pad, m), \
@@ -276,7 +299,7 @@ struct pad_ofs_size {
         unsigned int field_size;
 };
 
-static struct pad_ofs_size pad_desc[] = {
+static const struct pad_ofs_size pad_desc[] = {
         HPICMN_PAD_OFS_AND_SIZE(c_channel),     /* HPI_PAD_CHANNEL_NAME */
         HPICMN_PAD_OFS_AND_SIZE(c_artist),      /* HPI_PAD_ARTIST */
         HPICMN_PAD_OFS_AND_SIZE(c_title),       /* HPI_PAD_TITLE */
@@ -290,13 +313,16 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
         struct hpi_message *phm, struct hpi_response *phr)
 {
         short found = 1;
-        u16 control_index;
         struct hpi_control_cache_info *pI;
         struct hpi_control_cache_single *pC;
         struct hpi_control_cache_pad *p_pad;
 
-        if (!find_control(phm, p_cache, &pI, &control_index))
+        if (!find_control(phm->obj_index, p_cache, &pI)) {
+                HPI_DEBUG_LOG(VERBOSE,
+                        "HPICMN find_control() failed for adap %d\n",
+                        phm->adapter_index);
                 return 0;
+        }
 
         phr->error = 0;
 
@@ -310,55 +336,79 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
 
         case HPI_CONTROL_METER:
                 if (phm->u.c.attribute == HPI_METER_PEAK) {
-                        phr->u.c.an_log_value[0] = pC->u.p.an_log_peak[0];
-                        phr->u.c.an_log_value[1] = pC->u.p.an_log_peak[1];
+                        phr->u.c.an_log_value[0] = pC->u.meter.an_log_peak[0];
+                        phr->u.c.an_log_value[1] = pC->u.meter.an_log_peak[1];
                 } else if (phm->u.c.attribute == HPI_METER_RMS) {
-                        phr->u.c.an_log_value[0] = pC->u.p.an_logRMS[0];
-                        phr->u.c.an_log_value[1] = pC->u.p.an_logRMS[1];
+                        if (pC->u.meter.an_logRMS[0] ==
+                                HPI_CACHE_INVALID_SHORT) {
+                                phr->error =
+                                        HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                phr->u.c.an_log_value[0] = HPI_METER_MINIMUM;
+                                phr->u.c.an_log_value[1] = HPI_METER_MINIMUM;
+                        } else {
+                                phr->u.c.an_log_value[0] =
+                                        pC->u.meter.an_logRMS[0];
+                                phr->u.c.an_log_value[1] =
+                                        pC->u.meter.an_logRMS[1];
+                        }
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_VOLUME:
                 if (phm->u.c.attribute == HPI_VOLUME_GAIN) {
-                        phr->u.c.an_log_value[0] = pC->u.v.an_log[0];
-                        phr->u.c.an_log_value[1] = pC->u.v.an_log[1];
-                } else
+                        phr->u.c.an_log_value[0] = pC->u.vol.an_log[0];
+                        phr->u.c.an_log_value[1] = pC->u.vol.an_log[1];
+                } else if (phm->u.c.attribute == HPI_VOLUME_MUTE) {
+                        if (pC->u.vol.flags & HPI_VOLUME_FLAG_HAS_MUTE) {
+                                if (pC->u.vol.flags & HPI_VOLUME_FLAG_MUTED)
+                                        phr->u.c.param1 =
+                                                HPI_BITMASK_ALL_CHANNELS;
+                                else
+                                        phr->u.c.param1 = 0;
+                        } else {
+                                phr->error =
+                                        HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                phr->u.c.param1 = 0;
+                        }
+                } else {
                         found = 0;
+                }
                 break;
         case HPI_CONTROL_MULTIPLEXER:
                 if (phm->u.c.attribute == HPI_MULTIPLEXER_SOURCE) {
-                        phr->u.c.param1 = pC->u.x.source_node_type;
-                        phr->u.c.param2 = pC->u.x.source_node_index;
+                        phr->u.c.param1 = pC->u.mux.source_node_type;
+                        phr->u.c.param2 = pC->u.mux.source_node_index;
                 } else {
                         found = 0;
                 }
                 break;
         case HPI_CONTROL_CHANNEL_MODE:
                 if (phm->u.c.attribute == HPI_CHANNEL_MODE_MODE)
-                        phr->u.c.param1 = pC->u.m.mode;
+                        phr->u.c.param1 = pC->u.mode.mode;
                 else
                         found = 0;
                 break;
         case HPI_CONTROL_LEVEL:
                 if (phm->u.c.attribute == HPI_LEVEL_GAIN) {
-                        phr->u.c.an_log_value[0] = pC->u.l.an_log[0];
-                        phr->u.c.an_log_value[1] = pC->u.l.an_log[1];
+                        phr->u.c.an_log_value[0] = pC->u.level.an_log[0];
+                        phr->u.c.an_log_value[1] = pC->u.level.an_log[1];
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_TUNER:
                 if (phm->u.c.attribute == HPI_TUNER_FREQ)
-                        phr->u.c.param1 = pC->u.t.freq_ink_hz;
+                        phr->u.c.param1 = pC->u.tuner.freq_ink_hz;
                 else if (phm->u.c.attribute == HPI_TUNER_BAND)
-                        phr->u.c.param1 = pC->u.t.band;
-                else if ((phm->u.c.attribute == HPI_TUNER_LEVEL)
-                        && (phm->u.c.param1 == HPI_TUNER_LEVEL_AVERAGE))
-                        if (pC->u.t.level == HPI_ERROR_ILLEGAL_CACHE_VALUE) {
-                                phr->u.c.param1 = 0;
+                        phr->u.c.param1 = pC->u.tuner.band;
+                else if (phm->u.c.attribute == HPI_TUNER_LEVEL_AVG)
+                        if (pC->u.tuner.s_level_avg ==
+                                HPI_CACHE_INVALID_SHORT) {
+                                phr->u.cu.tuner.s_level = 0;
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
                         } else
-                                phr->u.c.param1 = pC->u.t.level;
+                                phr->u.cu.tuner.s_level =
+                                        pC->u.tuner.s_level_avg;
                 else
                         found = 0;
                 break;
@@ -366,7 +416,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 if (phm->u.c.attribute == HPI_AESEBURX_ERRORSTATUS)
                         phr->u.c.param1 = pC->u.aes3rx.error_status;
                 else if (phm->u.c.attribute == HPI_AESEBURX_FORMAT)
-                        phr->u.c.param1 = pC->u.aes3rx.source;
+                        phr->u.c.param1 = pC->u.aes3rx.format;
                 else
                         found = 0;
                 break;
@@ -385,13 +435,12 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
         case HPI_CONTROL_SILENCEDETECTOR:
                 if (phm->u.c.attribute == HPI_SILENCEDETECTOR_STATE) {
                         phr->u.c.param1 = pC->u.silence.state;
-                        phr->u.c.param2 = pC->u.silence.count;
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_MICROPHONE:
                 if (phm->u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)
-                        phr->u.c.param1 = pC->u.phantom_power.state;
+                        phr->u.c.param1 = pC->u.microphone.phantom_state;
                 else
                         found = 0;
                 break;
@@ -400,7 +449,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                         phr->u.c.param1 = pC->u.clk.source;
                 else if (phm->u.c.attribute == HPI_SAMPLECLOCK_SOURCE_INDEX) {
                         if (pC->u.clk.source_index ==
-                                HPI_ERROR_ILLEGAL_CACHE_VALUE) {
+                                HPI_CACHE_INVALID_UINT16) {
                                 phr->u.c.param1 = 0;
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
@@ -411,60 +460,63 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 else
                         found = 0;
                 break;
-        case HPI_CONTROL_PAD:
-
-                if (!(p_pad->field_valid_flags & (1 <<
-                                        HPI_CTL_ATTR_INDEX(phm->u.c.
-                                                attribute)))) {
-                        phr->error = HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
-                        break;
-                }
+        case HPI_CONTROL_PAD:{
+                        struct hpi_control_cache_pad *p_pad;
+                        p_pad = (struct hpi_control_cache_pad *)pI;
 
-                if (phm->u.c.attribute == HPI_PAD_PROGRAM_ID)
-                        phr->u.c.param1 = p_pad->pI;
-                else if (phm->u.c.attribute == HPI_PAD_PROGRAM_TYPE)
-                        phr->u.c.param1 = p_pad->pTY;
-                else {
-                        unsigned int index =
-                                HPI_CTL_ATTR_INDEX(phm->u.c.attribute) - 1;
-                        unsigned int offset = phm->u.c.param1;
-                        unsigned int pad_string_len, field_size;
-                        char *pad_string;
-                        unsigned int tocopy;
-
-                        HPI_DEBUG_LOG(VERBOSE, "PADS HPI_PADS_ %d\n",
-                                phm->u.c.attribute);
-
-                        if (index > ARRAY_SIZE(pad_desc) - 1) {
+                        if (!(p_pad->field_valid_flags & (1 <<
+                                                HPI_CTL_ATTR_INDEX(phm->u.c.
+                                                        attribute)))) {
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
                                 break;
                         }
 
-                        pad_string = ((char *)p_pad) + pad_desc[index].offset;
-                        field_size = pad_desc[index].field_size;
-                        /* Ensure null terminator */
-                        pad_string[field_size - 1] = 0;
-
-                        pad_string_len = strlen(pad_string) + 1;
-
-                        if (offset > pad_string_len) {
-                                phr->error = HPI_ERROR_INVALID_CONTROL_VALUE;
-                                break;
+                        if (phm->u.c.attribute == HPI_PAD_PROGRAM_ID)
+                                phr->u.c.param1 = p_pad->pI;
+                        else if (phm->u.c.attribute == HPI_PAD_PROGRAM_TYPE)
+                                phr->u.c.param1 = p_pad->pTY;
+                        else {
+                                unsigned int index =
+                                        HPI_CTL_ATTR_INDEX(phm->u.c.
+                                        attribute) - 1;
+                                unsigned int offset = phm->u.c.param1;
+                                unsigned int pad_string_len, field_size;
+                                char *pad_string;
+                                unsigned int tocopy;
+
+                                if (index > ARRAY_SIZE(pad_desc) - 1) {
+                                        phr->error =
+                                                HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                        break;
+                                }
+
+                                pad_string =
+                                        ((char *)p_pad) +
+                                        pad_desc[index].offset;
+                                field_size = pad_desc[index].field_size;
+                                /* Ensure null terminator */
+                                pad_string[field_size - 1] = 0;
+
+                                pad_string_len = strlen(pad_string) + 1;
+
+                                if (offset > pad_string_len) {
+                                        phr->error =
+                                                HPI_ERROR_INVALID_CONTROL_VALUE;
+                                        break;
+                                }
+
+                                tocopy = pad_string_len - offset;
+                                if (tocopy > sizeof(phr->u.cu.chars8.sz_data))
+                                        tocopy = sizeof(phr->u.cu.chars8.
+                                                sz_data);
+
+                                memcpy(phr->u.cu.chars8.sz_data,
+                                        &pad_string[offset], tocopy);
+
+                                phr->u.cu.chars8.remaining_chars =
+                                        pad_string_len - offset - tocopy;
                         }
-
-                        tocopy = pad_string_len - offset;
-                        if (tocopy > sizeof(phr->u.cu.chars8.sz_data))
-                                tocopy = sizeof(phr->u.cu.chars8.sz_data);
-
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "PADS memcpy(%d), offset %d \n", tocopy,
-                                offset);
-                        memcpy(phr->u.cu.chars8.sz_data, &pad_string[offset],
-                                tocopy);
-
-                        phr->u.cu.chars8.remaining_chars =
-                                pad_string_len - offset - tocopy;
                 }
                 break;
         default:
@@ -472,16 +524,9 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 break;
         }
 
-        if (found)
-                HPI_DEBUG_LOG(VERBOSE,
-                        "cached adap %d, ctl %d, type %d, attr %d\n",
-                        phm->adapter_index, pI->control_index,
-                        pI->control_type, phm->u.c.attribute);
-        else
-                HPI_DEBUG_LOG(VERBOSE,
-                        "uncached adap %d, ctl %d, ctl type %d\n",
-                        phm->adapter_index, pI->control_index,
-                        pI->control_type);
+        HPI_DEBUG_LOG(VERBOSE, "%s Adap %d, Ctl %d, Type %d, Attr %d\n",
+                found ? "Cached" : "Uncached", phm->adapter_index,
+                pI->control_index, pI->control_type, phm->u.c.attribute);
 
         if (found)
                 phr->size =
@@ -497,18 +542,21 @@ Only update if no error.
 Volume and Level return the limited values in the response, so use these
 Multiplexer does so use sent values
 */
-void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
+void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        u16 control_index;
         struct hpi_control_cache_single *pC;
         struct hpi_control_cache_info *pI;
 
         if (phr->error)
                 return;
 
-        if (!find_control(phm, p_cache, &pI, &control_index))
+        if (!find_control(phm->obj_index, p_cache, &pI)) {
+                HPI_DEBUG_LOG(VERBOSE,
+                        "HPICMN find_control() failed for adap %d\n",
+                        phm->adapter_index);
                 return;
+        }
 
         /* pC is the default cached control strucure.
            May be cast to something else in the following switch statement.
@@ -518,31 +566,36 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
         switch (pI->control_type) {
         case HPI_CONTROL_VOLUME:
                 if (phm->u.c.attribute == HPI_VOLUME_GAIN) {
-                        pC->u.v.an_log[0] = phr->u.c.an_log_value[0];
-                        pC->u.v.an_log[1] = phr->u.c.an_log_value[1];
+                        pC->u.vol.an_log[0] = phr->u.c.an_log_value[0];
+                        pC->u.vol.an_log[1] = phr->u.c.an_log_value[1];
+                } else if (phm->u.c.attribute == HPI_VOLUME_MUTE) {
+                        if (phm->u.c.param1)
+                                pC->u.vol.flags |= HPI_VOLUME_FLAG_MUTED;
+                        else
+                                pC->u.vol.flags &= ~HPI_VOLUME_FLAG_MUTED;
                 }
                 break;
         case HPI_CONTROL_MULTIPLEXER:
                 /* mux does not return its setting on Set command. */
                 if (phm->u.c.attribute == HPI_MULTIPLEXER_SOURCE) {
-                        pC->u.x.source_node_type = (u16)phm->u.c.param1;
-                        pC->u.x.source_node_index = (u16)phm->u.c.param2;
+                        pC->u.mux.source_node_type = (u16)phm->u.c.param1;
+                        pC->u.mux.source_node_index = (u16)phm->u.c.param2;
                 }
                 break;
         case HPI_CONTROL_CHANNEL_MODE:
                 /* mode does not return its setting on Set command. */
                 if (phm->u.c.attribute == HPI_CHANNEL_MODE_MODE)
-                        pC->u.m.mode = (u16)phm->u.c.param1;
+                        pC->u.mode.mode = (u16)phm->u.c.param1;
                 break;
         case HPI_CONTROL_LEVEL:
                 if (phm->u.c.attribute == HPI_LEVEL_GAIN) {
-                        pC->u.v.an_log[0] = phr->u.c.an_log_value[0];
-                        pC->u.v.an_log[1] = phr->u.c.an_log_value[1];
+                        pC->u.vol.an_log[0] = phr->u.c.an_log_value[0];
+                        pC->u.vol.an_log[1] = phr->u.c.an_log_value[1];
                 }
                 break;
         case HPI_CONTROL_MICROPHONE:
                 if (phm->u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)
-                        pC->u.phantom_power.state = (u16)phm->u.c.param1;
+                        pC->u.microphone.phantom_state = (u16)phm->u.c.param1;
                 break;
         case HPI_CONTROL_AESEBU_TRANSMITTER:
                 if (phm->u.c.attribute == HPI_AESEBUTX_FORMAT)
@@ -550,7 +603,7 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
                 break;
         case HPI_CONTROL_AESEBU_RECEIVER:
                 if (phm->u.c.attribute == HPI_AESEBURX_FORMAT)
-                        pC->u.aes3rx.source = phm->u.c.param1;
+                        pC->u.aes3rx.format = phm->u.c.param1;
                 break;
         case HPI_CONTROL_SAMPLECLOCK:
                 if (phm->u.c.attribute == HPI_SAMPLECLOCK_SOURCE)
@@ -565,53 +618,60 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
         }
 }
 
-struct hpi_control_cache *hpi_alloc_control_cache(const u32
-        number_of_controls, const u32 size_in_bytes,
-        struct hpi_control_cache_info *pDSP_control_buffer)
+/** Allocate control cache.
+
+\return Cache pointer, or NULL if allocation fails.
+*/
+struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
+        const u32 size_in_bytes, u8 *p_dsp_control_buffer)
 {
         struct hpi_control_cache *p_cache =
                 kmalloc(sizeof(*p_cache), GFP_KERNEL);
+        if (!p_cache)
+                return NULL;
+
+        p_cache->p_info =
+                kmalloc(sizeof(*p_cache->p_info) * control_count, GFP_KERNEL);
+        if (!p_cache->p_info) {
+                kfree(p_cache);
+                return NULL;
+        }
+        memset(p_cache->p_info, 0, sizeof(*p_cache->p_info) * control_count);
         p_cache->cache_size_in_bytes = size_in_bytes;
-        p_cache->control_count = number_of_controls;
-        p_cache->p_cache =
-                (struct hpi_control_cache_single *)pDSP_control_buffer;
+        p_cache->control_count = control_count;
+        p_cache->p_cache = p_dsp_control_buffer;
         p_cache->init = 0;
-        p_cache->p_info =
-                kmalloc(sizeof(*p_cache->p_info) * p_cache->control_count,
-                GFP_KERNEL);
         return p_cache;
 }
 
 void hpi_free_control_cache(struct hpi_control_cache *p_cache)
 {
-        if (p_cache->init) {
+        if (p_cache) {
                 kfree(p_cache->p_info);
-                p_cache->p_info = NULL;
-                p_cache->init = 0;
                 kfree(p_cache);
         }
 }
 
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 {
+        hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm->function, 0);
 
         switch (phm->function) {
         case HPI_SUBSYS_OPEN:
         case HPI_SUBSYS_CLOSE:
         case HPI_SUBSYS_DRIVER_UNLOAD:
-                phr->error = 0;
                 break;
         case HPI_SUBSYS_DRIVER_LOAD:
                 wipe_adapter_list();
                 hpios_alistlock_init(&adapters);
-                phr->error = 0;
                 break;
-        case HPI_SUBSYS_GET_INFO:
-                subsys_get_adapters(phr);
+        case HPI_SUBSYS_GET_ADAPTER:
+                subsys_get_adapter(phm, phr);
+                break;
+        case HPI_SUBSYS_GET_NUM_ADAPTERS:
+                phr->u.s.num_adapters = adapters.gw_num_adapters;
                 break;
         case HPI_SUBSYS_CREATE_ADAPTER:
-        case HPI_SUBSYS_DELETE_ADAPTER:
-                phr->error = 0;
                 break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
index 6229022f56cb..d53cdf6e535f 100644
--- a/sound/pci/asihpi/hpicmn.h
+++ b/sound/pci/asihpi/hpicmn.h
@@ -33,18 +33,19 @@ struct hpi_adapter_obj {
 };
 
 struct hpi_control_cache {
-        u32 init;            /**< indicates whether the
-                                structures are initialized */
+        /** indicates whether the structures are initialized */
+        u16 init;
+        u16 adap_idx;
         u32 control_count;
         u32 cache_size_in_bytes;
-        struct hpi_control_cache_info
-        **p_info;                /**< pointer to allocated memory of
-                                lookup pointers. */
-        struct hpi_control_cache_single
-        *p_cache;                /**< pointer to DSP's control cache. */
+        /** pointer to allocated memory of lookup pointers. */
+        struct hpi_control_cache_info **p_info;
+        /** pointer to DSP's control cache. */
+        u8 *p_cache;
 };
 
 struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index);
+
 u16 hpi_add_adapter(struct hpi_adapter_obj *pao);
 
 void hpi_delete_adapter(struct hpi_adapter_obj *pao);
@@ -52,13 +53,12 @@ void hpi_delete_adapter(struct hpi_adapter_obj *pao);
 short hpi_check_control_cache(struct hpi_control_cache *pC,
         struct hpi_message *phm, struct hpi_response *phr);
 struct hpi_control_cache *hpi_alloc_control_cache(const u32
-        number_of_controls, const u32 size_in_bytes,
-        struct hpi_control_cache_info
-        *pDSP_control_buffer);
+        number_of_controls, const u32 size_in_bytes, u8 *pDSP_control_buffer);
 void hpi_free_control_cache(struct hpi_control_cache *p_cache);
 
-void hpi_sync_control_cache(struct hpi_control_cache *pC,
+void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *pC,
         struct hpi_message *phm, struct hpi_response *phr);
+
 u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr);
-short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,
-        struct hpi_message *phm, void **p, unsigned int *pN);
+
+hpi_handler_func HPI_COMMON;
diff --git a/sound/pci/asihpi/hpidebug.c b/sound/pci/asihpi/hpidebug.c
index 949836ec913a..b52baf62791e 100644
--- a/sound/pci/asihpi/hpidebug.c
+++ b/sound/pci/asihpi/hpidebug.c
@@ -45,161 +45,14 @@ int hpi_debug_level_get(void)
         return hpi_debug_level;
 }
 
-#ifdef HPIOS_DEBUG_PRINT
-/* implies OS has no printf-like function */
-#include <stdarg.h>
-
-void hpi_debug_printf(char *fmt, ...)
-{
-        va_list arglist;
-        char buffer[128];
-
-        va_start(arglist, fmt);
-
-        if (buffer[0])
-                HPIOS_DEBUG_PRINT(buffer);
-        va_end(arglist);
-}
-#endif
-
-struct treenode {
-        void *array;
-        unsigned int num_elements;
-};
-
-#define make_treenode_from_array(nodename, array) \
-static void *tmp_strarray_##nodename[] = array; \
-static struct treenode nodename = { \
-        &tmp_strarray_##nodename, \
-        ARRAY_SIZE(tmp_strarray_##nodename) \
-};
-
-#define get_treenode_elem(node_ptr, idx, type)  \
-        (&(*((type *)(node_ptr)->array)[idx]))
-
-make_treenode_from_array(hpi_control_type_strings, HPI_CONTROL_TYPE_STRINGS)
-
-        make_treenode_from_array(hpi_subsys_strings, HPI_SUBSYS_STRINGS)
-        make_treenode_from_array(hpi_adapter_strings, HPI_ADAPTER_STRINGS)
-        make_treenode_from_array(hpi_istream_strings, HPI_ISTREAM_STRINGS)
-        make_treenode_from_array(hpi_ostream_strings, HPI_OSTREAM_STRINGS)
-        make_treenode_from_array(hpi_mixer_strings, HPI_MIXER_STRINGS)
-        make_treenode_from_array(hpi_node_strings,
-        {
-        "NODE is invalid object"})
-
-        make_treenode_from_array(hpi_control_strings, HPI_CONTROL_STRINGS)
-        make_treenode_from_array(hpi_nvmemory_strings, HPI_OBJ_STRINGS)
-        make_treenode_from_array(hpi_digitalio_strings, HPI_DIGITALIO_STRINGS)
-        make_treenode_from_array(hpi_watchdog_strings, HPI_WATCHDOG_STRINGS)
-        make_treenode_from_array(hpi_clock_strings, HPI_CLOCK_STRINGS)
-        make_treenode_from_array(hpi_profile_strings, HPI_PROFILE_STRINGS)
-        make_treenode_from_array(hpi_asyncevent_strings, HPI_ASYNCEVENT_STRINGS)
-#define HPI_FUNCTION_STRINGS \
-{ \
-  &hpi_subsys_strings,\
-  &hpi_adapter_strings,\
-  &hpi_ostream_strings,\
-  &hpi_istream_strings,\
-  &hpi_mixer_strings,\
-  &hpi_node_strings,\
-  &hpi_control_strings,\
-  &hpi_nvmemory_strings,\
-  &hpi_digitalio_strings,\
-  &hpi_watchdog_strings,\
-  &hpi_clock_strings,\
-  &hpi_profile_strings,\
-  &hpi_control_strings, \
-  &hpi_asyncevent_strings \
-}
-        make_treenode_from_array(hpi_function_strings, HPI_FUNCTION_STRINGS)
-
-        compile_time_assert(HPI_OBJ_MAXINDEX == 14, obj_list_doesnt_match);
-
-static char *hpi_function_string(unsigned int function)
-{
-        unsigned int object;
-        struct treenode *tmp;
-
-        object = function / HPI_OBJ_FUNCTION_SPACING;
-        function = function - object * HPI_OBJ_FUNCTION_SPACING;
-
-        if (object == 0 || object == HPI_OBJ_NODE
-                || object > hpi_function_strings.num_elements)
-                return "invalid object";
-
-        tmp = get_treenode_elem(&hpi_function_strings, object - 1,
-                struct treenode *);
-
-        if (function == 0 || function > tmp->num_elements)
-                return "invalid function";
-
-        return get_treenode_elem(tmp, function - 1, char *);
-}
-
 void hpi_debug_message(struct hpi_message *phm, char *sz_fileline)
 {
         if (phm) {
-                if ((phm->object <= HPI_OBJ_MAXINDEX) && phm->object) {
-                        u16 index = 0;
-                        u16 attrib = 0;
-                        int is_control = 0;
-
-                        index = phm->obj_index;
-                        switch (phm->object) {
-                        case HPI_OBJ_ADAPTER:
-                        case HPI_OBJ_PROFILE:
-                                break;
-                        case HPI_OBJ_MIXER:
-                                if (phm->function ==
-                                        HPI_MIXER_GET_CONTROL_BY_INDEX)
-                                        index = phm->u.m.control_index;
-                                break;
-                        case HPI_OBJ_OSTREAM:
-                        case HPI_OBJ_ISTREAM:
-                                break;
-
-                        case HPI_OBJ_CONTROLEX:
-                        case HPI_OBJ_CONTROL:
-                                if (phm->version == 1)
-                                        attrib = HPI_CTL_ATTR(UNIVERSAL, 1);
-                                else
-                                        attrib = phm->u.c.attribute;
-                                is_control = 1;
-                                break;
-                        default:
-                                break;
-                        }
-
-                        if (is_control && (attrib & 0xFF00)) {
-                                int control_type = (attrib & 0xFF00) >> 8;
-                                int attr_index = HPI_CTL_ATTR_INDEX(attrib);
-                                /* note the KERN facility level
-                                   is in szFileline already */
-                                printk("%s adapter %d %s "
-                                        "ctrl_index x%04x %s %d\n",
-                                        sz_fileline, phm->adapter_index,
-                                        hpi_function_string(phm->function),
-                                        index,
-                                        get_treenode_elem
-                                        (&hpi_control_type_strings,
-                                                control_type, char *),
-                                        attr_index);
-
-                        } else
-                                printk("%s adapter %d %s "
-                                        "idx x%04x attr x%04x \n",
-                                        sz_fileline, phm->adapter_index,
-                                        hpi_function_string(phm->function),
-                                        index, attrib);
-                } else {
-                        printk("adap=%d, invalid obj=%d, func=0x%x\n",
-                                phm->adapter_index, phm->object,
-                                phm->function);
-                }
-        } else
-                printk(KERN_ERR
-                        "NULL message pointer to hpi_debug_message!\n");
+                printk(KERN_DEBUG "HPI_MSG%d,%d,%d,%d,%d\n", phm->version,
+                        phm->adapter_index, phm->obj_index, phm->function,
+                        phm->u.c.attribute);
+        }
+
 }
 
 void hpi_debug_data(u16 *pdata, u32 len)
diff --git a/sound/pci/asihpi/hpidebug.h b/sound/pci/asihpi/hpidebug.h
index a2f0952a99f0..940f54c3c538 100644
--- a/sound/pci/asihpi/hpidebug.h
+++ b/sound/pci/asihpi/hpidebug.h
@@ -37,7 +37,7 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */
 #define HPI_DEBUG_LEVEL_DEFAULT HPI_DEBUG_LEVEL_NOTICE
 
 /* an OS can define an extra flag string that is appended to
-   the start of each message, eg see hpios_linux.h */
+   the start of each message, eg see linux kernel hpios.h */
 
 #ifdef SOURCEFILE_NAME
 #define FILE_LINE  SOURCEFILE_NAME ":" __stringify(__LINE__) " "
@@ -45,18 +45,11 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */
 #define FILE_LINE  __FILE__ ":" __stringify(__LINE__) " "
 #endif
 
-#if defined(HPI_DEBUG) && defined(_WINDOWS)
-#define HPI_DEBUGBREAK() debug_break()
-#else
-#define HPI_DEBUGBREAK()
-#endif
-
 #define HPI_DEBUG_ASSERT(expression) \
         do { \
-                if (!(expression)) {\
-                        printk(KERN_ERR  FILE_LINE\
-                                "ASSERT " __stringify(expression));\
-                        HPI_DEBUGBREAK();\
+                if (!(expression)) { \
+                        printk(KERN_ERR  FILE_LINE \
+                                "ASSERT " __stringify(expression)); \
                 } \
         } while (0)
 
@@ -78,28 +71,27 @@ void hpi_debug_message(struct hpi_message *phm, char *sz_fileline);
 
 void hpi_debug_data(u16 *pdata, u32 len);
 
-#define HPI_DEBUG_DATA(pdata, len)                                      \
-        do {                                                            \
+#define HPI_DEBUG_DATA(pdata, len) \
+        do { \
                 if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE) \
                         hpi_debug_data(pdata, len); \
         } while (0)
 
-#define HPI_DEBUG_MESSAGE(level, phm)                                   \
-        do {                                                            \
-                if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) {         \
-                        hpi_debug_message(phm,HPI_DEBUG_FLAG_##level    \
-                                FILE_LINE __stringify(level));\
-                }                                                       \
+#define HPI_DEBUG_MESSAGE(level, phm) \
+        do { \
+                if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) { \
+                        hpi_debug_message(phm, HPI_DEBUG_FLAG_##level \
+                                FILE_LINE __stringify(level)); \
+                } \
         } while (0)
 
-#define HPI_DEBUG_RESPONSE(phr)                                         \
-        do {                                                            \
-                if ((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && (phr->error))\
-                        HPI_DEBUG_LOG(ERROR, \
-                                "HPI response - error# %d\n", \
-                                phr->error); \
-                else if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE) \
-                        HPI_DEBUG_LOG(VERBOSE, "HPI response OK\n");\
+#define HPI_DEBUG_RESPONSE(phr) \
+        do { \
+                if (((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && \
+                        (phr->error)) ||\
+                (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)) \
+                        printk(KERN_DEBUG "HPI_RES%d,%d,%d\n", \
+                                phr->version, phr->error, phr->specific_error); \
         } while (0)
 
 #ifndef compile_time_assert
@@ -107,279 +99,4 @@ void hpi_debug_data(u16 *pdata, u32 len);
     typedef char msg[(cond) ? 1 : -1]
 #endif
 
-          /* check that size is exactly some number */
-#define function_count_check(sym, size) \
-    compile_time_assert((sym##_FUNCTION_COUNT) == (size),\
-            strings_match_defs_##sym)
-
-/* These strings should be generated using a macro which defines
-   the corresponding symbol values.  */
-#define HPI_OBJ_STRINGS \
-{                               \
-  "HPI_OBJ_SUBSYSTEM",        \
-  "HPI_OBJ_ADAPTER",          \
-  "HPI_OBJ_OSTREAM",          \
-  "HPI_OBJ_ISTREAM",          \
-  "HPI_OBJ_MIXER",            \
-  "HPI_OBJ_NODE",             \
-  "HPI_OBJ_CONTROL",          \
-  "HPI_OBJ_NVMEMORY",         \
-  "HPI_OBJ_DIGITALIO",        \
-  "HPI_OBJ_WATCHDOG",         \
-  "HPI_OBJ_CLOCK",            \
-  "HPI_OBJ_PROFILE",          \
-  "HPI_OBJ_CONTROLEX"         \
-}
-
-#define HPI_SUBSYS_STRINGS      \
-{                               \
-  "HPI_SUBSYS_OPEN",          \
-  "HPI_SUBSYS_GET_VERSION",   \
-  "HPI_SUBSYS_GET_INFO",      \
-  "HPI_SUBSYS_FIND_ADAPTERS", \
-  "HPI_SUBSYS_CREATE_ADAPTER",\
-  "HPI_SUBSYS_CLOSE",         \
-  "HPI_SUBSYS_DELETE_ADAPTER", \
-  "HPI_SUBSYS_DRIVER_LOAD", \
-  "HPI_SUBSYS_DRIVER_UNLOAD", \
-  "HPI_SUBSYS_READ_PORT_8",   \
-  "HPI_SUBSYS_WRITE_PORT_8",  \
-  "HPI_SUBSYS_GET_NUM_ADAPTERS",\
-  "HPI_SUBSYS_GET_ADAPTER",   \
-  "HPI_SUBSYS_SET_NETWORK_INTERFACE"\
-}
-function_count_check(HPI_SUBSYS, 14);
-
-#define HPI_ADAPTER_STRINGS     \
-{                               \
-  "HPI_ADAPTER_OPEN",         \
-  "HPI_ADAPTER_CLOSE",        \
-  "HPI_ADAPTER_GET_INFO",     \
-  "HPI_ADAPTER_GET_ASSERT",   \
-  "HPI_ADAPTER_TEST_ASSERT",    \
-  "HPI_ADAPTER_SET_MODE",       \
-  "HPI_ADAPTER_GET_MODE",       \
-  "HPI_ADAPTER_ENABLE_CAPABILITY",\
-  "HPI_ADAPTER_SELFTEST",        \
-  "HPI_ADAPTER_FIND_OBJECT",     \
-  "HPI_ADAPTER_QUERY_FLASH",     \
-  "HPI_ADAPTER_START_FLASH",     \
-  "HPI_ADAPTER_PROGRAM_FLASH",   \
-  "HPI_ADAPTER_SET_PROPERTY",    \
-  "HPI_ADAPTER_GET_PROPERTY",    \
-  "HPI_ADAPTER_ENUM_PROPERTY",    \
-  "HPI_ADAPTER_MODULE_INFO",    \
-  "HPI_ADAPTER_DEBUG_READ"    \
-}
-
-function_count_check(HPI_ADAPTER, 18);
-
-#define HPI_OSTREAM_STRINGS     \
-{                               \
-  "HPI_OSTREAM_OPEN",         \
-  "HPI_OSTREAM_CLOSE",        \
-  "HPI_OSTREAM_WRITE",        \
-  "HPI_OSTREAM_START",        \
-  "HPI_OSTREAM_STOP",         \
-  "HPI_OSTREAM_RESET",                \
-  "HPI_OSTREAM_GET_INFO",     \
-  "HPI_OSTREAM_QUERY_FORMAT", \
-  "HPI_OSTREAM_DATA",         \
-  "HPI_OSTREAM_SET_VELOCITY", \
-  "HPI_OSTREAM_SET_PUNCHINOUT", \
-  "HPI_OSTREAM_SINEGEN",        \
-  "HPI_OSTREAM_ANC_RESET",      \
-  "HPI_OSTREAM_ANC_GET_INFO",   \
-  "HPI_OSTREAM_ANC_READ",       \
-  "HPI_OSTREAM_SET_TIMESCALE",\
-  "HPI_OSTREAM_SET_FORMAT", \
-  "HPI_OSTREAM_HOSTBUFFER_ALLOC", \
-  "HPI_OSTREAM_HOSTBUFFER_FREE", \
-  "HPI_OSTREAM_GROUP_ADD",\
-  "HPI_OSTREAM_GROUP_GETMAP", \
-  "HPI_OSTREAM_GROUP_RESET", \
-  "HPI_OSTREAM_HOSTBUFFER_GET_INFO", \
-  "HPI_OSTREAM_WAIT_START", \
-}
-function_count_check(HPI_OSTREAM, 24);
-
-#define HPI_ISTREAM_STRINGS     \
-{                               \
-  "HPI_ISTREAM_OPEN",         \
-  "HPI_ISTREAM_CLOSE",        \
-  "HPI_ISTREAM_SET_FORMAT",   \
-  "HPI_ISTREAM_READ",         \
-  "HPI_ISTREAM_START",        \
-  "HPI_ISTREAM_STOP",         \
-  "HPI_ISTREAM_RESET",        \
-  "HPI_ISTREAM_GET_INFO",     \
-  "HPI_ISTREAM_QUERY_FORMAT", \
-  "HPI_ISTREAM_ANC_RESET",      \
-  "HPI_ISTREAM_ANC_GET_INFO",   \
-  "HPI_ISTREAM_ANC_WRITE",   \
-  "HPI_ISTREAM_HOSTBUFFER_ALLOC",\
-  "HPI_ISTREAM_HOSTBUFFER_FREE", \
-  "HPI_ISTREAM_GROUP_ADD", \
-  "HPI_ISTREAM_GROUP_GETMAP", \
-  "HPI_ISTREAM_GROUP_RESET", \
-  "HPI_ISTREAM_HOSTBUFFER_GET_INFO", \
-  "HPI_ISTREAM_WAIT_START", \
-}
-function_count_check(HPI_ISTREAM, 19);
-
-#define HPI_MIXER_STRINGS       \
-{                               \
-  "HPI_MIXER_OPEN",           \
-  "HPI_MIXER_CLOSE",          \
-  "HPI_MIXER_GET_INFO",       \
-  "HPI_MIXER_GET_NODE_INFO",  \
-  "HPI_MIXER_GET_CONTROL",    \
-  "HPI_MIXER_SET_CONNECTION", \
-  "HPI_MIXER_GET_CONNECTIONS",        \
-  "HPI_MIXER_GET_CONTROL_BY_INDEX",   \
-  "HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX",     \
-  "HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES",    \
-  "HPI_MIXER_STORE",  \
-}
-function_count_check(HPI_MIXER, 11);
-
-#define HPI_CONTROL_STRINGS     \
-{                               \
-  "HPI_CONTROL_GET_INFO",     \
-  "HPI_CONTROL_GET_STATE",    \
-  "HPI_CONTROL_SET_STATE"     \
-}
-function_count_check(HPI_CONTROL, 3);
-
-#define HPI_NVMEMORY_STRINGS    \
-{                               \
-  "HPI_NVMEMORY_OPEN",        \
-  "HPI_NVMEMORY_READ_BYTE",   \
-  "HPI_NVMEMORY_WRITE_BYTE"   \
-}
-function_count_check(HPI_NVMEMORY, 3);
-
-#define HPI_DIGITALIO_STRINGS   \
-{                               \
-  "HPI_GPIO_OPEN",            \
-  "HPI_GPIO_READ_BIT",        \
-  "HPI_GPIO_WRITE_BIT",       \
-  "HPI_GPIO_READ_ALL",                \
-  "HPI_GPIO_WRITE_STATUS"\
-}
-function_count_check(HPI_GPIO, 5);
-
-#define HPI_WATCHDOG_STRINGS    \
-{                               \
-  "HPI_WATCHDOG_OPEN",        \
-  "HPI_WATCHDOG_SET_TIME",    \
-  "HPI_WATCHDOG_PING"         \
-}
-
-#define HPI_CLOCK_STRINGS       \
-{                               \
-  "HPI_CLOCK_OPEN",           \
-  "HPI_CLOCK_SET_TIME",       \
-  "HPI_CLOCK_GET_TIME"        \
-}
-
-#define HPI_PROFILE_STRINGS     \
-{                               \
-  "HPI_PROFILE_OPEN_ALL",     \
-  "HPI_PROFILE_START_ALL",    \
-  "HPI_PROFILE_STOP_ALL",     \
-  "HPI_PROFILE_GET",          \
-  "HPI_PROFILE_GET_IDLECOUNT",  \
-  "HPI_PROFILE_GET_NAME",       \
-  "HPI_PROFILE_GET_UTILIZATION" \
-}
-function_count_check(HPI_PROFILE, 7);
-
-#define HPI_ASYNCEVENT_STRINGS  \
-{                               \
-  "HPI_ASYNCEVENT_OPEN",\
-  "HPI_ASYNCEVENT_CLOSE  ",\
-  "HPI_ASYNCEVENT_WAIT",\
-  "HPI_ASYNCEVENT_GETCOUNT",\
-  "HPI_ASYNCEVENT_GET",\
-  "HPI_ASYNCEVENT_SENDEVENTS"\
-}
-function_count_check(HPI_ASYNCEVENT, 6);
-
-#define HPI_CONTROL_TYPE_STRINGS \
-{ \
-        "null control", \
-        "HPI_CONTROL_CONNECTION", \
-        "HPI_CONTROL_VOLUME", \
-        "HPI_CONTROL_METER", \
-        "HPI_CONTROL_MUTE", \
-        "HPI_CONTROL_MULTIPLEXER", \
-        "HPI_CONTROL_AESEBU_TRANSMITTER", \
-        "HPI_CONTROL_AESEBU_RECEIVER", \
-        "HPI_CONTROL_LEVEL", \
-        "HPI_CONTROL_TUNER", \
-        "HPI_CONTROL_ONOFFSWITCH", \
-        "HPI_CONTROL_VOX", \
-        "HPI_CONTROL_AES18_TRANSMITTER", \
-        "HPI_CONTROL_AES18_RECEIVER", \
-        "HPI_CONTROL_AES18_BLOCKGENERATOR", \
-        "HPI_CONTROL_CHANNEL_MODE", \
-        "HPI_CONTROL_BITSTREAM", \
-        "HPI_CONTROL_SAMPLECLOCK", \
-        "HPI_CONTROL_MICROPHONE", \
-        "HPI_CONTROL_PARAMETRIC_EQ", \
-        "HPI_CONTROL_COMPANDER", \
-        "HPI_CONTROL_COBRANET", \
-        "HPI_CONTROL_TONE_DETECT", \
-        "HPI_CONTROL_SILENCE_DETECT", \
-        "HPI_CONTROL_PAD", \
-        "HPI_CONTROL_SRC" ,\
-        "HPI_CONTROL_UNIVERSAL" \
-}
-
-compile_time_assert((HPI_CONTROL_LAST_INDEX + 1 == 27),
-        controltype_strings_match_defs);
-
-#define HPI_SOURCENODE_STRINGS \
-{ \
-        "no source", \
-        "HPI_SOURCENODE_OSTREAM", \
-        "HPI_SOURCENODE_LINEIN", \
-        "HPI_SOURCENODE_AESEBU_IN", \
-        "HPI_SOURCENODE_TUNER", \
-        "HPI_SOURCENODE_RF", \
-        "HPI_SOURCENODE_CLOCK_SOURCE", \
-        "HPI_SOURCENODE_RAW_BITSTREAM", \
-        "HPI_SOURCENODE_MICROPHONE", \
-        "HPI_SOURCENODE_COBRANET", \
-        "HPI_SOURCENODE_ANALOG", \
-        "HPI_SOURCENODE_ADAPTER" \
-}
-
-compile_time_assert((HPI_SOURCENODE_LAST_INDEX - HPI_SOURCENODE_NONE + 1) ==
-        (12), sourcenode_strings_match_defs);
-
-#define HPI_DESTNODE_STRINGS \
-{ \
-        "no destination", \
-        "HPI_DESTNODE_ISTREAM", \
-        "HPI_DESTNODE_LINEOUT", \
-        "HPI_DESTNODE_AESEBU_OUT", \
-        "HPI_DESTNODE_RF", \
-        "HPI_DESTNODE_SPEAKER", \
-        "HPI_DESTNODE_COBRANET", \
-        "HPI_DESTNODE_ANALOG" \
-}
-compile_time_assert((HPI_DESTNODE_LAST_INDEX - HPI_DESTNODE_NONE + 1) == (8),
-        destnode_strings_match_defs);
-
-#define HPI_CONTROL_CHANNEL_MODE_STRINGS \
-{ \
-        "XXX HPI_CHANNEL_MODE_ERROR XXX", \
-        "HPI_CHANNEL_MODE_NORMAL", \
-        "HPI_CHANNEL_MODE_SWAP", \
-        "HPI_CHANNEL_MODE_LEFT_ONLY", \
-        "HPI_CHANNEL_MODE_RIGHT_ONLY" \
-}
-
-#endif                          /* _HPIDEBUG_H  */
+#endif                          /* _HPIDEBUG_H_  */
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c
index 9b10d9a5c255..5c6ea113d219 100644
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
@@ -60,7 +60,7 @@ struct code_header {
             HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))
 
 /***********************************************************************/
-#include "linux/pci.h"
+#include <linux/pci.h>
 /*-------------------------------------------------------------------*/
 short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code,
         u32 *pos_error_code)
@@ -71,47 +71,50 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code,
         int err;
 
         sprintf(fw_name, "asihpi/dsp%04x.bin", adapter);
-        HPI_DEBUG_LOG(INFO, "requesting firmware for %s\n", fw_name);
 
         err = request_firmware(&ps_firmware, fw_name,
                 &ps_dsp_code->ps_dev->dev);
+
         if (err != 0) {
-                HPI_DEBUG_LOG(ERROR, "%d, request_firmware failed for  %s\n",
-                        err, fw_name);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "%d, request_firmware failed for  %s\n", err,
+                        fw_name);
                 goto error1;
         }
         if (ps_firmware->size < sizeof(header)) {
-                HPI_DEBUG_LOG(ERROR, "header size too small %s\n", fw_name);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Header size too small %s\n", fw_name);
                 goto error2;
         }
         memcpy(&header, ps_firmware->data, sizeof(header));
         if (header.adapter != adapter) {
-                HPI_DEBUG_LOG(ERROR, "adapter type incorrect %4x != %4x\n",
-                        header.adapter, adapter);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Adapter type incorrect %4x != %4x\n", header.adapter,
+                        adapter);
                 goto error2;
         }
         if (header.size != ps_firmware->size) {
-                HPI_DEBUG_LOG(ERROR, "code size wrong  %d != %ld\n",
-                        header.size, (unsigned long)ps_firmware->size);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Code size wrong  %d != %ld\n", header.size,
+                        (unsigned long)ps_firmware->size);
                 goto error2;
         }
 
-        if (header.version / 10000 != HPI_VER_DECIMAL / 10000) {
-                HPI_DEBUG_LOG(ERROR,
-                        "firmware major version mismatch "
-                        "DSP image %d != driver %d\n", header.version,
+        if (header.version / 100 != HPI_VER_DECIMAL / 100) {
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Incompatible firmware version "
+                        "DSP image %d != Driver %d\n", header.version,
                         HPI_VER_DECIMAL);
                 goto error2;
         }
 
         if (header.version != HPI_VER_DECIMAL) {
-                HPI_DEBUG_LOG(WARNING,
-                        "version mismatch  DSP image %d != driver %d\n",
+                dev_printk(KERN_WARNING, &ps_dsp_code->ps_dev->dev,
+                        "Firmware: release version mismatch  DSP image %d != Driver %d\n",
                         header.version, HPI_VER_DECIMAL);
-                /* goto error2;  still allow driver to load */
         }
 
-        HPI_DEBUG_LOG(INFO, "dsp code %s opened\n", fw_name);
+        HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);
         ps_dsp_code->ps_firmware = ps_firmware;
         ps_dsp_code->block_length = header.size / sizeof(u32);
         ps_dsp_code->word_count = sizeof(header) / sizeof(u32);
@@ -148,7 +151,7 @@ void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code)
 short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code, u32 *pword)
 {
         if (ps_dsp_code->word_count + 1 > ps_dsp_code->block_length)
-                return (HPI_ERROR_DSP_FILE_FORMAT);
+                return HPI_ERROR_DSP_FILE_FORMAT;
 
         *pword = ((u32 *)(ps_dsp_code->ps_firmware->data))[ps_dsp_code->
                 word_count];
diff --git a/sound/pci/asihpi/hpidspcd.h b/sound/pci/asihpi/hpidspcd.h
index d7c240398225..65f0ca732704 100644
--- a/sound/pci/asihpi/hpidspcd.h
+++ b/sound/pci/asihpi/hpidspcd.h
@@ -87,7 +87,7 @@ void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code);
 */
 short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code,
                                       /**< DSP code descriptor */
-        u32 *pword /**< where to store the read word */
+        u32 *pword /**< Where to store the read word */
         );
 
 /** Get a block of dsp code into an internal buffer, and provide a pointer to
diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c
index 1e92eb6dd509..7397b169b89f 100644
--- a/sound/pci/asihpi/hpifunc.c
+++ b/sound/pci/asihpi/hpifunc.c
@@ -30,16 +30,25 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,
         return handle.w;
 }
 
-void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,
-        u16 *pw_object_index)
+static u16 hpi_handle_indexes(const u32 h, u16 *p1, u16 *p2)
 {
         union handle_word uhandle;
-        uhandle.w = handle;
+        if (!h)
+                return HPI_ERROR_INVALID_HANDLE;
+
+        uhandle.w = h;
+
+        *p1 = (u16)uhandle.h.adapter_index;
+        if (p2)
+                *p2 = (u16)uhandle.h.obj_index;
 
-        if (pw_adapter_index)
-                *pw_adapter_index = (u16)uhandle.h.adapter_index;
-        if (pw_object_index)
-                *pw_object_index = (u16)uhandle.h.obj_index;
+        return 0;
+}
+
+void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,
+        u16 *pw_object_index)
+{
+        hpi_handle_indexes(handle, pw_adapter_index, pw_object_index);
 }
 
 char hpi_handle_object(const u32 handle)
@@ -49,22 +58,6 @@ char hpi_handle_object(const u32 handle)
         return (char)uhandle.h.obj_type;
 }
 
-#define u32TOINDEX(h, i1) \
-do {\
-        if (h == 0) \
-                return HPI_ERROR_INVALID_OBJ; \
-        else \
-                hpi_handle_to_indexes(h, i1, NULL); \
-} while (0)
-
-#define u32TOINDEXES(h, i1, i2) \
-do {\
-        if (h == 0) \
-                return HPI_ERROR_INVALID_OBJ; \
-        else \
-                hpi_handle_to_indexes(h, i1, i2);\
-} while (0)
-
 void hpi_format_to_msg(struct hpi_msg_format *pMF,
         const struct hpi_format *pF)
 {
@@ -94,52 +87,13 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR)
         pSR->u.legacy_stream_info.state = pSR->u.stream_info.state;
 }
 
-static struct hpi_hsubsys gh_subsys;
-
-struct hpi_hsubsys *hpi_subsys_create(void)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        memset(&gh_subsys, 0, sizeof(struct hpi_hsubsys));
-
-        {
-                hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                        HPI_SUBSYS_OPEN);
-                hpi_send_recv(&hm, &hr);
-
-                if (hr.error == 0)
-                        return &gh_subsys;
-
-        }
-        return NULL;
-}
-
-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys)
+static inline void hpi_send_recvV1(struct hpi_message_header *m,
+        struct hpi_response_header *r)
 {
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_CLOSE);
-        hpi_send_recv(&hm, &hr);
-
-}
-
-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys, u32 *pversion)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_GET_VERSION);
-        hpi_send_recv(&hm, &hr);
-        *pversion = hr.u.s.version;
-        return hr.error;
+        hpi_send_recv((struct hpi_message *)m, (struct hpi_response *)r);
 }
 
-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion_ex)
+u16 hpi_subsys_get_version_ex(u32 *pversion_ex)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -151,79 +105,7 @@ u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_GET_INFO);
-
-        hpi_send_recv(&hm, &hr);
-
-        *pversion = hr.u.s.version;
-        if (list_length > HPI_MAX_ADAPTERS)
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        HPI_MAX_ADAPTERS);
-        else
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list, list_length);
-        *pw_num_adapters = hr.u.s.num_adapters;
-        return hr.error;
-}
-
-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_FIND_ADAPTERS);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (list_length > HPI_MAX_ADAPTERS) {
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        HPI_MAX_ADAPTERS * sizeof(u16));
-                memset(&aw_adapter_list[HPI_MAX_ADAPTERS], 0,
-                        (list_length - HPI_MAX_ADAPTERS) * sizeof(u16));
-        } else
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        list_length * sizeof(u16));
-        *pw_num_adapters = hr.u.s.num_adapters;
-
-        return hr.error;
-}
-
-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,
-        const struct hpi_resource *p_resource, u16 *pw_adapter_index)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_CREATE_ADAPTER);
-        hm.u.s.resource = *p_resource;
-
-        hpi_send_recv(&hm, &hr);
-
-        *pw_adapter_index = hr.u.s.adapter_index;
-        return hr.error;
-}
-
-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_DELETE_ADAPTER);
-        hm.adapter_index = adapter_index;
-        hpi_send_recv(&hm, &hr);
-        return hr.error;
-}
-
-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
-        int *pn_num_adapters)
+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -234,35 +116,22 @@ u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,
-        u32 *padapter_index, u16 *pw_adapter_type)
+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,
+        u16 *pw_adapter_type)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_GET_ADAPTER);
-        hm.adapter_index = (u16)iterator;
+        hm.obj_index = (u16)iterator;
         hpi_send_recv(&hm, &hr);
         *padapter_index = (int)hr.u.s.adapter_index;
-        *pw_adapter_type = hr.u.s.aw_adapter_list[0];
-        return hr.error;
-}
+        *pw_adapter_type = hr.u.s.adapter_type;
 
-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,
-        const char *sz_interface)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_SET_NETWORK_INTERFACE);
-        if (sz_interface == NULL)
-                return HPI_ERROR_INVALID_RESOURCE;
-        hm.u.s.resource.r.net_if = sz_interface;
-        hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
+u16 hpi_adapter_open(u16 adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -276,7 +145,7 @@ u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
 
 }
 
-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
+u16 hpi_adapter_close(u16 adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -289,15 +158,14 @@ u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
         return hr.error;
 }
 
-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode)
+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode)
 {
-        return hpi_adapter_set_mode_ex(ph_subsys, adapter_index, adapter_mode,
+        return hpi_adapter_set_mode_ex(adapter_index, adapter_mode,
                 HPI_ADAPTER_MODE_SET);
 }
 
-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode, u16 query_or_set)
+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,
+        u16 query_or_set)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -305,14 +173,13 @@ u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
                 HPI_ADAPTER_SET_MODE);
         hm.adapter_index = adapter_index;
-        hm.u.a.adapter_mode = adapter_mode;
-        hm.u.a.assert_id = query_or_set;
+        hm.u.ax.mode.adapter_mode = adapter_mode;
+        hm.u.ax.mode.query_or_set = query_or_set;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *padapter_mode)
+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -321,13 +188,13 @@ u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
         hm.adapter_index = adapter_index;
         hpi_send_recv(&hm, &hr);
         if (padapter_mode)
-                *padapter_mode = hr.u.a.serial_number;
+                *padapter_mode = hr.u.ax.mode.adapter_mode;
         return hr.error;
 }
 
-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,
-        u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type)
+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,
+        u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,
+        u16 *pw_adapter_type)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -337,18 +204,17 @@ u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_send_recv(&hm, &hr);
 
-        *pw_adapter_type = hr.u.a.adapter_type;
-        *pw_num_outstreams = hr.u.a.num_outstreams;
-        *pw_num_instreams = hr.u.a.num_instreams;
-        *pw_version = hr.u.a.version;
-        *pserial_number = hr.u.a.serial_number;
+        *pw_adapter_type = hr.u.ax.info.adapter_type;
+        *pw_num_outstreams = hr.u.ax.info.num_outstreams;
+        *pw_num_instreams = hr.u.ax.info.num_instreams;
+        *pw_version = hr.u.ax.info.version;
+        *pserial_number = hr.u.ax.info.serial_number;
         return hr.error;
 }
 
-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 module_index, u16 *pw_num_outputs,
-        u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,
-        u16 *pw_module_type, u32 *ph_module)
+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,
+        u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,
+        u32 *pserial_number, u16 *pw_module_type, u32 *ph_module)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -360,173 +226,18 @@ u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
 
         hpi_send_recv(&hm, &hr);
 
-        *pw_module_type = hr.u.a.adapter_type;
-        *pw_num_outputs = hr.u.a.num_outstreams;
-        *pw_num_inputs = hr.u.a.num_instreams;
-        *pw_version = hr.u.a.version;
-        *pserial_number = hr.u.a.serial_number;
+        *pw_module_type = hr.u.ax.info.adapter_type;
+        *pw_num_outputs = hr.u.ax.info.num_outstreams;
+        *pw_num_inputs = hr.u.ax.info.num_instreams;
+        *pw_version = hr.u.ax.info.version;
+        *pserial_number = hr.u.ax.info.serial_number;
         *ph_module = 0;
 
         return hr.error;
 }
 
-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u16 *pw_line_number)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_GET_ASSERT);
-        hm.adapter_index = adapter_index;
-        hpi_send_recv(&hm, &hr);
-
-        *assert_present = 0;
-
-        if (!hr.error) {
-
-                *pw_line_number = (u16)hr.u.a.serial_number;
-                if (*pw_line_number) {
-
-                        int i;
-                        char *src = (char *)hr.u.a.sz_adapter_assert;
-                        char *dst = psz_assert;
-
-                        *assert_present = 1;
-
-                        for (i = 0; i < HPI_STRING_LEN; i++) {
-                                char c;
-                                c = *src++;
-                                *dst++ = c;
-                                if (c == 0)
-                                        break;
-                        }
-
-                }
-        }
-        return hr.error;
-}
-
-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u32 *pline_number, u16 *pw_assert_on_dsp)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_GET_ASSERT);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *assert_present = 0;
-
-        if (!hr.error) {
-
-                *pline_number = hr.u.a.serial_number;
-
-                *assert_present = hr.u.a.adapter_type;
-
-                *pw_assert_on_dsp = hr.u.a.adapter_index;
-
-                if (!*assert_present && *pline_number)
-
-                        *assert_present = 1;
-
-                if (*assert_present) {
-
-                        int i;
-                        char *src = (char *)hr.u.a.sz_adapter_assert;
-                        char *dst = psz_assert;
-
-                        for (i = 0; i < HPI_STRING_LEN; i++) {
-                                char c;
-                                c = *src++;
-                                *dst++ = c;
-                                if (c == 0)
-                                        break;
-                        }
-
-                } else {
-                        *psz_assert = 0;
-                }
-        }
-        return hr.error;
-}
-
-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 assert_id)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_TEST_ASSERT);
-        hm.adapter_index = adapter_index;
-        hm.u.a.assert_id = assert_id;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 capability, u32 key)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_ENABLE_CAPABILITY);
-        hm.adapter_index = adapter_index;
-        hm.u.a.assert_id = capability;
-        hm.u.a.adapter_mode = key;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_SELFTEST);
-        hm.adapter_index = adapter_index;
-        hpi_send_recv(&hm, &hr);
-        return hr.error;
-}
-
-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 dsp_address, char *p_buffer, int *count_bytes)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_DEBUG_READ);
-
-        hr.size = sizeof(hr);
-
-        hm.adapter_index = adapter_index;
-        hm.u.ax.debug_read.dsp_address = dsp_address;
-
-        if (*count_bytes > (int)sizeof(hr.u.bytes))
-                *count_bytes = sizeof(hr.u.bytes);
-
-        hm.u.ax.debug_read.count_bytes = *count_bytes;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (!hr.error) {
-                *count_bytes = hr.size - 12;
-                memcpy(p_buffer, &hr.u.bytes, *count_bytes);
-        } else
-                *count_bytes = 0;
-        return hr.error;
-}
-
-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 parameter1, u16 parameter2)
+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 parameter1,
+        u16 parameter2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -542,9 +253,8 @@ u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 *pw_parameter1,
-        u16 *pw_parameter2)
+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,
+        u16 *pw_parameter1, u16 *pw_parameter2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -564,9 +274,8 @@ u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 index, u16 what_to_enumerate,
-        u16 property_index, u32 *psetting)
+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,
+        u16 what_to_enumerate, u16 property_index, u32 *psetting)
 {
         return 0;
 }
@@ -574,7 +283,7 @@ u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
 u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         u32 sample_rate, u32 bit_rate, u32 attributes)
 {
-        u16 error = 0;
+        u16 err = 0;
         struct hpi_msg_format fmt;
 
         switch (channels) {
@@ -586,8 +295,8 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         case 16:
                 break;
         default:
-                error = HPI_ERROR_INVALID_CHANNELS;
-                return error;
+                err = HPI_ERROR_INVALID_CHANNELS;
+                return err;
         }
         fmt.channels = channels;
 
@@ -610,17 +319,17 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         case HPI_FORMAT_OEM2:
                 break;
         default:
-                error = HPI_ERROR_INVALID_FORMAT;
-                return error;
+                err = HPI_ERROR_INVALID_FORMAT;
+                return err;
         }
         fmt.format = format;
 
         if (sample_rate < 8000L) {
-                error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
+                err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
                 sample_rate = 8000L;
         }
         if (sample_rate > 200000L) {
-                error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
+                err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
                 sample_rate = 200000L;
         }
         fmt.sample_rate = sample_rate;
@@ -651,10 +360,10 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
                 if ((channels == 1)
                         && (attributes != HPI_MPEG_MODE_DEFAULT)) {
                         attributes = HPI_MPEG_MODE_DEFAULT;
-                        error = HPI_ERROR_INVALID_FORMAT;
+                        err = HPI_ERROR_INVALID_FORMAT;
                 } else if (attributes > HPI_MPEG_MODE_DUALCHANNEL) {
                         attributes = HPI_MPEG_MODE_DEFAULT;
-                        error = HPI_ERROR_INVALID_FORMAT;
+                        err = HPI_ERROR_INVALID_FORMAT;
                 }
                 fmt.attributes = attributes;
                 break;
@@ -663,7 +372,7 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         }
 
         hpi_msg_to_format(p_format, &fmt);
-        return error;
+        return err;
 }
 
 u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,
@@ -712,8 +421,8 @@ u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,
         return 0;
 }
 
-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 outstream_index, u32 *ph_outstream)
+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,
+        u32 *ph_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -733,38 +442,41 @@ u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_close(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_CLOSE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,
-        u32 *psamples_played, u32 *pauxiliary_data_to_play)
+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,
+        u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,
+        u32 *pauxiliary_data_to_play)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
@@ -782,15 +494,15 @@ u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, const u8 *pb_data, u32 bytes_to_write,
-        const struct hpi_format *p_format)
+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_data,
+        u32 bytes_to_write, const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_WRITE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)pb_data;
         hm.u.d.u.data.data_size = bytes_to_write;
 
@@ -801,82 +513,85 @@ u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_start(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_START);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_wait_start(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_WAIT_START);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_stop(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_STOP);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_sinegen(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SINEGEN);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_reset(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format)
+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_QUERY_FORMAT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
@@ -885,15 +600,15 @@ u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format)
+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_FORMAT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
@@ -902,15 +617,15 @@ u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, short velocity)
+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_VELOCITY);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.velocity = velocity;
 
         hpi_send_recv(&hm, &hr);
@@ -918,15 +633,16 @@ u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample)
+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,
+        u32 punch_out_sample)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_PUNCHINOUT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.d.u.pio.punch_in_sample = punch_in_sample;
         hm.u.d.u.pio.punch_out_sample = punch_out_sample;
@@ -936,29 +652,29 @@ u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 mode)
+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.format.channels = mode;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *pframes_available)
+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         if (hr.error == 0) {
                 if (pframes_available)
@@ -969,8 +685,8 @@ u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_outstream_ancillary_read(u32 h_outstream,
+        struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_read)
 {
@@ -979,7 +695,8 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_READ);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;
         hm.u.d.u.data.data_size =
                 number_of_ancillary_frames_to_read *
@@ -987,19 +704,19 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
         if (hm.u.d.u.data.data_size <= anc_frame_buffer_size_in_bytes)
                 hpi_send_recv(&hm, &hr);
         else
-                hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;
+                hr.error = HPI_ERROR_INVALID_DATASIZE;
         return hr.error;
 }
 
-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 time_scale)
+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scale)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_TIMESCALE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.d.u.time_scale = time_scale;
 
@@ -1008,22 +725,21 @@ u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 size_in_bytes)
+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_ALLOC);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = size_in_bytes;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u8 **pp_buffer,
+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status)
 {
         struct hpi_message hm;
@@ -1031,7 +747,8 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (hr.error == 0) {
@@ -1043,21 +760,20 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_host_buffer_free(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 h_stream)
+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1066,22 +782,22 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_ADD);
-        hr.error = 0;
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
+        if (hpi_handle_indexes(h_stream, &adapter,
+                        &hm.u.d.u.stream.stream_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         c_obj_type = hpi_handle_object(h_stream);
         switch (c_obj_type) {
         case HPI_OBJ_OSTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
-                break;
         case HPI_OBJ_ISTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
+                hm.u.d.u.stream.object_type = c_obj_type;
                 break;
         default:
-                return HPI_ERROR_INVALID_STREAM;
+                return HPI_ERROR_INVALID_OBJ;
         }
         if (adapter != hm.adapter_index)
                 return HPI_ERROR_NO_INTERADAPTER_GROUPS;
@@ -1090,15 +806,16 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map)
+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,
+        u32 *pinstream_map)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_GETMAP);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (poutstream_map)
@@ -1109,21 +826,20 @@ u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_group_reset(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 instream_index, u32 *ph_instream)
+u16 hpi_instream_open(u16 adapter_index, u16 instream_index, u32 *ph_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1145,38 +861,40 @@ u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_close(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_CLOSE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format)
+u16 hpi_instream_query_format(u32 h_instream,
+        const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_QUERY_FORMAT);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
         hpi_send_recv(&hm, &hr);
@@ -1184,15 +902,15 @@ u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format)
+u16 hpi_instream_set_format(u32 h_instream, const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_SET_FORMAT);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
         hpi_send_recv(&hm, &hr);
@@ -1200,15 +918,15 @@ u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
-        u8 *pb_data, u32 bytes_to_read)
+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_data, u32 bytes_to_read)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_READ);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = bytes_to_read;
         hm.u.d.u.data.pb_data = pb_data;
 
@@ -1217,72 +935,76 @@ u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
         return hr.error;
 }
 
-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_start(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_START);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_wait_start(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_WAIT_START);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_stop(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_STOP);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_reset(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,
-        u32 *psamples_recorded, u32 *pauxiliary_data_recorded)
+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,
+        u32 *pdata_recorded, u32 *psamples_recorded,
+        u32 *pauxiliary_data_recorded)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
@@ -1300,15 +1022,15 @@ u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,
-        u16 idle_bit)
+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,
+        u16 mode, u16 alignment, u16 idle_bit)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.format.attributes = bytes_per_frame;
         hm.u.d.u.data.format.format = (mode << 8) | (alignment & 0xff);
         hm.u.d.u.data.format.channels = idle_bit;
@@ -1316,14 +1038,14 @@ u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *pframe_space)
+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         if (pframe_space)
                 *pframe_space =
@@ -1333,8 +1055,8 @@ u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_instream_ancillary_write(u32 h_instream,
+        const struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_write)
 {
@@ -1343,7 +1065,8 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_WRITE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;
         hm.u.d.u.data.data_size =
                 number_of_ancillary_frames_to_write *
@@ -1351,12 +1074,11 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
         if (hm.u.d.u.data.data_size <= anc_frame_buffer_size_in_bytes)
                 hpi_send_recv(&hm, &hr);
         else
-                hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;
+                hr.error = HPI_ERROR_INVALID_DATASIZE;
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 size_in_bytes)
+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes)
 {
 
         struct hpi_message hm;
@@ -1364,14 +1086,14 @@ u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_ALLOC);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = size_in_bytes;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u8 **pp_buffer,
+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status)
 {
         struct hpi_message hm;
@@ -1379,7 +1101,8 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (hr.error == 0) {
@@ -1391,8 +1114,7 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_host_buffer_free(u32 h_instream)
 {
 
         struct hpi_message hm;
@@ -1400,13 +1122,13 @@ u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 h_stream)
+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1416,22 +1138,23 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_ADD);
         hr.error = 0;
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
+        if (hpi_handle_indexes(h_stream, &adapter,
+                        &hm.u.d.u.stream.stream_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         c_obj_type = hpi_handle_object(h_stream);
 
         switch (c_obj_type) {
         case HPI_OBJ_OSTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
-                break;
         case HPI_OBJ_ISTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
+                hm.u.d.u.stream.object_type = c_obj_type;
                 break;
         default:
-                return HPI_ERROR_INVALID_STREAM;
+                return HPI_ERROR_INVALID_OBJ;
         }
 
         if (adapter != hm.adapter_index)
@@ -1441,15 +1164,16 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *poutstream_map, u32 *pinstream_map)
+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,
+        u32 *pinstream_map)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (poutstream_map)
@@ -1460,21 +1184,20 @@ u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_group_reset(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_mixer)
+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1492,25 +1215,29 @@ u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer)
+u16 hpi_mixer_close(u32 h_mixer)
 {
         struct hpi_message hm;
         struct hpi_response hr;
+
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER, HPI_MIXER_CLOSE);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
+
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,
-        u16 dst_node_type_index, u16 control_type, u32 *ph_control)
+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,
+        u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,
+        u16 control_type, u32 *ph_control)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER,
                 HPI_MIXER_GET_CONTROL);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.m.node_type1 = src_node_type;
         hm.u.m.node_index1 = src_node_type_index;
         hm.u.m.node_type2 = dst_node_type;
@@ -1528,16 +1255,16 @@ u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
         return hr.error;
 }
 
-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_mixer, u16 control_index, u16 *pw_src_node_type,
-        u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,
-        u16 *pw_control_type, u32 *ph_control)
+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,
+        u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,
+        u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER,
                 HPI_MIXER_GET_CONTROL_BY_INDEX);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.m.control_index = control_index;
         hpi_send_recv(&hm, &hr);
 
@@ -1562,13 +1289,14 @@ u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        enum HPI_MIXER_STORE_COMMAND command, u16 index)
+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,
+        u16 index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER, HPI_MIXER_STORE);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.mx.store.command = command;
         hm.u.mx.store.index = index;
         hpi_send_recv(&hm, &hr);
@@ -1576,16 +1304,16 @@ u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
 }
 
 static
-u16 hpi_control_param_set(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, const u32 param1,
-        const u32 param2)
+u16 hpi_control_param_set(const u32 h_control, const u16 attrib,
+        const u32 param1, const u32 param2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = param1;
         hm.u.c.param2 = param2;
@@ -1601,7 +1329,8 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.an_log_value[0] = sv0;
         hm.u.c.an_log_value[1] = sv1;
@@ -1610,16 +1339,16 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,
 }
 
 static
-u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, u32 param1, u32 param2,
-        u32 *pparam1, u32 *pparam2)
+u16 hpi_control_param_get(const u32 h_control, const u16 attrib, u32 param1,
+        u32 param2, u32 *pparam1, u32 *pparam2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = param1;
         hm.u.c.param2 = param2;
@@ -1632,19 +1361,20 @@ u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-#define hpi_control_param1_get(s, h, a, p1) \
-                hpi_control_param_get(s, h, a, 0, 0, p1, NULL)
-#define hpi_control_param2_get(s, h, a, p1, p2) \
-                hpi_control_param_get(s, h, a, 0, 0, p1, p2)
+#define hpi_control_param1_get(h, a, p1) \
+                hpi_control_param_get(h, a, 0, 0, p1, NULL)
+#define hpi_control_param2_get(h, a, p1, p2) \
+                hpi_control_param_get(h, a, 0, 0, p1, p2)
 
-static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attrib, short *sv0, short *sv1)
+static u16 hpi_control_log_get2(u32 h_control, u16 attrib, short *sv0,
+        short *sv1)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
 
         hpi_send_recv(&hm, &hr);
@@ -1655,8 +1385,7 @@ static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,
 }
 
 static
-u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, const u32 index,
+u16 hpi_control_query(const u32 h_control, const u16 attrib, const u32 index,
         const u32 param, u32 *psetting)
 {
         struct hpi_message hm;
@@ -1664,7 +1393,8 @@ u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_INFO);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = index;
@@ -1682,7 +1412,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
         unsigned int sub_string_index = 0, j = 0;
         char c = 0;
         unsigned int n = 0;
-        u16 hE = 0;
+        u16 err = 0;
 
         if ((string_length < 1) || (string_length > 256))
                 return HPI_ERROR_INVALID_CONTROL_VALUE;
@@ -1693,7 +1423,9 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
 
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                         HPI_CONTROL_GET_STATE);
-                u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+                if (hpi_handle_indexes(h_control, &hm.adapter_index,
+                                &hm.obj_index))
+                        return HPI_ERROR_INVALID_HANDLE;
                 hm.u.c.attribute = attribute;
                 hm.u.c.param1 = sub_string_index;
                 hm.u.c.param2 = 0;
@@ -1705,7 +1437,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                         return HPI_ERROR_INVALID_CONTROL_VALUE;
 
                 if (hr.error) {
-                        hE = hr.error;
+                        err = hr.error;
                         break;
                 }
                 for (j = 0; j < 8; j++) {
@@ -1714,7 +1446,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                         n++;
                         if (n >= string_length) {
                                 psz_string[string_length - 1] = 0;
-                                hE = HPI_ERROR_INVALID_CONTROL_VALUE;
+                                err = HPI_ERROR_INVALID_CONTROL_VALUE;
                                 break;
                         }
                         if (c == 0)
@@ -1730,57 +1462,52 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                 if (c == 0)
                         break;
         }
-        return hE;
+        return err;
 }
 
-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_rx, const u32 index, u16 *pw_format)
+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,
+        u16 *pw_format)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_aes_rx, HPI_AESEBURX_FORMAT,
-                index, 0, &qr);
+        err = hpi_control_query(h_aes_rx, HPI_AESEBURX_FORMAT, index, 0, &qr);
         *pw_format = (u16)qr;
         return err;
 }
 
-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 format)
+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 format)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBURX_FORMAT, format, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBURX_FORMAT, format,
+                0);
 }
 
-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_format)
+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_format)
 {
         u16 err;
         u32 param;
 
-        err = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_FORMAT, &param);
+        err = hpi_control_param1_get(h_control, HPI_AESEBURX_FORMAT, &param);
         if (!err && pw_format)
                 *pw_format = (u16)param;
 
         return err;
 }
 
-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_SAMPLERATE, psample_rate);
+        return hpi_control_param1_get(h_control, HPI_AESEBURX_SAMPLERATE,
+                psample_rate);
 }
 
-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_AESEBURX_USERDATA;
         hm.u.c.param1 = index;
 
@@ -1791,14 +1518,15 @@ u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_AESEBURX_CHANNELSTATUS;
         hm.u.c.param1 = index;
 
@@ -1809,101 +1537,93 @@ u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
         return hr.error;
 }
 
-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_error_data)
+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data)
 {
         u32 error_data = 0;
-        u16 error = 0;
+        u16 err = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_ERRORSTATUS, &error_data);
+        err = hpi_control_param1_get(h_control, HPI_AESEBURX_ERRORSTATUS,
+                &error_data);
         if (pw_error_data)
                 *pw_error_data = (u16)error_data;
-        return error;
+        return err;
 }
 
-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 sample_rate)
+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_SAMPLERATE, sample_rate, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_SAMPLERATE,
+                sample_rate, 0);
 }
 
-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 data)
+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_USERDATA, index, data);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_USERDATA, index,
+                data);
 }
 
-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 data)
+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,
+        u16 data)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_CHANNELSTATUS, index, data);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_CHANNELSTATUS,
+                index, data);
 }
 
-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data)
 {
         return HPI_ERROR_INVALID_OPERATION;
 }
 
-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_tx, const u32 index, u16 *pw_format)
+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,
+        u16 *pw_format)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_aes_tx, HPI_AESEBUTX_FORMAT,
-                index, 0, &qr);
+        err = hpi_control_query(h_aes_tx, HPI_AESEBUTX_FORMAT, index, 0, &qr);
         *pw_format = (u16)qr;
         return err;
 }
 
-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 output_format)
+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_FORMAT, output_format, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_FORMAT,
+                output_format, 0);
 }
 
-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_output_format)
+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format)
 {
         u16 err;
         u32 param;
 
-        err = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBUTX_FORMAT, &param);
+        err = hpi_control_param1_get(h_control, HPI_AESEBUTX_FORMAT, &param);
         if (!err && pw_output_format)
                 *pw_output_format = (u16)param;
 
         return err;
 }
 
-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 edge_type)
+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_BITSTREAM_CLOCK_EDGE, edge_type, 0);
+        return hpi_control_param_set(h_control, HPI_BITSTREAM_CLOCK_EDGE,
+                edge_type, 0);
 }
 
-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 polarity)
+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_BITSTREAM_DATA_POLARITY, polarity, 0);
+        return hpi_control_param_set(h_control, HPI_BITSTREAM_DATA_POLARITY,
+                polarity, 0);
 }
 
-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity)
+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,
+        u16 *pw_data_activity)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_BITSTREAM_ACTIVITY;
         hpi_send_recv(&hm, &hr);
         if (pw_clk_activity)
@@ -1913,45 +1633,43 @@ u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_mode, const u32 index, u16 *pw_mode)
+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,
+        u16 *pw_mode)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_mode, HPI_CHANNEL_MODE_MODE,
-                index, 0, &qr);
+        err = hpi_control_query(h_mode, HPI_CHANNEL_MODE_MODE, index, 0, &qr);
         *pw_mode = (u16)qr;
         return err;
 }
 
-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 mode)
+u16 hpi_channel_mode_set(u32 h_control, u16 mode)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_CHANNEL_MODE_MODE, mode, 0);
+        return hpi_control_param_set(h_control, HPI_CHANNEL_MODE_MODE, mode,
+                0);
 }
 
-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *mode)
+u16 hpi_channel_mode_get(u32 h_control, u16 *mode)
 {
         u32 mode32 = 0;
-        u16 error = hpi_control_param1_get(ph_subsys, h_control,
+        u16 err = hpi_control_param1_get(h_control,
                 HPI_CHANNEL_MODE_MODE, &mode32);
         if (mode)
                 *mode = (u16)mode32;
-        return error;
+        return err;
 }
 
-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 byte_count, u8 *pb_data)
+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,
+        u8 *pb_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.u.cobranet_data.byte_count = byte_count;
         hm.u.cx.u.cobranet_data.hmi_address = hmi_address;
@@ -1969,15 +1687,16 @@ u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data)
+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,
+        u32 *pbyte_count, u8 *pb_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.u.cobranet_data.byte_count = max_byte_count;
         hm.u.cx.u.cobranet_data.hmi_address = hmi_address;
@@ -2008,16 +1727,16 @@ u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pstatus, u32 *preadable_size,
-        u32 *pwriteable_size)
+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,
+        u32 *preadable_size, u32 *pwriteable_size)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.attribute = HPI_COBRANET_GET_STATUS;
 
@@ -2035,177 +1754,176 @@ u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress)
+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address)
 {
         u32 byte_count;
         u32 iP;
-        u16 error;
+        u16 err;
 
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, &byte_count,
                 (u8 *)&iP);
 
-        *pi_paddress =
+        *pdw_ip_address =
                 ((iP & 0xff000000) >> 8) | ((iP & 0x00ff0000) << 8) | ((iP &
                         0x0000ff00) >> 8) | ((iP & 0x000000ff) << 8);
 
-        if (error)
-                *pi_paddress = 0;
+        if (err)
+                *pdw_ip_address = 0;
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress)
+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address)
 {
         u32 iP;
-        u16 error;
+        u16 err;
 
-        iP = ((i_paddress & 0xff000000) >> 8) | ((i_paddress & 0x00ff0000) <<
-                8) | ((i_paddress & 0x0000ff00) >> 8) | ((i_paddress &
-                        0x000000ff) << 8);
+        iP = ((dw_ip_address & 0xff000000) >> 8) | ((dw_ip_address &
+                        0x00ff0000) << 8) | ((dw_ip_address & 0x0000ff00) >>
+                8) | ((dw_ip_address & 0x000000ff) << 8);
 
-        error = hpi_cobranet_hmi_write(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_write(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, (u8 *)&iP);
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress)
+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address)
 {
         u32 byte_count;
         u32 iP;
-        u16 error;
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        u16 err;
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, &byte_count,
                 (u8 *)&iP);
 
-        *pi_paddress =
+        *pdw_ip_address =
                 ((iP & 0xff000000) >> 8) | ((iP & 0x00ff0000) << 8) | ((iP &
                         0x0000ff00) >> 8) | ((iP & 0x000000ff) << 8);
 
-        if (error)
-                *pi_paddress = 0;
+        if (err)
+                *pdw_ip_address = 0;
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress)
+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address)
 {
         u32 iP;
-        u16 error;
+        u16 err;
 
-        iP = ((i_paddress & 0xff000000) >> 8) | ((i_paddress & 0x00ff0000) <<
-                8) | ((i_paddress & 0x0000ff00) >> 8) | ((i_paddress &
-                        0x000000ff) << 8);
+        iP = ((dw_ip_address & 0xff000000) >> 8) | ((dw_ip_address &
+                        0x00ff0000) << 8) | ((dw_ip_address & 0x0000ff00) >>
+                8) | ((dw_ip_address & 0x000000ff) << 8);
 
-        error = hpi_cobranet_hmi_write(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_write(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, (u8 *)&iP);
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs)
+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,
+        u32 *p_mac_lsbs)
 {
         u32 byte_count;
-        u16 error;
-        u32 mAC;
+        u16 err;
+        u32 mac;
 
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_if_phy_address, 4, &byte_count,
-                (u8 *)&mAC);
-        *pmAC_MS_bs =
-                ((mAC & 0xff000000) >> 8) | ((mAC & 0x00ff0000) << 8) | ((mAC
-                        & 0x0000ff00) >> 8) | ((mAC & 0x000000ff) << 8);
-        error += hpi_cobranet_hmi_read(ph_subsys, h_control,
-                HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4, &byte_count,
-                (u8 *)&mAC);
-        *pmAC_LS_bs =
-                ((mAC & 0xff000000) >> 8) | ((mAC & 0x00ff0000) << 8) | ((mAC
-                        & 0x0000ff00) >> 8) | ((mAC & 0x000000ff) << 8);
-
-        if (error) {
-                *pmAC_MS_bs = 0;
-                *pmAC_LS_bs = 0;
+                (u8 *)&mac);
+
+        if (!err) {
+                *p_mac_msbs =
+                        ((mac & 0xff000000) >> 8) | ((mac & 0x00ff0000) << 8)
+                        | ((mac & 0x0000ff00) >> 8) | ((mac & 0x000000ff) <<
+                        8);
+
+                err = hpi_cobranet_hmi_read(h_control,
+                        HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4,
+                        &byte_count, (u8 *)&mac);
         }
 
-        return error;
+        if (!err) {
+                *p_mac_lsbs =
+                        ((mac & 0xff000000) >> 8) | ((mac & 0x00ff0000) << 8)
+                        | ((mac & 0x0000ff00) >> 8) | ((mac & 0x000000ff) <<
+                        8);
+        } else {
+                *p_mac_msbs = 0;
+                *p_mac_lsbs = 0;
+        }
+
+        return err;
 }
 
-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_compander_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_compander_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short makeup_gain0_01dB)
+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB)
 {
         return hpi_control_log_set2(h_control, HPI_COMPANDER_MAKEUPGAIN,
                 makeup_gain0_01dB, 0);
 }
 
-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *makeup_gain0_01dB)
+u16 hpi_compander_get_makeup_gain(u32 h_control, short *makeup_gain0_01dB)
 {
-        return hpi_control_log_get2(ph_subsys, h_control,
-                HPI_COMPANDER_MAKEUPGAIN, makeup_gain0_01dB, NULL);
+        return hpi_control_log_get2(h_control, HPI_COMPANDER_MAKEUPGAIN,
+                makeup_gain0_01dB, NULL);
 }
 
-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, unsigned int index, u32 attack)
+u16 hpi_compander_set_attack_time_constant(u32 h_control, unsigned int index,
+        u32 attack)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_ATTACK, attack, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_ATTACK, attack,
+                index);
 }
 
-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, unsigned int index, u32 *attack)
+u16 hpi_compander_get_attack_time_constant(u32 h_control, unsigned int index,
+        u32 *attack)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_ATTACK, 0, index, attack, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_ATTACK, 0,
+                index, attack, NULL);
 }
 
-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, u32 decay)
+u16 hpi_compander_set_decay_time_constant(u32 h_control, unsigned int index,
+        u32 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_DECAY, decay, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_DECAY, decay,
+                index);
 }
 
-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, u32 *decay)
+u16 hpi_compander_get_decay_time_constant(u32 h_control, unsigned int index,
+        u32 *decay)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_DECAY, 0, index, decay, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_DECAY, 0, index,
+                decay, NULL);
 
 }
 
-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, short threshold0_01dB)
+u16 hpi_compander_set_threshold(u32 h_control, unsigned int index,
+        short threshold0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;
         hm.u.c.param2 = index;
         hm.u.c.an_log_value[0] = threshold0_01dB;
@@ -2215,15 +1933,16 @@ u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, short *threshold0_01dB)
+u16 hpi_compander_get_threshold(u32 h_control, unsigned int index,
+        short *threshold0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;
         hm.u.c.param2 = index;
 
@@ -2233,29 +1952,28 @@ u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 ratio100)
+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_RATIO, ratio100, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_RATIO, ratio100,
+                index);
 }
 
-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *ratio100)
+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *ratio100)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_RATIO, 0, index, ratio100, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_RATIO, 0, index,
+                ratio100, NULL);
 }
 
-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)
+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_LEVEL_RANGE;
 
         hpi_send_recv(&hm, &hr);
@@ -2273,31 +1991,27 @@ u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         )
 {
         return hpi_control_log_set2(h_control, HPI_LEVEL_GAIN,
                 an_gain0_01dB[0], an_gain0_01dB[1]);
 }
 
-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_get_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         )
 {
-        return hpi_control_log_get2(ph_subsys, h_control, HPI_LEVEL_GAIN,
+        return hpi_control_log_get2(h_control, HPI_LEVEL_GAIN,
                 &an_gain0_01dB[0], &an_gain0_01dB[1]);
 }
 
-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_meter, u32 *p_channels)
+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels)
 {
-        return hpi_control_query(ph_subsys, h_meter, HPI_METER_NUM_CHANNELS,
-                0, 0, p_channels);
+        return hpi_control_query(h_meter, HPI_METER_NUM_CHANNELS, 0, 0,
+                p_channels);
 }
 
-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_peakdB[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_peak(u32 h_control, short an_peakdB[HPI_MAX_CHANNELS]
         )
 {
         short i = 0;
@@ -2307,7 +2021,8 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.obj_index = hm.obj_index;
         hm.u.c.attribute = HPI_METER_PEAK;
 
@@ -2322,8 +2037,7 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_rmsdB[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_rms(u32 h_control, short an_rmsdB[HPI_MAX_CHANNELS]
         )
 {
         short i = 0;
@@ -2333,7 +2047,8 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_METER_RMS;
 
         hpi_send_recv(&hm, &hr);
@@ -2348,22 +2063,20 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay)
+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_METER_RMS_BALLISTICS, attack, decay);
+        return hpi_control_param_set(h_control, HPI_METER_RMS_BALLISTICS,
+                attack, decay);
 }
 
-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pn_attack, u16 *pn_decay)
+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *pn_attack, u16 *pn_decay)
 {
         u32 attack;
         u32 decay;
         u16 error;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_METER_RMS_BALLISTICS, &attack, &decay);
+        error = hpi_control_param2_get(h_control, HPI_METER_RMS_BALLISTICS,
+                &attack, &decay);
 
         if (pn_attack)
                 *pn_attack = (unsigned short)attack;
@@ -2373,22 +2086,21 @@ u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay)
+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_METER_PEAK_BALLISTICS, attack, decay);
+        return hpi_control_param_set(h_control, HPI_METER_PEAK_BALLISTICS,
+                attack, decay);
 }
 
-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pn_attack, u16 *pn_decay)
+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *pn_attack,
+        u16 *pn_decay)
 {
         u32 attack;
         u32 decay;
         u16 error;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_METER_PEAK_BALLISTICS, &attack, &decay);
+        error = hpi_control_param2_get(h_control, HPI_METER_PEAK_BALLISTICS,
+                &attack, &decay);
 
         if (pn_attack)
                 *pn_attack = (short)attack;
@@ -2398,55 +2110,53 @@ u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off)
+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_MICROPHONE_PHANTOM_POWER, (u32)on_off, 0);
+        return hpi_control_param_set(h_control, HPI_MICROPHONE_PHANTOM_POWER,
+                (u32)on_off, 0);
 }
 
-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_on_off)
+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off)
 {
         u16 error = 0;
         u32 on_off = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
+        error = hpi_control_param1_get(h_control,
                 HPI_MICROPHONE_PHANTOM_POWER, &on_off);
         if (pw_on_off)
                 *pw_on_off = (u16)on_off;
         return error;
 }
 
-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_node_type, u16 source_node_index)
+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,
+        u16 source_node_index)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_MULTIPLEXER_SOURCE, source_node_type, source_node_index);
+        return hpi_control_param_set(h_control, HPI_MULTIPLEXER_SOURCE,
+                source_node_type, source_node_index);
 }
 
-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *source_node_type, u16 *source_node_index)
+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,
+        u16 *source_node_index)
 {
         u32 node, index;
-        u16 error = hpi_control_param2_get(ph_subsys, h_control,
+        u16 err = hpi_control_param2_get(h_control,
                 HPI_MULTIPLEXER_SOURCE, &node,
                 &index);
         if (source_node_type)
                 *source_node_type = (u16)node;
         if (source_node_index)
                 *source_node_index = (u16)index;
-        return error;
+        return err;
 }
 
-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *source_node_type,
-        u16 *source_node_index)
+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,
+        u16 *source_node_type, u16 *source_node_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_MULTIPLEXER_QUERYSOURCE;
         hm.u.c.param1 = index;
 
@@ -2459,15 +2169,15 @@ u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_number_of_bands, u16 *pw_on_off)
+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,
+        u16 *pw_on_off)
 {
         u32 oB = 0;
         u32 oO = 0;
         u16 error = 0;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_EQUALIZER_NUM_FILTERS, &oO, &oB);
+        error = hpi_control_param2_get(h_control, HPI_EQUALIZER_NUM_FILTERS,
+                &oO, &oB);
         if (pw_number_of_bands)
                 *pw_number_of_bands = (u16)oB;
         if (pw_on_off)
@@ -2475,23 +2185,22 @@ u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off)
+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_EQUALIZER_NUM_FILTERS, on_off, 0);
+        return hpi_control_param_set(h_control, HPI_EQUALIZER_NUM_FILTERS,
+                on_off, 0);
 }
 
-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,
-        short *pnQ100, short *pn_gain0_01dB)
+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,
+        u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_EQUALIZER_FILTER;
         hm.u.c.param2 = index;
 
@@ -2509,16 +2218,16 @@ u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,
-        short gain0_01dB)
+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,
+        u32 frequency_hz, short q100, short gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.c.param1 = frequency_hz;
         hm.u.c.param2 = (index & 0xFFFFL) + ((u32)type << 16);
@@ -2531,8 +2240,7 @@ u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, short coeffs[5]
+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]
         )
 {
         struct hpi_message hm;
@@ -2540,7 +2248,8 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_EQUALIZER_COEFFICIENTS;
         hm.u.c.param2 = index;
 
@@ -2555,444 +2264,388 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u16 *pw_source)
+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,
+        u16 *pw_source)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_clock, HPI_SAMPLECLOCK_SOURCE,
-                index, 0, &qr);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE, index, 0,
+                &qr);
         *pw_source = (u16)qr;
         return err;
 }
 
-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source)
+u16 hpi_sample_clock_set_source(u32 h_control, u16 source)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE, source, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE,
+                source, 0);
 }
 
-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source)
+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 source = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE, &source);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE,
+                &source);
+        if (!err)
                 if (pw_source)
                         *pw_source = (u16)source;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, const u32 source,
-        u16 *pw_source_index)
+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,
+        const u32 source, u16 *pw_source_index)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_clock,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, index, source, &qr);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE_INDEX, index,
+                source, &qr);
         *pw_source_index = (u16)qr;
         return err;
 }
 
-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_index)
+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, source_index, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,
+                source_index, 0);
 }
 
-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source_index)
+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 source_index = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, &source_index);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,
+                &source_index);
+        if (!err)
                 if (pw_source_index)
                         *pw_source_index = (u16)source_index;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u32 *prate)
+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,
+        u32 *prate)
 {
         u16 err;
-        err = hpi_control_query(ph_subsys, h_clock,
-                HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, index, 0, prate);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,
+                index, 0, prate);
 
         return err;
 }
 
-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 sample_rate)
+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
+        return hpi_control_param_set(h_control,
                 HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, sample_rate, 0);
 }
 
-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 sample_rate = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
+        err = hpi_control_param1_get(h_control,
                 HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, &sample_rate);
-        if (!error)
+        if (!err)
                 if (psample_rate)
                         *psample_rate = sample_rate;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 sample_rate = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SAMPLERATE, &sample_rate);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SAMPLERATE,
+                &sample_rate);
+        if (!err)
                 if (psample_rate)
                         *psample_rate = sample_rate;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_AUTO, enable, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_AUTO, enable,
+                0);
 }
 
-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *penable)
+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_AUTO, penable);
+        return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_AUTO,
+                penable);
 }
 
-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 lock)
+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_LOCAL_LOCK, lock, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,
+                lock, 0);
 }
 
-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *plock)
+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_LOCAL_LOCK, plock);
+        return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,
+                plock);
 }
 
-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *frequency)
+u16 hpi_tone_detector_get_frequency(u32 h_control, u32 index, u32 *frequency)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_FREQUENCY, index, 0, frequency, NULL);
+        return hpi_control_param_get(h_control, HPI_TONEDETECTOR_FREQUENCY,
+                index, 0, frequency, NULL);
 }
 
-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *state)
+u16 hpi_tone_detector_get_state(u32 h_control, u32 *state)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_STATE, state);
+        return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_STATE,
+                state);
 }
 
-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_tone_detector_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                (u32)enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_tone_detector_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 event_enable)
+u16 hpi_tone_detector_set_event_enable(u32 h_control, u32 event_enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, (u32)event_enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,
+                (u32)event_enable, 0);
 }
 
-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *event_enable)
+u16 hpi_tone_detector_get_event_enable(u32 h_control, u32 *event_enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable);
 }
 
-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int threshold)
+u16 hpi_tone_detector_set_threshold(u32 h_control, int threshold)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TONEDETECTOR_THRESHOLD, (u32)threshold, 0);
+        return hpi_control_param_set(h_control, HPI_TONEDETECTOR_THRESHOLD,
+                (u32)threshold, 0);
 }
 
-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int *threshold)
+u16 hpi_tone_detector_get_threshold(u32 h_control, int *threshold)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_THRESHOLD, (u32 *)threshold);
+        return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_THRESHOLD,
+                (u32 *)threshold);
 }
 
-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *state)
+u16 hpi_silence_detector_get_state(u32 h_control, u32 *state)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_STATE, state);
+        return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_STATE,
+                state);
 }
 
-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_silence_detector_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                (u32)enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_silence_detector_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 event_enable)
+u16 hpi_silence_detector_set_event_enable(u32 h_control, u32 event_enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable, 0);
 }
 
-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *event_enable)
+u16 hpi_silence_detector_get_event_enable(u32 h_control, u32 *event_enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable);
 }
 
-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 delay)
+u16 hpi_silence_detector_set_delay(u32 h_control, u32 delay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_DELAY, delay, 0);
+        return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_DELAY,
+                delay, 0);
 }
 
-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *delay)
+u16 hpi_silence_detector_get_delay(u32 h_control, u32 *delay)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_DELAY, delay);
+        return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_DELAY,
+                delay);
 }
 
-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int threshold)
+u16 hpi_silence_detector_set_threshold(u32 h_control, int threshold)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_THRESHOLD, threshold, 0);
+        return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_THRESHOLD,
+                threshold, 0);
 }
 
-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int *threshold)
+u16 hpi_silence_detector_get_threshold(u32 h_control, int *threshold)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
+        return hpi_control_param1_get(h_control,
                 HPI_SILENCEDETECTOR_THRESHOLD, (u32 *)threshold);
 }
 
-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_band)
+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,
-                &qr);
+        err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &qr);
         *pw_band = (u16)qr;
         return err;
 }
 
-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 band)
+u16 hpi_tuner_set_band(u32 h_control, u16 band)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_BAND,
-                band, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_BAND, band, 0);
 }
 
-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_band)
+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band)
 {
         u32 band = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_BAND,
-                &band);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_BAND, &band);
         if (pw_band)
                 *pw_band = (u16)band;
         return error;
 }
 
-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq)
+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pfreq)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_FREQ, index,
-                band, pfreq);
+        return hpi_control_query(h_tuner, HPI_TUNER_FREQ, index, band, pfreq);
 }
 
-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 freq_ink_hz)
+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_FREQ,
-                freq_ink_hz, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_FREQ, freq_ink_hz,
+                0);
 }
 
-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pw_freq_ink_hz)
+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz)
 {
-        return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_FREQ,
+        return hpi_control_param1_get(h_control, HPI_TUNER_FREQ,
                 pw_freq_ink_hz);
 }
 
-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_gain)
+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,
-                &qr);
+        err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &qr);
         *pw_gain = (u16)qr;
         return err;
 }
 
-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short gain)
+u16 hpi_tuner_set_gain(u32 h_control, short gain)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_GAIN,
-                gain, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_GAIN, gain, 0);
 }
 
-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pn_gain)
+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain)
 {
         u32 gain = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_GAIN,
-                &gain);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_GAIN, &gain);
         if (pn_gain)
                 *pn_gain = (u16)gain;
         return error;
 }
 
-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pw_level)
+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
-        hm.u.c.attribute = HPI_TUNER_LEVEL;
-        hm.u.c.param1 = HPI_TUNER_LEVEL_AVERAGE;
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+        hm.u.cu.attribute = HPI_TUNER_LEVEL_AVG;
         hpi_send_recv(&hm, &hr);
         if (pw_level)
-                *pw_level = (short)hr.u.c.param1;
+                *pw_level = hr.u.cu.tuner.s_level;
         return hr.error;
 }
 
-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pw_level)
+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
-        hm.u.c.attribute = HPI_TUNER_LEVEL;
-        hm.u.c.param1 = HPI_TUNER_LEVEL_RAW;
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+        hm.u.cu.attribute = HPI_TUNER_LEVEL_RAW;
         hpi_send_recv(&hm, &hr);
         if (pw_level)
-                *pw_level = (short)hr.u.c.param1;
+                *pw_level = hr.u.cu.tuner.s_level;
         return hr.error;
 }
 
-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis)
+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pdeemphasis)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_DEEMPHASIS,
-                index, band, pdeemphasis);
+        return hpi_control_query(h_tuner, HPI_TUNER_DEEMPHASIS, index, band,
+                pdeemphasis);
 }
 
-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 deemphasis)
+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TUNER_DEEMPHASIS, deemphasis, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_DEEMPHASIS,
+                deemphasis, 0);
 }
 
-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pdeemphasis)
+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TUNER_DEEMPHASIS, pdeemphasis);
+        return hpi_control_param1_get(h_control, HPI_TUNER_DEEMPHASIS,
+                pdeemphasis);
 }
 
-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, u32 *pbitmap_program)
+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_PROGRAM, 0, 0,
+        return hpi_control_query(h_tuner, HPI_TUNER_PROGRAM, 0, 0,
                 pbitmap_program);
 }
 
-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 program)
+u16 hpi_tuner_set_program(u32 h_control, u32 program)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_PROGRAM,
-                program, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_PROGRAM, program,
+                0);
 }
 
-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *pprogram)
+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram)
 {
-        return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_PROGRAM,
-                pprogram);
+        return hpi_control_param1_get(h_control, HPI_TUNER_PROGRAM, pprogram);
 }
 
-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_dsp_version, const u32 string_size)
+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,
+        const u32 string_size)
 {
         return hpi_control_get_string(h_control,
                 HPI_TUNER_HDRADIO_DSP_VERSION, psz_dsp_version, string_size);
 }
 
-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_sdk_version, const u32 string_size)
+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,
+        const u32 string_size)
 {
         return hpi_control_get_string(h_control,
                 HPI_TUNER_HDRADIO_SDK_VERSION, psz_sdk_version, string_size);
 }
 
-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_status_mask, u16 *pw_status)
+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status)
 {
         u32 status = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_STATUS,
-                &status);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_STATUS, &status);
         if (pw_status) {
                 if (!error) {
                         *pw_status_mask = (u16)(status >> 16);
@@ -3005,50 +2658,44 @@ u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return error;
 }
 
-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 value)
+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_MODE,
-                mode, value);
+        return hpi_control_param_set(h_control, HPI_TUNER_MODE, mode, value);
 }
 
-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 *pn_value)
+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value)
 {
-        return hpi_control_param_get(ph_subsys, h_control, HPI_TUNER_MODE,
-                mode, 0, pn_value, NULL);
+        return hpi_control_param_get(h_control, HPI_TUNER_MODE, mode, 0,
+                pn_value, NULL);
 }
 
-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pquality)
+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
+        return hpi_control_param1_get(h_control,
                 HPI_TUNER_HDRADIO_SIGNAL_QUALITY, pquality);
 }
 
-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pblend)
+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TUNER_HDRADIO_BLEND, pblend);
+        return hpi_control_param1_get(h_control, HPI_TUNER_HDRADIO_BLEND,
+                pblend);
 }
 
-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 blend)
+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TUNER_HDRADIO_BLEND, blend, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_HDRADIO_BLEND,
+                blend, 0);
 }
 
-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *p_data)
+u16 hpi_tuner_get_rds(u32 h_control, char *p_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_TUNER_RDS;
         hpi_send_recv(&hm, &hr);
         if (p_data) {
@@ -3059,80 +2706,82 @@ u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_string, const u32 data_length)
+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,
+        const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_CHANNEL_NAME,
                 psz_string, data_length);
 }
 
-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_artist(u32 h_control, char *psz_string, const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_ARTIST, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_title(u32 h_control, char *psz_string, const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_TITLE, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,
+        const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_COMMENT, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *ppTY)
+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_PAD_PROGRAM_TYPE, ppTY);
+        return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_TYPE, ppTY);
 }
 
-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *ppI)
+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_PAD_PROGRAM_ID, ppI);
+        return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_ID, ppI);
 }
 
-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_volume, u32 *p_channels)
+u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels)
 {
-        return hpi_control_query(ph_subsys, h_volume, HPI_VOLUME_NUM_CHANNELS,
-                0, 0, p_channels);
+        return hpi_control_query(h_volume, HPI_VOLUME_NUM_CHANNELS, 0, 0,
+                p_channels);
 }
 
-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_log_gain[HPI_MAX_CHANNELS]
+u16 hpi_volume_set_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]
         )
 {
         return hpi_control_log_set2(h_control, HPI_VOLUME_GAIN,
                 an_log_gain[0], an_log_gain[1]);
 }
 
-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_log_gain[HPI_MAX_CHANNELS]
+u16 hpi_volume_get_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]
         )
 {
-        return hpi_control_log_get2(ph_subsys, h_control, HPI_VOLUME_GAIN,
+        return hpi_control_log_get2(h_control, HPI_VOLUME_GAIN,
                 &an_log_gain[0], &an_log_gain[1]);
 }
 
-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)
+u16 hpi_volume_set_mute(u32 h_control, u32 mute)
+{
+        return hpi_control_param_set(h_control, HPI_VOLUME_MUTE, mute, 0);
+}
+
+u16 hpi_volume_get_mute(u32 h_control, u32 *mute)
+{
+        return hpi_control_param1_get(h_control, HPI_VOLUME_MUTE, mute);
+}
+
+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOLUME_RANGE;
 
         hpi_send_recv(&hm, &hr);
@@ -3150,16 +2799,17 @@ u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],
-        u32 duration_ms, u16 profile)
+u16 hpi_volume_auto_fade_profile(u32 h_control,
+        short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,
+        u16 profile)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         memcpy(hm.u.c.an_log_value, an_stop_gain0_01dB,
                 sizeof(short) * HPI_MAX_CHANNELS);
@@ -3173,21 +2823,21 @@ u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_auto_fade(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms)
 {
-        return hpi_volume_auto_fade_profile(ph_subsys, h_control,
-                an_stop_gain0_01dB, duration_ms, HPI_VOLUME_AUTOFADE_LOG);
+        return hpi_volume_auto_fade_profile(h_control, an_stop_gain0_01dB,
+                duration_ms, HPI_VOLUME_AUTOFADE_LOG);
 }
 
-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB)
+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOX_THRESHOLD;
 
         hm.u.c.an_log_value[0] = an_gain0_01dB;
@@ -3197,14 +2847,14 @@ u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *an_gain0_01dB)
+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOX_THRESHOLD;
 
         hpi_send_recv(&hm, &hr);
@@ -3213,728 +2863,3 @@ u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         return hr.error;
 }
-
-static size_t strv_packet_size = MIN_STRV_PACKET_SIZE;
-
-static size_t entity_type_to_size[LAST_ENTITY_TYPE] = {
-        0,
-        sizeof(struct hpi_entity),
-        sizeof(void *),
-
-        sizeof(int),
-        sizeof(float),
-        sizeof(double),
-
-        sizeof(char),
-        sizeof(char),
-
-        4 * sizeof(char),
-        16 * sizeof(char),
-        6 * sizeof(char),
-};
-
-static inline size_t hpi_entity_size(struct hpi_entity *entity_ptr)
-{
-        return entity_ptr->header.size;
-}
-
-static inline size_t hpi_entity_header_size(struct hpi_entity *entity_ptr)
-{
-        return sizeof(entity_ptr->header);
-}
-
-static inline size_t hpi_entity_value_size(struct hpi_entity *entity_ptr)
-{
-        return hpi_entity_size(entity_ptr) -
-                hpi_entity_header_size(entity_ptr);
-}
-
-static inline size_t hpi_entity_item_count(struct hpi_entity *entity_ptr)
-{
-        return hpi_entity_value_size(entity_ptr) /
-                entity_type_to_size[entity_ptr->header.type];
-}
-
-static inline struct hpi_entity *hpi_entity_ptr_to_next(struct hpi_entity
-        *entity_ptr)
-{
-        return (void *)(((u8 *)entity_ptr) + hpi_entity_size(entity_ptr));
-}
-
-static inline u16 hpi_entity_check_type(const enum e_entity_type t)
-{
-        if (t >= 0 && t < STR_TYPE_FIELD_MAX)
-                return 0;
-        return HPI_ERROR_ENTITY_TYPE_INVALID;
-}
-
-static inline u16 hpi_entity_check_role(const enum e_entity_role r)
-{
-        if (r >= 0 && r < STR_ROLE_FIELD_MAX)
-                return 0;
-        return HPI_ERROR_ENTITY_ROLE_INVALID;
-}
-
-static u16 hpi_entity_get_next(struct hpi_entity *entity, int recursive_flag,
-        void *guard_p, struct hpi_entity **next)
-{
-        HPI_DEBUG_ASSERT(entity != NULL);
-        HPI_DEBUG_ASSERT(next != NULL);
-        HPI_DEBUG_ASSERT(hpi_entity_size(entity) != 0);
-
-        if (guard_p <= (void *)entity) {
-                *next = NULL;
-                return 0;
-        }
-
-        if (recursive_flag && entity->header.type == entity_type_sequence)
-                *next = (struct hpi_entity *)entity->value;
-        else
-                *next = (struct hpi_entity *)hpi_entity_ptr_to_next(entity);
-
-        if (guard_p <= (void *)*next) {
-                *next = NULL;
-                return 0;
-        }
-
-        HPI_DEBUG_ASSERT(guard_p >= (void *)hpi_entity_ptr_to_next(*next));
-        return 0;
-}
-
-u16 hpi_entity_find_next(struct hpi_entity *container_entity,
-        enum e_entity_type type, enum e_entity_role role, int recursive_flag,
-        struct hpi_entity **current_match)
-{
-        struct hpi_entity *tmp = NULL;
-        void *guard_p = NULL;
-
-        HPI_DEBUG_ASSERT(container_entity != NULL);
-        guard_p = hpi_entity_ptr_to_next(container_entity);
-
-        if (*current_match != NULL)
-                hpi_entity_get_next(*current_match, recursive_flag, guard_p,
-                        &tmp);
-        else
-                hpi_entity_get_next(container_entity, 1, guard_p, &tmp);
-
-        while (tmp) {
-                u16 err;
-
-                HPI_DEBUG_ASSERT((void *)tmp >= (void *)container_entity);
-
-                if ((!type || tmp->header.type == type) && (!role
-                                || tmp->header.role == role)) {
-                        *current_match = tmp;
-                        return 0;
-                }
-
-                err = hpi_entity_get_next(tmp, recursive_flag, guard_p,
-                        current_match);
-                if (err)
-                        return err;
-
-                tmp = *current_match;
-        }
-
-        *current_match = NULL;
-        return 0;
-}
-
-void hpi_entity_free(struct hpi_entity *entity)
-{
-        kfree(entity);
-}
-
-static u16 hpi_entity_alloc_and_copy(struct hpi_entity *src,
-        struct hpi_entity **dst)
-{
-        size_t buf_size;
-        HPI_DEBUG_ASSERT(dst != NULL);
-        HPI_DEBUG_ASSERT(src != NULL);
-
-        buf_size = hpi_entity_size(src);
-        *dst = kmalloc(buf_size, GFP_KERNEL);
-        if (*dst == NULL)
-                return HPI_ERROR_MEMORY_ALLOC;
-        memcpy(*dst, src, buf_size);
-        return 0;
-}
-
-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **info)
-{
-        struct hpi_msg_strv hm;
-        struct hpi_res_strv *phr;
-        u16 hpi_err;
-        int remaining_attempts = 2;
-        size_t resp_packet_size = 1024;
-
-        *info = NULL;
-
-        while (remaining_attempts--) {
-                phr = kmalloc(resp_packet_size, GFP_KERNEL);
-                HPI_DEBUG_ASSERT(phr != NULL);
-
-                hpi_init_message_responseV1(&hm.h, (u16)sizeof(hm), &phr->h,
-                        (u16)resp_packet_size, HPI_OBJ_CONTROL,
-                        HPI_CONTROL_GET_INFO);
-                u32TOINDEXES(hC, &hm.h.adapter_index, &hm.h.obj_index);
-
-                hm.strv.header.size = sizeof(hm.strv);
-                phr->strv.header.size = resp_packet_size - sizeof(phr->h);
-
-                hpi_send_recv((struct hpi_message *)&hm.h,
-                        (struct hpi_response *)&phr->h);
-                if (phr->h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {
-
-                        HPI_DEBUG_ASSERT(phr->h.specific_error >
-                                MIN_STRV_PACKET_SIZE
-                                && phr->h.specific_error < 1500);
-                        resp_packet_size = phr->h.specific_error;
-                } else {
-                        remaining_attempts = 0;
-                        if (!phr->h.error)
-                                hpi_entity_alloc_and_copy(&phr->strv, info);
-                }
-
-                hpi_err = phr->h.error;
-                kfree(phr);
-        }
-
-        return hpi_err;
-}
-
-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **value)
-{
-        struct hpi_msg_strv hm;
-        struct hpi_res_strv *phr;
-        u16 hpi_err;
-        int remaining_attempts = 2;
-
-        *value = NULL;
-
-        while (remaining_attempts--) {
-                phr = kmalloc(strv_packet_size, GFP_KERNEL);
-                if (!phr)
-                        return HPI_ERROR_MEMORY_ALLOC;
-
-                hpi_init_message_responseV1(&hm.h, (u16)sizeof(hm), &phr->h,
-                        (u16)strv_packet_size, HPI_OBJ_CONTROL,
-                        HPI_CONTROL_GET_STATE);
-                u32TOINDEXES(hC, &hm.h.adapter_index, &hm.h.obj_index);
-
-                hm.strv.header.size = sizeof(hm.strv);
-                phr->strv.header.size = strv_packet_size - sizeof(phr->h);
-
-                hpi_send_recv((struct hpi_message *)&hm.h,
-                        (struct hpi_response *)&phr->h);
-                if (phr->h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {
-
-                        HPI_DEBUG_ASSERT(phr->h.specific_error >
-                                MIN_STRV_PACKET_SIZE
-                                && phr->h.specific_error < 1000);
-                        strv_packet_size = phr->h.specific_error;
-                } else {
-                        remaining_attempts = 0;
-                        if (!phr->h.error)
-                                hpi_entity_alloc_and_copy(&phr->strv, value);
-                }
-
-                hpi_err = phr->h.error;
-                kfree(phr);
-        }
-
-        return hpi_err;
-}
-
-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity *value)
-{
-        struct hpi_msg_strv *phm;
-        struct hpi_res_strv hr;
-
-        phm = kmalloc(sizeof(phm->h) + value->header.size, GFP_KERNEL);
-        HPI_DEBUG_ASSERT(phm != NULL);
-
-        hpi_init_message_responseV1(&phm->h,
-                sizeof(phm->h) + value->header.size, &hr.h, sizeof(hr),
-                HPI_OBJ_CONTROL, HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(hC, &phm->h.adapter_index, &phm->h.obj_index);
-        hr.strv.header.size = sizeof(hr.strv);
-
-        memcpy(&phm->strv, value, value->header.size);
-        hpi_send_recv((struct hpi_message *)&phm->h,
-                (struct hpi_response *)&hr.h);
-
-        return hr.h.error;
-}
-
-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,
-        const size_t item_count, const enum e_entity_role role, void *value,
-        struct hpi_entity **entity)
-{
-        size_t bytes_to_copy, total_size;
-        u16 hE = 0;
-        *entity = NULL;
-
-        hE = hpi_entity_check_type(type);
-        if (hE)
-                return hE;
-
-        HPI_DEBUG_ASSERT(role > entity_role_null && type < LAST_ENTITY_TYPE);
-
-        bytes_to_copy = entity_type_to_size[type] * item_count;
-        total_size = hpi_entity_header_size(*entity) + bytes_to_copy;
-
-        HPI_DEBUG_ASSERT(total_size >= hpi_entity_header_size(*entity)
-                && total_size < STR_SIZE_FIELD_MAX);
-
-        *entity = kmalloc(total_size, GFP_KERNEL);
-        if (*entity == NULL)
-                return HPI_ERROR_MEMORY_ALLOC;
-        memcpy((*entity)->value, value, bytes_to_copy);
-        (*entity)->header.size =
-                hpi_entity_header_size(*entity) + bytes_to_copy;
-        (*entity)->header.type = type;
-        (*entity)->header.role = role;
-        return 0;
-}
-
-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,
-        enum e_entity_type type, size_t item_count, void *value_dst_p)
-{
-        size_t bytes_to_copy;
-
-        if (entity->header.type != type)
-                return HPI_ERROR_ENTITY_TYPE_MISMATCH;
-
-        if (hpi_entity_item_count(entity) != item_count)
-                return HPI_ERROR_ENTITY_ITEM_COUNT;
-
-        bytes_to_copy = entity_type_to_size[type] * item_count;
-        memcpy(value_dst_p, entity->value, bytes_to_copy);
-        return 0;
-}
-
-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,
-        size_t *item_count, enum e_entity_role *role, void **value)
-{
-        u16 err = 0;
-        HPI_DEBUG_ASSERT(entity != NULL);
-
-        if (type)
-                *type = entity->header.type;
-
-        if (role)
-                *role = entity->header.role;
-
-        if (value)
-                *value = entity->value;
-
-        if (item_count != NULL) {
-                if (entity->header.type == entity_type_sequence) {
-                        void *guard_p = hpi_entity_ptr_to_next(entity);
-                        struct hpi_entity *next = NULL;
-                        void *contents = entity->value;
-
-                        *item_count = 0;
-                        while (contents < guard_p) {
-                                (*item_count)++;
-                                err = hpi_entity_get_next(contents, 0,
-                                        guard_p, &next);
-                                if (next == NULL || err)
-                                        break;
-                                contents = next;
-                        }
-                } else {
-                        *item_count = hpi_entity_item_count(entity);
-                }
-        }
-        return err;
-}
-
-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0) {
-                *ph_gpio =
-                        hpi_indexes_to_handle(HPI_OBJ_GPIO, adapter_index, 0);
-                if (pw_number_input_bits)
-                        *pw_number_input_bits = hr.u.l.number_input_bits;
-                if (pw_number_output_bits)
-                        *pw_number_output_bits = hr.u.l.number_output_bits;
-        } else
-                *ph_gpio = 0;
-        return hr.error;
-}
-
-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 *pw_bit_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_READ_BIT);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-        hm.u.l.bit_index = bit_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *pw_bit_data = hr.u.l.bit_data[0];
-        return hr.error;
-}
-
-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        )
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_READ_ALL);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (aw_all_bit_data) {
-                aw_all_bit_data[0] = hr.u.l.bit_data[0];
-                aw_all_bit_data[1] = hr.u.l.bit_data[1];
-                aw_all_bit_data[2] = hr.u.l.bit_data[2];
-                aw_all_bit_data[3] = hr.u.l.bit_data[3];
-        }
-        return hr.error;
-}
-
-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 bit_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_WRITE_BIT);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-        hm.u.l.bit_index = bit_index;
-        hm.u.l.bit_data = bit_data;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        )
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO,
-                HPI_GPIO_WRITE_STATUS);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (aw_all_bit_data) {
-                aw_all_bit_data[0] = hr.u.l.bit_data[0];
-                aw_all_bit_data[1] = hr.u.l.bit_data[1];
-                aw_all_bit_data[2] = hr.u.l.bit_data[2];
-                aw_all_bit_data[3] = hr.u.l.bit_data[3];
-        }
-        return hr.error;
-}
-
-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *ph_async)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-
-                *ph_async =
-                        hpi_indexes_to_handle(HPI_OBJ_ASYNCEVENT,
-                        adapter_index, 0);
-        else
-                *ph_async = 0;
-        return hr.error;
-
-}
-
-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_OPEN);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned)
-{
-
-        return 0;
-}
-
-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,
-        u32 h_async, u16 *pw_count)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_GETCOUNT);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-                if (pw_count)
-                        *pw_count = hr.u.as.u.count.count;
-
-        return hr.error;
-}
-
-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_GET);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-        if (!hr.error) {
-                memcpy(p_events, &hr.u.as.u.event,
-                        sizeof(struct hpi_async_event));
-                *pw_number_returned = 1;
-        }
-
-        return hr.error;
-}
-
-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_nv_memory, u16 *pw_size_in_bytes)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0) {
-                *ph_nv_memory =
-                        hpi_indexes_to_handle(HPI_OBJ_NVMEMORY, adapter_index,
-                        0);
-                if (pw_size_in_bytes)
-                        *pw_size_in_bytes = hr.u.n.size_in_bytes;
-        } else
-                *ph_nv_memory = 0;
-        return hr.error;
-}
-
-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 *pw_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_READ_BYTE);
-        u32TOINDEX(h_nv_memory, &hm.adapter_index);
-        hm.u.n.address = index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *pw_data = hr.u.n.data;
-        return hr.error;
-}
-
-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_WRITE_BYTE);
-        u32TOINDEX(h_nv_memory, &hm.adapter_index);
-        hm.u.n.address = index;
-        hm.u.n.data = data;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 profile_index, u32 *ph_profile,
-        u16 *pw_max_profiles)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_OPEN_ALL);
-        hm.adapter_index = adapter_index;
-        hm.obj_index = profile_index;
-        hpi_send_recv(&hm, &hr);
-
-        *pw_max_profiles = hr.u.p.u.o.max_profiles;
-        if (hr.error == 0)
-                *ph_profile =
-                        hpi_indexes_to_handle(HPI_OBJ_PROFILE, adapter_index,
-                        profile_index);
-        else
-                *ph_profile = 0;
-        return hr.error;
-}
-
-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 bin_index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,
-        u32 *pmax_micro_seconds, u32 *pmin_micro_seconds)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE, HPI_PROFILE_GET);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hm.u.p.bin_index = bin_index;
-        hpi_send_recv(&hm, &hr);
-        if (pw_seconds)
-                *pw_seconds = hr.u.p.u.t.seconds;
-        if (pmicro_seconds)
-                *pmicro_seconds = hr.u.p.u.t.micro_seconds;
-        if (pcall_count)
-                *pcall_count = hr.u.p.u.t.call_count;
-        if (pmax_micro_seconds)
-                *pmax_micro_seconds = hr.u.p.u.t.max_micro_seconds;
-        if (pmin_micro_seconds)
-                *pmin_micro_seconds = hr.u.p.u.t.min_micro_seconds;
-        return hr.error;
-}
-
-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,
-        u32 h_profile, u32 *putilization)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_GET_UTILIZATION);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-        if (hr.error) {
-                if (putilization)
-                        *putilization = 0;
-        } else {
-                if (putilization)
-                        *putilization = hr.u.p.u.t.call_count;
-        }
-        return hr.error;
-}
-
-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 bin_index, char *sz_name, u16 name_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_GET_NAME);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hm.u.p.bin_index = bin_index;
-        hpi_send_recv(&hm, &hr);
-        if (hr.error) {
-                if (sz_name)
-                        strcpy(sz_name, "??");
-        } else {
-                if (sz_name)
-                        memcpy(sz_name, (char *)hr.u.p.u.n.sz_name,
-                                name_length);
-        }
-        return hr.error;
-}
-
-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_START_ALL);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_STOP_ALL);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_watchdog)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-                *ph_watchdog =
-                        hpi_indexes_to_handle(HPI_OBJ_WATCHDOG, adapter_index,
-                        0);
-        else
-                *ph_watchdog = 0;
-        return hr.error;
-}
-
-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,
-        u32 time_millisec)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_SET_TIME);
-        u32TOINDEX(h_watchdog, &hm.adapter_index);
-        hm.u.w.time_ms = time_millisec;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_PING);
-        u32TOINDEX(h_watchdog, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c
index 8e1d099ed7e4..628376ce4a49 100644
--- a/sound/pci/asihpi/hpimsginit.c
+++ b/sound/pci/asihpi/hpimsginit.c
@@ -32,21 +32,6 @@ static u16 res_size[HPI_OBJ_MAXINDEX + 1] = HPI_RESPONSE_SIZE_BY_OBJECT;
 static u16 gwSSX2_bypass;
 
 /** \internal
-  * Used by ASIO driver to disable SSX2 for a single process
-  * \param phSubSys Pointer to HPI subsystem handle.
-  * \param wBypass New bypass setting 0 = off, nonzero = on
-  * \return Previous bypass setting.
-  */
-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass)
-{
-        u16 old_value = gwSSX2_bypass;
-
-        gwSSX2_bypass = bypass;
-
-        return old_value;
-}
-
-/** \internal
   * initialize the HPI message structure
   */
 static void hpi_init_message(struct hpi_message *phm, u16 object,
@@ -65,7 +50,8 @@ static void hpi_init_message(struct hpi_message *phm, u16 object,
         phm->object = object;
         phm->function = function;
         phm->version = 0;
-        /* Expect adapter index to be set by caller */
+        phm->adapter_index = HPI_ADAPTER_INDEX_INVALID;
+        /* Expect actual adapter index to be set by caller */
 }
 
 /** \internal
diff --git a/sound/pci/asihpi/hpimsginit.h b/sound/pci/asihpi/hpimsginit.h
index 864ad020c9b3..bfd330d78b58 100644
--- a/sound/pci/asihpi/hpimsginit.h
+++ b/sound/pci/asihpi/hpimsginit.h
@@ -21,11 +21,15 @@
  (C) Copyright AudioScience Inc. 2007
 *******************************************************************************/
 /* Initialise response headers, or msg/response pairs.
-Note that it is valid to just init a response e.g. when a lower level is preparing
-a response to a message.
-However, when sending a message, a matching response buffer always must be prepared
+Note that it is valid to just init a response e.g. when a lower level is
+preparing a response to a message.
+However, when sending a message, a matching response buffer must always be
+prepared.
 */
 
+#ifndef _HPIMSGINIT_H_
+#define _HPIMSGINIT_H_
+
 void hpi_init_response(struct hpi_response *phr, u16 object, u16 function,
         u16 error);
 
@@ -38,3 +42,5 @@ void hpi_init_responseV1(struct hpi_response_header *phr, u16 size,
 void hpi_init_message_responseV1(struct hpi_message_header *phm, u16 msg_size,
         struct hpi_response_header *phr, u16 res_size, u16 object,
         u16 function);
+
+#endif                          /* _HPIMSGINIT_H_ */
diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
index f01ab964f602..7352a5f7b4f7 100644
--- a/sound/pci/asihpi/hpimsgx.c
+++ b/sound/pci/asihpi/hpimsgx.c
@@ -23,6 +23,7 @@ Extended Message Function With Response Cacheing
 #define SOURCEFILE_NAME "hpimsgx.c"
 #include "hpi_internal.h"
 #include "hpimsginit.h"
+#include "hpicmn.h"
 #include "hpimsgx.h"
 #include "hpidebug.h"
 
@@ -42,22 +43,24 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci
 
         for (i = 0; asihpi_pci_tbl[i].vendor != 0; i++) {
                 if (asihpi_pci_tbl[i].vendor != PCI_ANY_ID
-                        && asihpi_pci_tbl[i].vendor != pci_info->vendor_id)
+                        && asihpi_pci_tbl[i].vendor !=
+                        pci_info->pci_dev->vendor)
                         continue;
                 if (asihpi_pci_tbl[i].device != PCI_ANY_ID
-                        && asihpi_pci_tbl[i].device != pci_info->device_id)
+                        && asihpi_pci_tbl[i].device !=
+                        pci_info->pci_dev->device)
                         continue;
                 if (asihpi_pci_tbl[i].subvendor != PCI_ANY_ID
                         && asihpi_pci_tbl[i].subvendor !=
-                        pci_info->subsys_vendor_id)
+                        pci_info->pci_dev->subsystem_vendor)
                         continue;
                 if (asihpi_pci_tbl[i].subdevice != PCI_ANY_ID
                         && asihpi_pci_tbl[i].subdevice !=
-                        pci_info->subsys_device_id)
+                        pci_info->pci_dev->subsystem_device)
                         continue;
 
-                HPI_DEBUG_LOG(DEBUG, " %x,%lu\n", i,
-                        asihpi_pci_tbl[i].driver_data);
+                /* HPI_DEBUG_LOG(DEBUG, " %x,%lx\n", i,
+                   asihpi_pci_tbl[i].driver_data); */
                 return (hpi_handler_func *) asihpi_pci_tbl[i].driver_data;
         }
 
@@ -67,21 +70,12 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci
 static inline void hw_entry_point(struct hpi_message *phm,
         struct hpi_response *phr)
 {
-
-        hpi_handler_func *ep;
-
-        if (phm->adapter_index < HPI_MAX_ADAPTERS) {
-                ep = (hpi_handler_func *) hpi_entry_points[phm->
-                        adapter_index];
-                if (ep) {
-                        HPI_DEBUG_MESSAGE(DEBUG, phm);
-                        ep(phm, phr);
-                        HPI_DEBUG_RESPONSE(phr);
-                        return;
-                }
-        }
-        hpi_init_response(phr, phm->object, phm->function,
-                HPI_ERROR_PROCESSING_MESSAGE);
+        if ((phm->adapter_index < HPI_MAX_ADAPTERS)
+                && hpi_entry_points[phm->adapter_index])
+                hpi_entry_points[phm->adapter_index] (phm, phr);
+        else
+                hpi_init_response(phr, phm->object, phm->function,
+                        HPI_ERROR_PROCESSING_MESSAGE);
 }
 
 static void adapter_open(struct hpi_message *phm, struct hpi_response *phr);
@@ -100,6 +94,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
         void *h_owner);
 
 static void HPIMSGX__reset(u16 adapter_index);
+
 static u16 HPIMSGX__init(struct hpi_message *phm, struct hpi_response *phr);
 static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner);
 
@@ -153,8 +148,6 @@ static struct hpi_stream_response
 
 static struct hpi_mixer_response rESP_HPI_MIXER_OPEN[HPI_MAX_ADAPTERS];
 
-static struct hpi_subsys_response gRESP_HPI_SUBSYS_FIND_ADAPTERS;
-
 static struct adapter_info aDAPTER_INFO[HPI_MAX_ADAPTERS];
 
 /* use these to keep track of opens from user mode apps/DLLs */
@@ -167,6 +160,11 @@ static struct asi_open_state
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,
         void *h_owner)
 {
+        if (phm->adapter_index != HPI_ADAPTER_INDEX_INVALID)
+                HPI_DEBUG_LOG(WARNING,
+                        "suspicious adapter index %d in subsys message 0x%x.\n",
+                        phm->adapter_index, phm->function);
+
         switch (phm->function) {
         case HPI_SUBSYS_GET_VERSION:
                 hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
@@ -204,85 +202,19 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,
                         HPI_SUBSYS_DRIVER_UNLOAD, 0);
                 return;
 
-        case HPI_SUBSYS_GET_INFO:
-                HPI_COMMON(phm, phr);
-                break;
-
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                memcpy(phr, &gRESP_HPI_SUBSYS_FIND_ADAPTERS,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-                break;
         case HPI_SUBSYS_GET_NUM_ADAPTERS:
-                memcpy(phr, &gRESP_HPI_SUBSYS_FIND_ADAPTERS,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-                phr->function = HPI_SUBSYS_GET_NUM_ADAPTERS;
-                break;
         case HPI_SUBSYS_GET_ADAPTER:
-                {
-                        int count = phm->adapter_index;
-                        int index = 0;
-                        hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
-                                HPI_SUBSYS_GET_ADAPTER, 0);
-
-                        /* This is complicated by the fact that we want to
-                         * "skip" 0's in the adapter list.
-                         * First, make sure we are pointing to a
-                         * non-zero adapter type.
-                         */
-                        while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                s.aw_adapter_list[index] == 0) {
-                                index++;
-                                if (index >= HPI_MAX_ADAPTERS)
-                                        break;
-                        }
-                        while (count) {
-                                /* move on to the next adapter */
-                                index++;
-                                if (index >= HPI_MAX_ADAPTERS)
-                                        break;
-                                while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                        s.aw_adapter_list[index] == 0) {
-                                        index++;
-                                        if (index >= HPI_MAX_ADAPTERS)
-                                                break;
-                                }
-                                count--;
-                        }
+                HPI_COMMON(phm, phr);
+                break;
 
-                        if (index < HPI_MAX_ADAPTERS) {
-                                phr->u.s.adapter_index = (u16)index;
-                                phr->u.s.aw_adapter_list[0] =
-                                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                        s.aw_adapter_list[index];
-                        } else {
-                                phr->u.s.adapter_index = 0;
-                                phr->u.s.aw_adapter_list[0] = 0;
-                                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
-                        }
-                        break;
-                }
         case HPI_SUBSYS_CREATE_ADAPTER:
                 HPIMSGX__init(phm, phr);
                 break;
-        case HPI_SUBSYS_DELETE_ADAPTER:
-                HPIMSGX__cleanup(phm->adapter_index, h_owner);
-                {
-                        struct hpi_message hm;
-                        struct hpi_response hr;
-                        /* call to HPI_ADAPTER_CLOSE */
-                        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                                HPI_ADAPTER_CLOSE);
-                        hm.adapter_index = phm->adapter_index;
-                        hw_entry_point(&hm, &hr);
-                }
-                hw_entry_point(phm, phr);
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.
-                        aw_adapter_list[phm->adapter_index]
-                        = 0;
-                hpi_entry_points[phm->adapter_index] = NULL;
-                break;
+
         default:
-                hw_entry_point(phm, phr);
+                /* Must explicitly handle every subsys message in this switch */
+                hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm->function,
+                        HPI_ERROR_INVALID_FUNC);
                 break;
         }
 }
@@ -297,6 +229,19 @@ static void adapter_message(struct hpi_message *phm, struct hpi_response *phr,
         case HPI_ADAPTER_CLOSE:
                 adapter_close(phm, phr);
                 break;
+        case HPI_ADAPTER_DELETE:
+                HPIMSGX__cleanup(phm->adapter_index, h_owner);
+                {
+                        struct hpi_message hm;
+                        struct hpi_response hr;
+                        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
+                                HPI_ADAPTER_CLOSE);
+                        hm.adapter_index = phm->adapter_index;
+                        hw_entry_point(&hm, &hr);
+                }
+                hw_entry_point(phm, phr);
+                break;
+
         default:
                 hw_entry_point(phm, phr);
                 break;
@@ -409,33 +354,7 @@ void hpi_send_recv_ex(struct hpi_message *phm, struct hpi_response *phr,
                 break;
         }
         HPI_DEBUG_RESPONSE(phr);
-#if 1
-        if (phr->error >= HPI_ERROR_BACKEND_BASE) {
-                void *ep = NULL;
-                char *ep_name;
-
-                HPI_DEBUG_MESSAGE(ERROR, phm);
-
-                if (phm->adapter_index < HPI_MAX_ADAPTERS)
-                        ep = hpi_entry_points[phm->adapter_index];
-
-                /* Don't need this? Have adapter index in debug info
-                   Know at driver load time index->backend mapping */
-                if (ep == HPI_6000)
-                        ep_name = "HPI_6000";
-                else if (ep == HPI_6205)
-                        ep_name = "HPI_6205";
-                else
-                        ep_name = "unknown";
-
-                HPI_DEBUG_LOG(ERROR, "HPI %s response - error# %d\n", ep_name,
-                        phr->error);
-
-                if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)
-                        hpi_debug_data((u16 *)phm,
-                                sizeof(*phm) / sizeof(u16));
-        }
-#endif
+
 }
 
 static void adapter_open(struct hpi_message *phm, struct hpi_response *phr)
@@ -484,7 +403,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,
         else {
                 instream_user_open[phm->adapter_index][phm->
                         obj_index].open_flag = 1;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
 
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
@@ -509,7 +428,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,
                                 sizeof(rESP_HPI_ISTREAM_OPEN[0][0]));
                 }
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
@@ -530,7 +449,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
                    phm->wAdapterIndex, phm->wObjIndex, hOwner); */
                 instream_user_open[phm->adapter_index][phm->
                         obj_index].h_owner = NULL;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                         HPI_ISTREAM_RESET);
@@ -556,7 +475,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
                                 obj_index].h_owner);
                 phr->error = HPI_ERROR_OBJ_NOT_OPEN;
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
@@ -581,7 +500,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
         else {
                 outstream_user_open[phm->adapter_index][phm->
                         obj_index].open_flag = 1;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
 
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
@@ -606,7 +525,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
                                 sizeof(rESP_HPI_OSTREAM_OPEN[0][0]));
                 }
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
@@ -628,7 +547,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
                    phm->wAdapterIndex, phm->wObjIndex, hOwner); */
                 outstream_user_open[phm->adapter_index][phm->
                         obj_index].h_owner = NULL;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                         HPI_OSTREAM_RESET);
@@ -654,7 +573,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
                                 obj_index].h_owner);
                 phr->error = HPI_ERROR_OBJ_NOT_OPEN;
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static u16 adapter_prepare(u16 adapter)
@@ -683,16 +602,9 @@ static u16 adapter_prepare(u16 adapter)
         if (hr.error)
                 return hr.error;
 
-        aDAPTER_INFO[adapter].num_outstreams = hr.u.a.num_outstreams;
-        aDAPTER_INFO[adapter].num_instreams = hr.u.a.num_instreams;
-        aDAPTER_INFO[adapter].type = hr.u.a.adapter_type;
-
-        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list[adapter] =
-                hr.u.a.adapter_type;
-        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters++;
-        if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters > HPI_MAX_ADAPTERS)
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters =
-                        HPI_MAX_ADAPTERS;
+        aDAPTER_INFO[adapter].num_outstreams = hr.u.ax.info.num_outstreams;
+        aDAPTER_INFO[adapter].num_instreams = hr.u.ax.info.num_instreams;
+        aDAPTER_INFO[adapter].type = hr.u.ax.info.adapter_type;
 
         /* call to HPI_OSTREAM_OPEN */
         for (i = 0; i < aDAPTER_INFO[adapter].num_outstreams; i++) {
@@ -727,7 +639,7 @@ static u16 adapter_prepare(u16 adapter)
         memcpy(&rESP_HPI_MIXER_OPEN[adapter], &hr,
                 sizeof(rESP_HPI_MIXER_OPEN[0]));
 
-        return gRESP_HPI_SUBSYS_FIND_ADAPTERS.h.error;
+        return 0;
 }
 
 static void HPIMSGX__reset(u16 adapter_index)
@@ -737,12 +649,6 @@ static void HPIMSGX__reset(u16 adapter_index)
         struct hpi_response hr;
 
         if (adapter_index == HPIMSGX_ALLADAPTERS) {
-                /* reset all responses to contain errors */
-                hpi_init_response(&hr, HPI_OBJ_SUBSYSTEM,
-                        HPI_SUBSYS_FIND_ADAPTERS, 0);
-                memcpy(&gRESP_HPI_SUBSYS_FIND_ADAPTERS, &hr,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-
                 for (adapter = 0; adapter < HPI_MAX_ADAPTERS; adapter++) {
 
                         hpi_init_response(&hr, HPI_OBJ_ADAPTER,
@@ -783,12 +689,6 @@ static void HPIMSGX__reset(u16 adapter_index)
                         rESP_HPI_ISTREAM_OPEN[adapter_index][i].h.error =
                                 HPI_ERROR_INVALID_OBJ;
                 }
-                if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                        s.aw_adapter_list[adapter_index]) {
-                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                s.aw_adapter_list[adapter_index] = 0;
-                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters--;
-                }
         }
 }
 
@@ -802,15 +702,9 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
         hpi_handler_func *entry_point_func;
         struct hpi_response hr;
 
-        if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters >= HPI_MAX_ADAPTERS)
-                return HPI_ERROR_BAD_ADAPTER_NUMBER;
-
         /* Init response here so we can pass in previous adapter list */
         hpi_init_response(&hr, phm->object, phm->function,
                 HPI_ERROR_INVALID_OBJ);
-        memcpy(hr.u.s.aw_adapter_list,
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list,
-                sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list));
 
         entry_point_func =
                 hpi_lookup_entry_point_function(phm->u.s.resource.r.pci);
@@ -823,7 +717,7 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
                 return phr->error;
         }
         if (hr.error == 0) {
-                /* the adapter was created succesfully
+                /* the adapter was created successfully
                    save the mapping for future use */
                 hpi_entry_points[hr.u.s.adapter_index] = entry_point_func;
                 /* prepare adapter (pre-open streams etc.) */
@@ -860,7 +754,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)
                                 struct hpi_response hr;
 
                                 HPI_DEBUG_LOG(DEBUG,
-                                        "close adapter %d ostream %d\n",
+                                        "Close adapter %d ostream %d\n",
                                         adapter, i);
 
                                 hpi_init_message_response(&hm, &hr,
@@ -884,7 +778,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)
                                 struct hpi_response hr;
 
                                 HPI_DEBUG_LOG(DEBUG,
-                                        "close adapter %d istream %d\n",
+                                        "Close adapter %d istream %d\n",
                                         adapter, i);
 
                                 hpi_init_message_response(&hm, &hr,
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 62895a719fcb..d8e7047512f8 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -25,11 +25,13 @@ Common Linux HPI ioctl and module probe/remove functions
 #include "hpidebug.h"
 #include "hpimsgx.h"
 #include "hpioctl.h"
+#include "hpicmn.h"
 
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <asm/uaccess.h>
+#include <linux/pci.h>
 #include <linux/stringify.h>
 
 #ifdef MODULE_FIRMWARE
@@ -45,7 +47,7 @@ MODULE_FIRMWARE("asihpi/dsp8900.bin");
 static int prealloc_stream_buf;
 module_param(prealloc_stream_buf, int, S_IRUGO);
 MODULE_PARM_DESC(prealloc_stream_buf,
-        "preallocate size for per-adapter stream buffer");
+        "Preallocate size for per-adapter stream buffer");
 
 /* Allow the debug level to be changed after module load.
  E.g.   echo 2 > /sys/module/asihpi/parameters/hpiDebugLevel
@@ -121,8 +123,8 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg;
 
         /* Read the message and response pointers from user space.  */
-        if (get_user(puhm, &phpi_ioctl_data->phm) ||
-            get_user(puhr, &phpi_ioctl_data->phr)) {
+        if (get_user(puhm, &phpi_ioctl_data->phm)
+                || get_user(puhr, &phpi_ioctl_data->phr)) {
                 err = -EFAULT;
                 goto out;
         }
@@ -135,7 +137,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (hm->h.size > sizeof(*hm))
                 hm->h.size = sizeof(*hm);
 
-        /*printk(KERN_INFO "message size %d\n", hm->h.wSize); */
+        /* printk(KERN_INFO "message size %d\n", hm->h.wSize); */
 
         uncopied_bytes = copy_from_user(hm, puhm, hm->h.size);
         if (uncopied_bytes) {
@@ -155,26 +157,29 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 goto out;
         }
 
-        pa = &adapters[hm->h.adapter_index];
-        hr->h.size = 0;
-        if (hm->h.object == HPI_OBJ_SUBSYSTEM) {
-                switch (hm->h.function) {
-                case HPI_SUBSYS_CREATE_ADAPTER:
-                case HPI_SUBSYS_DELETE_ADAPTER:
-                        /* Application must not use these functions! */
-                        hr->h.size = sizeof(hr->h);
-                        hr->h.error = HPI_ERROR_INVALID_OPERATION;
-                        hr->h.function = hm->h.function;
-                        uncopied_bytes = copy_to_user(puhr, hr, hr->h.size);
-                        if (uncopied_bytes)
-                                err = -EFAULT;
-                        else
-                                err = 0;
-                        goto out;
+        if (hm->h.adapter_index >= HPI_MAX_ADAPTERS) {
+                err = -EINVAL;
+                goto out;
+        }
 
-                default:
-                        hpi_send_recv_f(&hm->m0, &hr->r0, file);
-                }
+        switch (hm->h.function) {
+        case HPI_SUBSYS_CREATE_ADAPTER:
+        case HPI_ADAPTER_DELETE:
+                /* Application must not use these functions! */
+                hr->h.size = sizeof(hr->h);
+                hr->h.error = HPI_ERROR_INVALID_OPERATION;
+                hr->h.function = hm->h.function;
+                uncopied_bytes = copy_to_user(puhr, hr, hr->h.size);
+                if (uncopied_bytes)
+                        err = -EFAULT;
+                else
+                        err = 0;
+                goto out;
+        }
+
+        hr->h.size = res_max_size;
+        if (hm->h.object == HPI_OBJ_SUBSYSTEM) {
+                hpi_send_recv_f(&hm->m0, &hr->r0, file);
         } else {
                 u16 __user *ptr = NULL;
                 u32 size = 0;
@@ -182,8 +187,9 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 /* -1=no data 0=read from user mem, 1=write to user mem */
                 int wrflag = -1;
                 u32 adapter = hm->h.adapter_index;
+                pa = &adapters[adapter];
 
-                if ((hm->h.adapter_index > HPI_MAX_ADAPTERS) || (!pa->type)) {
+                if ((adapter > HPI_MAX_ADAPTERS) || (!pa->type)) {
                         hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER,
                                 HPI_ADAPTER_OPEN,
                                 HPI_ERROR_BAD_ADAPTER_NUMBER);
@@ -216,7 +222,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                  */
                                 if (pa->buffer_size < size) {
                                         HPI_DEBUG_LOG(DEBUG,
-                                                "realloc adapter %d stream "
+                                                "Realloc adapter %d stream "
                                                 "buffer from %zd to %d\n",
                                                 hm->h.adapter_index,
                                                 pa->buffer_size, size);
@@ -259,7 +265,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 copy_from_user(pa->p_buffer, ptr, size);
                         if (uncopied_bytes)
                                 HPI_DEBUG_LOG(WARNING,
-                                        "missed %d of %d "
+                                        "Missed %d of %d "
                                         "bytes from user\n", uncopied_bytes,
                                         size);
                 }
@@ -271,7 +277,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 copy_to_user(ptr, pa->p_buffer, size);
                         if (uncopied_bytes)
                                 HPI_DEBUG_LOG(WARNING,
-                                        "missed %d of %d " "bytes to user\n",
+                                        "Missed %d of %d " "bytes to user\n",
                                         uncopied_bytes, size);
                 }
 
@@ -290,9 +296,9 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (hr->h.size > res_max_size) {
                 HPI_DEBUG_LOG(ERROR, "response too big %d %d\n", hr->h.size,
                         res_max_size);
-                /*HPI_DEBUG_MESSAGE(ERROR, hm); */
-                err = -EFAULT;
-                goto out;
+                hr->h.error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;
+                hr->h.specific_error = hr->h.size;
+                hr->h.size = sizeof(hr->h);
         }
 
         uncopied_bytes = copy_to_user(puhr, hr, hr->h.size);
@@ -311,7 +317,7 @@ out:
 int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         const struct pci_device_id *pci_id)
 {
-        int err, idx, nm;
+        int idx, nm;
         unsigned int memlen;
         struct hpi_message hm;
         struct hpi_response hr;
@@ -320,28 +326,33 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
 
         memset(&adapter, 0, sizeof(adapter));
 
-        printk(KERN_DEBUG "probe PCI device (%04x:%04x,%04x:%04x,%04x)\n",
-                pci_dev->vendor, pci_dev->device, pci_dev->subsystem_vendor,
+        dev_printk(KERN_DEBUG, &pci_dev->dev,
+                "probe %04x:%04x,%04x:%04x,%04x\n", pci_dev->vendor,
+                pci_dev->device, pci_dev->subsystem_vendor,
                 pci_dev->subsystem_device, pci_dev->devfn);
 
+        if (pci_enable_device(pci_dev) < 0) {
+                dev_printk(KERN_ERR, &pci_dev->dev,
+                        "pci_enable_device failed, disabling device\n");
+                return -EIO;
+        }
+
+        pci_set_master(pci_dev);        /* also sets latency timer if < 16 */
+
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_CREATE_ADAPTER);
         hpi_init_response(&hr, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CREATE_ADAPTER,
                 HPI_ERROR_PROCESSING_MESSAGE);
 
-        hm.adapter_index = -1;  /* an invalid index */
+        hm.adapter_index = HPI_ADAPTER_INDEX_INVALID;
 
-        /* fill in HPI_PCI information from kernel provided information */
         adapter.pci = pci_dev;
 
         nm = HPI_MAX_ADAPTER_MEM_SPACES;
 
         for (idx = 0; idx < nm; idx++) {
-                HPI_DEBUG_LOG(INFO, "resource %d %s %08llx-%08llx %04llx\n",
-                        idx, pci_dev->resource[idx].name,
-                        (unsigned long long)pci_resource_start(pci_dev, idx),
-                        (unsigned long long)pci_resource_end(pci_dev, idx),
-                        (unsigned long long)pci_resource_flags(pci_dev, idx));
+                HPI_DEBUG_LOG(INFO, "resource %d %pR\n", idx,
+                        &pci_dev->resource[idx]);
 
                 if (pci_resource_flags(pci_dev, idx) & IORESOURCE_MEM) {
                         memlen = pci_resource_len(pci_dev, idx);
@@ -359,19 +370,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
                 pci.ap_mem_base[idx] = adapter.ap_remapped_mem_base[idx];
         }
 
-        /* could replace Pci with direct pointer to pci_dev for linux
-           Instead wrap accessor functions for IDs etc.
-           Would it work for windows?
-         */
-        pci.bus_number = pci_dev->bus->number;
-        pci.vendor_id = (u16)pci_dev->vendor;
-        pci.device_id = (u16)pci_dev->device;
-        pci.subsys_vendor_id = (u16)(pci_dev->subsystem_vendor & 0xffff);
-        pci.subsys_device_id = (u16)(pci_dev->subsystem_device & 0xffff);
-        pci.device_number = pci_dev->devfn;
-        pci.interrupt = pci_dev->irq;
-        pci.p_os_data = pci_dev;
-
+        pci.pci_dev = pci_dev;
         hm.u.s.resource.bus_type = HPI_BUS_PCI;
         hm.u.s.resource.r.pci = &pci;
 
@@ -392,23 +391,27 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         }
 
         adapter.index = hr.u.s.adapter_index;
-        adapter.type = hr.u.s.aw_adapter_list[adapter.index];
+        adapter.type = hr.u.s.adapter_type;
+
+        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
+                HPI_ADAPTER_OPEN);
         hm.adapter_index = adapter.index;
+        hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
 
-        err = hpi_adapter_open(NULL, adapter.index);
-        if (err)
+        if (hr.error)
                 goto err;
 
         adapter.snd_card_asihpi = NULL;
         /* WARNING can't init mutex in 'adapter'
          * and then copy it to adapters[] ?!?!
          */
-        adapters[hr.u.s.adapter_index] = adapter;
+        adapters[adapter.index] = adapter;
         mutex_init(&adapters[adapter.index].mutex);
         pci_set_drvdata(pci_dev, &adapters[adapter.index]);
 
-        printk(KERN_INFO "probe found adapter ASI%04X HPI index #%d.\n",
-                adapter.type, adapter.index);
+        dev_printk(KERN_INFO, &pci_dev->dev,
+                "probe succeeded for ASI%04X HPI index %d\n", adapter.type,
+                adapter.index);
 
         return 0;
 
@@ -435,10 +438,10 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
         struct hpi_message hm;
         struct hpi_response hr;
         struct hpi_adapter *pa;
-        pa = (struct hpi_adapter *)pci_get_drvdata(pci_dev);
+        pa = pci_get_drvdata(pci_dev);
 
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_DELETE_ADAPTER);
+        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
+                HPI_ADAPTER_DELETE);
         hm.adapter_index = pa->index;
         hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
 
@@ -450,20 +453,18 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
                 }
         }
 
-        if (pa->p_buffer) {
-                pa->buffer_size = 0;
+        if (pa->p_buffer)
                 vfree(pa->p_buffer);
-        }
 
         pci_set_drvdata(pci_dev, NULL);
-        /*
-           printk(KERN_INFO "PCI device (%04x:%04x,%04x:%04x,%04x),"
-           " HPI index # %d, removed.\n",
-           pci_dev->vendor, pci_dev->device,
-           pci_dev->subsystem_vendor,
-           pci_dev->subsystem_device, pci_dev->devfn,
-           pa->index);
-         */
+        if (1)
+                dev_printk(KERN_INFO, &pci_dev->dev,
+                        "remove %04x:%04x,%04x:%04x,%04x," " HPI index %d.\n",
+                        pci_dev->vendor, pci_dev->device,
+                        pci_dev->subsystem_vendor, pci_dev->subsystem_device,
+                        pci_dev->devfn, pa->index);
+
+        memset(pa, 0, sizeof(*pa));
 }
 
 void __init asihpi_init(void)
diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h
index 370f39b43f85..03273e729f99 100644
--- a/sound/pci/asihpi/hpios.h
+++ b/sound/pci/asihpi/hpios.h
@@ -27,9 +27,7 @@ HPI Operating System Specific macros for Linux Kernel driver
 #define HPI_OS_LINUX_KERNEL
 
 #define HPI_OS_DEFINED
-#define HPI_KERNEL_MODE
-
-#define HPI_REASSIGN_DUPLICATE_ADAPTER_IDX
+#define HPI_BUILD_KERNEL_MODE
 
 #include <linux/io.h>
 #include <asm/system.h>
@@ -135,20 +133,20 @@ static inline void cond_unlock(struct hpios_spinlock *l)
 
 #define hpios_msgxlock_init(obj)      spin_lock_init(&(obj)->lock)
 #define hpios_msgxlock_lock(obj)   cond_lock(obj)
-#define hpios_msgxlock_un_lock(obj) cond_unlock(obj)
+#define hpios_msgxlock_unlock(obj) cond_unlock(obj)
 
 #define hpios_dsplock_init(obj)       spin_lock_init(&(obj)->dsp_lock.lock)
 #define hpios_dsplock_lock(obj)    cond_lock(&(obj)->dsp_lock)
 #define hpios_dsplock_unlock(obj)  cond_unlock(&(obj)->dsp_lock)
 
 #ifdef CONFIG_SND_DEBUG
-#define HPI_DEBUG
+#define HPI_BUILD_DEBUG
 #endif
 
 #define HPI_ALIST_LOCKING
 #define hpios_alistlock_init(obj)    spin_lock_init(&((obj)->list_lock.lock))
 #define hpios_alistlock_lock(obj) spin_lock(&((obj)->list_lock.lock))
-#define hpios_alistlock_un_lock(obj) spin_unlock(&((obj)->list_lock.lock))
+#define hpios_alistlock_unlock(obj) spin_unlock(&((obj)->list_lock.lock))
 
 struct hpi_adapter {
         /* mutex prevents contention for one card
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 49d572a7b235..3119cd97a217 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -522,7 +522,7 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
                 atiixp_read(chip, CMD);
                 mdelay(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-                if (--timeout) {
+                if (!--timeout) {
                         snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
                         break;
                 }
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 91d7036b6411..2f74c2fdf1ea 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -498,7 +498,7 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)
                 atiixp_read(chip, CMD);
                 msleep(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-                if (--timeout) {
+                if (!--timeout) {
                         snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");
                         break;
                 }
diff --git a/sound/pci/au88x0/au8810.h b/sound/pci/au88x0/au8810.h
index 5d69c31fe3f4..79fbee3845eb 100644
--- a/sound/pci/au88x0/au8810.h
+++ b/sound/pci/au88x0/au8810.h
@@ -4,7 +4,7 @@
 
 #define CHIP_AU8810
 
-#define CARD_NAME "Aureal Advantage 3D Sound Processor"
+#define CARD_NAME "Aureal Advantage"
 #define CARD_NAME_SHORT "au8810"
 
 #define NR_ADB          0x10
diff --git a/sound/pci/au88x0/au8820.h b/sound/pci/au88x0/au8820.h
index abbe85e4f7a9..cafdb9668a34 100644
--- a/sound/pci/au88x0/au8820.h
+++ b/sound/pci/au88x0/au8820.h
@@ -11,7 +11,7 @@
 
 #define CHIP_AU8820
 
-#define CARD_NAME "Aureal Vortex 3D Sound Processor"
+#define CARD_NAME "Aureal Vortex"
 #define CARD_NAME_SHORT "au8820"
 
 /* Number of ADB and WT channels */
diff --git a/sound/pci/au88x0/au8830.h b/sound/pci/au88x0/au8830.h
index 04ece1b1c218..999b29ab34ad 100644
--- a/sound/pci/au88x0/au8830.h
+++ b/sound/pci/au88x0/au8830.h
@@ -11,7 +11,7 @@
 
 #define CHIP_AU8830
 
-#define CARD_NAME "Aureal Vortex 2 3D Sound Processor"
+#define CARD_NAME "Aureal Vortex 2"
 #define CARD_NAME_SHORT "au8830"
 
 #define NR_ADB 0x20
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index cf46bba563cf..02f6e08f7592 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -104,7 +104,7 @@
 #define MIX_PLAYB(x) (vortex->mixplayb[x])
 #define MIX_SPDIF(x) (vortex->mixspdif[x])
 
-#define NR_WTPB 0x20            /* WT channels per eahc bank. */
+#define NR_WTPB 0x20            /* WT channels per each bank. */
 
 /* Structs */
 typedef struct {
@@ -211,7 +211,7 @@ static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma);
 //static void vortex_adbdma_stopfifo(vortex_t *vortex, int adbdma);
 static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma);
 static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma);
-static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma);
+static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma);
 static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma);
 
 #ifndef CHIP_AU8810
@@ -219,7 +219,7 @@ static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma);
 static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma);
 static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma);
 static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma);
-static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma);
+static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma);
 #endif
 
 /* global stuff. */
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index f4aa8ff6f5f9..9ae8b3b17651 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -53,7 +53,7 @@ a3dsrc_GetTimeConsts(a3dsrc_t * a, short *HrtfTrack, short *ItdTrack,
 }
 
 #endif
-/* Atmospheric absorbtion. */
+/* Atmospheric absorption. */
 
 static void
 a3dsrc_SetAtmosTarget(a3dsrc_t * a, short aa, short b, short c, short d,
@@ -835,7 +835,7 @@ snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol,
                 params[i] = ucontrol->value.integer.value[i];
         /* Translate generic filter params to a3d filter params. */
         vortex_a3d_translate_filter(a->filter, params);
-        /* Atmospheric absorbtion and filtering. */
+        /* Atmospheric absorption and filtering. */
         a3dsrc_SetAtmosTarget(a, a->filter[0],
                               a->filter[1], a->filter[2],
                               a->filter[3], a->filter[4]);
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 23f49f356e0f..489150380eac 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -1249,14 +1249,22 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) {
         }
 }
 
-static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
+static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma)
 {
         stream_t *dma = &vortex->dma_adb[adbdma];
-        int temp;
+        int temp, page, delta;
 
         temp = hwread(vortex->mmio, VORTEX_ADBDMA_STAT + (adbdma << 2));
-        temp = (dma->period_virt * dma->period_bytes) + (temp & (dma->period_bytes - 1));
-        return temp;
+        page = (temp & ADB_SUBBUF_MASK) >> ADB_SUBBUF_SHIFT;
+        if (dma->nr_periods >= 4)
+                delta = (page - dma->period_real) & 3;
+        else {
+                delta = (page - dma->period_real);
+                if (delta < 0)
+                        delta += dma->nr_periods;
+        }
+        return (dma->period_virt + delta) * dma->period_bytes
+                + (temp & (dma->period_bytes - 1));
 }
 
 static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma)
@@ -1498,7 +1506,7 @@ static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma)
                  POS_SHIFT) & POS_MASK);
 }
 #endif
-static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)
+static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma)
 {
         stream_t *dma = &vortex->dma_wt[wtdma];
         int temp;
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 38602b85874d..278ed8189fca 100644
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -896,7 +896,8 @@ static int __devinit vortex_eq_init(vortex_t * vortex)
                 if ((kcontrol =
                      snd_ctl_new1(&vortex_eq_kcontrol, vortex)) == NULL)
                         return -ENOMEM;
-                strcpy(kcontrol->id.name, EqBandLabels[i]);
+                snprintf(kcontrol->id.name, sizeof(kcontrol->id.name),
+                        "%s Playback Volume", EqBandLabels[i]);
                 kcontrol->private_value = i;
                 if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
                         return err;
diff --git a/sound/pci/au88x0/au88x0_mixer.c b/sound/pci/au88x0/au88x0_mixer.c
index c92f493d341e..557c782ae4fc 100644
--- a/sound/pci/au88x0/au88x0_mixer.c
+++ b/sound/pci/au88x0/au88x0_mixer.c
@@ -23,7 +23,7 @@ static int __devinit snd_vortex_mixer(vortex_t * vortex)
         if ((err = snd_ac97_bus(vortex->card, 0, &ops, NULL, &pbus)) < 0)
                 return err;
         memset(&ac97, 0, sizeof(ac97));
-        // Intialize AC97 codec stuff.
+        // Initialize AC97 codec stuff.
         ac97.private_data = vortex;
         ac97.scaps = AC97_SCAP_NO_SPDIF;
         err = snd_ac97_mixer(pbus, &ac97, &vortex->codec);
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index b9d2f202cf9b..c5f7ae46afef 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -42,16 +42,12 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_adb = {
         .rate_min = 5000,
         .rate_max = 48000,
         .channels_min = 1,
-#ifdef CHIP_AU8830
-        .channels_max = 4,
-#else
         .channels_max = 2,
-#endif
         .buffer_bytes_max = 0x10000,
-        .period_bytes_min = 0x1,
+        .period_bytes_min = 0x20,
         .period_bytes_max = 0x1000,
         .periods_min = 2,
-        .periods_max = 32,
+        .periods_max = 1024,
 };
 
 #ifndef CHIP_AU8820
@@ -115,6 +111,17 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_wt = {
         .periods_max = 64,
 };
 #endif
+#ifdef CHIP_AU8830
+static unsigned int au8830_channels[3] = {
+        1, 2, 4,
+};
+
+static struct snd_pcm_hw_constraint_list hw_constraints_au8830_channels = {
+        .count = ARRAY_SIZE(au8830_channels),
+        .list = au8830_channels,
+        .mask = 0,
+};
+#endif
 /* open callback */
 static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
 {
@@ -133,6 +140,9 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
                                         SNDRV_PCM_HW_PARAM_PERIOD_BYTES)) < 0)
                 return err;
 
+        snd_pcm_hw_constraint_step(runtime, 0,
+                                        SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 64);
+
         if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) {
 #ifndef CHIP_AU8820
                 if (VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_A3D) {
@@ -156,6 +166,15 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
                 if (VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB
                     || VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_I2S)
                         runtime->hw = snd_vortex_playback_hw_adb;
+#ifdef CHIP_AU8830
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+                        VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB) {
+                        runtime->hw.channels_max = 4;
+                        snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_CHANNELS,
+                                &hw_constraints_au8830_channels);
+                }
+#endif
                 substream->runtime->private_data = NULL;
         }
 #ifndef CHIP_AU8810
@@ -407,11 +426,11 @@ static struct snd_pcm_ops snd_vortex_playback_ops = {
 */
 
 static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {
-        "AU88x0 ADB",
-        "AU88x0 SPDIF",
-        "AU88x0 A3D",
-        "AU88x0 WT",
-        "AU88x0 I2S",
+        CARD_NAME " ADB",
+        CARD_NAME " SPDIF",
+        CARD_NAME " A3D",
+        CARD_NAME " WT",
+        CARD_NAME " I2S",
 };
 static char *vortex_pcm_name[VORTEX_PCM_LAST] = {
         "adb",
@@ -499,7 +518,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                 return -ENODEV;
 
         /* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the 
-         * same dma engine. WT uses it own separate dma engine whcih cant capture. */
+         * same dma engine. WT uses it own separate dma engine which can't capture. */
         if (idx == VORTEX_PCM_ADB)
                 nr_capt = nr;
         else
@@ -508,7 +527,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                           nr_capt, &pcm);
         if (err < 0)
                 return err;
-        strcpy(pcm->name, vortex_pcm_name[idx]);
+        snprintf(pcm->name, sizeof(pcm->name),
+                "%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);
         chip->pcm[idx] = pcm;
         // This is an evil hack, but it saves a lot of duplicated code.
         VORTEX_PCM_TYPE(pcm) = idx;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 4679ed83a43b..9b7a6346037a 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1,6 +1,5 @@
-/*
- *  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).
- *  Copyright (C) 2002, 2005 - 2009 by Andreas Mohr <andi AT lisas.de>
+/*  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).
+ *  Copyright (C) 2002, 2005 - 2011 by Andreas Mohr <andi AT lisas.de>
  *
  *  Framework borrowed from Bart Hartgers's als4000.c.
  *  Driver developed on PCI168 AP(W) version (PCI rev. 10, subsystem ID 1801),
@@ -66,6 +65,13 @@
  *    addresses illegally. So far unfortunately it looks like the very flexible
  *    ALSA AC97 support is still not enough to easily compensate for such a
  *    grave layout violation despite all tweaks and quirks mechanisms it offers.
+ *    Well, not quite: now ac97 layer is much improved (bus-specific ops!),
+ *    thus I was able to implement support - it's actually working quite well.
+ *    An interesting item might be Aztech AMR 2800-W, since it's an AC97
+ *    modem card which might reveal the Aztech-specific codec ID which
+ *    we might want to pretend, too. Dito PCI168's brother, PCI368,
+ *    where the advertising datasheet says it's AC97-based and has a
+ *    Digital Enhanced Game Port.
  *  - builtin genuine OPL3 - verified to work fine, 20080506
  *  - full duplex 16bit playback/record at independent sampling rate
  *  - MPU401 (+ legacy address support, claimed by one official spec sheet)
@@ -134,7 +140,7 @@
  *  Possible remedies:
  *  - use speaker (amplifier) output instead of headphone output
  *    (in case crackling is due to overloaded output clipping)
- *  - plug card into a different PCI slot, preferrably one that isn't shared
+ *  - plug card into a different PCI slot, preferably one that isn't shared
  *    too much (this helps a lot, but not completely!)
  *  - get rid of PCI VGA card, use AGP instead
  *  - upgrade or downgrade BIOS
@@ -175,6 +181,7 @@
 
 #include <asm/io.h>
 #include <linux/init.h>
+#include <linux/bug.h> /* WARN_ONCE */
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -188,6 +195,16 @@
 #include <sound/mpu401.h>
 #include <sound/opl3.h>
 #include <sound/initval.h>
+/*
+ * Config switch, to use ALSA's AC97 layer instead of old custom mixer crap.
+ * If the AC97 compatibility parts we needed to implement locally turn out
+ * to work nicely, then remove the old implementation eventually.
+ */
+#define AZF_USE_AC97_LAYER 1
+
+#ifdef AZF_USE_AC97_LAYER
+#include <sound/ac97_codec.h>
+#endif
 #include "azt3328.h"
 
 MODULE_AUTHOR("Andreas Mohr <andi AT lisas.de>");
@@ -201,14 +218,15 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
 
 /* === Debug settings ===
   Further diagnostic functionality than the settings below
-  does not need to be provided, since one can easily write a bash script
+  does not need to be provided, since one can easily write a POSIX shell script
   to dump the card's I/O ports (those listed in lspci -v -v):
-  function dump()
+  dump()
   {
     local descr=$1; local addr=$2; local count=$3
 
     echo "${descr}: ${count} @ ${addr}:"
-    dd if=/dev/port skip=$[${addr}] count=${count} bs=1 2>/dev/null| hexdump -C
+    dd if=/dev/port skip=`printf %d ${addr}` count=${count} bs=1 \
+      2>/dev/null| hexdump -C
   }
   and then use something like
   "dump joy200 0x200 8", "dump mpu388 0x388 4", "dump joy 0xb400 8",
@@ -216,14 +234,14 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}");
   possibly within a "while true; do ... sleep 1; done" loop.
   Tweaking ports could be done using
   VALSTRING="`printf "%02x" $value`"
-  printf "\x""$VALSTRING"|dd of=/dev/port seek=$[${addr}] bs=1 2>/dev/null
+  printf "\x""$VALSTRING"|dd of=/dev/port seek=`printf %d ${addr}` bs=1 \
+    2>/dev/null
 */
 
 #define DEBUG_MISC      0
 #define DEBUG_CALLS     0
 #define DEBUG_MIXER     0
 #define DEBUG_CODEC     0
-#define DEBUG_IO        0
 #define DEBUG_TIMER     0
 #define DEBUG_GAME      0
 #define DEBUG_PM        0
@@ -291,19 +309,23 @@ static int seqtimer_scaling = 128;
 module_param(seqtimer_scaling, int, 0444);
 MODULE_PARM_DESC(seqtimer_scaling, "Set 1024000Hz sequencer timer scale factor (lockup danger!). Default 128.");
 
-struct snd_azf3328_codec_data {
-        unsigned long io_base;
-        struct snd_pcm_substream *substream;
-        bool running;
-        const char *name;
-};
-
 enum snd_azf3328_codec_type {
+  /* warning: fixed indices (also used for bitmask checks!) */
   AZF_CODEC_PLAYBACK = 0,
   AZF_CODEC_CAPTURE = 1,
   AZF_CODEC_I2S_OUT = 2,
 };
 
+struct snd_azf3328_codec_data {
+        unsigned long io_base; /* keep first! (avoid offset calc) */
+        unsigned int dma_base; /* helper to avoid an indirection in hotpath */
+        spinlock_t *lock; /* TODO: convert to our own per-codec lock member */
+        struct snd_pcm_substream *substream;
+        bool running;
+        enum snd_azf3328_codec_type type;
+        const char *name;
+};
+
 struct snd_azf3328 {
         /* often-used fields towards beginning, then grouped */
 
@@ -322,6 +344,10 @@ struct snd_azf3328 {
         /* playback, recording and I2S out codecs */
         struct snd_azf3328_codec_data codecs[3];
 
+#ifdef AZF_USE_AC97_LAYER
+        struct snd_ac97 *ac97;
+#endif
+
         struct snd_card *card;
         struct snd_rawmidi *rmidi;
 
@@ -362,6 +388,9 @@ MODULE_DEVICE_TABLE(pci, snd_azf3328_ids);
 static int
 snd_azf3328_io_reg_setb(unsigned reg, u8 mask, bool do_set)
 {
+        /* Well, strictly spoken, the inb/outb sequence isn't atomic
+           and would need locking. However we currently don't care
+           since it potentially complicates matters. */
         u8 prev = inb(reg), new;
 
         new = (do_set) ? (prev|mask) : (prev & ~mask);
@@ -413,6 +442,21 @@ snd_azf3328_codec_outl(const struct snd_azf3328_codec_data *codec,
         outl(value, codec->io_base + reg);
 }
 
+static inline void
+snd_azf3328_codec_outl_multi(const struct snd_azf3328_codec_data *codec,
+                             unsigned reg, const void *buffer, int count
+)
+{
+        unsigned long addr = codec->io_base + reg;
+        if (count) {
+                const u32 *buf = buffer;
+                do {
+                        outl(*buf++, addr);
+                        addr += 4;
+                } while (--count);
+        }
+}
+
 static inline u32
 snd_azf3328_codec_inl(const struct snd_azf3328_codec_data *codec, unsigned reg)
 {
@@ -482,7 +526,7 @@ snd_azf3328_mixer_inw(const struct snd_azf3328 *chip, unsigned reg)
 #define AZF_MUTE_BIT 0x80
 
 static bool
-snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,
+snd_azf3328_mixer_mute_control(const struct snd_azf3328 *chip,
                            unsigned reg, bool do_mute
 )
 {
@@ -497,6 +541,323 @@ snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,
         return (do_mute) ? !updated : updated;
 }
 
+static inline bool
+snd_azf3328_mixer_mute_control_master(const struct snd_azf3328 *chip,
+                           bool do_mute
+)
+{
+        return snd_azf3328_mixer_mute_control(
+                chip,
+                IDX_MIXER_PLAY_MASTER,
+                do_mute
+        );
+}
+
+static inline bool
+snd_azf3328_mixer_mute_control_pcm(const struct snd_azf3328 *chip,
+                           bool do_mute
+)
+{
+        return snd_azf3328_mixer_mute_control(
+                chip,
+                IDX_MIXER_WAVEOUT,
+                do_mute
+        );
+}
+
+static inline void
+snd_azf3328_mixer_reset(const struct snd_azf3328 *chip)
+{
+        /* reset (close) mixer:
+         * first mute master volume, then reset
+         */
+        snd_azf3328_mixer_mute_control_master(chip, 1);
+        snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);
+}
+
+#ifdef AZF_USE_AC97_LAYER
+
+static inline void
+snd_azf3328_mixer_ac97_map_unsupported(unsigned short reg, const char *mode)
+{
+        /* need to add some more or less clever emulation? */
+        printk(KERN_WARNING
+                "azt3328: missing %s emulation for AC97 register 0x%02x!\n",
+                mode, reg);
+}
+
+/*
+ * Need to have _special_ AC97 mixer hardware register index mapper,
+ * to compensate for the issue of a rather AC97-incompatible hardware layout.
+ */
+#define AZF_REG_MASK 0x3f
+#define AZF_AC97_REG_UNSUPPORTED 0x8000
+#define AZF_AC97_REG_REAL_IO_READ 0x4000
+#define AZF_AC97_REG_REAL_IO_WRITE 0x2000
+#define AZF_AC97_REG_REAL_IO_RW \
+        (AZF_AC97_REG_REAL_IO_READ | AZF_AC97_REG_REAL_IO_WRITE)
+#define AZF_AC97_REG_EMU_IO_READ 0x0400
+#define AZF_AC97_REG_EMU_IO_WRITE 0x0200
+#define AZF_AC97_REG_EMU_IO_RW \
+        (AZF_AC97_REG_EMU_IO_READ | AZF_AC97_REG_EMU_IO_WRITE)
+static unsigned short
+snd_azf3328_mixer_ac97_map_reg_idx(unsigned short reg)
+{
+        static const struct {
+                unsigned short azf_reg;
+        } azf_reg_mapper[] = {
+                /* Especially when taking into consideration
+                 * mono/stereo-based sequence of azf vs. AC97 control series,
+                 * it's quite obvious that azf simply got rid
+                 * of the AC97_HEADPHONE control at its intended offset,
+                 * thus shifted _all_ controls by one,
+                 * and _then_ simply added it as an FMSYNTH control at the end,
+                 * to make up for the offset.
+                 * This means we'll have to translate indices here as
+                 * needed and then do some tiny AC97 patch action
+                 * (snd_ac97_rename_vol_ctl() etc.) - that's it.
+                 */
+                { /* AC97_RESET */ IDX_MIXER_RESET
+                        | AZF_AC97_REG_REAL_IO_WRITE
+                        | AZF_AC97_REG_EMU_IO_READ },
+                { /* AC97_MASTER */ IDX_MIXER_PLAY_MASTER },
+                 /* note large shift: AC97_HEADPHONE to IDX_MIXER_FMSYNTH! */
+                { /* AC97_HEADPHONE */ IDX_MIXER_FMSYNTH },
+                { /* AC97_MASTER_MONO */ IDX_MIXER_MODEMOUT },
+                { /* AC97_MASTER_TONE */ IDX_MIXER_BASSTREBLE },
+                { /* AC97_PC_BEEP */ IDX_MIXER_PCBEEP },
+                { /* AC97_PHONE */ IDX_MIXER_MODEMIN },
+                { /* AC97_MIC */ IDX_MIXER_MIC },
+                { /* AC97_LINE */ IDX_MIXER_LINEIN },
+                { /* AC97_CD */ IDX_MIXER_CDAUDIO },
+                { /* AC97_VIDEO */ IDX_MIXER_VIDEO },
+                { /* AC97_AUX */ IDX_MIXER_AUX },
+                { /* AC97_PCM */ IDX_MIXER_WAVEOUT },
+                { /* AC97_REC_SEL */ IDX_MIXER_REC_SELECT },
+                { /* AC97_REC_GAIN */ IDX_MIXER_REC_VOLUME },
+                { /* AC97_REC_GAIN_MIC */ AZF_AC97_REG_EMU_IO_RW },
+                { /* AC97_GENERAL_PURPOSE */ IDX_MIXER_ADVCTL2 },
+                { /* AC97_3D_CONTROL */ IDX_MIXER_ADVCTL1 },
+        };
+
+        unsigned short reg_azf = AZF_AC97_REG_UNSUPPORTED;
+
+        /* azf3328 supports the low-numbered and low-spec:ed range
+           of AC97 regs only */
+        if (reg <= AC97_3D_CONTROL) {
+                unsigned short reg_idx = reg / 2;
+                reg_azf = azf_reg_mapper[reg_idx].azf_reg;
+                /* a translation-only entry means it's real read/write: */
+                if (!(reg_azf & ~AZF_REG_MASK))
+                        reg_azf |= AZF_AC97_REG_REAL_IO_RW;
+        } else {
+                switch (reg) {
+                case AC97_POWERDOWN:
+                        reg_azf = AZF_AC97_REG_EMU_IO_RW;
+                        break;
+                case AC97_EXTENDED_ID:
+                        reg_azf = AZF_AC97_REG_EMU_IO_READ;
+                        break;
+                case AC97_EXTENDED_STATUS:
+                        /* I don't know what the h*ll AC97 layer
+                         * would consult this _extended_ register for
+                         * given a base-AC97-advertised card,
+                         * but let's just emulate it anyway :-P
+                         */
+                        reg_azf = AZF_AC97_REG_EMU_IO_RW;
+                        break;
+                case AC97_VENDOR_ID1:
+                case AC97_VENDOR_ID2:
+                        reg_azf = AZF_AC97_REG_EMU_IO_READ;
+                        break;
+                }
+        }
+        return reg_azf;
+}
+
+static const unsigned short
+azf_emulated_ac97_caps =
+        AC97_BC_DEDICATED_MIC |
+        AC97_BC_BASS_TREBLE |
+        /* Headphone is an FM Synth control here */
+        AC97_BC_HEADPHONE |
+        /* no AC97_BC_LOUDNESS! */
+        /* mask 0x7c00 is
+           vendor-specific 3D enhancement
+           vendor indicator.
+           Since there actually _is_ an
+           entry for Aztech Labs
+           (13), make damn sure
+           to indicate it. */
+        (13 << 10);
+
+static const unsigned short
+azf_emulated_ac97_powerdown =
+        /* pretend everything to be active */
+                AC97_PD_ADC_STATUS |
+                AC97_PD_DAC_STATUS |
+                AC97_PD_MIXER_STATUS |
+                AC97_PD_VREF_STATUS;
+
+/*
+ * Emulated, _inofficial_ vendor ID
+ * (there might be some devices such as the MR 2800-W
+ * which could reveal the real Aztech AC97 ID).
+ * We choose to use "AZT" prefix, and then use 1 to indicate PCI168
+ * (better don't use 0x68 since there's a PCI368 as well).
+ */
+static const unsigned int
+azf_emulated_ac97_vendor_id = 0x415a5401;
+
+static unsigned short
+snd_azf3328_mixer_ac97_read(struct snd_ac97 *ac97, unsigned short reg_ac97)
+{
+        const struct snd_azf3328 *chip = ac97->private_data;
+        unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);
+        unsigned short reg_val = 0;
+        bool unsupported = 0;
+
+        snd_azf3328_dbgmixer(
+                "snd_azf3328_mixer_ac97_read reg_ac97 %u\n",
+                        reg_ac97
+        );
+        if (reg_azf & AZF_AC97_REG_UNSUPPORTED)
+                unsupported = 1;
+        else {
+                if (reg_azf & AZF_AC97_REG_REAL_IO_READ)
+                        reg_val = snd_azf3328_mixer_inw(chip,
+                                                reg_azf & AZF_REG_MASK);
+                else {
+                        /*
+                         * Proceed with dummy I/O read,
+                         * to ensure compatible timing where this may matter.
+                         * (ALSA AC97 layer usually doesn't call I/O functions
+                         * due to intelligent I/O caching anyway)
+                         * Choose a mixer register that's thoroughly unrelated
+                         * to common audio (try to minimize distortion).
+                         */
+                        snd_azf3328_mixer_inw(chip, IDX_MIXER_SOMETHING30H);
+                }
+
+                if (reg_azf & AZF_AC97_REG_EMU_IO_READ) {
+                        switch (reg_ac97) {
+                        case AC97_RESET:
+                                reg_val |= azf_emulated_ac97_caps;
+                                break;
+                        case AC97_POWERDOWN:
+                                reg_val |= azf_emulated_ac97_powerdown;
+                                break;
+                        case AC97_EXTENDED_ID:
+                        case AC97_EXTENDED_STATUS:
+                                /* AFAICS we simply can't support anything: */
+                                reg_val |= 0;
+                                break;
+                        case AC97_VENDOR_ID1:
+                                reg_val = azf_emulated_ac97_vendor_id >> 16;
+                                break;
+                        case AC97_VENDOR_ID2:
+                                reg_val = azf_emulated_ac97_vendor_id & 0xffff;
+                                break;
+                        default:
+                                unsupported = 1;
+                                break;
+                        }
+                }
+        }
+        if (unsupported)
+                snd_azf3328_mixer_ac97_map_unsupported(reg_ac97, "read");
+
+        return reg_val;
+}
+
+static void
+snd_azf3328_mixer_ac97_write(struct snd_ac97 *ac97,
+                     unsigned short reg_ac97, unsigned short val)
+{
+        const struct snd_azf3328 *chip = ac97->private_data;
+        unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);
+        bool unsupported = 0;
+
+        snd_azf3328_dbgmixer(
+                "snd_azf3328_mixer_ac97_write reg_ac97 %u val %u\n",
+                        reg_ac97, val
+        );
+        if (reg_azf & AZF_AC97_REG_UNSUPPORTED)
+                unsupported = 1;
+        else {
+                if (reg_azf & AZF_AC97_REG_REAL_IO_WRITE)
+                        snd_azf3328_mixer_outw(
+                                chip,
+                                reg_azf & AZF_REG_MASK,
+                                val
+                        );
+                else
+                if (reg_azf & AZF_AC97_REG_EMU_IO_WRITE) {
+                        switch (reg_ac97) {
+                        case AC97_REC_GAIN_MIC:
+                        case AC97_POWERDOWN:
+                        case AC97_EXTENDED_STATUS:
+                                /*
+                                 * Silently swallow these writes.
+                                 * Since for most registers our card doesn't
+                                 * actually support a comparable feature,
+                                 * this is exactly what we should do here.
+                                 * The AC97 layer's I/O caching probably
+                                 * automatically takes care of all the rest...
+                                 * (remembers written values etc.)
+                                 */
+                                break;
+                        default:
+                                unsupported = 1;
+                                break;
+                        }
+                }
+        }
+        if (unsupported)
+                snd_azf3328_mixer_ac97_map_unsupported(reg_ac97, "write");
+}
+
+static int __devinit
+snd_azf3328_mixer_new(struct snd_azf3328 *chip)
+{
+        struct snd_ac97_bus *bus;
+        struct snd_ac97_template ac97;
+        static struct snd_ac97_bus_ops ops = {
+                .write = snd_azf3328_mixer_ac97_write,
+                .read = snd_azf3328_mixer_ac97_read,
+        };
+        int rc;
+
+        memset(&ac97, 0, sizeof(ac97));
+        ac97.scaps = AC97_SCAP_SKIP_MODEM
+                        | AC97_SCAP_AUDIO /* we support audio! */
+                        | AC97_SCAP_NO_SPDIF;
+        ac97.private_data = chip;
+        ac97.pci = chip->pci;
+
+        /*
+         * ALSA's AC97 layer has terrible init crackling issues,
+         * unfortunately, and since it makes use of AC97_RESET,
+         * there's no use trying to mute Master Playback proactively.
+         */
+
+        rc = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus);
+        if (!rc)
+                rc = snd_ac97_mixer(bus, &ac97, &chip->ac97);
+                /*
+                 * Make sure to complain loudly in case of AC97 init failure,
+                 * since failure may happen quite often,
+                 * due to this card being a very quirky AC97 "lookalike".
+                 */
+        if (rc)
+                printk(KERN_ERR "azt3328: AC97 init failed, err %d!\n", rc);
+
+        /* If we return an error here, then snd_card_free() should
+         * free up any ac97 codecs that got created, as well as the bus.
+         */
+        return rc;
+}
+#else /* AZF_USE_AC97_LAYER */
 static void
 snd_azf3328_mixer_write_volume_gradually(const struct snd_azf3328 *chip,
                                          unsigned reg,
@@ -921,6 +1282,7 @@ snd_azf3328_mixer_new(struct snd_azf3328 *chip)
         snd_azf3328_dbgcallleave();
         return 0;
 }
+#endif /* AZF_USE_AC97_LAYER */
 
 static int
 snd_azf3328_hw_params(struct snd_pcm_substream *substream,
@@ -943,38 +1305,37 @@ snd_azf3328_hw_free(struct snd_pcm_substream *substream)
 }
 
 static void
-snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,
-                               enum snd_azf3328_codec_type codec_type,
+snd_azf3328_codec_setfmt(struct snd_azf3328_codec_data *codec,
                                enum azf_freq_t bitrate,
                                unsigned int format_width,
                                unsigned int channels
 )
 {
         unsigned long flags;
-        const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
         u16 val = 0xff00;
+        u8 freq = 0;
 
         snd_azf3328_dbgcallenter();
         switch (bitrate) {
-        case AZF_FREQ_4000:  val |= SOUNDFORMAT_FREQ_SUSPECTED_4000; break;
-        case AZF_FREQ_4800:  val |= SOUNDFORMAT_FREQ_SUSPECTED_4800; break;
+        case AZF_FREQ_4000:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4000; break;
+        case AZF_FREQ_4800:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4800; break;
         case AZF_FREQ_5512:
                 /* the AZF3328 names it "5510" for some strange reason */
-                             val |= SOUNDFORMAT_FREQ_5510; break;
-        case AZF_FREQ_6620:  val |= SOUNDFORMAT_FREQ_6620; break;
-        case AZF_FREQ_8000:  val |= SOUNDFORMAT_FREQ_8000; break;
-        case AZF_FREQ_9600:  val |= SOUNDFORMAT_FREQ_9600; break;
-        case AZF_FREQ_11025: val |= SOUNDFORMAT_FREQ_11025; break;
-        case AZF_FREQ_13240: val |= SOUNDFORMAT_FREQ_SUSPECTED_13240; break;
-        case AZF_FREQ_16000: val |= SOUNDFORMAT_FREQ_16000; break;
-        case AZF_FREQ_22050: val |= SOUNDFORMAT_FREQ_22050; break;
-        case AZF_FREQ_32000: val |= SOUNDFORMAT_FREQ_32000; break;
+                             freq = SOUNDFORMAT_FREQ_5510; break;
+        case AZF_FREQ_6620:  freq = SOUNDFORMAT_FREQ_6620; break;
+        case AZF_FREQ_8000:  freq = SOUNDFORMAT_FREQ_8000; break;
+        case AZF_FREQ_9600:  freq = SOUNDFORMAT_FREQ_9600; break;
+        case AZF_FREQ_11025: freq = SOUNDFORMAT_FREQ_11025; break;
+        case AZF_FREQ_13240: freq = SOUNDFORMAT_FREQ_SUSPECTED_13240; break;
+        case AZF_FREQ_16000: freq = SOUNDFORMAT_FREQ_16000; break;
+        case AZF_FREQ_22050: freq = SOUNDFORMAT_FREQ_22050; break;
+        case AZF_FREQ_32000: freq = SOUNDFORMAT_FREQ_32000; break;
         default:
                 snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate);
                 /* fall-through */
-        case AZF_FREQ_44100: val |= SOUNDFORMAT_FREQ_44100; break;
-        case AZF_FREQ_48000: val |= SOUNDFORMAT_FREQ_48000; break;
-        case AZF_FREQ_66200: val |= SOUNDFORMAT_FREQ_SUSPECTED_66200; break;
+        case AZF_FREQ_44100: freq = SOUNDFORMAT_FREQ_44100; break;
+        case AZF_FREQ_48000: freq = SOUNDFORMAT_FREQ_48000; break;
+        case AZF_FREQ_66200: freq = SOUNDFORMAT_FREQ_SUSPECTED_66200; break;
         }
         /* val = 0xff07; 3m27.993s (65301Hz; -> 64000Hz???) hmm, 66120, 65967, 66123 */
         /* val = 0xff09; 17m15.098s (13123,478Hz; -> 12000Hz???) hmm, 13237.2Hz? */
@@ -986,13 +1347,15 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,
         /* val = 0xff0d; 41m23.135s (5523,600Hz; -> 5512Hz???) */
         /* val = 0xff0e; 28m30.777s (8017Hz; -> 8000Hz???) */
 
+        val |= freq;
+
         if (channels == 2)
                 val |= SOUNDFORMAT_FLAG_2CHANNELS;
 
         if (format_width == 16)
                 val |= SOUNDFORMAT_FLAG_16BIT;
 
-        spin_lock_irqsave(&chip->reg_lock, flags);
+        spin_lock_irqsave(codec->lock, flags);
 
         /* set bitrate/format */
         snd_azf3328_codec_outw(codec, IDX_IO_CODEC_SOUNDFORMAT, val);
@@ -1004,7 +1367,8 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,
          * (FIXME: yes, it works, but what exactly am I doing here?? :)
          * FIXME: does this have some side effects for full-duplex
          * or other dramatic side effects? */
-        if (codec_type == AZF_CODEC_PLAYBACK) /* only do it for playback */
+        /* do it for non-capture codecs only */
+        if (codec->type != AZF_CODEC_CAPTURE)
                 snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,
                         snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS) |
                         DMA_RUN_SOMETHING1 |
@@ -1014,20 +1378,19 @@ snd_azf3328_codec_setfmt(struct snd_azf3328 *chip,
                         DMA_SOMETHING_ELSE
                 );
 
-        spin_unlock_irqrestore(&chip->reg_lock, flags);
+        spin_unlock_irqrestore(codec->lock, flags);
         snd_azf3328_dbgcallleave();
 }
 
 static inline void
-snd_azf3328_codec_setfmt_lowpower(struct snd_azf3328 *chip,
-                            enum snd_azf3328_codec_type codec_type
+snd_azf3328_codec_setfmt_lowpower(struct snd_azf3328_codec_data *codec
 )
 {
         /* choose lowest frequency for low power consumption.
          * While this will cause louder noise due to rather coarse frequency,
          * it should never matter since output should always
          * get disabled properly when idle anyway. */
-        snd_azf3328_codec_setfmt(chip, codec_type, AZF_FREQ_4000, 8, 1);
+        snd_azf3328_codec_setfmt(codec, AZF_FREQ_4000, 8, 1);
 }
 
 static void
@@ -1101,68 +1464,87 @@ snd_azf3328_ctrl_codec_activity(struct snd_azf3328 *chip,
                 /* ...and adjust clock, too
                  * (reduce noise and power consumption) */
                 if (!enable)
-                        snd_azf3328_codec_setfmt_lowpower(
-                                chip,
-                                codec_type
-                        );
+                        snd_azf3328_codec_setfmt_lowpower(codec);
                 codec->running = enable;
         }
 }
 
 static void
-snd_azf3328_codec_setdmaa(struct snd_azf3328 *chip,
-                                enum snd_azf3328_codec_type codec_type,
+snd_azf3328_codec_setdmaa(struct snd_azf3328_codec_data *codec,
                                 unsigned long addr,
-                                unsigned int count,
-                                unsigned int size
+                                unsigned int period_bytes,
+                                unsigned int buffer_bytes
 )
 {
-        const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
         snd_azf3328_dbgcallenter();
+        WARN_ONCE(period_bytes & 1, "odd period length!?\n");
+        WARN_ONCE(buffer_bytes != 2 * period_bytes,
+                 "missed our input expectations! %u vs. %u\n",
+                 buffer_bytes, period_bytes);
         if (!codec->running) {
                 /* AZF3328 uses a two buffer pointer DMA transfer approach */
 
-                unsigned long flags, addr_area2;
+                unsigned long flags;
 
                 /* width 32bit (prevent overflow): */
-                u32 count_areas, lengths;
+                u32 area_length;
+                struct codec_setup_io {
+                        u32 dma_start_1;
+                        u32 dma_start_2;
+                        u32 dma_lengths;
+                } __attribute__((packed)) setup_io;
+
+                area_length = buffer_bytes/2;
+
+                setup_io.dma_start_1 = addr;
+                setup_io.dma_start_2 = addr+area_length;
 
-                count_areas = size/2;
-                addr_area2 = addr+count_areas;
-                count_areas--; /* max. index */
-                snd_azf3328_dbgcodec("setdma: buffers %08lx[%u] / %08lx[%u]\n",
-                                addr, count_areas, addr_area2, count_areas);
+                snd_azf3328_dbgcodec(
+                        "setdma: buffers %08x[%u] / %08x[%u], %u, %u\n",
+                                setup_io.dma_start_1, area_length,
+                                setup_io.dma_start_2, area_length,
+                                period_bytes, buffer_bytes);
+
+                /* Hmm, are we really supposed to decrement this by 1??
+                   Most definitely certainly not: configuring full length does
+                   work properly (i.e. likely better), and BTW we
+                   violated possibly differing frame sizes with this...
+
+                area_length--; |* max. index *|
+                */
 
                 /* build combined I/O buffer length word */
-                lengths = (count_areas << 16) | (count_areas);
-                spin_lock_irqsave(&chip->reg_lock, flags);
-                snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_START_1, addr);
-                snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_START_2,
-                                                                addr_area2);
-                snd_azf3328_codec_outl(codec, IDX_IO_CODEC_DMA_LENGTHS,
-                                                                lengths);
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
+                setup_io.dma_lengths = (area_length << 16) | (area_length);
+
+                spin_lock_irqsave(codec->lock, flags);
+                snd_azf3328_codec_outl_multi(
+                        codec, IDX_IO_CODEC_DMA_START_1, &setup_io, 3
+                );
+                spin_unlock_irqrestore(codec->lock, flags);
         }
         snd_azf3328_dbgcallleave();
 }
 
 static int
-snd_azf3328_codec_prepare(struct snd_pcm_substream *substream)
+snd_azf3328_pcm_prepare(struct snd_pcm_substream *substream)
 {
-#if 0
-        struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_azf3328_codec_data *codec = runtime->private_data;
+#if 0
         unsigned int size = snd_pcm_lib_buffer_bytes(substream);
         unsigned int count = snd_pcm_lib_period_bytes(substream);
 #endif
 
         snd_azf3328_dbgcallenter();
+
+        codec->dma_base = runtime->dma_addr;
+
 #if 0
-        snd_azf3328_codec_setfmt(chip, AZF_CODEC_...,
+        snd_azf3328_codec_setfmt(codec,
                 runtime->rate,
                 snd_pcm_format_width(runtime->format),
                 runtime->channels);
-        snd_azf3328_codec_setdmaa(chip, AZF_CODEC_...,
+        snd_azf3328_codec_setdmaa(codec,
                                         runtime->dma_addr, count, size);
 #endif
         snd_azf3328_dbgcallleave();
@@ -1170,37 +1552,36 @@ snd_azf3328_codec_prepare(struct snd_pcm_substream *substream)
 }
 
 static int
-snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
-                        struct snd_pcm_substream *substream, int cmd)
+snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
-        const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
         struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_azf3328_codec_data *codec = runtime->private_data;
         int result = 0;
         u16 flags1;
         bool previously_muted = 0;
-        bool is_playback_codec = (AZF_CODEC_PLAYBACK == codec_type);
+        bool is_main_mixer_playback_codec = (AZF_CODEC_PLAYBACK == codec->type);
 
-        snd_azf3328_dbgcalls("snd_azf3328_codec_trigger cmd %d\n", cmd);
+        snd_azf3328_dbgcalls("snd_azf3328_pcm_trigger cmd %d\n", cmd);
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 snd_azf3328_dbgcodec("START %s\n", codec->name);
 
-                if (is_playback_codec) {
+                if (is_main_mixer_playback_codec) {
                         /* mute WaveOut (avoid clicking during setup) */
                         previously_muted =
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 1
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 1
                                 );
                 }
 
-                snd_azf3328_codec_setfmt(chip, codec_type,
+                snd_azf3328_codec_setfmt(codec,
                         runtime->rate,
                         snd_pcm_format_width(runtime->format),
                         runtime->channels);
 
-                spin_lock(&chip->reg_lock);
+                spin_lock(codec->lock);
                 /* first, remember current value: */
                 flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);
 
@@ -1210,14 +1591,14 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
 
                 /* FIXME: clear interrupts or what??? */
                 snd_azf3328_codec_outw(codec, IDX_IO_CODEC_IRQTYPE, 0xffff);
-                spin_unlock(&chip->reg_lock);
+                spin_unlock(codec->lock);
 
-                snd_azf3328_codec_setdmaa(chip, codec_type, runtime->dma_addr,
+                snd_azf3328_codec_setdmaa(codec, runtime->dma_addr,
                         snd_pcm_lib_period_bytes(substream),
                         snd_pcm_lib_buffer_bytes(substream)
                 );
 
-                spin_lock(&chip->reg_lock);
+                spin_lock(codec->lock);
 #ifdef WIN9X
                 /* FIXME: enable playback/recording??? */
                 flags1 |= DMA_RUN_SOMETHING1 | DMA_RUN_SOMETHING2;
@@ -1241,14 +1622,14 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
                         DMA_EPILOGUE_SOMETHING |
                         DMA_SOMETHING_ELSE);
 #endif
-                spin_unlock(&chip->reg_lock);
-                snd_azf3328_ctrl_codec_activity(chip, codec_type, 1);
+                spin_unlock(codec->lock);
+                snd_azf3328_ctrl_codec_activity(chip, codec->type, 1);
 
-                if (is_playback_codec) {
+                if (is_main_mixer_playback_codec) {
                         /* now unmute WaveOut */
                         if (!previously_muted)
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 0
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 0
                                 );
                 }
 
@@ -1257,27 +1638,27 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
         case SNDRV_PCM_TRIGGER_RESUME:
                 snd_azf3328_dbgcodec("RESUME %s\n", codec->name);
                 /* resume codec if we were active */
-                spin_lock(&chip->reg_lock);
+                spin_lock(codec->lock);
                 if (codec->running)
                         snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS,
                                 snd_azf3328_codec_inw(
                                         codec, IDX_IO_CODEC_DMA_FLAGS
                                 ) | DMA_RESUME
                         );
-                spin_unlock(&chip->reg_lock);
+                spin_unlock(codec->lock);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
                 snd_azf3328_dbgcodec("STOP %s\n", codec->name);
 
-                if (is_playback_codec) {
+                if (is_main_mixer_playback_codec) {
                         /* mute WaveOut (avoid clicking during setup) */
                         previously_muted =
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 1
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 1
                                 );
                 }
 
-                spin_lock(&chip->reg_lock);
+                spin_lock(codec->lock);
                 /* first, remember current value: */
                 flags1 = snd_azf3328_codec_inw(codec, IDX_IO_CODEC_DMA_FLAGS);
 
@@ -1292,14 +1673,14 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
 
                 flags1 &= ~DMA_RUN_SOMETHING1;
                 snd_azf3328_codec_outw(codec, IDX_IO_CODEC_DMA_FLAGS, flags1);
-                spin_unlock(&chip->reg_lock);
-                snd_azf3328_ctrl_codec_activity(chip, codec_type, 0);
+                spin_unlock(codec->lock);
+                snd_azf3328_ctrl_codec_activity(chip, codec->type, 0);
 
-                if (is_playback_codec) {
+                if (is_main_mixer_playback_codec) {
                         /* now unmute WaveOut */
                         if (!previously_muted)
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 0
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 0
                                 );
                 }
 
@@ -1329,67 +1710,29 @@ snd_azf3328_codec_trigger(enum snd_azf3328_codec_type codec_type,
         return result;
 }
 
-static int
-snd_azf3328_codec_playback_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        return snd_azf3328_codec_trigger(AZF_CODEC_PLAYBACK, substream, cmd);
-}
-
-static int
-snd_azf3328_codec_capture_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        return snd_azf3328_codec_trigger(AZF_CODEC_CAPTURE, substream, cmd);
-}
-
-static int
-snd_azf3328_codec_i2s_out_trigger(struct snd_pcm_substream *substream, int cmd)
-{
-        return snd_azf3328_codec_trigger(AZF_CODEC_I2S_OUT, substream, cmd);
-}
-
 static snd_pcm_uframes_t
-snd_azf3328_codec_pointer(struct snd_pcm_substream *substream,
-                          enum snd_azf3328_codec_type codec_type
+snd_azf3328_pcm_pointer(struct snd_pcm_substream *substream
 )
 {
-        const struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
-        const struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
-        unsigned long bufptr, result;
+        const struct snd_azf3328_codec_data *codec =
+                substream->runtime->private_data;
+        unsigned long result;
         snd_pcm_uframes_t frmres;
 
-#ifdef QUERY_HARDWARE
-        bufptr = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);
-#else
-        bufptr = substream->runtime->dma_addr;
-#endif
         result = snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_CURRPOS);
 
         /* calculate offset */
-        result -= bufptr;
+#ifdef QUERY_HARDWARE
+        result -= snd_azf3328_codec_inl(codec, IDX_IO_CODEC_DMA_START_1);
+#else
+        result -= codec->dma_base;
+#endif
         frmres = bytes_to_frames( substream->runtime, result);
-        snd_azf3328_dbgcodec("%s @ 0x%8lx, frames %8ld\n",
-                                codec->name, result, frmres);
+        snd_azf3328_dbgcodec("%08li %s @ 0x%8lx, frames %8ld\n",
+                                jiffies, codec->name, result, frmres);
         return frmres;
 }
 
-static snd_pcm_uframes_t
-snd_azf3328_codec_playback_pointer(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_codec_pointer(substream, AZF_CODEC_PLAYBACK);
-}
-
-static snd_pcm_uframes_t
-snd_azf3328_codec_capture_pointer(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_codec_pointer(substream, AZF_CODEC_CAPTURE);
-}
-
-static snd_pcm_uframes_t
-snd_azf3328_codec_i2s_out_pointer(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_codec_pointer(substream, AZF_CODEC_I2S_OUT);
-}
-
 /******************************************************************/
 
 #ifdef SUPPORT_GAMEPORT
@@ -1531,7 +1874,7 @@ snd_azf3328_gameport_cooked_read(struct gameport *gameport,
                 }
         }
 
-        /* trigger next axes sampling, to be evaluated the next time we
+        /* trigger next sampling of axes, to be evaluated the next time we
          * enter this function */
 
         /* for some very, very strange reason we cannot enable
@@ -1623,29 +1966,29 @@ snd_azf3328_irq_log_unknown_type(u8 which)
 }
 
 static inline void
-snd_azf3328_codec_interrupt(struct snd_azf3328 *chip, u8 status)
+snd_azf3328_pcm_interrupt(const struct snd_azf3328_codec_data *first_codec,
+                          u8 status
+)
 {
         u8 which;
         enum snd_azf3328_codec_type codec_type;
-        const struct snd_azf3328_codec_data *codec;
+        const struct snd_azf3328_codec_data *codec = first_codec;
 
         for (codec_type = AZF_CODEC_PLAYBACK;
                  codec_type <= AZF_CODEC_I2S_OUT;
-                         ++codec_type) {
+                         ++codec_type, ++codec) {
 
                 /* skip codec if there's no interrupt for it */
                 if (!(status & (1 << codec_type)))
                         continue;
 
-                codec = &chip->codecs[codec_type];
-
-                spin_lock(&chip->reg_lock);
+                spin_lock(codec->lock);
                 which = snd_azf3328_codec_inb(codec, IDX_IO_CODEC_IRQTYPE);
                 /* ack all IRQ types immediately */
                 snd_azf3328_codec_outb(codec, IDX_IO_CODEC_IRQTYPE, which);
-                spin_unlock(&chip->reg_lock);
+                spin_unlock(codec->lock);
 
-                if ((chip->pcm[codec_type]) && (codec->substream)) {
+                if (codec->substream) {
                         snd_pcm_period_elapsed(codec->substream);
                         snd_azf3328_dbgcodec("%s period done (#%x), @ %x\n",
                                 codec->name,
@@ -1700,7 +2043,7 @@ snd_azf3328_interrupt(int irq, void *dev_id)
         }
 
         if (status & (IRQ_PLAYBACK|IRQ_RECORDING|IRQ_I2S_OUT))
-                snd_azf3328_codec_interrupt(chip, status);
+                snd_azf3328_pcm_interrupt(chip->codecs, status);
 
         if (status & IRQ_GAMEPORT)
                 snd_azf3328_gameport_interrupt(chip);
@@ -1740,11 +2083,15 @@ static const struct snd_pcm_hardware snd_azf3328_hardware =
         .rate_max =             AZF_FREQ_66200,
         .channels_min =         1,
         .channels_max =         2,
-        .buffer_bytes_max =     65536,
-        .period_bytes_min =     64,
-        .period_bytes_max =     65536,
-        .periods_min =          1,
-        .periods_max =          1024,
+        .buffer_bytes_max =     (64*1024),
+        .period_bytes_min =     1024,
+        .period_bytes_max =     (32*1024),
+        /* We simply have two DMA areas (instead of a list of descriptors
+           such as other cards); I believe that this is a fixed hardware
+           attribute and there isn't much driver magic to be done to expand it.
+           Thus indicate that we have at least and at most 2 periods. */
+        .periods_min =          2,
+        .periods_max =          2,
         /* FIXME: maybe that card actually has a FIFO?
          * Hmm, it seems newer revisions do have one, but we still don't know
          * its size... */
@@ -1784,101 +2131,85 @@ snd_azf3328_pcm_open(struct snd_pcm_substream *substream,
 {
         struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_azf3328_codec_data *codec = &chip->codecs[codec_type];
 
         snd_azf3328_dbgcallenter();
-        chip->codecs[codec_type].substream = substream;
+        codec->substream = substream;
 
         /* same parameters for all our codecs - at least we think so... */
         runtime->hw = snd_azf3328_hardware;
 
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                    &snd_azf3328_hw_constraints_rates);
+        runtime->private_data = codec;
         snd_azf3328_dbgcallleave();
         return 0;
 }
 
 static int
-snd_azf3328_playback_open(struct snd_pcm_substream *substream)
+snd_azf3328_pcm_playback_open(struct snd_pcm_substream *substream)
 {
         return snd_azf3328_pcm_open(substream, AZF_CODEC_PLAYBACK);
 }
 
 static int
-snd_azf3328_capture_open(struct snd_pcm_substream *substream)
+snd_azf3328_pcm_capture_open(struct snd_pcm_substream *substream)
 {
         return snd_azf3328_pcm_open(substream, AZF_CODEC_CAPTURE);
 }
 
 static int
-snd_azf3328_i2s_out_open(struct snd_pcm_substream *substream)
+snd_azf3328_pcm_i2s_out_open(struct snd_pcm_substream *substream)
 {
         return snd_azf3328_pcm_open(substream, AZF_CODEC_I2S_OUT);
 }
 
 static int
-snd_azf3328_pcm_close(struct snd_pcm_substream *substream,
-                      enum snd_azf3328_codec_type codec_type
+snd_azf3328_pcm_close(struct snd_pcm_substream *substream
 )
 {
-        struct snd_azf3328 *chip = snd_pcm_substream_chip(substream);
+        struct snd_azf3328_codec_data *codec =
+                substream->runtime->private_data;
 
         snd_azf3328_dbgcallenter();
-        chip->codecs[codec_type].substream = NULL;
+        codec->substream = NULL;
         snd_azf3328_dbgcallleave();
         return 0;
 }
 
-static int
-snd_azf3328_playback_close(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_pcm_close(substream, AZF_CODEC_PLAYBACK);
-}
-
-static int
-snd_azf3328_capture_close(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_pcm_close(substream, AZF_CODEC_CAPTURE);
-}
-
-static int
-snd_azf3328_i2s_out_close(struct snd_pcm_substream *substream)
-{
-        return snd_azf3328_pcm_close(substream, AZF_CODEC_I2S_OUT);
-}
-
 /******************************************************************/
 
 static struct snd_pcm_ops snd_azf3328_playback_ops = {
-        .open =         snd_azf3328_playback_open,
-        .close =        snd_azf3328_playback_close,
+        .open =         snd_azf3328_pcm_playback_open,
+        .close =        snd_azf3328_pcm_close,
         .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_azf3328_hw_params,
         .hw_free =      snd_azf3328_hw_free,
-        .prepare =      snd_azf3328_codec_prepare,
-        .trigger =      snd_azf3328_codec_playback_trigger,
-        .pointer =      snd_azf3328_codec_playback_pointer
+        .prepare =      snd_azf3328_pcm_prepare,
+        .trigger =      snd_azf3328_pcm_trigger,
+        .pointer =      snd_azf3328_pcm_pointer
 };
 
 static struct snd_pcm_ops snd_azf3328_capture_ops = {
-        .open =         snd_azf3328_capture_open,
-        .close =        snd_azf3328_capture_close,
+        .open =         snd_azf3328_pcm_capture_open,
+        .close =        snd_azf3328_pcm_close,
         .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_azf3328_hw_params,
         .hw_free =      snd_azf3328_hw_free,
-        .prepare =      snd_azf3328_codec_prepare,
-        .trigger =      snd_azf3328_codec_capture_trigger,
-        .pointer =      snd_azf3328_codec_capture_pointer
+        .prepare =      snd_azf3328_pcm_prepare,
+        .trigger =      snd_azf3328_pcm_trigger,
+        .pointer =      snd_azf3328_pcm_pointer
 };
 
 static struct snd_pcm_ops snd_azf3328_i2s_out_ops = {
-        .open =         snd_azf3328_i2s_out_open,
-        .close =        snd_azf3328_i2s_out_close,
+        .open =         snd_azf3328_pcm_i2s_out_open,
+        .close =        snd_azf3328_pcm_close,
         .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_azf3328_hw_params,
         .hw_free =      snd_azf3328_hw_free,
-        .prepare =      snd_azf3328_codec_prepare,
-        .trigger =      snd_azf3328_codec_i2s_out_trigger,
-        .pointer =      snd_azf3328_codec_i2s_out_pointer
+        .prepare =      snd_azf3328_pcm_prepare,
+        .trigger =      snd_azf3328_pcm_trigger,
+        .pointer =      snd_azf3328_pcm_pointer
 };
 
 static int __devinit
@@ -1961,7 +2292,7 @@ snd_azf3328_timer_start(struct snd_timer *timer)
                 snd_azf3328_dbgtimer("delay was too low (%d)!\n", delay);
                 delay = 49; /* minimum time is 49 ticks */
         }
-        snd_azf3328_dbgtimer("setting timer countdown value %d, add COUNTDOWN|IRQ\n", delay);
+        snd_azf3328_dbgtimer("setting timer countdown value %d\n", delay);
         delay |= TIMER_COUNTDOWN_ENABLE | TIMER_IRQ_ENABLE;
         spin_lock_irqsave(&chip->reg_lock, flags);
         snd_azf3328_ctrl_outl(chip, IDX_IO_TIMER_VALUE, delay);
@@ -1980,8 +2311,13 @@ snd_azf3328_timer_stop(struct snd_timer *timer)
         chip = snd_timer_chip(timer);
         spin_lock_irqsave(&chip->reg_lock, flags);
         /* disable timer countdown and interrupt */
-        /* FIXME: should we write TIMER_IRQ_ACK here? */
-        snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0);
+        /* Hmm, should we write TIMER_IRQ_ACK here?
+           YES indeed, otherwise a rogue timer operation - which prompts
+           ALSA(?) to call repeated stop() in vain, but NOT start() -
+           will never end (value 0x03 is kept shown in control byte).
+           Simply manually poking 0x04 _once_ immediately successfully stops
+           the hardware/ALSA interrupt activity. */
+        snd_azf3328_ctrl_outb(chip, IDX_IO_TIMER_VALUE + 3, 0x04);
         spin_unlock_irqrestore(&chip->reg_lock, flags);
         snd_azf3328_dbgcallleave();
         return 0;
@@ -2052,11 +2388,7 @@ snd_azf3328_free(struct snd_azf3328 *chip)
         if (chip->irq < 0)
                 goto __end_hw;
 
-        /* reset (close) mixer:
-         * first mute master volume, then reset
-         */
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);
-        snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);
+        snd_azf3328_mixer_reset(chip);
 
         snd_azf3328_timer_stop(chip->timer);
         snd_azf3328_gameport_free(chip);
@@ -2170,6 +2502,7 @@ snd_azf3328_create(struct snd_card *card,
         };
         u8 dma_init;
         enum snd_azf3328_codec_type codec_type;
+        struct snd_azf3328_codec_data *codec_setup;
 
         *rchip = NULL;
 
@@ -2207,15 +2540,23 @@ snd_azf3328_create(struct snd_card *card,
         chip->opl3_io  = pci_resource_start(pci, 3);
         chip->mixer_io = pci_resource_start(pci, 4);
 
-        chip->codecs[AZF_CODEC_PLAYBACK].io_base =
-                                chip->ctrl_io + AZF_IO_OFFS_CODEC_PLAYBACK;
-        chip->codecs[AZF_CODEC_PLAYBACK].name = "PLAYBACK";
-        chip->codecs[AZF_CODEC_CAPTURE].io_base =
-                                chip->ctrl_io + AZF_IO_OFFS_CODEC_CAPTURE;
-        chip->codecs[AZF_CODEC_CAPTURE].name = "CAPTURE";
-        chip->codecs[AZF_CODEC_I2S_OUT].io_base =
-                                chip->ctrl_io + AZF_IO_OFFS_CODEC_I2S_OUT;
-        chip->codecs[AZF_CODEC_I2S_OUT].name = "I2S_OUT";
+        codec_setup = &chip->codecs[AZF_CODEC_PLAYBACK];
+        codec_setup->io_base = chip->ctrl_io + AZF_IO_OFFS_CODEC_PLAYBACK;
+        codec_setup->lock = &chip->reg_lock;
+        codec_setup->type = AZF_CODEC_PLAYBACK;
+        codec_setup->name = "PLAYBACK";
+
+        codec_setup = &chip->codecs[AZF_CODEC_CAPTURE];
+        codec_setup->io_base = chip->ctrl_io + AZF_IO_OFFS_CODEC_CAPTURE;
+        codec_setup->lock = &chip->reg_lock;
+        codec_setup->type = AZF_CODEC_CAPTURE;
+        codec_setup->name = "CAPTURE";
+
+        codec_setup = &chip->codecs[AZF_CODEC_I2S_OUT];
+        codec_setup->io_base = chip->ctrl_io + AZF_IO_OFFS_CODEC_I2S_OUT;
+        codec_setup->lock = &chip->reg_lock;
+        codec_setup->type = AZF_CODEC_I2S_OUT;
+        codec_setup->name = "I2S_OUT";
 
         if (request_irq(pci->irq, snd_azf3328_interrupt,
                         IRQF_SHARED, card->shortname, chip)) {
@@ -2247,15 +2588,15 @@ snd_azf3328_create(struct snd_card *card,
                 struct snd_azf3328_codec_data *codec =
                          &chip->codecs[codec_type];
 
-                /* shutdown codecs to save power */
+                /* shutdown codecs to reduce power / noise */
                         /* have ...ctrl_codec_activity() act properly */
                 codec->running = 1;
                 snd_azf3328_ctrl_codec_activity(chip, codec_type, 0);
 
-                spin_lock_irq(&chip->reg_lock);
+                spin_lock_irq(codec->lock);
                 snd_azf3328_codec_outb(codec, IDX_IO_CODEC_DMA_FLAGS,
                                                  dma_init);
-                spin_unlock_irq(&chip->reg_lock);
+                spin_unlock_irq(codec->lock);
         }
 
         snd_card_set_dev(card, &pci->dev);
@@ -2400,6 +2741,55 @@ snd_azf3328_suspend_regs(unsigned long io_addr, unsigned count, u32 *saved_regs)
         }
 }
 
+static inline void
+snd_azf3328_resume_regs(const u32 *saved_regs,
+                        unsigned long io_addr,
+                        unsigned count
+)
+{
+        unsigned reg;
+
+        for (reg = 0; reg < count; ++reg) {
+                outl(*saved_regs, io_addr);
+                snd_azf3328_dbgpm("resume: io 0x%04lx: 0x%08x --> 0x%08x\n",
+                        io_addr, *saved_regs, inl(io_addr));
+                ++saved_regs;
+                io_addr += sizeof(*saved_regs);
+        }
+}
+
+static inline void
+snd_azf3328_suspend_ac97(struct snd_azf3328 *chip)
+{
+#ifdef AZF_USE_AC97_LAYER
+        snd_ac97_suspend(chip->ac97);
+#else
+        snd_azf3328_suspend_regs(chip->mixer_io,
+                ARRAY_SIZE(chip->saved_regs_mixer), chip->saved_regs_mixer);
+
+        /* make sure to disable master volume etc. to prevent looping sound */
+        snd_azf3328_mixer_mute_control_master(chip, 1);
+        snd_azf3328_mixer_mute_control_pcm(chip, 1);
+#endif /* AZF_USE_AC97_LAYER */
+}
+
+static inline void
+snd_azf3328_resume_ac97(const struct snd_azf3328 *chip)
+{
+#ifdef AZF_USE_AC97_LAYER
+        snd_ac97_resume(chip->ac97);
+#else
+        snd_azf3328_resume_regs(chip->saved_regs_mixer, chip->mixer_io,
+                                        ARRAY_SIZE(chip->saved_regs_mixer));
+
+        /* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)
+           and IDX_MIXER_RESET (offset 0x00) get touched at the same time,
+           resulting in a mixer reset condition persisting until _after_
+           master vol was restored. Thus master vol needs an extra restore. */
+        outw(((u16 *)chip->saved_regs_mixer)[1], chip->mixer_io + 2);
+#endif /* AZF_USE_AC97_LAYER */
+}
+
 static int
 snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
 {
@@ -2409,15 +2799,11 @@ snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 
+        /* same pcm object for playback/capture */
         snd_pcm_suspend_all(chip->pcm[AZF_CODEC_PLAYBACK]);
         snd_pcm_suspend_all(chip->pcm[AZF_CODEC_I2S_OUT]);
 
-        snd_azf3328_suspend_regs(chip->mixer_io,
-                ARRAY_SIZE(chip->saved_regs_mixer), chip->saved_regs_mixer);
-
-        /* make sure to disable master volume etc. to prevent looping sound */
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 1);
+        snd_azf3328_suspend_ac97(chip);
 
         snd_azf3328_suspend_regs(chip->ctrl_io,
                 ARRAY_SIZE(chip->saved_regs_ctrl), chip->saved_regs_ctrl);
@@ -2439,23 +2825,6 @@ snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
         return 0;
 }
 
-static inline void
-snd_azf3328_resume_regs(const u32 *saved_regs,
-                        unsigned long io_addr,
-                        unsigned count
-)
-{
-        unsigned reg;
-
-        for (reg = 0; reg < count; ++reg) {
-                outl(*saved_regs, io_addr);
-                snd_azf3328_dbgpm("resume: io 0x%04lx: 0x%08x --> 0x%08x\n",
-                        io_addr, *saved_regs, inl(io_addr));
-                ++saved_regs;
-                io_addr += sizeof(*saved_regs);
-        }
-}
-
 static int
 snd_azf3328_resume(struct pci_dev *pci)
 {
@@ -2479,14 +2848,7 @@ snd_azf3328_resume(struct pci_dev *pci)
         snd_azf3328_resume_regs(chip->saved_regs_opl3, chip->opl3_io,
                                         ARRAY_SIZE(chip->saved_regs_opl3));
 
-        snd_azf3328_resume_regs(chip->saved_regs_mixer, chip->mixer_io,
-                                        ARRAY_SIZE(chip->saved_regs_mixer));
-
-        /* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)
-           and IDX_MIXER_RESET (offset 0x00) get touched at the same time,
-           resulting in a mixer reset condition persisting until _after_
-           master vol was restored. Thus master vol needs an extra restore. */
-        outw(((u16 *)chip->saved_regs_mixer)[1], chip->mixer_io + 2);
+        snd_azf3328_resume_ac97(chip);
 
         snd_azf3328_resume_regs(chip->saved_regs_ctrl, chip->ctrl_io,
                                         ARRAY_SIZE(chip->saved_regs_ctrl));
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 37e1b5df5ab8..2958a05b5293 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -637,15 +637,9 @@ static struct snd_kcontrol_new snd_bt87x_capture_boost = {
 static int snd_bt87x_capture_source_info(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_info *info)
 {
-        static char *texts[3] = {"TV Tuner", "FM", "Mic/Line"};
+        static const char *const texts[3] = {"TV Tuner", "FM", "Mic/Line"};
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item > 2)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 3, texts);
 }
 
 static int snd_bt87x_capture_source_get(struct snd_kcontrol *kcontrol,
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 14b8d9a91aae..e8e8ccc96403 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -51,7 +51,7 @@
  *    Add support for mute control on SB Live 24bit (cards w/ SPI DAC)
  *
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -175,7 +175,7 @@
 /* CA0106 pointer-offset register set, accessed through the PTR and DATA registers                     */
 /********************************************************************************************************/
                                                                                                                            
-/* Initally all registers from 0x00 to 0x3f have zero contents. */
+/* Initially all registers from 0x00 to 0x3f have zero contents. */
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
                                                 /* One list entry: 4 bytes for DMA address, 
                                                  * 4 bytes for period_size << 16.
@@ -188,7 +188,7 @@
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
                                                 /* PTR[5:0], Default: 0x0 */
 #define PLAYBACK_UNKNOWN3       0x03            /* Not used ?? */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
                                                 /* DMA[31:0], Default: 0x0 */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size. win2000 uses 0x04000000 */
                                                 /* SIZE[31:16], Default: 0x0 */
@@ -223,7 +223,7 @@
  * The jack has 4 poles. I will call 1 - Tip, 2 - Next to 1, 3 - Next to 2, 4 - Next to 3
  * For Analogue: 1 -> Center Speaker, 2 -> Sub Woofer, 3 -> Ground, 4 -> Ground
  * For Digital: 1 -> Front SPDIF, 2 -> Rear SPDIF, 3 -> Center/Subwoofer SPDIF, 4 -> Ground.
- * Standard 4 pole Video A/V cable with RCA outputs: 1 -> White, 2 -> Yellow, 3 -> Sheild on all three, 4 -> Red.
+ * Standard 4 pole Video A/V cable with RCA outputs: 1 -> White, 2 -> Yellow, 3 -> Shield on all three, 4 -> Red.
  * So, from this you can see that you cannot use a Standard 4 pole Video A/V cable with the SB Audigy LS card.
  */
 /* The Front SPDIF PCM gets mixed with samples from the AC97 codec, so can only work for Stereo PCM and not AC3/DTS
@@ -670,8 +670,9 @@ struct snd_ca0106_details {
                            gpio_type = 2 -> shared side-out/line-in. */
         int i2c_adc;    /* with i2c_adc=1, the driver adds some capture volume
                            controls, phone, mic, line-in and aux. */
-        int spi_dac;    /* spi_dac=1 adds the mute switch for each analog
-                           output, front, rear, etc. */
+        u16 spi_dac;    /* spi_dac = 0 -> no spi interface for DACs
+                           spi_dac = 0x<front><rear><center-lfe><side>
+                           -> specifies DAC id for each channel pair. */
 };
 
 // definition of the chip-specific record
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 0a3d3d6e77b4..437759239694 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -117,7 +117,7 @@
  *    DAC: Unknown
  *    Trying to handle it like the SB0410.
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -227,7 +227,7 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
            .name   = "Audigy SE [SB0570]",
            .gpio_type = 1,
            .i2c_adc = 1,
-           .spi_dac = 1 } ,
+           .spi_dac = 0x4021 } ,
          /* New Audigy LS. Has a different DAC. */
          /* SB0570:
           * CTRL:CA0106-DAT
@@ -238,7 +238,17 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
            .name   = "Audigy SE OEM [SB0570a]",
            .gpio_type = 1,
            .i2c_adc = 1,
-           .spi_dac = 1 } ,
+           .spi_dac = 0x4021 } ,
+        /* Sound Blaster 5.1vx
+         * Tested: Playback on front, rear, center/lfe speakers
+         * Not-Tested: Capture
+         */
+        { .serial = 0x10041102,
+          .name   = "Sound Blaster 5.1vx [SB1070]",
+          .gpio_type = 1,
+          .i2c_adc = 0,
+          .spi_dac = 0x0124
+         } ,
          /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
          /* SB0438
           * CTRL:CA0106-DAT
@@ -254,7 +264,7 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
            .name   = "MSI K8N Diamond MB",
            .gpio_type = 2,
            .i2c_adc = 1,
-           .spi_dac = 1 } ,
+           .spi_dac = 0x4021 } ,
         /* Giga-byte GA-G1975X mobo
          * Novell bnc#395807
          */
@@ -483,16 +493,18 @@ static void snd_ca0106_pcm_free_substream(struct snd_pcm_runtime *runtime)
 }
 
 static const int spi_dacd_reg[] = {
-        [PCM_FRONT_CHANNEL]     = SPI_DACD4_REG,
-        [PCM_REAR_CHANNEL]      = SPI_DACD0_REG,
-        [PCM_CENTER_LFE_CHANNEL]= SPI_DACD2_REG,
-        [PCM_UNKNOWN_CHANNEL]   = SPI_DACD1_REG,
+        SPI_DACD0_REG,
+        SPI_DACD1_REG,
+        SPI_DACD2_REG,
+        0,
+        SPI_DACD4_REG,
 };
 static const int spi_dacd_bit[] = {
-        [PCM_FRONT_CHANNEL]     = SPI_DACD4_BIT,
-        [PCM_REAR_CHANNEL]      = SPI_DACD0_BIT,
-        [PCM_CENTER_LFE_CHANNEL]= SPI_DACD2_BIT,
-        [PCM_UNKNOWN_CHANNEL]   = SPI_DACD1_BIT,
+        SPI_DACD0_BIT,
+        SPI_DACD1_BIT,
+        SPI_DACD2_BIT,
+        0,
+        SPI_DACD4_BIT,
 };
 
 static void restore_spdif_bits(struct snd_ca0106 *chip, int idx)
@@ -504,6 +516,45 @@ static void restore_spdif_bits(struct snd_ca0106 *chip, int idx)
         }
 }
 
+static int snd_ca0106_channel_dac(struct snd_ca0106_details *details,
+                                  int channel_id)
+{
+        switch (channel_id) {
+        case PCM_FRONT_CHANNEL:
+                return (details->spi_dac & 0xf000) >> (4 * 3);
+        case PCM_REAR_CHANNEL:
+                return (details->spi_dac & 0x0f00) >> (4 * 2);
+        case PCM_CENTER_LFE_CHANNEL:
+                return (details->spi_dac & 0x00f0) >> (4 * 1);
+        case PCM_UNKNOWN_CHANNEL:
+                return (details->spi_dac & 0x000f) >> (4 * 0);
+        default:
+                snd_printk(KERN_DEBUG "ca0106: unknown channel_id %d\n",
+                           channel_id);
+        }
+        return 0;
+}
+
+static int snd_ca0106_pcm_power_dac(struct snd_ca0106 *chip, int channel_id,
+                                    int power)
+{
+        if (chip->details->spi_dac) {
+                const int dac = snd_ca0106_channel_dac(chip->details,
+                                                       channel_id);
+                const int reg = spi_dacd_reg[dac];
+                const int bit = spi_dacd_bit[dac];
+
+                if (power)
+                        /* Power up */
+                        chip->spi_dac_reg[reg] &= ~bit;
+                else
+                        /* Power down */
+                        chip->spi_dac_reg[reg] |= bit;
+                return snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]);
+        }
+        return 0;
+}
+
 /* open_playback callback */
 static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substream,
                                                 int channel_id)
@@ -543,12 +594,9 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
                 return err;
         snd_pcm_set_sync(substream);
 
-        if (chip->details->spi_dac && channel_id != PCM_FRONT_CHANNEL) {
-                const int reg = spi_dacd_reg[channel_id];
-
-                /* Power up dac */
-                chip->spi_dac_reg[reg] &= ~spi_dacd_bit[channel_id];
-                err = snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]);
+        /* Front channel dac should already be on */
+        if (channel_id != PCM_FRONT_CHANNEL) {
+                err = snd_ca0106_pcm_power_dac(chip, channel_id, 1);
                 if (err < 0)
                         return err;
         }
@@ -568,13 +616,14 @@ static int snd_ca0106_pcm_close_playback(struct snd_pcm_substream *substream)
 
         restore_spdif_bits(chip, epcm->channel_id);
 
-        if (chip->details->spi_dac && epcm->channel_id != PCM_FRONT_CHANNEL) {
-                const int reg = spi_dacd_reg[epcm->channel_id];
-
-                /* Power down DAC */
-                chip->spi_dac_reg[reg] |= spi_dacd_bit[epcm->channel_id];
-                snd_ca0106_spi_write(chip, chip->spi_dac_reg[reg]);
+        /* Front channel dac should stay on */
+        if (epcm->channel_id != PCM_FRONT_CHANNEL) {
+                int err;
+                err = snd_ca0106_pcm_power_dac(chip, epcm->channel_id, 0);
+                if (err < 0)
+                        return err;
         }
+
         /* FIXME: maybe zero others */
         return 0;
 }
@@ -1002,29 +1051,27 @@ snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream)
         struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_ca0106_pcm *epcm = runtime->private_data;
-        snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;
+        unsigned int ptr, prev_ptr;
         int channel = epcm->channel_id;
+        int timeout = 10;
 
         if (!epcm->running)
                 return 0;
 
-        ptr3 = snd_ca0106_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
-        ptr1 = snd_ca0106_ptr_read(emu, PLAYBACK_POINTER, channel);
-        ptr4 = snd_ca0106_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
-        if (ptr3 != ptr4) ptr1 = snd_ca0106_ptr_read(emu, PLAYBACK_POINTER, channel);
-        ptr2 = bytes_to_frames(runtime, ptr1);
-        ptr2+= (ptr4 >> 3) * runtime->period_size;
-        ptr=ptr2;
-        if (ptr >= runtime->buffer_size)
-                ptr -= runtime->buffer_size;
-        /*
-        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;
+        prev_ptr = -1;
+        do {
+                ptr = snd_ca0106_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
+                ptr = (ptr >> 3) * runtime->period_size;
+                ptr += bytes_to_frames(runtime,
+                        snd_ca0106_ptr_read(emu, PLAYBACK_POINTER, channel));
+                if (ptr >= runtime->buffer_size)
+                        ptr -= runtime->buffer_size;
+                if (prev_ptr == ptr)
+                        return ptr;
+                prev_ptr = ptr;
+        } while (--timeout);
+        snd_printk(KERN_WARNING "ca0106: unstable DMA pointer!\n");
+        return 0;
 }
 
 /* pointer_capture callback */
@@ -1035,7 +1082,7 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_ca0106_pcm *epcm = runtime->private_data;
         snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
-        int channel = channel=epcm->channel_id;
+        int channel = epcm->channel_id;
 
         if (!epcm->running)
                 return 0;
@@ -1362,7 +1409,7 @@ static unsigned int spi_dac_init[] = {
         SPI_REG(12,             0x00),
         SPI_REG(SPI_LDA4_REG,   SPI_DA_BIT_0dB),
         SPI_REG(SPI_RDA4_REG,   SPI_DA_BIT_0dB | SPI_DA_BIT_UPDATE),
-        SPI_REG(SPI_DACD4_REG,  0x00),
+        SPI_REG(SPI_DACD4_REG,  SPI_DACD4_BIT),
 };
 
 static unsigned int i2c_adc_init[][2] = {
@@ -1541,7 +1588,7 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)
                 /* snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); */
         }
 
-        if (chip->details->spi_dac == 1) {
+        if (chip->details->spi_dac) {
                 /* The SB0570 use SPI to control DAC. */
                 int size, n;
 
@@ -1553,6 +1600,9 @@ static void ca0106_init_chip(struct snd_ca0106 *chip, int resume)
                         if (reg < ARRAY_SIZE(chip->spi_dac_reg))
                                 chip->spi_dac_reg[reg] = spi_dac_init[n];
                 }
+
+                /* Enable front dac only */
+                snd_ca0106_pcm_power_dac(chip, PCM_FRONT_CHANNEL, 1);
         }
 }
 
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 85fd315d9999..84f3f92436b5 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -42,7 +42,7 @@
  *  0.0.18
  *    Add support for mute control on SB Live 24bit (cards w/ SPI DAC)
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -676,28 +676,65 @@ static struct snd_kcontrol_new snd_ca0106_volume_i2c_adc_ctls[] __devinitdata =
         I2C_VOLUME("Aux Capture Volume", 3),
 };
 
-#define SPI_SWITCH(xname,reg,bit) \
-{                                                               \
-        .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,    \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
-        .info   = spi_mute_info,                                \
-        .get    = spi_mute_get,                                 \
-        .put    = spi_mute_put,                                 \
-        .private_value = (reg<<SPI_REG_SHIFT) | (bit)           \
-}
-
-static struct snd_kcontrol_new snd_ca0106_volume_spi_dac_ctls[]
-__devinitdata = {
-        SPI_SWITCH("Analog Front Playback Switch",
-                   SPI_DMUTE4_REG, SPI_DMUTE4_BIT),
-        SPI_SWITCH("Analog Rear Playback Switch",
-                   SPI_DMUTE0_REG, SPI_DMUTE0_BIT),
-        SPI_SWITCH("Analog Center/LFE Playback Switch",
-                   SPI_DMUTE2_REG, SPI_DMUTE2_BIT),
-        SPI_SWITCH("Analog Side Playback Switch",
-                   SPI_DMUTE1_REG, SPI_DMUTE1_BIT),
+static const int spi_dmute_reg[] = {
+        SPI_DMUTE0_REG,
+        SPI_DMUTE1_REG,
+        SPI_DMUTE2_REG,
+        0,
+        SPI_DMUTE4_REG,
+};
+static const int spi_dmute_bit[] = {
+        SPI_DMUTE0_BIT,
+        SPI_DMUTE1_BIT,
+        SPI_DMUTE2_BIT,
+        0,
+        SPI_DMUTE4_BIT,
 };
 
+static struct snd_kcontrol_new __devinit
+snd_ca0106_volume_spi_dac_ctl(struct snd_ca0106_details *details,
+                              int channel_id)
+{
+        struct snd_kcontrol_new spi_switch = {0};
+        int reg, bit;
+        int dac_id;
+
+        spi_switch.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        spi_switch.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
+        spi_switch.info = spi_mute_info;
+        spi_switch.get = spi_mute_get;
+        spi_switch.put = spi_mute_put;
+
+        switch (channel_id) {
+        case PCM_FRONT_CHANNEL:
+                spi_switch.name = "Analog Front Playback Switch";
+                dac_id = (details->spi_dac & 0xf000) >> (4 * 3);
+                break;
+        case PCM_REAR_CHANNEL:
+                spi_switch.name = "Analog Rear Playback Switch";
+                dac_id = (details->spi_dac & 0x0f00) >> (4 * 2);
+                break;
+        case PCM_CENTER_LFE_CHANNEL:
+                spi_switch.name = "Analog Center/LFE Playback Switch";
+                dac_id = (details->spi_dac & 0x00f0) >> (4 * 1);
+                break;
+        case PCM_UNKNOWN_CHANNEL:
+                spi_switch.name = "Analog Side Playback Switch";
+                dac_id = (details->spi_dac & 0x000f) >> (4 * 0);
+                break;
+        default:
+                /* Unused channel */
+                spi_switch.name = NULL;
+                dac_id = 0;
+        }
+        reg = spi_dmute_reg[dac_id];
+        bit = spi_dmute_bit[dac_id];
+
+        spi_switch.private_value = (reg << SPI_REG_SHIFT) | bit;
+
+        return spi_switch;
+}
+
 static int __devinit remove_ctl(struct snd_card *card, const char *name)
 {
         struct snd_ctl_elem_id id;
@@ -832,8 +869,18 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                 if (err < 0)
                         return err;
         }
-        if (emu->details->spi_dac == 1)
-                ADD_CTLS(emu, snd_ca0106_volume_spi_dac_ctls);
+        if (emu->details->spi_dac) {
+                int i;
+                for (i = 0;; i++) {
+                        struct snd_kcontrol_new ctl;
+                        ctl = snd_ca0106_volume_spi_dac_ctl(emu->details, i);
+                        if (!ctl.name)
+                                break;
+                        err = snd_ctl_add(card, snd_ctl_new1(&ctl, emu));
+                        if (err < 0)
+                                return err;
+                }
+        }
 
         /* Create virtual master controls */
         vmaster = snd_ctl_make_virtual_master("Master Playback Volume",
@@ -845,7 +892,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                 return err;
         add_slaves(card, vmaster, slave_vols);
 
-        if (emu->details->spi_dac == 1) {
+        if (emu->details->spi_dac) {
                 vmaster = snd_ctl_make_virtual_master("Master Playback Switch",
                                                       NULL);
                 if (!vmaster)
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index ba96428c9f4c..c694464b1168 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -42,7 +42,7 @@
  *  0.0.18
  *    Implement support for Line-in capture on SB Live 24bit.
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 329968edca9b..f4e573555da3 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
 module_param_array(fm_port, long, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port.");
 module_param_array(soft_ac3, bool, NULL, 0444);
-MODULE_PARM_DESC(soft_ac3, "Sofware-conversion of raw SPDIF packets (model 033 only).");
+MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");
 #ifdef SUPPORT_JOYSTICK
 module_param_array(joystick_port, int, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address.");
@@ -656,8 +656,8 @@ out:
 }
 
 /*
- * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff
- * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen
+ * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff
+ * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen
  * at the register CM_REG_FUNCTRL1 (0x04).
  * Problem: other ways are also possible (any information about that?)
  */
@@ -666,7 +666,7 @@ static void snd_cmipci_set_pll(struct cmipci *cm, unsigned int rate, unsigned in
         unsigned int reg = CM_REG_PLL + slot;
         /*
          * Guess that this programs at reg. 0x04 the pos 15:13/12:10
-         * for DSFC/ASFC (000 upto 111).
+         * for DSFC/ASFC (000 up to 111).
          */
 
         /* FIXME: Init (Do we've to set an other register first before programming?) */
@@ -2507,14 +2507,12 @@ static int snd_cmipci_line_in_mode_info(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_info *uinfo)
 {
         struct cmipci *cm = snd_kcontrol_chip(kcontrol);
-        static char *texts[3] = { "Line-In", "Rear Output", "Bass Output" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = cm->chip_version >= 39 ? 3 : 2;
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        static const char *const texts[3] = {
+                "Line-In", "Rear Output", "Bass Output"
+        };
+
+        return snd_ctl_enum_info(uinfo, 1,
+                                 cm->chip_version >= 39 ? 3 : 2, texts);
 }
 
 static inline unsigned int get_line_in_mode(struct cmipci *cm)
@@ -2564,14 +2562,9 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,
 static int snd_cmipci_mic_in_mode_info(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[2] = { "Mic-In", "Center/LFE Output" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        static const char *const texts[2] = { "Mic-In", "Center/LFE Output" };
+
+        return snd_ctl_enum_info(uinfo, 1, 2, texts);
 }
 
 static int snd_cmipci_mic_in_mode_get(struct snd_kcontrol *kcontrol,
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 3e5ca8fb519f..e377287192aa 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -225,39 +225,25 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
 {
         struct dsp_spos_instance * ins = kzalloc(sizeof(struct dsp_spos_instance), GFP_KERNEL);
 
-        if (ins == NULL) 
+        if (ins == NULL)
                 return NULL;
 
         /* better to use vmalloc for this big table */
-        ins->symbol_table.nsymbols = 0;
         ins->symbol_table.symbols = vmalloc(sizeof(struct dsp_symbol_entry) *
                                             DSP_MAX_SYMBOLS);
-        ins->symbol_table.highest_frag_index = 0;
-
-        if (ins->symbol_table.symbols == NULL) {
+        ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);
+        ins->modules = kmalloc(sizeof(struct dsp_module_desc) * DSP_MAX_MODULES, GFP_KERNEL);
+        if (!ins->symbol_table.symbols || !ins->code.data || !ins->modules) {
                 cs46xx_dsp_spos_destroy(chip);
                 goto error;
         }
-
+        ins->symbol_table.nsymbols = 0;
+        ins->symbol_table.highest_frag_index = 0;
         ins->code.offset = 0;
         ins->code.size = 0;
-        ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);
-
-        if (ins->code.data == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                goto error;
-        }
-
         ins->nscb = 0;
         ins->ntask = 0;
-
         ins->nmodules = 0;
-        ins->modules = kmalloc(sizeof(struct dsp_module_desc) * DSP_MAX_MODULES, GFP_KERNEL);
-
-        if (ins->modules == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                goto error;
-        }
 
         /* default SPDIF input sample rate
            to 48000 khz */
@@ -271,8 +257,8 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
 
         /* set left and right validity bits and
            default channel status */
-        ins->spdif_csuv_default = 
-                ins->spdif_csuv_stream =  
+        ins->spdif_csuv_default =
+                ins->spdif_csuv_stream =
          /* byte 0 */  ((unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF        & 0xff)) << 24) |
          /* byte 1 */  ((unsigned int)_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF >> 8) & 0xff)) << 16) |
          /* byte 3 */   (unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) |
@@ -281,6 +267,9 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
         return ins;
 
 error:
+        kfree(ins->modules);
+        kfree(ins->code.data);
+        vfree(ins->symbol_table.symbols);
         kfree(ins);
         return NULL;
 }
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index f16bc8aad6ed..e083122ca55a 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -149,7 +149,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
                         &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[i];
                 desc->addr = cpu_to_le32(addr);
                 desc->size = cpu_to_le32(period_bytes);
-                desc->ctlreserved = cpu_to_le32(PRD_EOP);
+                desc->ctlreserved = cpu_to_le16(PRD_EOP);
                 desc_addr += sizeof(struct cs5535audio_dma_desc);
                 addr += period_bytes;
         }
@@ -157,7 +157,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
         lastdesc = &((struct cs5535audio_dma_desc *) dma->desc_buf.area)[periods];
         lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr);
         lastdesc->size = 0;
-        lastdesc->ctlreserved = cpu_to_le32(PRD_JMP);
+        lastdesc->ctlreserved = cpu_to_le16(PRD_JMP);
         jmpprd_addr = cpu_to_le32(lastdesc->addr +
                                   (sizeof(struct cs5535audio_dma_desc)*periods));
 
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
index a3301cc4ab82..185b00088320 100644
--- a/sound/pci/cs5535audio/cs5535audio_pm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -90,12 +90,7 @@ int snd_cs5535audio_resume(struct pci_dev *pci)
         int i;
 
         pci_set_power_state(pci, PCI_D0);
-        if (pci_restore_state(pci) < 0) {
-                printk(KERN_ERR "cs5535audio: pci_restore_state failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
+        pci_restore_state(pci);
         if (pci_enable_device(pci) < 0) {
                 printk(KERN_ERR "cs5535audio: pci_enable_device failed, "
                        "disabling device\n");
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 1bff80cde0a2..13f33c0719d3 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -869,7 +869,7 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm)
         mutex_lock(&atc->atc_mutex);
         dao->ops->get_spos(dao, &status);
         if (((status >> 24) & IEC958_AES3_CON_FS) != iec958_con_fs) {
-                status &= ((~IEC958_AES3_CON_FS) << 24);
+                status &= ~(IEC958_AES3_CON_FS << 24);
                 status |= (iec958_con_fs << 24);
                 dao->ops->set_spos(dao, status);
                 dao->ops->commit_write(dao);
@@ -1627,7 +1627,7 @@ static struct ct_atc atc_preset __devinitdata = {
  *  Creates and initializes a hardware manager.
  *
  *  Creates kmallocated ct_atc structure. Initializes hardware.
- *  Returns 0 if suceeds, or negative error code if fails.
+ *  Returns 0 if succeeds, or negative error code if fails.
  */
 
 int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index af56eb949bde..47d9ea97de02 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -176,6 +176,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
         if (!entry)
                 return -ENOMEM;
 
+        dao->ops->clear_left_input(dao);
         /* Program master and conjugate resources */
         input->ops->master(input);
         daio->rscl.ops->master(&daio->rscl);
@@ -204,6 +205,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
         if (!entry)
                 return -ENOMEM;
 
+        dao->ops->clear_right_input(dao);
         /* Program master and conjugate resources */
         input->ops->master(input);
         daio->rscr.ops->master(&daio->rscr);
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 0cf400f879f9..a5c957db5cea 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1285,7 +1285,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
         hw_write_20kx(hw, PTPALX, ptp_phys_low);
         hw_write_20kx(hw, PTPAHX, ptp_phys_high);
         hw_write_20kx(hw, TRNCTL, trnctl);
-        hw_write_20kx(hw, TRNIS, 0x200c01); /* realy needed? */
+        hw_write_20kx(hw, TRNIS, 0x200c01); /* really needed? */
 
         return 0;
 }
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index b6b11bfe7574..5364164674e4 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -1307,10 +1307,10 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
         set_field(&pllctl, PLLCTL_B, 0);
         if (48000 == rsr) {
                 set_field(&pllctl, PLLCTL_FD, 16 - 2);
-                set_field(&pllctl, PLLCTL_RD, 1 - 1);
+                set_field(&pllctl, PLLCTL_RD, 1 - 1); /* 3000*16/1 = 48000 */
         } else { /* 44100 */
                 set_field(&pllctl, PLLCTL_FD, 147 - 2);
-                set_field(&pllctl, PLLCTL_RD, 10 - 1);
+                set_field(&pllctl, PLLCTL_RD, 10 - 1); /* 3000*147/10 = 44100 */
         }
         hw_write_20kx(hw, PLL_CTL, pllctl);
         mdelay(40);
@@ -1740,6 +1740,10 @@ static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)
         return data;
 }
 
+#define MIC_BOOST_0DB 0xCF
+#define MIC_BOOST_STEPS_PER_DB 2
+#define MIC_BOOST_20DB (MIC_BOOST_0DB + 20 * MIC_BOOST_STEPS_PER_DB)
+
 static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)
 {
         u32 data;
@@ -1751,10 +1755,12 @@ static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)
                 hw_write_20kx(hw, GPIO_DATA, data);
                 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),
                                 MAKE_WM8775_DATA(0x101)); /* Mic-in */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCL, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCR, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
                 break;
         case ADC_LINEIN:
                 data &= ~(0x1 << 14);
@@ -1827,10 +1833,12 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
 
                 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),
                                 MAKE_WM8775_DATA(0x101)); /* Mic-in */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCL, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCR, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
         } else if (mux == 2) {
                 /* Configures GPIO data to select Line-in */
                 data &= ~(0x1 << 14);
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index 15c1e7271ea8..c3519ff42fbb 100644
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -566,19 +566,6 @@ static int ct_spdif_get_mask(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int ct_spdif_default_get(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol)
-{
-        unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF;
-
-        ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
-        ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
-        ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
-        ucontrol->value.iec958.status[3] = (status >> 24) & 0xff;
-
-        return 0;
-}
-
 static int ct_spdif_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
 {
@@ -586,6 +573,10 @@ static int ct_spdif_get(struct snd_kcontrol *kcontrol,
         unsigned int status;
 
         atc->spdif_out_get_status(atc, &status);
+
+        if (status == 0)
+                status = SNDRV_PCM_DEFAULT_CON_SPDIF;
+
         ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
         ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
         ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
@@ -629,7 +620,7 @@ static struct snd_kcontrol_new iec958_default_ctl = {
         .name           = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
         .count          = 1,
         .info           = ct_spdif_info,
-        .get            = ct_spdif_default_get,
+        .get            = ct_spdif_get,
         .put            = ct_spdif_put,
         .private_value  = MIXER_IEC958_DEFAULT
 };
diff --git a/sound/pci/ctxfi/ctpcm.c b/sound/pci/ctxfi/ctpcm.c
index 85ab43e89212..457d21189b0d 100644
--- a/sound/pci/ctxfi/ctpcm.c
+++ b/sound/pci/ctxfi/ctpcm.c
@@ -129,8 +129,6 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)
 
         apcm->substream = substream;
         apcm->interrupt = ct_atc_pcm_interrupt;
-        runtime->private_data = apcm;
-        runtime->private_free = ct_atc_pcm_free_substream;
         if (IEC958 == substream->pcm->device) {
                 runtime->hw = ct_spdif_passthru_playback_hw;
                 atc->spdif_out_passthru(atc, 1);
@@ -155,8 +153,12 @@ static int ct_pcm_playback_open(struct snd_pcm_substream *substream)
         }
 
         apcm->timer = ct_timer_instance_new(atc->timer, apcm);
-        if (!apcm->timer)
+        if (!apcm->timer) {
+                kfree(apcm);
                 return -ENOMEM;
+        }
+        runtime->private_data = apcm;
+        runtime->private_free = ct_atc_pcm_free_substream;
 
         return 0;
 }
@@ -278,8 +280,6 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)
         apcm->started = 0;
         apcm->substream = substream;
         apcm->interrupt = ct_atc_pcm_interrupt;
-        runtime->private_data = apcm;
-        runtime->private_free = ct_atc_pcm_free_substream;
         runtime->hw = ct_pcm_capture_hw;
         runtime->hw.rate_max = atc->rsr * atc->msr;
 
@@ -298,8 +298,12 @@ static int ct_pcm_capture_open(struct snd_pcm_substream *substream)
         }
 
         apcm->timer = ct_timer_instance_new(atc->timer, apcm);
-        if (!apcm->timer)
+        if (!apcm->timer) {
+                kfree(apcm);
                 return -ENOMEM;
+        }
+        runtime->private_data = apcm;
+        runtime->private_free = ct_atc_pcm_free_substream;
 
         return 0;
 }
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 65da6e466f80..b78f3fc3c33c 100644
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -52,8 +52,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size)
 
         if (entry->size == size) {
                 /* Move the vm node from unused list to used list directly */
-                list_del(&entry->list);
-                list_add(&entry->list, &vm->used);
+                list_move(&entry->list, &vm->used);
                 vm->size -= size;
                 block = entry;
                 goto out;
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 66c7fb3ced3e..15f0161ce4a2 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -926,7 +926,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
         /* Unknown. */
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
-        /* IRQ Enable: Alll on */
+        /* IRQ Enable: All on */
         /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
         /* IRQ Enable: All off */
         snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .ca0102_chip = 1,
          .spk71 = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+        /* EMU0404 PCIe */
+        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
+         .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+         .id = "EMU0404",
+         .emu10k2_chip = 1,
+         .ca0108_chip = 1,
+         .spk71 = 1,
+         .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
         /* Note that all E-mu cards require kernel 2.6 or newer. */
         {.vendor = 0x1102, .device = 0x0008,
          .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index df47f738098d..0c701e4ec8a5 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
                                                  */
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size */
 #define PLAYBACK_POINTER        0x06            /* Playback period pointer. Sample currently in DAC */
 #define PLAYBACK_UNKNOWN1       0x07
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 7a9401462c1c..dae4050ede5c 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -303,6 +303,9 @@ static const u32 db_table[101] = {
 static const DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);
 static const DECLARE_TLV_DB_LINEAR(snd_emu10k1_db_linear, TLV_DB_GAIN_MUTE, 0);
 
+/* EMU10K1 bass/treble db gain */
+static const DECLARE_TLV_DB_SCALE(snd_emu10k1_bass_treble_db_scale, -1200, 60, 0);
+
 static const u32 onoff_table[2] = {
         0x00000000, 0x00000001
 };
@@ -2163,6 +2166,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
         ctl->min = 0;
         ctl->max = 40;
         ctl->value[0] = ctl->value[1] = 20;
+        ctl->tlv = snd_emu10k1_bass_treble_db_scale;
         ctl->translation = EMU10K1_GPR_TRANSLATION_BASS;
         ctl = &controls[i + 1];
         ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -2172,6 +2176,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
         ctl->min = 0;
         ctl->max = 40;
         ctl->value[0] = ctl->value[1] = 20;
+        ctl->tlv = snd_emu10k1_bass_treble_db_scale;
         ctl->translation = EMU10K1_GPR_TRANSLATION_TREBLE;
 
 #define BASS_GPR        0x8c
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 05afe06e353a..9d890a5aec5a 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1729,8 +1729,6 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                 "Master Mono Playback Volume",
                 "PCM Out Path & Mute",
                 "Mono Output Select",
-                "Front Playback Switch",
-                "Front Playback Volume",
                 "Surround Playback Switch",
                 "Surround Playback Volume",
                 "Center Playback Switch",
@@ -1879,6 +1877,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                                 emu->rear_ac97 = 1;
                                 snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
                                 snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
+                                remove_ctl(card,"Front Playback Volume");
+                                remove_ctl(card,"Front Playback Switch");
                         }
                         /* remove unused AC97 controls */
                         snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
@@ -1913,6 +1913,12 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
         for (; *c; c += 2)
                 rename_ctl(card, c[0], c[1]);
 
+        if (emu->card_capabilities->subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */
+                remove_ctl(card, "Center Playback Volume");
+                remove_ctl(card, "LFE Playback Volume");
+                remove_ctl(card, "Wave Center Playback Volume");
+                remove_ctl(card, "Wave LFE Playback Volume");
+        }
         if (emu->card_capabilities->subsystem == 0x20071102) {  /* Audigy 4 Pro */
                 rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");
                 rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c
index 8578c70c61f2..bab564824efe 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
@@ -321,7 +321,7 @@ static struct snd_rawmidi_ops snd_emu10k1_midi_input =
 
 static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi)
 {
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data;
+        struct snd_emu10k1_midi *midi = rmidi->private_data;
         midi->interrupt = NULL;
         midi->rmidi = NULL;
 }
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 957a311514c8..c250614dadd0 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -248,7 +248,7 @@ static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
 /*
  * map the given memory block on PTB.
  * if the block is already mapped, update the link order.
- * if no empty pages are found, tries to release unsed memory blocks
+ * if no empty pages are found, tries to release unused memory blocks
  * and retry the mapping.
  */
 int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 61b8ab39800f..a81dc44228ea 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -69,7 +69,7 @@
  *    ADC: Philips 1361T (Stereo 24bit)
  *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h
index 153214940336..4e0ee1a9747a 100644
--- a/sound/pci/emu10k1/p16v.h
+++ b/sound/pci/emu10k1/p16v.h
@@ -59,7 +59,7 @@
  *    ADC: Philips 1361T (Stereo 24bit)
  *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -86,7 +86,7 @@
  * The sample rate is also controlled by the same registers that control the rate of the EMU10K2 sample rate converters.
  */
 
-/* Initally all registers from 0x00 to 0x3f have zero contents. */
+/* Initially all registers from 0x00 to 0x3f have zero contents. */
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
                                                 /* One list entry: 4 bytes for DMA address, 
                                                  * 4 bytes for period_size << 16.
@@ -96,7 +96,7 @@
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
 #define PLAYBACK_UNKNOWN3       0x03            /* Not used */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size. win2000 uses 0x04000000 */
 #define PLAYBACK_POINTER        0x06            /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */
 #define PLAYBACK_FIFO_END_ADDRESS       0x07            /* Playback FIFO end address */
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index c7fba5379813..863eafea691f 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -22,7 +22,7 @@
 /* Power-Management-Code ( CONFIG_PM )
  * for ens1371 only ( FIXME )
  * derived from cs4281.c, atiixp.c and via82xx.c
- * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm
+ * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ 
  * by Kurt J. Bosch
  */
 
@@ -229,6 +229,7 @@ MODULE_PARM_DESC(lineio, "Line In to Rear Out (0 = auto, 1 = force).");
 #define ES_REG_1371_CODEC 0x14  /* W/R: Codec Read/Write register address */
 #define   ES_1371_CODEC_RDY        (1<<31)      /* codec ready */
 #define   ES_1371_CODEC_WIP        (1<<30)      /* codec register access in progress */
+#define   EV_1938_CODEC_MAGIC      (1<<26)
 #define   ES_1371_CODEC_PIRD       (1<<23)      /* codec read/write select register */
 #define   ES_1371_CODEC_WRITE(a,d) ((((a)&0x7f)<<16)|(((d)&0xffff)<<0))
 #define   ES_1371_CODEC_READS(a)   ((((a)&0x7f)<<16)|ES_1371_CODEC_PIRD)
@@ -603,12 +604,18 @@ static void snd_es1370_codec_write(struct snd_ak4531 *ak4531,
 
 #ifdef CHIP1371
 
+static inline bool is_ev1938(struct ensoniq *ensoniq)
+{
+        return ensoniq->pci->device == 0x8938;
+}
+
 static void snd_es1371_codec_write(struct snd_ac97 *ac97,
                                    unsigned short reg, unsigned short val)
 {
         struct ensoniq *ensoniq = ac97->private_data;
-        unsigned int t, x;
+        unsigned int t, x, flag;
 
+        flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
         mutex_lock(&ensoniq->src_mutex);
         for (t = 0; t < POLL_COUNT; t++) {
                 if (!(inl(ES_REG(ensoniq, 1371_CODEC)) & ES_1371_CODEC_WIP)) {
@@ -630,7 +637,8 @@ static void snd_es1371_codec_write(struct snd_ac97 *ac97,
                                     0x00010000)
                                         break;
                         }
-                        outl(ES_1371_CODEC_WRITE(reg, val), ES_REG(ensoniq, 1371_CODEC));
+                        outl(ES_1371_CODEC_WRITE(reg, val) | flag,
+                             ES_REG(ensoniq, 1371_CODEC));
                         /* restore SRC reg */
                         snd_es1371_wait_src_ready(ensoniq);
                         outl(x, ES_REG(ensoniq, 1371_SMPRATE));
@@ -647,8 +655,9 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
                                             unsigned short reg)
 {
         struct ensoniq *ensoniq = ac97->private_data;
-        unsigned int t, x, fail = 0;
+        unsigned int t, x, flag, fail = 0;
 
+        flag = is_ev1938(ensoniq) ? EV_1938_CODEC_MAGIC : 0;
       __again:
         mutex_lock(&ensoniq->src_mutex);
         for (t = 0; t < POLL_COUNT; t++) {
@@ -671,7 +680,8 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
                                     0x00010000)
                                         break;
                         }
-                        outl(ES_1371_CODEC_READS(reg), ES_REG(ensoniq, 1371_CODEC));
+                        outl(ES_1371_CODEC_READS(reg) | flag,
+                             ES_REG(ensoniq, 1371_CODEC));
                         /* restore SRC reg */
                         snd_es1371_wait_src_ready(ensoniq);
                         outl(x, ES_REG(ensoniq, 1371_SMPRATE));
@@ -683,6 +693,11 @@ static unsigned short snd_es1371_codec_read(struct snd_ac97 *ac97,
                         /* now wait for the stinkin' data (RDY) */
                         for (t = 0; t < POLL_COUNT; t++) {
                                 if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
+                                        if (is_ev1938(ensoniq)) {
+                                                for (t = 0; t < 100; t++)
+                                                        inl(ES_REG(ensoniq, CONTROL));
+                                                x = inl(ES_REG(ensoniq, 1371_CODEC));
+                                        }
                                         mutex_unlock(&ensoniq->src_mutex);
                                         return ES_1371_CODEC_READ(x);
                                 }
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 23a58f0d6cb9..ab0a6156a704 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -112,6 +112,10 @@
 #include <sound/ac97_codec.h>
 #include <sound/initval.h>
 
+#ifdef CONFIG_SND_ES1968_RADIO
+#include <sound/tea575x-tuner.h>
+#endif
+
 #define CARD_NAME "ESS Maestro1/2"
 #define DRIVER_NAME "ES1968"
 
@@ -220,7 +224,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick.");
 #define RINGB_EN_2CODEC         0x0020
 #define RINGB_SING_BIT_DUAL     0x0040
 
-/* ****Port Adresses**** */
+/* ****Port Addresses**** */
 
 /*   Write & Read */
 #define ESM_INDEX               0x02
@@ -553,6 +557,10 @@ struct es1968 {
         spinlock_t ac97_lock;
         struct tasklet_struct hwvol_tq;
 #endif
+
+#ifdef CONFIG_SND_ES1968_RADIO
+        struct snd_tea575x tea;
+#endif
 };
 
 static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);
@@ -2571,6 +2579,63 @@ static int __devinit snd_es1968_input_register(struct es1968 *chip)
 }
 #endif /* CONFIG_SND_ES1968_INPUT */
 
+#ifdef CONFIG_SND_ES1968_RADIO
+#define GPIO_DATA       0x60
+#define IO_MASK         4      /* mask      register offset from GPIO_DATA
+                                bits 1=unmask write to given bit */
+#define IO_DIR          8      /* direction register offset from GPIO_DATA
+                                bits 0/1=read/write direction */
+/* mask bits for GPIO lines */
+#define STR_DATA        0x0040 /* GPIO6 */
+#define STR_CLK         0x0080 /* GPIO7 */
+#define STR_WREN        0x0100 /* GPIO8 */
+#define STR_MOST        0x0200 /* GPIO9 */
+
+static void snd_es1968_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)
+{
+        struct es1968 *chip = tea->private_data;
+        unsigned long io = chip->io_port + GPIO_DATA;
+        u16 val = 0;
+
+        val |= (pins & TEA575X_DATA) ? STR_DATA : 0;
+        val |= (pins & TEA575X_CLK)  ? STR_CLK  : 0;
+        val |= (pins & TEA575X_WREN) ? STR_WREN : 0;
+
+        outw(val, io);
+}
+
+static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea)
+{
+        struct es1968 *chip = tea->private_data;
+        unsigned long io = chip->io_port + GPIO_DATA;
+        u16 val = inw(io);
+
+        return  (val & STR_DATA) ? TEA575X_DATA : 0 |
+                (val & STR_MOST) ? TEA575X_MOST : 0;
+}
+
+static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output)
+{
+        struct es1968 *chip = tea->private_data;
+        unsigned long io = chip->io_port + GPIO_DATA;
+        u16 odir = inw(io + IO_DIR);
+
+        if (output) {
+                outw(~(STR_DATA | STR_CLK | STR_WREN), io + IO_MASK);
+                outw(odir | STR_DATA | STR_CLK | STR_WREN, io + IO_DIR);
+        } else {
+                outw(~(STR_CLK | STR_WREN | STR_DATA | STR_MOST), io + IO_MASK);
+                outw((odir & ~(STR_DATA | STR_MOST)) | STR_CLK | STR_WREN, io + IO_DIR);
+        }
+}
+
+static struct snd_tea575x_ops snd_es1968_tea_ops = {
+        .set_pins = snd_es1968_tea575x_set_pins,
+        .get_pins = snd_es1968_tea575x_get_pins,
+        .set_direction = snd_es1968_tea575x_set_direction,
+};
+#endif
+
 static int snd_es1968_free(struct es1968 *chip)
 {
 #ifdef CONFIG_SND_ES1968_INPUT
@@ -2585,6 +2650,10 @@ static int snd_es1968_free(struct es1968 *chip)
                 outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
         }
 
+#ifdef CONFIG_SND_ES1968_RADIO
+        snd_tea575x_exit(&chip->tea);
+#endif
+
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
         snd_es1968_free_gameport(chip);
@@ -2723,6 +2792,15 @@ static int __devinit snd_es1968_create(struct snd_card *card,
 
         snd_card_set_dev(card, &pci->dev);
 
+#ifdef CONFIG_SND_ES1968_RADIO
+        chip->tea.private_data = chip;
+        chip->tea.ops = &snd_es1968_tea_ops;
+        strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
+        sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
+        if (!snd_tea575x_init(&chip->tea))
+                printk(KERN_INFO "es1968: detected TEA575x radio\n");
+#endif
+
         *chip_ret = chip;
 
         return 0;
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index e1baad74ea4b..a7ec7030cf87 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -53,7 +52,7 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card *
 /*
  *  Enable TEA575x tuner
  *    1 = MediaForte 256-PCS
- *    2 = MediaForte 256-PCPR
+ *    2 = MediaForte 256-PCP
  *    3 = MediaForte 64-PCR
  *   16 = setup tuner only (this is additional bit), i.e. SF64-PCR FM card
  *  High 16-bits are video (radio) device number + 1
@@ -67,7 +66,7 @@ MODULE_PARM_DESC(id, "ID string for the FM801 soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");
 module_param_array(tea575x_tuner, int, NULL, 0444);
-MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (1 = SF256-PCS, 2=SF256-PCPR, 3=SF64-PCR, +16=tuner-only).");
+MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (0 = auto, 1 = SF256-PCS, 2=SF256-PCP, 3=SF64-PCR, 8=disable, +16=tuner-only).");
 
 #define TUNER_ONLY              (1<<4)
 #define TUNER_TYPE_MASK         (~TUNER_ONLY & 0xFFFF)
@@ -196,7 +195,7 @@ struct fm801 {
         spinlock_t reg_lock;
         struct snd_info_entry *proc_entry;
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
         struct snd_tea575x tea;
 #endif
 
@@ -715,310 +714,89 @@ static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pc
  *  TEA5757 radio
  */
 
-#ifdef TEA575X_RADIO
-
-/* 256PCS GPIO numbers */
-#define TEA_256PCS_DATA                 1
-#define TEA_256PCS_WRITE_ENABLE         2       /* inverted */
-#define TEA_256PCS_BUS_CLOCK            3
-
-static void snd_fm801_tea575x_256pcs_write(struct snd_tea575x *tea, unsigned int val)
-{
-        struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        int i = 25;
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
 
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        /* use GPIO lines and set write enable bit */
-        reg |= FM801_GPIO_GS(TEA_256PCS_DATA) |
-               FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK);
-        /* all of lines are in the write direction */
-        /* clear data and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_256PCS_DATA) |
-                 FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCS_DATA) |
-                 FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE));
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
-        udelay(1);
-
-        while (i--) {
-                if (val & (1 << i))
-                        reg |= FM801_GPIO_GP(TEA_256PCS_DATA);
-                else
-                        reg &= ~FM801_GPIO_GP(TEA_256PCS_DATA);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                reg &= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-        }
+/* GPIO to TEA575x maps */
+struct snd_fm801_tea575x_gpio {
+        u8 data, clk, wren, most;
+        char *name;
+};
 
-        /* and reset the write enable bit */
-        reg |= FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE) |
-               FM801_GPIO_GP(TEA_256PCS_DATA);
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
-        spin_unlock_irq(&chip->reg_lock);
-}
+static struct snd_fm801_tea575x_gpio snd_fm801_tea575x_gpios[] = {
+        { .data = 1, .clk = 3, .wren = 2, .most = 0, .name = "SF256-PCS" },
+        { .data = 1, .clk = 0, .wren = 2, .most = 3, .name = "SF256-PCP" },
+        { .data = 2, .clk = 0, .wren = 1, .most = 3, .name = "SF64-PCR" },
+};
 
-static unsigned int snd_fm801_tea575x_256pcs_read(struct snd_tea575x *tea)
+static void snd_fm801_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        unsigned int val = 0;
-        int i;
-        
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        /* use GPIO lines, set data direction to input */
-        reg |= FM801_GPIO_GS(TEA_256PCS_DATA) |
-               FM801_GPIO_GS(TEA_256PCS_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_256PCS_BUS_CLOCK) |
-               FM801_GPIO_GD(TEA_256PCS_DATA) |
-               FM801_GPIO_GP(TEA_256PCS_DATA) |
-               FM801_GPIO_GP(TEA_256PCS_WRITE_ENABLE);
-        /* all of lines are in the write direction, except data */
-        /* clear data, write enable and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_256PCS_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_256PCS_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK));
-
-        for (i = 0; i < 24; i++) {
-                reg &= ~FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_256PCS_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                val <<= 1;
-                if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_256PCS_DATA))
-                        val |= 1;
-        }
+        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1];
 
-        spin_unlock_irq(&chip->reg_lock);
-
-        return val;
-}
+        reg &= ~(FM801_GPIO_GP(gpio.data) |
+                 FM801_GPIO_GP(gpio.clk) |
+                 FM801_GPIO_GP(gpio.wren));
 
-/* 256PCPR GPIO numbers */
-#define TEA_256PCPR_BUS_CLOCK           0
-#define TEA_256PCPR_DATA                1
-#define TEA_256PCPR_WRITE_ENABLE        2       /* inverted */
-
-static void snd_fm801_tea575x_256pcpr_write(struct snd_tea575x *tea, unsigned int val)
-{
-        struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        int i = 25;
-
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        /* use GPIO lines and set write enable bit */
-        reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) |
-               FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK);
-        /* all of lines are in the write direction */
-        /* clear data and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_256PCPR_DATA) |
-                 FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCPR_DATA) |
-                 FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE));
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
-        udelay(1);
-
-        while (i--) {
-                if (val & (1 << i))
-                        reg |= FM801_GPIO_GP(TEA_256PCPR_DATA);
-                else
-                        reg &= ~FM801_GPIO_GP(TEA_256PCPR_DATA);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                reg &= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-        }
+        reg |= (pins & TEA575X_DATA) ? FM801_GPIO_GP(gpio.data) : 0;
+        reg |= (pins & TEA575X_CLK)  ? FM801_GPIO_GP(gpio.clk) : 0;
+        /* WRITE_ENABLE is inverted */
+        reg |= (pins & TEA575X_WREN) ? 0 : FM801_GPIO_GP(gpio.wren);
 
-        /* and reset the write enable bit */
-        reg |= FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE) |
-               FM801_GPIO_GP(TEA_256PCPR_DATA);
         outw(reg, FM801_REG(chip, GPIO_CTRL));
-        spin_unlock_irq(&chip->reg_lock);
 }
 
-static unsigned int snd_fm801_tea575x_256pcpr_read(struct snd_tea575x *tea)
+static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        unsigned int val = 0;
-        int i;
-        
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        /* use GPIO lines, set data direction to input */
-        reg |= FM801_GPIO_GS(TEA_256PCPR_DATA) |
-               FM801_GPIO_GS(TEA_256PCPR_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_256PCPR_BUS_CLOCK) |
-               FM801_GPIO_GD(TEA_256PCPR_DATA) |
-               FM801_GPIO_GP(TEA_256PCPR_DATA) |
-               FM801_GPIO_GP(TEA_256PCPR_WRITE_ENABLE);
-        /* all of lines are in the write direction, except data */
-        /* clear data, write enable and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_256PCPR_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_256PCPR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK));
-
-        for (i = 0; i < 24; i++) {
-                reg &= ~FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_256PCPR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                val <<= 1;
-                if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_256PCPR_DATA))
-                        val |= 1;
-        }
-
-        spin_unlock_irq(&chip->reg_lock);
+        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1];
 
-        return val;
+        return  (reg & FM801_GPIO_GP(gpio.data)) ? TEA575X_DATA : 0 |
+                (reg & FM801_GPIO_GP(gpio.most)) ? TEA575X_MOST : 0;
 }
 
-/* 64PCR GPIO numbers */
-#define TEA_64PCR_BUS_CLOCK             0
-#define TEA_64PCR_WRITE_ENABLE          1       /* inverted */
-#define TEA_64PCR_DATA                  2
-
-static void snd_fm801_tea575x_64pcr_write(struct snd_tea575x *tea, unsigned int val)
+static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        int i = 25;
+        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        struct snd_fm801_tea575x_gpio gpio = snd_fm801_tea575x_gpios[(chip->tea575x_tuner & TUNER_TYPE_MASK) - 1];
 
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
         /* use GPIO lines and set write enable bit */
-        reg |= FM801_GPIO_GS(TEA_64PCR_DATA) |
-               FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK);
-        /* all of lines are in the write direction */
-        /* clear data and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_64PCR_DATA) |
-                 FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_64PCR_DATA) |
-                 FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE));
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
-        udelay(1);
-
-        while (i--) {
-                if (val & (1 << i))
-                        reg |= FM801_GPIO_GP(TEA_64PCR_DATA);
-                else
-                        reg &= ~FM801_GPIO_GP(TEA_64PCR_DATA);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                reg &= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-        }
-
-        /* and reset the write enable bit */
-        reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE) |
-               FM801_GPIO_GP(TEA_64PCR_DATA);
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
-        spin_unlock_irq(&chip->reg_lock);
-}
-
-static unsigned int snd_fm801_tea575x_64pcr_read(struct snd_tea575x *tea)
-{
-        struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-        unsigned int val = 0;
-        int i;
-        
-        spin_lock_irq(&chip->reg_lock);
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        /* use GPIO lines, set data direction to input */
-        reg |= FM801_GPIO_GS(TEA_64PCR_DATA) |
-               FM801_GPIO_GS(TEA_64PCR_WRITE_ENABLE) |
-               FM801_GPIO_GS(TEA_64PCR_BUS_CLOCK) |
-               FM801_GPIO_GD(TEA_64PCR_DATA) |
-               FM801_GPIO_GP(TEA_64PCR_DATA) |
-               FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);
-        /* all of lines are in the write direction, except data */
-        /* clear data, write enable and clock lines */
-        reg &= ~(FM801_GPIO_GD(TEA_64PCR_WRITE_ENABLE) |
-                 FM801_GPIO_GD(TEA_64PCR_BUS_CLOCK) |
-                 FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK));
-
-        for (i = 0; i < 24; i++) {
-                reg &= ~FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                reg |= FM801_GPIO_GP(TEA_64PCR_BUS_CLOCK);
-                outw(reg, FM801_REG(chip, GPIO_CTRL));
-                udelay(1);
-                val <<= 1;
-                if (inw(FM801_REG(chip, GPIO_CTRL)) & FM801_GPIO_GP(TEA_64PCR_DATA))
-                        val |= 1;
+        reg |= FM801_GPIO_GS(gpio.data) |
+               FM801_GPIO_GS(gpio.wren) |
+               FM801_GPIO_GS(gpio.clk) |
+               FM801_GPIO_GS(gpio.most);
+        if (output) {
+                /* all of lines are in the write direction */
+                /* clear data and clock lines */
+                reg &= ~(FM801_GPIO_GD(gpio.data) |
+                         FM801_GPIO_GD(gpio.wren) |
+                         FM801_GPIO_GD(gpio.clk) |
+                         FM801_GPIO_GP(gpio.data) |
+                         FM801_GPIO_GP(gpio.clk) |
+                         FM801_GPIO_GP(gpio.wren));
+        } else {
+                /* use GPIO lines, set data direction to input */
+                reg |= FM801_GPIO_GD(gpio.data) |
+                       FM801_GPIO_GD(gpio.most) |
+                       FM801_GPIO_GP(gpio.data) |
+                       FM801_GPIO_GP(gpio.most) |
+                       FM801_GPIO_GP(gpio.wren);
+                /* all of lines are in the write direction, except data */
+                /* clear data, write enable and clock lines */
+                reg &= ~(FM801_GPIO_GD(gpio.wren) |
+                         FM801_GPIO_GD(gpio.clk) |
+                         FM801_GPIO_GP(gpio.clk));
         }
 
-        spin_unlock_irq(&chip->reg_lock);
-
-        return val;
-}
-
-static void snd_fm801_tea575x_64pcr_mute(struct snd_tea575x *tea,
-                                          unsigned int mute)
-{
-        struct fm801 *chip = tea->private_data;
-        unsigned short reg;
-
-        spin_lock_irq(&chip->reg_lock);
-
-        reg = inw(FM801_REG(chip, GPIO_CTRL));
-        if (mute)
-                /* 0xf800 (mute) */
-                reg &= ~FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);
-        else
-                /* 0xf802 (unmute) */
-                reg |= FM801_GPIO_GP(TEA_64PCR_WRITE_ENABLE);
         outw(reg, FM801_REG(chip, GPIO_CTRL));
-        udelay(1);
-
-        spin_unlock_irq(&chip->reg_lock);
 }
 
-static struct snd_tea575x_ops snd_fm801_tea_ops[3] = {
-        {
-                /* 1 = MediaForte 256-PCS */
-                .write = snd_fm801_tea575x_256pcs_write,
-                .read = snd_fm801_tea575x_256pcs_read,
-        },
-        {
-                /* 2 = MediaForte 256-PCPR */
-                .write = snd_fm801_tea575x_256pcpr_write,
-                .read = snd_fm801_tea575x_256pcpr_read,
-        },
-        {
-                /* 3 = MediaForte 64-PCR */
-                .write = snd_fm801_tea575x_64pcr_write,
-                .read = snd_fm801_tea575x_64pcr_read,
-                .mute = snd_fm801_tea575x_64pcr_mute,
-        }
+static struct snd_tea575x_ops snd_fm801_tea_ops = {
+        .set_pins = snd_fm801_tea575x_set_pins,
+        .get_pins = snd_fm801_tea575x_get_pins,
+        .set_direction = snd_fm801_tea575x_set_direction,
 };
 #endif
 
@@ -1371,7 +1149,7 @@ static int snd_fm801_free(struct fm801 *chip)
         outw(cmdw, FM801_REG(chip, IRQ_MASK));
 
       __end_hw:
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
         snd_tea575x_exit(&chip->tea);
 #endif
         if (chip->irq >= 0)
@@ -1450,16 +1228,34 @@ static int __devinit snd_fm801_create(struct snd_card *card,
 
         snd_card_set_dev(card, &pci->dev);
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
+        chip->tea.private_data = chip;
+        chip->tea.ops = &snd_fm801_tea_ops;
+        sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
         if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
             (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
-                chip->tea.dev_nr = tea575x_tuner >> 16;
-                chip->tea.card = card;
-                chip->tea.freq_fixup = 10700;
-                chip->tea.private_data = chip;
-                chip->tea.ops = &snd_fm801_tea_ops[(tea575x_tuner & TUNER_TYPE_MASK) - 1];
-                snd_tea575x_init(&chip->tea);
+                if (snd_tea575x_init(&chip->tea)) {
+                        snd_printk(KERN_ERR "TEA575x radio not found\n");
+                        snd_fm801_free(chip);
+                        return -ENODEV;
+                }
+        } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) {
+                /* autodetect tuner connection */
+                for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
+                        chip->tea575x_tuner = tea575x_tuner;
+                        if (!snd_tea575x_init(&chip->tea)) {
+                                snd_printk(KERN_INFO "detected TEA575x radio type %s\n",
+                                        snd_fm801_tea575x_gpios[tea575x_tuner - 1].name);
+                                break;
+                        }
+                }
+                if (tea575x_tuner == 4) {
+                        snd_printk(KERN_ERR "TEA575x radio not found\n");
+                        snd_fm801_free(chip);
+                        return -ENODEV;
+                }
         }
+        strlcpy(chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner & TUNER_TYPE_MASK) - 1].name, sizeof(chip->tea.card));
 #endif
 
         *rchip = chip;
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 9194c3c1d04a..0ea5cc60ac78 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -119,47 +119,20 @@ config SND_HDA_CODEC_VIA
           snd-hda-codec-via.
           This module is automatically loaded at probing.
 
-config SND_HDA_CODEC_ATIHDMI
-        bool "Build ATI HDMI HD-audio codec support"
-        default y
-        help
-          Say Y here to include ATI HDMI HD-audio codec support in
-          snd-hda-intel driver, such as ATI RS600 HDMI.
-
-          When the HD-audio driver is built as a module, the codec
-          support code is also built as another module,
-          snd-hda-codec-atihdmi.
-          This module is automatically loaded at probing.
-
-config SND_HDA_CODEC_NVHDMI
-        bool "Build NVIDIA HDMI HD-audio codec support"
-        default y
-        help
-          Say Y here to include NVIDIA HDMI HD-audio codec support in
-          snd-hda-intel driver, such as NVIDIA MCP78 HDMI.
-
-          When the HD-audio driver is built as a module, the codec
-          support code is also built as another module,
-          snd-hda-codec-nvhdmi.
-          This module is automatically loaded at probing.
-
-config SND_HDA_CODEC_INTELHDMI
-        bool "Build INTEL HDMI HD-audio codec support"
+config SND_HDA_CODEC_HDMI
+        bool "Build HDMI/DisplayPort HD-audio codec support"
         select SND_DYNAMIC_MINORS
         default y
         help
-          Say Y here to include INTEL HDMI HD-audio codec support in
-          snd-hda-intel driver, such as Eaglelake integrated HDMI.
+          Say Y here to include HDMI and DisplayPort HD-audio codec
+          support in snd-hda-intel driver.  This includes all AMD/ATI,
+          Intel and Nvidia HDMI/DisplayPort codecs.
 
           When the HD-audio driver is built as a module, the codec
           support code is also built as another module,
-          snd-hda-codec-intelhdmi.
+          snd-hda-codec-hdmi.
           This module is automatically loaded at probing.
 
-config SND_HDA_ELD
-        def_bool y
-        depends on SND_HDA_CODEC_INTELHDMI || SND_HDA_CODEC_NVHDMI
-
 config SND_HDA_CODEC_CIRRUS
         bool "Build Cirrus Logic codec support"
         depends on SND_HDA_INTEL
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 24bc195b02da..17ef3658f34b 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -3,7 +3,6 @@ snd-hda-intel-objs := hda_intel.o
 snd-hda-codec-y := hda_codec.o
 snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o
 snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
-snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o
 snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
 snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
 
@@ -12,13 +11,11 @@ snd-hda-codec-cmedia-objs :=	patch_cmedia.o
 snd-hda-codec-analog-objs :=    patch_analog.o
 snd-hda-codec-idt-objs :=       patch_sigmatel.o
 snd-hda-codec-si3054-objs :=    patch_si3054.o
-snd-hda-codec-atihdmi-objs :=   patch_atihdmi.o
 snd-hda-codec-cirrus-objs :=    patch_cirrus.o
 snd-hda-codec-ca0110-objs :=    patch_ca0110.o
 snd-hda-codec-conexant-objs :=  patch_conexant.o
 snd-hda-codec-via-objs :=       patch_via.o
-snd-hda-codec-nvhdmi-objs :=    patch_nvhdmi.o
-snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o
+snd-hda-codec-hdmi-objs :=      patch_hdmi.o hda_eld.o
 
 # common driver
 obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o
@@ -39,9 +36,6 @@ endif
 ifdef CONFIG_SND_HDA_CODEC_SI3054
 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-si3054.o
 endif
-ifdef CONFIG_SND_HDA_CODEC_ATIHDMI
-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-atihdmi.o
-endif
 ifdef CONFIG_SND_HDA_CODEC_CIRRUS
 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cirrus.o
 endif
@@ -54,11 +48,8 @@ endif
 ifdef CONFIG_SND_HDA_CODEC_VIA
 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-via.o
 endif
-ifdef CONFIG_SND_HDA_CODEC_NVHDMI
-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-nvhdmi.o
-endif
-ifdef CONFIG_SND_HDA_CODEC_INTELHDMI
-obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-intelhdmi.o
+ifdef CONFIG_SND_HDA_CODEC_HDMI
+obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-hdmi.o
 endif
 
 # this must be the last entry after codec drivers;
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index f1de1bac042c..55f0647458c7 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
 void snd_hda_detach_beep_device(struct hda_codec *codec);
 #else
-#define snd_hda_attach_beep_device(...)         0
-#define snd_hda_detach_beep_device(...)
+static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
+{
+        return 0;
+}
+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
+{
+}
 #endif
 #endif
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 14829210ef0b..45b4a8d70e08 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -29,6 +29,7 @@
 #include <sound/asoundef.h>
 #include <sound/tlv.h>
 #include <sound/initval.h>
+#include <sound/jack.h>
 #include "hda_local.h"
 #include "hda_beep.h"
 #include <sound/hda_hwdep.h>
@@ -306,6 +307,12 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
 }
 EXPORT_SYMBOL_HDA(snd_hda_get_sub_nodes);
 
+static int _hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
+                                hda_nid_t *conn_list, int max_conns);
+static bool add_conn_list(struct snd_array *array, hda_nid_t nid);
+static int copy_conn_list(hda_nid_t nid, hda_nid_t *dst, int max_dst,
+                          hda_nid_t *src, int len);
+
 /**
  * snd_hda_get_connections - get connection list
  * @codec: the HDA codec
@@ -319,7 +326,44 @@ EXPORT_SYMBOL_HDA(snd_hda_get_sub_nodes);
  * Returns the number of connections, or a negative error code.
  */
 int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
-                            hda_nid_t *conn_list, int max_conns)
+                             hda_nid_t *conn_list, int max_conns)
+{
+        struct snd_array *array = &codec->conn_lists;
+        int i, len, old_used;
+        hda_nid_t list[HDA_MAX_CONNECTIONS];
+
+        /* look up the cached results */
+        for (i = 0; i < array->used; ) {
+                hda_nid_t *p = snd_array_elem(array, i);
+                len = p[1];
+                if (nid == *p)
+                        return copy_conn_list(nid, conn_list, max_conns,
+                                              p + 2, len);
+                i += len + 2;
+        }
+
+        len = _hda_get_connections(codec, nid, list, HDA_MAX_CONNECTIONS);
+        if (len < 0)
+                return len;
+
+        /* add to the cache */
+        old_used = array->used;
+        if (!add_conn_list(array, nid) || !add_conn_list(array, len))
+                goto error_add;
+        for (i = 0; i < len; i++)
+                if (!add_conn_list(array, list[i]))
+                        goto error_add;
+
+        return copy_conn_list(nid, conn_list, max_conns, list, len);
+                
+ error_add:
+        array->used = old_used;
+        return -ENOMEM;
+}
+EXPORT_SYMBOL_HDA(snd_hda_get_connections);
+
+static int _hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
+                             hda_nid_t *conn_list, int max_conns)
 {
         unsigned int parm;
         int i, conn_len, conns;
@@ -416,8 +460,28 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
         }
         return conns;
 }
-EXPORT_SYMBOL_HDA(snd_hda_get_connections);
 
+static bool add_conn_list(struct snd_array *array, hda_nid_t nid)
+{
+        hda_nid_t *p = snd_array_new(array);
+        if (!p)
+                return false;
+        *p = nid;
+        return true;
+}
+
+static int copy_conn_list(hda_nid_t nid, hda_nid_t *dst, int max_dst,
+                          hda_nid_t *src, int len)
+{
+        if (len > max_dst) {
+                snd_printk(KERN_ERR "hda_codec: "
+                           "Too many connections %d for NID 0x%x\n",
+                           len, nid);
+                return -EINVAL;
+        }
+        memcpy(dst, src, len * sizeof(hda_nid_t));
+        return len;
+}
 
 /**
  * snd_hda_queue_unsol_event - add an unsolicited event to queue
@@ -936,6 +1000,7 @@ void snd_hda_shutup_pins(struct hda_codec *codec)
 }
 EXPORT_SYMBOL_HDA(snd_hda_shutup_pins);
 
+#ifdef SND_HDA_NEEDS_RESUME
 /* Restore the pin controls cleared previously via snd_hda_shutup_pins() */
 static void restore_shutup_pins(struct hda_codec *codec)
 {
@@ -952,6 +1017,7 @@ static void restore_shutup_pins(struct hda_codec *codec)
         }
         codec->pins_shutup = 0;
 }
+#endif
 
 static void init_hda_cache(struct hda_cache_rec *cache,
                            unsigned int record_size);
@@ -1016,6 +1082,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
         list_del(&codec->list);
         snd_array_free(&codec->mixers);
         snd_array_free(&codec->nids);
+        snd_array_free(&codec->conn_lists);
         codec->bus->caddr_tbl[codec->addr] = NULL;
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
@@ -1076,6 +1143,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,
         snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
         snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
         snd_array_init(&codec->cvt_setups, sizeof(struct hda_cvt_setup), 8);
+        snd_array_init(&codec->conn_lists, sizeof(hda_nid_t), 64);
         if (codec->bus->modelname) {
                 codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
                 if (!codec->modelname) {
@@ -1216,6 +1284,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
         struct hda_codec *c;
         struct hda_cvt_setup *p;
         unsigned int oldval, newval;
+        int type;
         int i;
 
         if (!nid)
@@ -1254,10 +1323,12 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
         p->dirty = 0;
 
         /* make other inactive cvts with the same stream-tag dirty */
+        type = get_wcaps_type(get_wcaps(codec, nid));
         list_for_each_entry(c, &codec->bus->codec_list, list) {
                 for (i = 0; i < c->cvt_setups.used; i++) {
                         p = snd_array_elem(&c->cvt_setups, i);
-                        if (!p->active && p->stream_tag == stream_tag)
+                        if (!p->active && p->stream_tag == stream_tag &&
+                            get_wcaps_type(get_wcaps(codec, p->nid)) == type)
                                 p->dirty = 1;
                 }
         }
@@ -1281,6 +1352,9 @@ void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,
         if (!nid)
                 return;
 
+        if (codec->no_sticky_stream)
+                do_now = 1;
+
         snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid);
         p = get_hda_cvt_setup(codec, nid);
         if (p) {
@@ -1322,6 +1396,7 @@ static void purify_inactive_streams(struct hda_codec *codec)
         }
 }
 
+#ifdef SND_HDA_NEEDS_RESUME
 /* clean up all streams; called from suspend */
 static void hda_cleanup_all_streams(struct hda_codec *codec)
 {
@@ -1333,6 +1408,7 @@ static void hda_cleanup_all_streams(struct hda_codec *codec)
                         really_cleanup_stream(codec, p);
         }
 }
+#endif
 
 /*
  * amp access functions
@@ -1831,6 +1907,7 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         hda_nid_t nid = get_amp_nid(kcontrol);
         int dir = get_amp_direction(kcontrol);
         unsigned int ofs = get_amp_offset(kcontrol);
+        bool min_mute = get_amp_min_mute(kcontrol);
         u32 caps, val1, val2;
 
         if (size < 4 * sizeof(unsigned int))
@@ -1841,6 +1918,8 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT);
         val1 += ofs;
         val1 = ((int)val1) * ((int)val2);
+        if (min_mute)
+                val2 |= TLV_DB_SCALE_MUTE;
         if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv))
                 return -EFAULT;
         if (put_user(2 * sizeof(unsigned int), _tlv + 1))
@@ -1910,6 +1989,16 @@ struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_find_mixer_ctl);
 
+static int find_empty_mixer_ctl_idx(struct hda_codec *codec, const char *name)
+{
+        int idx;
+        for (idx = 0; idx < 16; idx++) { /* 16 ctlrs should be large enough */
+                if (!_snd_hda_find_mixer_ctl(codec, name, idx))
+                        return idx;
+        }
+        return -EBUSY;
+}
+
 /**
  * snd_hda_ctl_add - Add a control element and assign to the codec
  * @codec: HD-audio codec
@@ -2115,10 +2204,10 @@ int snd_hda_codec_reset(struct hda_codec *codec)
  * This function returns zero if successful or a negative error code.
  */
 int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
-                        unsigned int *tlv, const char **slaves)
+                        unsigned int *tlv, const char * const *slaves)
 {
         struct snd_kcontrol *kctl;
-        const char **s;
+        const char * const *s;
         int err;
 
         for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
@@ -2228,10 +2317,7 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
                 change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
                                                    HDA_AMP_MUTE,
                                                    *valp ? 0 : HDA_AMP_MUTE);
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-        if (codec->patch_ops.check_power_status)
-                codec->patch_ops.check_power_status(codec, nid);
-#endif
+        hda_call_check_power_status(codec, nid);
         snd_hda_power_down(codec);
         return change;
 }
@@ -2535,7 +2621,7 @@ static unsigned int convert_to_spdif_status(unsigned short val)
 static void set_dig_out(struct hda_codec *codec, hda_nid_t nid,
                         int verb, int val)
 {
-        hda_nid_t *d;
+        const hda_nid_t *d;
 
         snd_hda_codec_write_cache(codec, nid, 0, verb, val);
         d = codec->slave_dig_outs;
@@ -2648,8 +2734,6 @@ static struct snd_kcontrol_new dig_mixes[] = {
         { } /* end */
 };
 
-#define SPDIF_MAX_IDX   4       /* 4 instances should be enough to probe */
-
 /**
  * snd_hda_create_spdif_out_ctls - create Output SPDIF-related controls
  * @codec: the HDA codec
@@ -2667,12 +2751,8 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)
         struct snd_kcontrol_new *dig_mix;
         int idx;
 
-        for (idx = 0; idx < SPDIF_MAX_IDX; idx++) {
-                if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Playback Switch",
-                                             idx))
-                        break;
-        }
-        if (idx >= SPDIF_MAX_IDX) {
+        idx = find_empty_mixer_ctl_idx(codec, "IEC958 Playback Switch");
+        if (idx < 0) {
                 printk(KERN_ERR "hda_codec: too many IEC958 outputs\n");
                 return -EBUSY;
         }
@@ -2823,12 +2903,8 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
         struct snd_kcontrol_new *dig_mix;
         int idx;
 
-        for (idx = 0; idx < SPDIF_MAX_IDX; idx++) {
-                if (!_snd_hda_find_mixer_ctl(codec, "IEC958 Capture Switch",
-                                             idx))
-                        break;
-        }
-        if (idx >= SPDIF_MAX_IDX) {
+        idx = find_empty_mixer_ctl_idx(codec, "IEC958 Capture Switch");
+        if (idx < 0) {
                 printk(KERN_ERR "hda_codec: too many IEC958 inputs\n");
                 return -EBUSY;
         }
@@ -3654,7 +3730,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
  * with the proper parameters for set up.
  * ops.cleanup should be called in hw_free for clean up of streams.
  *
- * This function returns 0 if successfull, or a negative error code.
+ * This function returns 0 if successful, or a negative error code.
  */
 int __devinit snd_hda_build_pcms(struct hda_bus *bus)
 {
@@ -3683,7 +3759,7 @@ EXPORT_SYMBOL_HDA(snd_hda_build_pcms);
  * If no entries are matching, the function returns a negative value.
  */
 int snd_hda_check_board_config(struct hda_codec *codec,
-                               int num_configs, const char **models,
+                               int num_configs, const char * const *models,
                                const struct snd_pci_quirk *tbl)
 {
         if (codec->modelname && models) {
@@ -3747,7 +3823,7 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_config);
  * If no entries are matching, the function returns a negative value.
  */
 int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
-                               int num_configs, const char **models,
+                               int num_configs, const char * const *models,
                                const struct snd_pci_quirk *tbl)
 {
         const struct snd_pci_quirk *q;
@@ -3796,27 +3872,39 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_codec_sid_config);
  *
  * Returns 0 if successful, or a negative error code.
  */
-int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
+int snd_hda_add_new_ctls(struct hda_codec *codec,
+                         const struct snd_kcontrol_new *knew)
 {
         int err;
 
         for (; knew->name; knew++) {
                 struct snd_kcontrol *kctl;
+                int addr = 0, idx = 0;
                 if (knew->iface == -1)  /* skip this codec private value */
                         continue;
-                kctl = snd_ctl_new1(knew, codec);
-                if (!kctl)
-                        return -ENOMEM;
-                err = snd_hda_ctl_add(codec, 0, kctl);
-                if (err < 0) {
-                        if (!codec->addr)
-                                return err;
+                for (;;) {
                         kctl = snd_ctl_new1(knew, codec);
                         if (!kctl)
                                 return -ENOMEM;
-                        kctl->id.device = codec->addr;
+                        if (addr > 0)
+                                kctl->id.device = addr;
+                        if (idx > 0)
+                                kctl->id.index = idx;
                         err = snd_hda_ctl_add(codec, 0, kctl);
-                        if (err < 0)
+                        if (!err)
+                                break;
+                        /* try first with another device index corresponding to
+                         * the codec addr; if it still fails (or it's the
+                         * primary codec), then try another control index
+                         */
+                        if (!addr && codec->addr)
+                                addr = codec->addr;
+                        else if (!idx && !knew->index) {
+                                idx = find_empty_mixer_ctl_idx(codec,
+                                                               knew->name);
+                                if (idx <= 0)
+                                        return err;
+                        } else
                                 return err;
                 }
         }
@@ -3928,7 +4016,7 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,
                                  struct hda_loopback_check *check,
                                  hda_nid_t nid)
 {
-        struct hda_amp_list *p;
+        const struct hda_amp_list *p;
         int ch, v;
 
         if (!check->amplist)
@@ -4096,7 +4184,7 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
                                     -1);
         snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);
         if (codec->slave_dig_outs) {
-                hda_nid_t *d;
+                const hda_nid_t *d;
                 for (d = codec->slave_dig_outs; *d; d++)
                         snd_hda_codec_setup_stream(codec, *d, stream_tag, 0,
                                                    format);
@@ -4111,7 +4199,7 @@ static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid)
 {
         snd_hda_codec_cleanup_stream(codec, nid);
         if (codec->slave_dig_outs) {
-                hda_nid_t *d;
+                const hda_nid_t *d;
                 for (d = codec->slave_dig_outs; *d; d++)
                         snd_hda_codec_cleanup_stream(codec, *d);
         }
@@ -4258,7 +4346,7 @@ int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
                                      unsigned int format,
                                      struct snd_pcm_substream *substream)
 {
-        hda_nid_t *nids = mout->dac_nids;
+        const hda_nid_t *nids = mout->dac_nids;
         int chs = substream->runtime->channels;
         int i;
 
@@ -4313,7 +4401,7 @@ EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_prepare);
 int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
                                      struct hda_multi_out *mout)
 {
-        hda_nid_t *nids = mout->dac_nids;
+        const hda_nid_t *nids = mout->dac_nids;
         int i;
 
         for (i = 0; i < mout->num_dacs; i++)
@@ -4338,7 +4426,7 @@ EXPORT_SYMBOL_HDA(snd_hda_multi_out_analog_cleanup);
  * Helper for automatic pin configuration
  */
 
-static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
+static int is_in_nid_list(hda_nid_t nid, const hda_nid_t *list)
 {
         for (; *list; list++)
                 if (*list == nid)
@@ -4372,6 +4460,34 @@ static void sort_pins_by_sequence(hda_nid_t *pins, short *sequences,
 }
 
 
+/* add the found input-pin to the cfg->inputs[] table */
+static void add_auto_cfg_input_pin(struct auto_pin_cfg *cfg, hda_nid_t nid,
+                                   int type)
+{
+        if (cfg->num_inputs < AUTO_CFG_MAX_INS) {
+                cfg->inputs[cfg->num_inputs].pin = nid;
+                cfg->inputs[cfg->num_inputs].type = type;
+                cfg->num_inputs++;
+        }
+}
+
+/* sort inputs in the order of AUTO_PIN_* type */
+static void sort_autocfg_input_pins(struct auto_pin_cfg *cfg)
+{
+        int i, j;
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                for (j = i + 1; j < cfg->num_inputs; j++) {
+                        if (cfg->inputs[i].type > cfg->inputs[j].type) {
+                                struct auto_pin_cfg_item tmp;
+                                tmp = cfg->inputs[i];
+                                cfg->inputs[i] = cfg->inputs[j];
+                                cfg->inputs[j] = tmp;
+                        }
+                }
+        }
+}
+
 /*
  * Parse all pin widgets and store the useful pin nids to cfg
  *
@@ -4385,19 +4501,20 @@ static void sort_pins_by_sequence(hda_nid_t *pins, short *sequences,
  * output, i.e. to line_out_pins[0].  So, line_outs is always positive
  * if any analog output exists.
  *
- * The analog input pins are assigned to input_pins array.
+ * The analog input pins are assigned to inputs array.
  * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
  * respectively.
  */
 int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                                  struct auto_pin_cfg *cfg,
-                                 hda_nid_t *ignore_nids)
+                                 const hda_nid_t *ignore_nids)
 {
         hda_nid_t nid, end_nid;
         short seq, assoc_line_out, assoc_speaker;
         short sequences_line_out[ARRAY_SIZE(cfg->line_out_pins)];
         short sequences_speaker[ARRAY_SIZE(cfg->speaker_pins)];
         short sequences_hp[ARRAY_SIZE(cfg->hp_pins)];
+        int i;
 
         memset(cfg, 0, sizeof(*cfg));
 
@@ -4468,33 +4585,17 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                         sequences_hp[cfg->hp_outs] = (assoc << 4) | seq;
                         cfg->hp_outs++;
                         break;
-                case AC_JACK_MIC_IN: {
-                        int preferred, alt;
-                        if (loc == AC_JACK_LOC_FRONT ||
-                            (loc & 0x30) == AC_JACK_LOC_INTERNAL) {
-                                preferred = AUTO_PIN_FRONT_MIC;
-                                alt = AUTO_PIN_MIC;
-                        } else {
-                                preferred = AUTO_PIN_MIC;
-                                alt = AUTO_PIN_FRONT_MIC;
-                        }
-                        if (!cfg->input_pins[preferred])
-                                cfg->input_pins[preferred] = nid;
-                        else if (!cfg->input_pins[alt])
-                                cfg->input_pins[alt] = nid;
+                case AC_JACK_MIC_IN:
+                        add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_MIC);
                         break;
-                }
                 case AC_JACK_LINE_IN:
-                        if (loc == AC_JACK_LOC_FRONT)
-                                cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;
-                        else
-                                cfg->input_pins[AUTO_PIN_LINE] = nid;
+                        add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_LINE_IN);
                         break;
                 case AC_JACK_CD:
-                        cfg->input_pins[AUTO_PIN_CD] = nid;
+                        add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_CD);
                         break;
                 case AC_JACK_AUX:
-                        cfg->input_pins[AUTO_PIN_AUX] = nid;
+                        add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_AUX);
                         break;
                 case AC_JACK_SPDIF_OUT:
                 case AC_JACK_DIG_OTHER_OUT:
@@ -4539,6 +4640,11 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                         memmove(sequences_hp + i, sequences_hp + i + 1,
                                 sizeof(sequences_hp[0]) * (cfg->hp_outs - i));
                 }
+                memset(cfg->hp_pins + cfg->hp_outs, 0,
+                       sizeof(hda_nid_t) * (AUTO_CFG_MAX_OUTS - cfg->hp_outs));
+                if (!cfg->hp_outs)
+                        cfg->line_out_type = AUTO_PIN_HP_OUT;
+
         }
 
         /* sort by sequence */
@@ -4549,21 +4655,6 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
         sort_pins_by_sequence(cfg->hp_pins, sequences_hp,
                               cfg->hp_outs);
 
-        /* if we have only one mic, make it AUTO_PIN_MIC */
-        if (!cfg->input_pins[AUTO_PIN_MIC] &&
-            cfg->input_pins[AUTO_PIN_FRONT_MIC]) {
-                cfg->input_pins[AUTO_PIN_MIC] =
-                        cfg->input_pins[AUTO_PIN_FRONT_MIC];
-                cfg->input_pins[AUTO_PIN_FRONT_MIC] = 0;
-        }
-        /* ditto for line-in */
-        if (!cfg->input_pins[AUTO_PIN_LINE] &&
-            cfg->input_pins[AUTO_PIN_FRONT_LINE]) {
-                cfg->input_pins[AUTO_PIN_LINE] =
-                        cfg->input_pins[AUTO_PIN_FRONT_LINE];
-                cfg->input_pins[AUTO_PIN_FRONT_LINE] = 0;
-        }
-
         /*
          * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
          * as a primary output
@@ -4602,13 +4693,18 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                 break;
         }
 
+        sort_autocfg_input_pins(cfg);
+
         /*
          * debug prints of the parsed results
          */
-        snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+        snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x) type:%s\n",
                    cfg->line_outs, cfg->line_out_pins[0], cfg->line_out_pins[1],
                    cfg->line_out_pins[2], cfg->line_out_pins[3],
-                   cfg->line_out_pins[4]);
+                   cfg->line_out_pins[4],
+                   cfg->line_out_type == AUTO_PIN_HP_OUT ? "hp" :
+                   (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT ?
+                    "speaker" : "line"));
         snd_printd("   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
                    cfg->speaker_outs, cfg->speaker_pins[0],
                    cfg->speaker_pins[1], cfg->speaker_pins[2],
@@ -4621,14 +4717,13 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
         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],
-                   cfg->input_pins[AUTO_PIN_FRONT_MIC],
-                   cfg->input_pins[AUTO_PIN_LINE],
-                   cfg->input_pins[AUTO_PIN_FRONT_LINE],
-                   cfg->input_pins[AUTO_PIN_CD],
-                   cfg->input_pins[AUTO_PIN_AUX]);
+        snd_printd("   inputs:");
+        for (i = 0; i < cfg->num_inputs; i++) {
+                snd_printd(" %s=0x%x",
+                            hda_get_autocfg_input_label(codec, cfg, i),
+                            cfg->inputs[i].pin);
+        }
+        snd_printd("\n");
         if (cfg->dig_in_pin)
                 snd_printd("   dig-in=0x%x\n", cfg->dig_in_pin);
 
@@ -4636,11 +4731,165 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
 }
 EXPORT_SYMBOL_HDA(snd_hda_parse_pin_def_config);
 
-/* labels for input pins */
-const char *auto_pin_cfg_labels[AUTO_PIN_LAST] = {
-        "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
-};
-EXPORT_SYMBOL_HDA(auto_pin_cfg_labels);
+int snd_hda_get_input_pin_attr(unsigned int def_conf)
+{
+        unsigned int loc = get_defcfg_location(def_conf);
+        unsigned int conn = get_defcfg_connect(def_conf);
+        if (conn == AC_JACK_PORT_NONE)
+                return INPUT_PIN_ATTR_UNUSED;
+        /* Windows may claim the internal mic to be BOTH, too */
+        if (conn == AC_JACK_PORT_FIXED || conn == AC_JACK_PORT_BOTH)
+                return INPUT_PIN_ATTR_INT;
+        if ((loc & 0x30) == AC_JACK_LOC_INTERNAL)
+                return INPUT_PIN_ATTR_INT;
+        if ((loc & 0x30) == AC_JACK_LOC_SEPARATE)
+                return INPUT_PIN_ATTR_DOCK;
+        if (loc == AC_JACK_LOC_REAR)
+                return INPUT_PIN_ATTR_REAR;
+        if (loc == AC_JACK_LOC_FRONT)
+                return INPUT_PIN_ATTR_FRONT;
+        return INPUT_PIN_ATTR_NORMAL;
+}
+EXPORT_SYMBOL_HDA(snd_hda_get_input_pin_attr);
+
+/**
+ * hda_get_input_pin_label - Give a label for the given input pin
+ *
+ * When check_location is true, the function checks the pin location
+ * for mic and line-in pins, and set an appropriate prefix like "Front",
+ * "Rear", "Internal".
+ */
+
+const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin,
+                                        int check_location)
+{
+        unsigned int def_conf;
+        static const char * const mic_names[] = {
+                "Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",
+        };
+        int attr;
+
+        def_conf = snd_hda_codec_get_pincfg(codec, pin);
+
+        switch (get_defcfg_device(def_conf)) {
+        case AC_JACK_MIC_IN:
+                if (!check_location)
+                        return "Mic";
+                attr = snd_hda_get_input_pin_attr(def_conf);
+                if (!attr)
+                        return "None";
+                return mic_names[attr - 1];
+        case AC_JACK_LINE_IN:
+                if (!check_location)
+                        return "Line";
+                attr = snd_hda_get_input_pin_attr(def_conf);
+                if (!attr)
+                        return "None";
+                if (attr == INPUT_PIN_ATTR_DOCK)
+                        return "Dock Line";
+                return "Line";
+        case AC_JACK_AUX:
+                return "Aux";
+        case AC_JACK_CD:
+                return "CD";
+        case AC_JACK_SPDIF_IN:
+                return "SPDIF In";
+        case AC_JACK_DIG_OTHER_IN:
+                return "Digital In";
+        default:
+                return "Misc";
+        }
+}
+EXPORT_SYMBOL_HDA(hda_get_input_pin_label);
+
+/* Check whether the location prefix needs to be added to the label.
+ * If all mic-jacks are in the same location (e.g. rear panel), we don't
+ * have to put "Front" prefix to each label.  In such a case, returns false.
+ */
+static int check_mic_location_need(struct hda_codec *codec,
+                                   const struct auto_pin_cfg *cfg,
+                                   int input)
+{
+        unsigned int defc;
+        int i, attr, attr2;
+
+        defc = snd_hda_codec_get_pincfg(codec, cfg->inputs[input].pin);
+        attr = snd_hda_get_input_pin_attr(defc);
+        /* for internal or docking mics, we need locations */
+        if (attr <= INPUT_PIN_ATTR_NORMAL)
+                return 1;
+
+        attr = 0;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                defc = snd_hda_codec_get_pincfg(codec, cfg->inputs[i].pin);
+                attr2 = snd_hda_get_input_pin_attr(defc);
+                if (attr2 >= INPUT_PIN_ATTR_NORMAL) {
+                        if (attr && attr != attr2)
+                                return 1; /* different locations found */
+                        attr = attr2;
+                }
+        }
+        return 0;
+}
+
+/**
+ * hda_get_autocfg_input_label - Get a label for the given input
+ *
+ * Get a label for the given input pin defined by the autocfg item.
+ * Unlike hda_get_input_pin_label(), this function checks all inputs
+ * defined in autocfg and avoids the redundant mic/line prefix as much as
+ * possible.
+ */
+const char *hda_get_autocfg_input_label(struct hda_codec *codec,
+                                        const struct auto_pin_cfg *cfg,
+                                        int input)
+{
+        int type = cfg->inputs[input].type;
+        int has_multiple_pins = 0;
+
+        if ((input > 0 && cfg->inputs[input - 1].type == type) ||
+            (input < cfg->num_inputs - 1 && cfg->inputs[input + 1].type == type))
+                has_multiple_pins = 1;
+        if (has_multiple_pins && type == AUTO_PIN_MIC)
+                has_multiple_pins &= check_mic_location_need(codec, cfg, input);
+        return hda_get_input_pin_label(codec, cfg->inputs[input].pin,
+                                       has_multiple_pins);
+}
+EXPORT_SYMBOL_HDA(hda_get_autocfg_input_label);
+
+/**
+ * snd_hda_add_imux_item - Add an item to input_mux
+ *
+ * When the same label is used already in the existing items, the number
+ * suffix is appended to the label.  This label index number is stored
+ * to type_idx when non-NULL pointer is given.
+ */
+int snd_hda_add_imux_item(struct hda_input_mux *imux, const char *label,
+                          int index, int *type_idx)
+{
+        int i, label_idx = 0;
+        if (imux->num_items >= HDA_MAX_NUM_INPUTS) {
+                snd_printd(KERN_ERR "hda_codec: Too many imux items!\n");
+                return -EINVAL;
+        }
+        for (i = 0; i < imux->num_items; i++) {
+                if (!strncmp(label, imux->items[i].label, strlen(label)))
+                        label_idx++;
+        }
+        if (type_idx)
+                *type_idx = label_idx;
+        if (label_idx > 0)
+                snprintf(imux->items[imux->num_items].label,
+                         sizeof(imux->items[imux->num_items].label),
+                         "%s %d", label, label_idx);
+        else
+                strlcpy(imux->items[imux->num_items].label, label,
+                        sizeof(imux->items[imux->num_items].label));
+        imux->items[imux->num_items].index = index;
+        imux->num_items++;
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_add_imux_item);
 
 
 #ifdef CONFIG_PM
@@ -4675,7 +4924,7 @@ EXPORT_SYMBOL_HDA(snd_hda_suspend);
  *
  * Returns 0 if successful.
  *
- * This fucntion is defined only when POWER_SAVE isn't set.
+ * This function is defined only when POWER_SAVE isn't set.
  * In the power-save mode, the codec is resumed dynamically.
  */
 int snd_hda_resume(struct hda_bus *bus)
@@ -4784,5 +5033,111 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen)
 }
 EXPORT_SYMBOL_HDA(snd_print_pcm_bits);
 
+#ifdef CONFIG_SND_HDA_INPUT_JACK
+/*
+ * Input-jack notification support
+ */
+struct hda_jack_item {
+        hda_nid_t nid;
+        int type;
+        struct snd_jack *jack;
+};
+
+static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
+                                         int type)
+{
+        switch (type) {
+        case SND_JACK_HEADPHONE:
+                return "Headphone";
+        case SND_JACK_MICROPHONE:
+                return "Mic";
+        case SND_JACK_LINEOUT:
+                return "Line-out";
+        case SND_JACK_HEADSET:
+                return "Headset";
+        case SND_JACK_VIDEOOUT:
+                return "HDMI/DP";
+        default:
+                return "Misc";
+        }
+}
+
+static void hda_free_jack_priv(struct snd_jack *jack)
+{
+        struct hda_jack_item *jacks = jack->private_data;
+        jacks->nid = 0;
+        jacks->jack = NULL;
+}
+
+int snd_hda_input_jack_add(struct hda_codec *codec, hda_nid_t nid, int type,
+                           const char *name)
+{
+        struct hda_jack_item *jack;
+        int err;
+
+        snd_array_init(&codec->jacks, sizeof(*jack), 32);
+        jack = snd_array_new(&codec->jacks);
+        if (!jack)
+                return -ENOMEM;
+
+        jack->nid = nid;
+        jack->type = type;
+        if (!name)
+                name = get_jack_default_name(codec, nid, type);
+        err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
+        if (err < 0) {
+                jack->nid = 0;
+                return err;
+        }
+        jack->jack->private_data = jack;
+        jack->jack->private_free = hda_free_jack_priv;
+        return 0;
+}
+EXPORT_SYMBOL_HDA(snd_hda_input_jack_add);
+
+void snd_hda_input_jack_report(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct hda_jack_item *jacks = codec->jacks.list;
+        int i;
+
+        if (!jacks)
+                return;
+
+        for (i = 0; i < codec->jacks.used; i++, jacks++) {
+                unsigned int pin_ctl;
+                unsigned int present;
+                int type;
+
+                if (jacks->nid != nid)
+                        continue;
+                present = snd_hda_jack_detect(codec, nid);
+                type = jacks->type;
+                if (type == (SND_JACK_HEADPHONE | SND_JACK_LINEOUT)) {
+                        pin_ctl = snd_hda_codec_read(codec, nid, 0,
+                                             AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                        type = (pin_ctl & AC_PINCTL_HP_EN) ?
+                                SND_JACK_HEADPHONE : SND_JACK_LINEOUT;
+                }
+                snd_jack_report(jacks->jack, present ? type : 0);
+        }
+}
+EXPORT_SYMBOL_HDA(snd_hda_input_jack_report);
+
+/* free jack instances manually when clearing/reconfiguring */
+void snd_hda_input_jack_free(struct hda_codec *codec)
+{
+        if (!codec->bus->shutdown && codec->jacks.list) {
+                struct hda_jack_item *jacks = codec->jacks.list;
+                int i;
+                for (i = 0; i < codec->jacks.used; i++, jacks++) {
+                        if (jacks->jack)
+                                snd_device_free(codec->bus->card, jacks->jack);
+                }
+        }
+        snd_array_free(&codec->jacks);
+}
+EXPORT_SYMBOL_HDA(snd_hda_input_jack_free);
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
+
 MODULE_DESCRIPTION("HDA codec core");
 MODULE_LICENSE("GPL");
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 62c702240108..59c97306c1de 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -825,12 +825,14 @@ struct hda_codec {
         struct hda_cache_rec amp_cache; /* cache for amp access */
         struct hda_cache_rec cmd_cache; /* cache for other commands */
 
+        struct snd_array conn_lists;    /* connection-list array */
+
         struct mutex spdif_mutex;
         struct mutex control_mutex;
         unsigned int spdif_status;      /* IEC958 status bits */
         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 */
+        const 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 */
         struct snd_array cvt_setups;    /* audio convert setups */
@@ -850,6 +852,7 @@ struct hda_codec {
         unsigned int pin_amp_workaround:1; /* pin out-amp takes index
                                             * (e.g. Conexant codecs)
                                             */
+        unsigned int no_sticky_stream:1; /* no sticky-PCM stream assignment */
         unsigned int pins_shutup:1;     /* pins are shut up */
         unsigned int no_trigger_sense:1; /* don't trigger at pin-sensing */
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -865,6 +868,11 @@ struct hda_codec {
         /* codec-specific additional proc output */
         void (*proc_widget_hook)(struct snd_info_buffer *buffer,
                                  struct hda_codec *codec, hda_nid_t nid);
+
+#ifdef CONFIG_SND_HDA_INPUT_JACK
+        /* jack detection */
+        struct snd_array jacks;
+#endif
 };
 
 /* direction */
@@ -989,6 +997,18 @@ int snd_hda_suspend(struct hda_bus *bus);
 int snd_hda_resume(struct hda_bus *bus);
 #endif
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static inline
+int hda_call_check_power_status(struct hda_codec *codec, hda_nid_t nid)
+{
+        if (codec->patch_ops.check_power_status)
+                return codec->patch_ops.check_power_status(codec, nid);
+        return 0;
+}
+#else   
+#define hda_call_check_power_status(codec, nid)         0
+#endif
+
 /*
  * get widget information
  */
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 26c3ade73583..e3e853153d14 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -189,6 +189,9 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
         a->channels = GRAB_BITS(buf, 0, 0, 3);
         a->channels++;
 
+        a->sample_bits = 0;
+        a->max_bitrate = 0;
+
         a->format = GRAB_BITS(buf, 0, 3, 4);
         switch (a->format) {
         case AUDIO_CODING_TYPE_REF_STREAM_HEADER:
@@ -198,7 +201,6 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
 
         case AUDIO_CODING_TYPE_LPCM:
                 val = GRAB_BITS(buf, 2, 0, 3);
-                a->sample_bits = 0;
                 for (i = 0; i < 3; i++)
                         if (val & (1 << i))
                                 a->sample_bits |= cea_sample_sizes[i + 1];
@@ -292,7 +294,7 @@ static int hdmi_update_eld(struct hdmi_eld *e,
                 snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);
                 goto out_fail;
         } else
-                strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl);
+                strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);
 
         for (i = 0; i < e->sad_count; i++) {
                 if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) {
@@ -310,29 +312,11 @@ out_fail:
         return -EINVAL;
 }
 
-static int hdmi_eld_valid(struct hda_codec *codec, hda_nid_t nid)
-{
-        int eldv;
-        int present;
-
-        present = snd_hda_pin_sense(codec, nid);
-        eldv    = (present & AC_PINSENSE_ELDV);
-        present = (present & AC_PINSENSE_PRESENCE);
-
-#ifdef CONFIG_SND_DEBUG_VERBOSE
-        printk(KERN_INFO "HDMI: sink_present = %d, eld_valid = %d\n",
-                        !!present, !!eldv);
-#endif
-
-        return eldv && present;
-}
-
 int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)
 {
         return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,
                                                  AC_DIPSIZE_ELD_BUF);
 }
-EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size);
 
 int snd_hdmi_get_eld(struct hdmi_eld *eld,
                      struct hda_codec *codec, hda_nid_t nid)
@@ -342,7 +326,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
         int size;
         unsigned char *buf;
 
-        if (!hdmi_eld_valid(codec, nid))
+        if (!eld->eld_valid)
                 return -ENOENT;
 
         size = snd_hdmi_get_eld_size(codec, nid);
@@ -368,7 +352,6 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
         kfree(buf);
         return ret;
 }
-EXPORT_SYMBOL_HDA(snd_hdmi_get_eld);
 
 static void hdmi_show_short_audio_desc(struct cea_sad *a)
 {
@@ -381,7 +364,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
         snd_print_pcm_rates(a->rates, buf, sizeof(buf));
 
         if (a->format == AUDIO_CODING_TYPE_LPCM)
-                snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2 - 8));
+                snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
         else if (a->max_bitrate)
                 snprintf(buf2, sizeof(buf2),
                                 ", max bitrate = %d", a->max_bitrate);
@@ -407,7 +390,6 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
         }
         buf[j] = '\0';  /* necessary when j == 0 */
 }
-EXPORT_SYMBOL_HDA(snd_print_channel_allocation);
 
 void snd_hdmi_show_eld(struct hdmi_eld *e)
 {
@@ -426,7 +408,6 @@ void snd_hdmi_show_eld(struct hdmi_eld *e)
         for (i = 0; i < e->sad_count; i++)
                 hdmi_show_short_audio_desc(e->sad + i);
 }
-EXPORT_SYMBOL_HDA(snd_hdmi_show_eld);
 
 #ifdef CONFIG_PROC_FS
 
@@ -479,6 +460,8 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
 
         snd_iprintf(buffer, "monitor_present\t\t%d\n", e->monitor_present);
         snd_iprintf(buffer, "eld_valid\t\t%d\n", e->eld_valid);
+        if (!e->eld_valid)
+                return;
         snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name);
         snd_iprintf(buffer, "connection_type\t\t%s\n",
                                 eld_connection_type_names[e->conn_type]);
@@ -585,7 +568,6 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,
 
         return 0;
 }
-EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new);
 
 void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
 {
@@ -594,7 +576,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
                 eld->proc_entry = NULL;
         }
 }
-EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);
 
 #endif /* CONFIG_PROC_FS */
 
@@ -604,24 +585,19 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
 {
         int i;
 
-        pcm->rates = 0;
-        pcm->formats = 0;
-        pcm->maxbps = 0;
-        pcm->channels_min = -1;
-        pcm->channels_max = 0;
+        /* assume basic audio support (the basic audio flag is not in ELD;
+         * however, all audio capable sinks are required to support basic
+         * audio) */
+        pcm->rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;
+        pcm->formats = SNDRV_PCM_FMTBIT_S16_LE;
+        pcm->maxbps = 16;
+        pcm->channels_max = 2;
         for (i = 0; i < eld->sad_count; i++) {
                 struct cea_sad *a = &eld->sad[i];
                 pcm->rates |= a->rates;
-                if (a->channels < pcm->channels_min)
-                        pcm->channels_min = a->channels;
                 if (a->channels > pcm->channels_max)
                         pcm->channels_max = a->channels;
                 if (a->format == AUDIO_CODING_TYPE_LPCM) {
-                        if (a->sample_bits & AC_SUPPCM_BITS_16) {
-                                pcm->formats |= SNDRV_PCM_FMTBIT_S16_LE;
-                                if (pcm->maxbps < 16)
-                                        pcm->maxbps = 16;
-                        }
                         if (a->sample_bits & AC_SUPPCM_BITS_20) {
                                 pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;
                                 if (pcm->maxbps < 20)
@@ -641,8 +617,6 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
         /* restrict the parameters by the values the codec provides */
         pcm->rates &= codec_pars->rates;
         pcm->formats &= codec_pars->formats;
-        pcm->channels_min = max(pcm->channels_min, codec_pars->channels_min);
         pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);
         pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);
 }
-EXPORT_SYMBOL_HDA(hdmi_eld_update_pcm_info);
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 5ea21285ee1f..a63c54d9d767 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -61,7 +61,6 @@ struct hda_gspec {
         struct hda_gnode *cap_vol_node; /* Node for capture volume */
         unsigned int cur_cap_src;       /* current capture source */
         struct hda_input_mux input_mux;
-        char cap_labels[HDA_MAX_NUM_INPUTS][16];
 
         unsigned int def_amp_in_caps;
         unsigned int def_amp_out_caps;
@@ -506,11 +505,10 @@ static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)
  * returns 0 if not found, 1 if found, or a negative error code.
  */
 static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
-                               struct hda_gnode *node)
+                               struct hda_gnode *node, int idx)
 {
         int i, err;
         unsigned int pinctl;
-        char *label;
         const char *type;
 
         if (node->checked)
@@ -523,7 +521,7 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
                         child = hda_get_node(spec, node->conn_list[i]);
                         if (! child)
                                 continue;
-                        err = parse_adc_sub_nodes(codec, spec, child);
+                        err = parse_adc_sub_nodes(codec, spec, child, idx);
                         if (err < 0)
                                 return err;
                         if (err > 0) {
@@ -564,9 +562,7 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
                         return 0;
                 type = "Input";
         }
-        label = spec->cap_labels[spec->input_mux.num_items];
-        strcpy(label, type);
-        spec->input_mux.items[spec->input_mux.num_items].label = label;
+        snd_hda_add_imux_item(&spec->input_mux, type, idx, NULL);
 
         /* unmute the PIN external input */
         unmute_input(codec, node, 0); /* index = 0? */
@@ -577,29 +573,6 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
         return 1; /* found */
 }
 
-/* add a capture source element */
-static void add_cap_src(struct hda_gspec *spec, int idx)
-{
-        struct hda_input_mux_item *csrc;
-        char *buf;
-        int num, ocap;
-
-        num = spec->input_mux.num_items;
-        csrc = &spec->input_mux.items[num];
-        buf = spec->cap_labels[num];
-        for (ocap = 0; ocap < num; ocap++) {
-                if (! strcmp(buf, spec->cap_labels[ocap])) {
-                        /* same label already exists,
-                         * put the index number to be unique
-                         */
-                        sprintf(buf, "%s %d", spec->cap_labels[ocap], num);
-                        break;
-                }
-        }
-        csrc->index = idx;
-        spec->input_mux.num_items++;
-}
-
 /*
  * parse input
  */
@@ -624,22 +597,18 @@ static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)
         for (i = 0; i < adc_node->nconns; i++) {
                 node = hda_get_node(spec, adc_node->conn_list[i]);
                 if (node && node->type == AC_WID_PIN) {
-                        err = parse_adc_sub_nodes(codec, spec, node);
+                        err = parse_adc_sub_nodes(codec, spec, node, i);
                         if (err < 0)
                                 return err;
-                        else if (err > 0)
-                                add_cap_src(spec, i);
                 }
         }
         /* ... then check the rests, more complicated connections */
         for (i = 0; i < adc_node->nconns; i++) {
                 node = hda_get_node(spec, adc_node->conn_list[i]);
                 if (node && node->type != AC_WID_PIN) {
-                        err = parse_adc_sub_nodes(codec, spec, node);
+                        err = parse_adc_sub_nodes(codec, spec, node, i);
                         if (err < 0)
                                 return err;
-                        else if (err > 0)
-                                add_cap_src(spec, i);
                 }
         }
 
@@ -793,7 +762,8 @@ static int check_existing_control(struct hda_codec *codec, const char *type, con
 /*
  * build output mixer controls
  */
-static int create_output_mixers(struct hda_codec *codec, const char **names)
+static int create_output_mixers(struct hda_codec *codec,
+                                const char * const *names)
 {
         struct hda_gspec *spec = codec->spec;
         int i, err;
@@ -811,8 +781,8 @@ static int create_output_mixers(struct hda_codec *codec, const char **names)
 static int build_output_controls(struct hda_codec *codec)
 {
         struct hda_gspec *spec = codec->spec;
-        static const char *types_speaker[] = { "Speaker", "Headphone" };
-        static const char *types_line[] = { "Front", "Headphone" };
+        static const char * const types_speaker[] = { "Speaker", "Headphone" };
+        static const char * const types_line[] = { "Front", "Headphone" };
 
         switch (spec->pcm_vol_nodes) {
         case 1:
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 34940a079051..486f6deb3eee 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -78,8 +78,8 @@ MODULE_PARM_DESC(enable, "Enable Intel HD audio interface.");
 module_param_array(model, charp, NULL, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
 module_param_array(position_fix, int, NULL, 0444);
-MODULE_PARM_DESC(position_fix, "Fix DMA pointer "
-                 "(0 = auto, 1 = none, 2 = POSBUF).");
+MODULE_PARM_DESC(position_fix, "DMA pointer read method."
+                 "(0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO).");
 module_param_array(bdl_pos_adj, int, NULL, 0644);
 MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset.");
 module_param_array(probe_mask, int, NULL, 0444);
@@ -126,6 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, ICH10},"
                          "{Intel, PCH},"
                          "{Intel, CPT},"
+                         "{Intel, PPT},"
                          "{Intel, PBG},"
                          "{Intel, SCH},"
                          "{ATI, SB450},"
@@ -305,6 +306,7 @@ enum {
         POS_FIX_AUTO,
         POS_FIX_LPIB,
         POS_FIX_POSBUF,
+        POS_FIX_VIACOMBO,
 };
 
 /* Defines for ATI HD Audio support in SB450 south bridge */
@@ -389,6 +391,7 @@ struct azx {
 
         /* chip type specific */
         int driver_type;
+        unsigned int driver_caps;
         int playback_streams;
         int playback_index_offset;
         int capture_streams;
@@ -433,7 +436,6 @@ struct azx {
         unsigned int polling_mode :1;
         unsigned int msi :1;
         unsigned int irq_pending_warned :1;
-        unsigned int via_dmapos_patch :1; /* enable DMA-position fix for VIA */
         unsigned int probing :1; /* codec probing phase */
 
         /* for debugging */
@@ -458,10 +460,39 @@ enum {
         AZX_DRIVER_ULI,
         AZX_DRIVER_NVIDIA,
         AZX_DRIVER_TERA,
+        AZX_DRIVER_CTX,
         AZX_DRIVER_GENERIC,
         AZX_NUM_DRIVERS, /* keep this as last entry */
 };
 
+/* driver quirks (capabilities) */
+/* bits 0-7 are used for indicating driver type */
+#define AZX_DCAPS_NO_TCSEL      (1 << 8)        /* No Intel TCSEL bit */
+#define AZX_DCAPS_NO_MSI        (1 << 9)        /* No MSI support */
+#define AZX_DCAPS_ATI_SNOOP     (1 << 10)       /* ATI snoop enable */
+#define AZX_DCAPS_NVIDIA_SNOOP  (1 << 11)       /* Nvidia snoop enable */
+#define AZX_DCAPS_SCH_SNOOP     (1 << 12)       /* SCH/PCH snoop enable */
+#define AZX_DCAPS_RIRB_DELAY    (1 << 13)       /* Long delay in read loop */
+#define AZX_DCAPS_RIRB_PRE_DELAY (1 << 14)      /* Put a delay before read */
+#define AZX_DCAPS_CTX_WORKAROUND (1 << 15)      /* X-Fi workaround */
+#define AZX_DCAPS_POSFIX_LPIB   (1 << 16)       /* Use LPIB as default */
+#define AZX_DCAPS_POSFIX_VIA    (1 << 17)       /* Use VIACOMBO as default */
+#define AZX_DCAPS_NO_64BIT      (1 << 18)       /* No 64bit address */
+#define AZX_DCAPS_SYNC_WRITE    (1 << 19)       /* sync each cmd write */
+
+/* quirks for ATI SB / AMD Hudson */
+#define AZX_DCAPS_PRESET_ATI_SB \
+        (AZX_DCAPS_ATI_SNOOP | AZX_DCAPS_NO_TCSEL | \
+         AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB)
+
+/* quirks for ATI/AMD HDMI */
+#define AZX_DCAPS_PRESET_ATI_HDMI \
+        (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB)
+
+/* quirks for Nvidia */
+#define AZX_DCAPS_PRESET_NVIDIA \
+        (AZX_DCAPS_NVIDIA_SNOOP | AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI)
+
 static char *driver_short_names[] __devinitdata = {
         [AZX_DRIVER_ICH] = "HDA Intel",
         [AZX_DRIVER_PCH] = "HDA Intel PCH",
@@ -473,6 +504,7 @@ static char *driver_short_names[] __devinitdata = {
         [AZX_DRIVER_ULI] = "HDA ULI M5461",
         [AZX_DRIVER_NVIDIA] = "HDA NVidia",
         [AZX_DRIVER_TERA] = "HDA Teradici", 
+        [AZX_DRIVER_CTX] = "HDA Creative", 
         [AZX_DRIVER_GENERIC] = "HD-Audio Generic",
 };
 
@@ -563,7 +595,10 @@ static void azx_init_cmd_io(struct azx *chip)
         /* reset the rirb hw write pointer */
         azx_writew(chip, RIRBWP, ICH6_RIRBWP_RST);
         /* set N=1, get RIRB response interrupt for new entry */
-        azx_writew(chip, RINTCNT, 1);
+        if (chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND)
+                azx_writew(chip, RINTCNT, 0xc0);
+        else
+                azx_writew(chip, RINTCNT, 1);
         /* enable rirb dma and response irq */
         azx_writeb(chip, RIRBCTL, ICH6_RBCTL_DMA_EN | ICH6_RBCTL_IRQ_EN);
         spin_unlock_irq(&chip->reg_lock);
@@ -1047,19 +1082,27 @@ static void azx_init_pci(struct azx *chip)
         /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
          * TCSEL == Traffic Class Select Register, which sets PCI express QOS
          * Ensuring these bits are 0 clears playback static on some HD Audio
-         * codecs
+         * codecs.
+         * The PCI register TCSEL is defined in the Intel manuals.
          */
-        update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
+        if (!(chip->driver_caps & AZX_DCAPS_NO_TCSEL)) {
+                snd_printdd(SFX "Clearing TCSEL\n");
+                update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
+        }
 
-        switch (chip->driver_type) {
-        case AZX_DRIVER_ATI:
-                /* For ATI SB450 azalia HD audio, we need to enable snoop */
+        /* For ATI SB450/600/700/800/900 and AMD Hudson azalia HD audio,
+         * we need to enable snoop.
+         */
+        if (chip->driver_caps & AZX_DCAPS_ATI_SNOOP) {
+                snd_printdd(SFX "Enabling ATI snoop\n");
                 update_pci_byte(chip->pci,
                                 ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
                                 0x07, ATI_SB450_HDAUDIO_ENABLE_SNOOP);
-                break;
-        case AZX_DRIVER_NVIDIA:
-                /* For NVIDIA HDA, enable snoop */
+        }
+
+        /* For NVIDIA HDA, enable snoop */
+        if (chip->driver_caps & AZX_DCAPS_NVIDIA_SNOOP) {
+                snd_printdd(SFX "Enabling Nvidia snoop\n");
                 update_pci_byte(chip->pci,
                                 NVIDIA_HDA_TRANSREG_ADDR,
                                 0x0f, NVIDIA_HDA_ENABLE_COHBITS);
@@ -1069,9 +1112,10 @@ static void azx_init_pci(struct azx *chip)
                 update_pci_byte(chip->pci,
                                 NVIDIA_HDA_OSTRM_COH,
                                 0x01, NVIDIA_HDA_ENABLE_COHBIT);
-                break;
-        case AZX_DRIVER_SCH:
-        case AZX_DRIVER_PCH:
+        }
+
+        /* Enable SCH/PCH snoop if needed */
+        if (chip->driver_caps & AZX_DCAPS_SCH_SNOOP) {
                 pci_read_config_word(chip->pci, INTEL_SCH_HDA_DEVC, &snoop);
                 if (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP) {
                         pci_write_config_word(chip->pci, INTEL_SCH_HDA_DEVC,
@@ -1082,8 +1126,6 @@ static void azx_init_pci(struct azx *chip)
                                 (snoop & INTEL_SCH_HDA_DEVC_NOSNOOP)
                                 ? "Failed" : "OK");
                 }
-                break;
-
         }
 }
 
@@ -1136,8 +1178,11 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
         /* clear rirb int */
         status = azx_readb(chip, RIRBSTS);
         if (status & RIRB_INT_MASK) {
-                if (status & RIRB_INT_RESPONSE)
+                if (status & RIRB_INT_RESPONSE) {
+                        if (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY)
+                                udelay(80);
                         azx_update_rirb(chip);
+                }
                 azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
         }
 
@@ -1227,7 +1272,8 @@ static int azx_setup_periods(struct azx *chip,
                         pos_adj = 0;
                 } else {
                         ofs = setup_bdle(substream, azx_dev,
-                                         &bdl, ofs, pos_adj, 1);
+                                         &bdl, ofs, pos_adj,
+                                         !substream->runtime->no_period_wakeup);
                         if (ofs < 0)
                                 goto error;
                 }
@@ -1239,7 +1285,8 @@ static int azx_setup_periods(struct azx *chip,
                                          period_bytes - pos_adj, 0);
                 else
                         ofs = setup_bdle(substream, azx_dev, &bdl, ofs,
-                                         period_bytes, 1);
+                                         period_bytes,
+                                         !substream->runtime->no_period_wakeup);
                 if (ofs < 0)
                         goto error;
         }
@@ -1309,11 +1356,8 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
         azx_sd_writel(azx_dev, SD_BDLPU, upper_32_bits(azx_dev->bdl.addr));
 
         /* enable the position buffer */
-        if (chip->position_fix[0] == POS_FIX_POSBUF ||
-            chip->position_fix[0] == POS_FIX_AUTO ||
-            chip->position_fix[1] == POS_FIX_POSBUF ||
-            chip->position_fix[1] == POS_FIX_AUTO ||
-            chip->via_dmapos_patch) {
+        if (chip->position_fix[0] != POS_FIX_LPIB ||
+            chip->position_fix[1] != POS_FIX_LPIB) {
                 if (!(azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
                         azx_writel(chip, DPLBASE,
                                 (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
@@ -1404,8 +1448,10 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
         if (err < 0)
                 return err;
 
-        if (chip->driver_type == AZX_DRIVER_NVIDIA)
+        if (chip->driver_caps & AZX_DCAPS_RIRB_DELAY) {
+                snd_printd(SFX "Enable delay in RIRB handling\n");
                 chip->bus->needs_damn_long_delay = 1;
+        }
 
         codecs = 0;
         max_slots = azx_max_codecs[chip->driver_type];
@@ -1436,6 +1482,16 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
                 }
         }
 
+        /* AMD chipsets often cause the communication stalls upon certain
+         * sequence like the pin-detection.  It seems that forcing the synced
+         * access works around the stall.  Grrr...
+         */
+        if (chip->driver_caps & AZX_DCAPS_SYNC_WRITE) {
+                snd_printd(SFX "Enable sync_write for stable communication\n");
+                chip->bus->sync_write = 1;
+                chip->bus->allow_bus_reset = 1;
+        }
+
         /* Then create codec instances */
         for (c = 0; c < max_slots; c++) {
                 if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
@@ -1510,7 +1566,8 @@ static struct snd_pcm_hardware azx_pcm_hw = {
                                  /* No full-resume yet implemented */
                                  /* SNDRV_PCM_INFO_RESUME |*/
                                  SNDRV_PCM_INFO_PAUSE |
-                                 SNDRV_PCM_INFO_SYNC_START),
+                                 SNDRV_PCM_INFO_SYNC_START |
+                                 SNDRV_PCM_INFO_NO_PERIOD_WAKEUP),
         .formats =              SNDRV_PCM_FMTBIT_S16_LE,
         .rates =                SNDRV_PCM_RATE_48000,
         .rate_min =             48000,
@@ -1647,7 +1704,7 @@ 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;
+        unsigned int bufsize, period_bytes, format_val, stream_tag;
         int err;
 
         azx_stream_reset(chip, azx_dev);
@@ -1689,7 +1746,12 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
         else
                 azx_dev->fifo_size = 0;
 
-        return snd_hda_codec_prepare(apcm->codec, hinfo, azx_dev->stream_tag,
+        stream_tag = azx_dev->stream_tag;
+        /* CA-IBG chips need the playback stream starting from 1 */
+        if ((chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) &&
+            stream_tag > chip->capture_streams)
+                stream_tag -= chip->capture_streams;
+        return snd_hda_codec_prepare(apcm->codec, hinfo, stream_tag,
                                      azx_dev->format_val, substream);
 }
 
@@ -1852,20 +1914,21 @@ static unsigned int azx_get_position(struct azx *chip,
                                      struct azx_dev *azx_dev)
 {
         unsigned int pos;
+        int stream = azx_dev->substream->stream;
 
-        if (chip->via_dmapos_patch)
+        switch (chip->position_fix[stream]) {
+        case POS_FIX_LPIB:
+                /* read LPIB */
+                pos = azx_sd_readl(azx_dev, SD_LPIB);
+                break;
+        case POS_FIX_VIACOMBO:
                 pos = azx_via_get_position(chip, azx_dev);
-        else {
-                int stream = azx_dev->substream->stream;
-                if (chip->position_fix[stream] == POS_FIX_POSBUF ||
-                    chip->position_fix[stream] == POS_FIX_AUTO) {
-                        /* use the position buffer */
-                        pos = le32_to_cpu(*azx_dev->posbuf);
-                } else {
-                        /* read LPIB */
-                        pos = azx_sd_readl(azx_dev, SD_LPIB);
-                }
+                break;
+        default:
+                /* use the position buffer */
+                pos = le32_to_cpu(*azx_dev->posbuf);
         }
+
         if (pos >= azx_dev->bufsize)
                 pos = 0;
         return pos;
@@ -2285,13 +2348,16 @@ static int azx_dev_free(struct snd_device *device)
  */
 static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1025, 0x026f, "Acer Aspire 5538", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1028, 0x0470, "Dell Inspiron 1120", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
+        SND_PCI_QUIRK(0x1043, 0x8410, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
@@ -2313,19 +2379,10 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
         switch (fix) {
         case POS_FIX_LPIB:
         case POS_FIX_POSBUF:
+        case POS_FIX_VIACOMBO:
                 return fix;
         }
 
-        /* Check VIA/ATI HD Audio Controller exist */
-        switch (chip->driver_type) {
-        case AZX_DRIVER_VIA:
-        case AZX_DRIVER_ATI:
-                chip->via_dmapos_patch = 1;
-                /* Use link position directly, avoid any transfer problem. */
-                return POS_FIX_LPIB;
-        }
-        chip->via_dmapos_patch = 0;
-
         q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
         if (q) {
                 printk(KERN_INFO
@@ -2334,6 +2391,16 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
                        q->value, q->subvendor, q->subdevice);
                 return q->value;
         }
+
+        /* Check VIA/ATI HD Audio Controller exist */
+        if (chip->driver_caps & AZX_DCAPS_POSFIX_VIA) {
+                snd_printd(SFX "Using VIACOMBO position fix\n");
+                return POS_FIX_VIACOMBO;
+        }
+        if (chip->driver_caps & AZX_DCAPS_POSFIX_LPIB) {
+                snd_printd(SFX "Using LPIB position fix\n");
+                return POS_FIX_LPIB;
+        }
         return POS_FIX_AUTO;
 }
 
@@ -2415,8 +2482,8 @@ static void __devinit check_msi(struct azx *chip)
         }
 
         /* NVidia chipsets seem to cause troubles with MSI */
-        if (chip->driver_type == AZX_DRIVER_NVIDIA) {
-                printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");
+        if (chip->driver_caps & AZX_DCAPS_NO_MSI) {
+                printk(KERN_INFO "hda_intel: Disabling MSI\n");
                 chip->msi = 0;
         }
 }
@@ -2426,7 +2493,7 @@ static void __devinit check_msi(struct azx *chip)
  * constructor
  */
 static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
-                                int dev, int driver_type,
+                                int dev, unsigned int driver_caps,
                                 struct azx **rchip)
 {
         struct azx *chip;
@@ -2454,7 +2521,8 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         chip->card = card;
         chip->pci = pci;
         chip->irq = -1;
-        chip->driver_type = driver_type;
+        chip->driver_caps = driver_caps;
+        chip->driver_type = driver_caps & 0xff;
         check_msi(chip);
         chip->dev_index = dev;
         INIT_WORK(&chip->irq_pending_work, azx_irq_pending_work);
@@ -2518,8 +2586,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         snd_printdd(SFX "chipset global capabilities = 0x%x\n", gcap);
 
         /* disable SB600 64bit support for safety */
-        if ((chip->driver_type == AZX_DRIVER_ATI) ||
-            (chip->driver_type == AZX_DRIVER_ATIHDMI)) {
+        if (chip->pci->vendor == PCI_VENDOR_ID_ATI) {
                 struct pci_dev *p_smbus;
                 p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
                                          PCI_DEVICE_ID_ATI_SBX00_SMBUS,
@@ -2531,10 +2598,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                 }
         }
 
-        /* disable 64bit DMA address for Teradici */
-        /* it does not work with device 6549:1200 subsys e4a2:040b */
-        if (chip->driver_type == AZX_DRIVER_TERA)
+        /* disable 64bit DMA address on some devices */
+        if (chip->driver_caps & AZX_DCAPS_NO_64BIT) {
+                snd_printd(SFX "Disabling 64bit DMA\n");
                 gcap &= ~ICH6_GCAP_64OK;
+        }
 
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))
@@ -2687,7 +2755,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
         if (err < 0)
                 goto out_free;
 #ifdef CONFIG_SND_HDA_PATCH_LOADER
-        if (patch[dev]) {
+        if (patch[dev] && *patch[dev]) {
                 snd_printk(KERN_ERR SFX "Applying patch firmware '%s'\n",
                            patch[dev]);
                 err = snd_hda_load_patch(chip->bus, patch[dev]);
@@ -2735,45 +2803,63 @@ static void __devexit azx_remove(struct pci_dev *pci)
 
 /* PCI IDs */
 static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
-        /* ICH 6..10 */
-        { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x27d8), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x269a), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x284b), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x2911), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x293e), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x293f), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3a3e), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },
-        /* PCH */
-        { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },
-        { PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },
         /* CPT */
-        { PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },
+        { PCI_DEVICE(0x8086, 0x1c20),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP },
         /* PBG */
-        { PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },
+        { PCI_DEVICE(0x8086, 0x1d20),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP },
+        /* Panther Point */
+        { PCI_DEVICE(0x8086, 0x1e20),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_SCH_SNOOP },
         /* SCH */
-        { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },
-        /* ATI SB 450/600 */
-        { PCI_DEVICE(0x1002, 0x437b), .driver_data = AZX_DRIVER_ATI },
-        { PCI_DEVICE(0x1002, 0x4383), .driver_data = AZX_DRIVER_ATI },
+        { PCI_DEVICE(0x8086, 0x811b),
+          .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP },
+        /* Generic Intel */
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
+          .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
+          .class_mask = 0xffffff,
+          .driver_data = AZX_DRIVER_ICH },
+        /* ATI SB 450/600/700/800/900 */
+        { PCI_DEVICE(0x1002, 0x437b),
+          .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
+        { PCI_DEVICE(0x1002, 0x4383),
+          .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
+        /* AMD Hudson */
+        { PCI_DEVICE(0x1022, 0x780d),
+          .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
         /* ATI HDMI */
-        { PCI_DEVICE(0x1002, 0x793b), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0x7919), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0x960f), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0x970f), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa00), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa08), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa10), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa18), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa20), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa28), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa30), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa38), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa40), .driver_data = AZX_DRIVER_ATIHDMI },
-        { PCI_DEVICE(0x1002, 0xaa48), .driver_data = AZX_DRIVER_ATIHDMI },
+        { PCI_DEVICE(0x1002, 0x793b),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0x7919),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0x960f),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0x970f),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa00),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa08),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa10),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa18),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa20),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa28),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa30),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa38),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa40),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
+        { PCI_DEVICE(0x1002, 0xaa48),
+          .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
         /* VIA VT8251/VT8237A */
-        { PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
+        { PCI_DEVICE(0x1106, 0x3288),
+          .driver_data = AZX_DRIVER_VIA | AZX_DCAPS_POSFIX_VIA },
         /* SIS966 */
         { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
         /* ULI M5461 */
@@ -2782,9 +2868,10 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
           .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
           .class_mask = 0xffffff,
-          .driver_data = AZX_DRIVER_NVIDIA },
+          .driver_data = AZX_DRIVER_NVIDIA | AZX_DCAPS_PRESET_NVIDIA },
         /* Teradici */
-        { PCI_DEVICE(0x6549, 0x1200), .driver_data = AZX_DRIVER_TERA },
+        { PCI_DEVICE(0x6549, 0x1200),
+          .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
         /* Creative X-Fi (CA0110-IBG) */
 #if !defined(CONFIG_SND_CTXFI) && !defined(CONFIG_SND_CTXFI_MODULE)
         /* the following entry conflicts with snd-ctxfi driver,
@@ -2794,20 +2881,27 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_CREATIVE, PCI_ANY_ID),
           .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
           .class_mask = 0xffffff,
-          .driver_data = AZX_DRIVER_GENERIC },
+          .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
+          AZX_DCAPS_RIRB_PRE_DELAY },
 #else
         /* this entry seems still valid -- i.e. without emu20kx chip */
-        { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_GENERIC },
+        { PCI_DEVICE(0x1102, 0x0009),
+          .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
+          AZX_DCAPS_RIRB_PRE_DELAY },
 #endif
+        /* Vortex86MX */
+        { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
+        /* VMware HDAudio */
+        { PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
         /* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
         { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
           .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
           .class_mask = 0xffffff,
-          .driver_data = AZX_DRIVER_GENERIC },
+          .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_ANY_ID),
           .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
           .class_mask = 0xffffff,
-          .driver_data = AZX_DRIVER_GENERIC },
+          .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 28ab4aead48f..08ec073444e2 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -38,10 +38,11 @@
  */
 #define HDA_COMPOSE_AMP_VAL_OFS(nid,chs,idx,dir,ofs)            \
         ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19) | ((ofs)<<23))
+#define HDA_AMP_VAL_MIN_MUTE (1<<29)
 #define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) \
         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) \
+#define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, dir, flags) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \
           .subdevice = HDA_SUBDEV_AMP_FLAG, \
           .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | \
@@ -51,16 +52,20 @@
           .get = snd_hda_mixer_amp_volume_get, \
           .put = snd_hda_mixer_amp_volume_put, \
           .tlv = { .c = snd_hda_mixer_amp_tlv },                \
-          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }
+          .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, dir) | flags }
 /* stereo volume with index */
 #define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \
-        HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, 3, xindex, direction)
+        HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, 3, xindex, direction, 0)
 /* mono volume */
 #define HDA_CODEC_VOLUME_MONO(xname, nid, channel, xindex, direction) \
-        HDA_CODEC_VOLUME_MONO_IDX(xname, 0, nid, channel, xindex, direction)
+        HDA_CODEC_VOLUME_MONO_IDX(xname, 0, nid, channel, xindex, direction, 0)
 /* stereo volume */
 #define HDA_CODEC_VOLUME(xname, nid, xindex, direction) \
         HDA_CODEC_VOLUME_MONO(xname, nid, 3, xindex, direction)
+/* stereo volume with min=mute */
+#define HDA_CODEC_VOLUME_MIN_MUTE(xname, nid, xindex, direction) \
+        HDA_CODEC_VOLUME_MONO_IDX(xname, 0, nid, 3, xindex, direction, \
+                                  HDA_AMP_VAL_MIN_MUTE)
 /* mono mute switch with index (index=0,1,...) (channel=1,2) */
 #define HDA_CODEC_MUTE_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \
@@ -135,7 +140,7 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
 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);
+                        unsigned int *tlv, const char * const *slaves);
 int snd_hda_codec_reset(struct hda_codec *codec);
 
 /* amp value bits */
@@ -215,7 +220,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid);
  */
 #define HDA_MAX_NUM_INPUTS      16
 struct hda_input_mux_item {
-        const char *label;
+        char label[32];
         unsigned int index;
 };
 struct hda_input_mux {
@@ -262,11 +267,11 @@ enum { HDA_DIG_NONE, HDA_DIG_EXCLUSIVE, HDA_DIG_ANALOG_DUP }; /* dig_out_used */
 
 struct hda_multi_out {
         int num_dacs;           /* # of DACs, must be more than 1 */
-        hda_nid_t *dac_nids;    /* DAC list */
+        const hda_nid_t *dac_nids;      /* DAC list */
         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;
+        const 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 */
@@ -336,13 +341,13 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen);
  * Misc
  */
 int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,
-                               const char **modelnames,
+                               const char * const *modelnames,
                                const struct snd_pci_quirk *pci_list);
 int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
-                               int num_configs, const char **models,
+                               int num_configs, const char * const *models,
                                const struct snd_pci_quirk *tbl);
 int snd_hda_add_new_ctls(struct hda_codec *codec,
-                         struct snd_kcontrol_new *knew);
+                         const struct snd_kcontrol_new *knew);
 
 /*
  * unsolicited event handler
@@ -366,9 +371,7 @@ struct hda_bus_unsolicited {
 
 enum {
         AUTO_PIN_MIC,
-        AUTO_PIN_FRONT_MIC,
-        AUTO_PIN_LINE,
-        AUTO_PIN_FRONT_LINE,
+        AUTO_PIN_LINE_IN,
         AUTO_PIN_CD,
         AUTO_PIN_AUX,
         AUTO_PIN_LAST
@@ -380,9 +383,33 @@ enum {
         AUTO_PIN_HP_OUT
 };
 
-extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];
-
 #define AUTO_CFG_MAX_OUTS       5
+#define AUTO_CFG_MAX_INS        8
+
+struct auto_pin_cfg_item {
+        hda_nid_t pin;
+        int type;
+};
+
+struct auto_pin_cfg;
+const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin,
+                                    int check_location);
+const char *hda_get_autocfg_input_label(struct hda_codec *codec,
+                                        const struct auto_pin_cfg *cfg,
+                                        int input);
+int snd_hda_add_imux_item(struct hda_input_mux *imux, const char *label,
+                          int index, int *type_index_ret);
+
+enum {
+        INPUT_PIN_ATTR_UNUSED,  /* pin not connected */
+        INPUT_PIN_ATTR_INT,     /* internal mic/line-in */
+        INPUT_PIN_ATTR_DOCK,    /* docking mic/line-in */
+        INPUT_PIN_ATTR_NORMAL,  /* mic/line-in jack */
+        INPUT_PIN_ATTR_FRONT,   /* mic/line-in jack in front */
+        INPUT_PIN_ATTR_REAR,    /* mic/line-in jack in rear */
+};
+
+int snd_hda_get_input_pin_attr(unsigned int def_conf);
 
 struct auto_pin_cfg {
         int line_outs;
@@ -393,7 +420,8 @@ struct auto_pin_cfg {
         int hp_outs;
         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];
+        int num_inputs;
+        struct auto_pin_cfg_item inputs[AUTO_CFG_MAX_INS];
         int dig_outs;
         hda_nid_t dig_out_pins[2];
         hda_nid_t dig_in_pin;
@@ -415,7 +443,7 @@ struct auto_pin_cfg {
 
 int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                                  struct auto_pin_cfg *cfg,
-                                 hda_nid_t *ignore_nids);
+                                 const hda_nid_t *ignore_nids);
 
 /* amp values */
 #define AMP_IN_MUTE(idx)        (0x7080 | ((idx)<<8))
@@ -465,6 +493,12 @@ u32 snd_hda_query_pin_caps(struct hda_codec *codec, hda_nid_t nid);
 u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid);
 int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);
 
+static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)
+{
+        return (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT) &&
+                (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP);
+}
+
 /* flags for hda_nid_item */
 #define HDA_NID_ITEM_AMP        (1<<0)
 
@@ -539,7 +573,7 @@ struct hda_amp_list {
 };
 
 struct hda_loopback_check {
-        struct hda_amp_list *amplist;
+        const struct hda_amp_list *amplist;
         int power_on;
 };
 
@@ -558,6 +592,7 @@ int snd_hda_check_amp_list_power(struct hda_codec *codec,
 #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)
+#define get_amp_min_mute(kc)    (((kc)->private_value >> 29) & 0x1)
 
 /*
  * CEA Short Audio Descriptor data
@@ -627,4 +662,28 @@ static inline void snd_hda_eld_proc_free(struct hda_codec *codec,
 #define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
 void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
 
+/*
+ * Input-jack notification support
+ */
+#ifdef CONFIG_SND_HDA_INPUT_JACK
+int snd_hda_input_jack_add(struct hda_codec *codec, hda_nid_t nid, int type,
+                           const char *name);
+void snd_hda_input_jack_report(struct hda_codec *codec, hda_nid_t nid);
+void snd_hda_input_jack_free(struct hda_codec *codec);
+#else /* CONFIG_SND_HDA_INPUT_JACK */
+static inline int snd_hda_input_jack_add(struct hda_codec *codec,
+                                         hda_nid_t nid, int type,
+                                         const char *name)
+{
+        return 0;
+}
+static inline void snd_hda_input_jack_report(struct hda_codec *codec,
+                                             hda_nid_t nid)
+{
+}
+static inline void snd_hda_input_jack_free(struct hda_codec *codec)
+{
+}
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
+
 #endif /* __SOUND_HDA_LOCAL_H */
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index f025200f2a62..bfe74c2fb079 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -418,7 +418,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer,
 
 static const char *get_pwr_state(u32 state)
 {
-        static const char *buf[4] = {
+        static const char * const buf[4] = {
                 "D0", "D1", "D2", "D3"
         };
         if (state < 4)
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 10bbbaf6ebc3..d694e9d4921d 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -30,10 +30,10 @@
 #include "hda_beep.h"
 
 struct ad198x_spec {
-        struct snd_kcontrol_new *mixers[5];
+        const struct snd_kcontrol_new *mixers[6];
         int num_mixers;
         unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
-        const struct hda_verb *init_verbs[5];   /* initialization verbs
+        const struct hda_verb *init_verbs[6];   /* initialization verbs
                                                  * don't forget NULL termination!
                                                  */
         unsigned int num_init_verbs;
@@ -46,14 +46,17 @@ struct ad198x_spec {
         unsigned int cur_eapd;
         unsigned int need_dac_fix;
 
+        const hda_nid_t *alt_dac_nid;
+        const struct hda_pcm_stream *stream_analog_alt_playback;
+
         /* capture */
         unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
+        const hda_nid_t *adc_nids;
         hda_nid_t dig_in_nid;           /* digital-in NID; optional */
 
         /* capture source */
         const struct hda_input_mux *input_mux;
-        hda_nid_t *capsrc_nids;
+        const hda_nid_t *capsrc_nids;
         unsigned int cur_mux[3];
 
         /* channel model */
@@ -81,8 +84,8 @@ struct ad198x_spec {
 #endif
         /* for virtual master */
         hda_nid_t vmaster_nid;
-        const char **slave_vols;
-        const char **slave_sws;
+        const char * const *slave_vols;
+        const char * const *slave_sws;
 };
 
 /*
@@ -130,7 +133,7 @@ static int ad198x_init(struct hda_codec *codec)
         return 0;
 }
 
-static const char *ad_slave_vols[] = {
+static const char * const ad_slave_vols[] = {
         "Front Playback Volume",
         "Surround Playback Volume",
         "Center Playback Volume",
@@ -143,7 +146,7 @@ static const char *ad_slave_vols[] = {
         NULL
 };
 
-static const char *ad_slave_sws[] = {
+static const char * const ad_slave_sws[] = {
         "Front Playback Switch",
         "Surround Playback Switch",
         "Center Playback Switch",
@@ -156,17 +159,36 @@ static const char *ad_slave_sws[] = {
         NULL
 };
 
+static const char * const ad1988_6stack_fp_slave_vols[] = {
+        "Front Playback Volume",
+        "Surround Playback Volume",
+        "Center Playback Volume",
+        "LFE Playback Volume",
+        "Side Playback Volume",
+        "IEC958 Playback Volume",
+        NULL
+};
+
+static const char * const ad1988_6stack_fp_slave_sws[] = {
+        "Front Playback Switch",
+        "Surround Playback Switch",
+        "Center Playback Switch",
+        "LFE Playback Switch",
+        "Side Playback Switch",
+        "IEC958 Playback Switch",
+        NULL
+};
 static void ad198x_free_kctls(struct hda_codec *codec);
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
 /* additional beep mixers; the actual parameters are overwritten at build */
-static struct snd_kcontrol_new ad_beep_mixer[] = {
+static const struct snd_kcontrol_new ad_beep_mixer[] = {
         HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad_beep2_mixer[] = {
+static const struct snd_kcontrol_new ad_beep2_mixer[] = {
         HDA_CODEC_VOLUME("Digital Beep Playback Volume", 0, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE_BEEP("Digital Beep Playback Switch", 0, 0, HDA_OUTPUT),
         { } /* end */
@@ -209,7 +231,7 @@ static int ad198x_build_controls(struct hda_codec *codec)
         /* create beep controls if needed */
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
         if (spec->beep_amp) {
-                struct snd_kcontrol_new *knew;
+                const struct snd_kcontrol_new *knew;
                 knew = spec->analog_beep ? ad_beep2_mixer : ad_beep_mixer;
                 for ( ; knew->name; knew++) {
                         struct snd_kcontrol *kctl;
@@ -309,6 +331,13 @@ static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
 }
 
+static const struct hda_pcm_stream ad198x_pcm_analog_alt_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        /* NID is set in ad198x_build_pcms */
+};
+
 /*
  * Digital out
  */
@@ -374,7 +403,7 @@ static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 
 /*
  */
-static struct hda_pcm_stream ad198x_pcm_analog_playback = {
+static const struct hda_pcm_stream ad198x_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 6, /* changed later */
@@ -386,7 +415,7 @@ static struct hda_pcm_stream ad198x_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream ad198x_pcm_analog_capture = {
+static const struct hda_pcm_stream ad198x_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -397,7 +426,7 @@ static struct hda_pcm_stream ad198x_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream ad198x_pcm_digital_playback = {
+static const struct hda_pcm_stream ad198x_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -410,7 +439,7 @@ static struct hda_pcm_stream ad198x_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream ad198x_pcm_digital_capture = {
+static const struct hda_pcm_stream ad198x_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -446,12 +475,18 @@ static int ad198x_build_pcms(struct hda_codec *codec)
                 }
         }
 
-        return 0;
-}
+        if (spec->alt_dac_nid && spec->stream_analog_alt_playback) {
+                codec->num_pcms++;
+                info = spec->pcm_rec + 2;
+                info->name = "AD198x Headphone";
+                info->pcm_type = HDA_PCM_TYPE_AUDIO;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
+                        *spec->stream_analog_alt_playback;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
+                        spec->alt_dac_nid[0];
+        }
 
-static inline void ad198x_shutup(struct hda_codec *codec)
-{
-        snd_hda_shutup_pins(codec);
+        return 0;
 }
 
 static void ad198x_free_kctls(struct hda_codec *codec)
@@ -471,9 +506,11 @@ static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,
                                 hda_nid_t hp)
 {
         struct ad198x_spec *spec = codec->spec;
-        snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,
+        if (snd_hda_query_pin_caps(codec, front) & AC_PINCAP_EAPD)
+                snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE,
                             !spec->inv_eapd ? 0x00 : 0x02);
-        snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,
+        if (snd_hda_query_pin_caps(codec, hp) & AC_PINCAP_EAPD)
+                snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE,
                             !spec->inv_eapd ? 0x00 : 0x02);
 }
 
@@ -489,6 +526,10 @@ static void ad198x_power_eapd(struct hda_codec *codec)
         case 0x11d4184a:
         case 0x11d4194a:
         case 0x11d4194b:
+        case 0x11d41988:
+        case 0x11d4198b:
+        case 0x11d4989a:
+        case 0x11d4989b:
                 ad198x_power_eapd_write(codec, 0x12, 0x11);
                 break;
         case 0x11d41981:
@@ -498,15 +539,15 @@ static void ad198x_power_eapd(struct hda_codec *codec)
         case 0x11d41986:
                 ad198x_power_eapd_write(codec, 0x1b, 0x1a);
                 break;
-        case 0x11d41988:
-        case 0x11d4198b:
-        case 0x11d4989a:
-        case 0x11d4989b:
-                ad198x_power_eapd_write(codec, 0x29, 0x22);
-                break;
         }
 }
 
+static void ad198x_shutup(struct hda_codec *codec)
+{
+        snd_hda_shutup_pins(codec);
+        ad198x_power_eapd(codec);
+}
+
 static void ad198x_free(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
@@ -524,12 +565,11 @@ static void ad198x_free(struct hda_codec *codec)
 static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
 {
         ad198x_shutup(codec);
-        ad198x_power_eapd(codec);
         return 0;
 }
 #endif
 
-static struct hda_codec_ops ad198x_patch_ops = {
+static const struct hda_codec_ops ad198x_patch_ops = {
         .build_controls = ad198x_build_controls,
         .build_pcms = ad198x_build_pcms,
         .init = ad198x_init,
@@ -599,13 +639,13 @@ static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
 #define AD1986A_CLFE_DAC        0x05
 #define AD1986A_ADC             0x06
 
-static hda_nid_t ad1986a_dac_nids[3] = {
+static const hda_nid_t ad1986a_dac_nids[3] = {
         AD1986A_FRONT_DAC, AD1986A_SURR_DAC, AD1986A_CLFE_DAC
 };
-static hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC };
-static hda_nid_t ad1986a_capsrc_nids[1] = { 0x12 };
+static const hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC };
+static const hda_nid_t ad1986a_capsrc_nids[1] = { 0x12 };
 
-static struct hda_input_mux ad1986a_capture_source = {
+static const struct hda_input_mux ad1986a_capture_source = {
         .num_items = 7,
         .items = {
                 { "Mic", 0x0 },
@@ -619,7 +659,7 @@ static struct hda_input_mux ad1986a_capture_source = {
 };
 
 
-static struct hda_bind_ctls ad1986a_bind_pcm_vol = {
+static const struct hda_bind_ctls ad1986a_bind_pcm_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT),
@@ -629,7 +669,7 @@ static struct hda_bind_ctls ad1986a_bind_pcm_vol = {
         },
 };
 
-static struct hda_bind_ctls ad1986a_bind_pcm_sw = {
+static const struct hda_bind_ctls ad1986a_bind_pcm_sw = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT),
@@ -642,7 +682,7 @@ static struct hda_bind_ctls ad1986a_bind_pcm_sw = {
 /*
  * mixers
  */
-static struct snd_kcontrol_new ad1986a_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_mixers[] = {
         /*
          * bind volumes/mutes of 3 DACs as a single PCM control for simplicity
          */
@@ -666,7 +706,7 @@ static struct snd_kcontrol_new ad1986a_mixers[] = {
         HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x0f, 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),
@@ -683,7 +723,7 @@ static struct snd_kcontrol_new ad1986a_mixers[] = {
 };
 
 /* additional mixers for 3stack mode */
-static struct snd_kcontrol_new ad1986a_3st_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_3st_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -695,10 +735,10 @@ static struct snd_kcontrol_new ad1986a_3st_mixers[] = {
 };
 
 /* laptop model - 2ch only */
-static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };
+static const hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };
 
 /* master controls both pins 0x1a and 0x1b */
-static struct hda_bind_ctls ad1986a_laptop_master_vol = {
+static const struct hda_bind_ctls ad1986a_laptop_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
@@ -707,7 +747,7 @@ static struct hda_bind_ctls ad1986a_laptop_master_vol = {
         },
 };
 
-static struct hda_bind_ctls ad1986a_laptop_master_sw = {
+static const struct hda_bind_ctls ad1986a_laptop_master_sw = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
@@ -716,7 +756,7 @@ static struct hda_bind_ctls ad1986a_laptop_master_sw = {
         },
 };
 
-static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
@@ -729,7 +769,7 @@ static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
         HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x0f, 0x0, HDA_OUTPUT),
         /* 
            HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
            HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), */
@@ -747,7 +787,7 @@ static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
 
 /* laptop-eapd model - 2ch only */
 
-static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
+static const struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -756,7 +796,7 @@ static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
         },
 };
 
-static struct hda_input_mux ad1986a_automic_capture_source = {
+static const struct hda_input_mux ad1986a_automic_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x0 },
@@ -764,18 +804,18 @@ static struct hda_input_mux ad1986a_automic_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1986a_laptop_master_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_laptop_master_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
         HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x0f, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
         {
@@ -797,7 +837,7 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1986a_laptop_intmic_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_laptop_intmic_mixers[] = {
         HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT),
         { } /* end */
@@ -891,7 +931,7 @@ static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {
+static const struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -909,7 +949,7 @@ static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = {
 /*
  * initialization verbs
  */
-static struct hda_verb ad1986a_init_verbs[] = {
+static const struct hda_verb ad1986a_init_verbs[] = {
         /* Front, Surround, CLFE DAC; mute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
@@ -964,7 +1004,7 @@ static struct hda_verb ad1986a_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1986a_ch2_init[] = {
+static const struct hda_verb ad1986a_ch2_init[] = {
         /* Surround out -> Line In */
         { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* Line-in selectors */
@@ -976,7 +1016,7 @@ static struct hda_verb ad1986a_ch2_init[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1986a_ch4_init[] = {
+static const struct hda_verb ad1986a_ch4_init[] = {
         /* Surround out -> Surround */
         { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
@@ -986,7 +1026,7 @@ static struct hda_verb ad1986a_ch4_init[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1986a_ch6_init[] = {
+static const struct hda_verb ad1986a_ch6_init[] = {
         /* Surround out -> Surround out */
         { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
@@ -996,19 +1036,19 @@ static struct hda_verb ad1986a_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode ad1986a_modes[3] = {
+static const struct hda_channel_mode ad1986a_modes[3] = {
         { 2, ad1986a_ch2_init },
         { 4, ad1986a_ch4_init },
         { 6, ad1986a_ch6_init },
 };
 
 /* eapd initialization */
-static struct hda_verb ad1986a_eapd_init_verbs[] = {
+static const struct hda_verb ad1986a_eapd_init_verbs[] = {
         {0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 },
         {}
 };
 
-static struct hda_verb ad1986a_automic_verbs[] = {
+static const struct hda_verb ad1986a_automic_verbs[] = {
         {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         {0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         /*{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},*/
@@ -1018,7 +1058,7 @@ static struct hda_verb ad1986a_automic_verbs[] = {
 };
 
 /* Ultra initialization */
-static struct hda_verb ad1986a_ultra_init[] = {
+static const struct hda_verb ad1986a_ultra_init[] = {
         /* eapd initialization */
         { 0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 },
         /* CLFE -> Mic in */
@@ -1029,7 +1069,7 @@ static struct hda_verb ad1986a_ultra_init[] = {
 };
 
 /* pin sensing on HP jack */
-static struct hda_verb ad1986a_hp_init_verbs[] = {
+static const struct hda_verb ad1986a_hp_init_verbs[] = {
         {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_HP_EVENT},
         {}
 };
@@ -1069,7 +1109,7 @@ enum {
         AD1986A_MODELS
 };
 
-static const char *ad1986a_models[AD1986A_MODELS] = {
+static const char * const ad1986a_models[AD1986A_MODELS] = {
         [AD1986A_6STACK]        = "6stack",
         [AD1986A_3STACK]        = "3stack",
         [AD1986A_LAPTOP]        = "laptop",
@@ -1080,7 +1120,7 @@ static const char *ad1986a_models[AD1986A_MODELS] = {
         [AD1986A_SAMSUNG_P50]   = "samsung-p50",
 };
 
-static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
+static const struct snd_pci_quirk ad1986a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9", AD1986A_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x1043, 0x11f7, "ASUS U5A", AD1986A_LAPTOP_EAPD),
@@ -1112,7 +1152,7 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1986a_loopbacks[] = {
+static const struct hda_amp_list ad1986a_loopbacks[] = {
         { 0x13, HDA_OUTPUT, 0 }, /* Mic */
         { 0x14, HDA_OUTPUT, 0 }, /* Phone */
         { 0x15, HDA_OUTPUT, 0 }, /* CD */
@@ -1276,6 +1316,7 @@ static int patch_ad1986a(struct hda_codec *codec)
         spec->multiout.no_share_stream = 1;
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -1288,11 +1329,11 @@ static int patch_ad1986a(struct hda_codec *codec)
 #define AD1983_DAC              0x03
 #define AD1983_ADC              0x04
 
-static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };
-static hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC };
-static hda_nid_t ad1983_capsrc_nids[1] = { 0x15 };
+static const hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };
+static const hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC };
+static const hda_nid_t ad1983_capsrc_nids[1] = { 0x15 };
 
-static struct hda_input_mux ad1983_capture_source = {
+static const struct hda_input_mux ad1983_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -1307,7 +1348,7 @@ static struct hda_input_mux ad1983_capture_source = {
  */
 static int ad1983_spdif_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "PCM", "ADC" };
+        static const char * const texts[] = { "PCM", "ADC" };
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
@@ -1344,7 +1385,7 @@ static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
         return 0;
 }
 
-static struct snd_kcontrol_new ad1983_mixers[] = {
+static const struct snd_kcontrol_new ad1983_mixers[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
@@ -1357,7 +1398,7 @@ 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("Mic Boost", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
         {
@@ -1377,7 +1418,7 @@ static struct snd_kcontrol_new ad1983_mixers[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1983_init_verbs[] = {
+static const struct hda_verb ad1983_init_verbs[] = {
         /* Front, HP, Mono; mute as default */
         {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
@@ -1417,7 +1458,7 @@ static struct hda_verb ad1983_init_verbs[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1983_loopbacks[] = {
+static const struct hda_amp_list ad1983_loopbacks[] = {
         { 0x12, HDA_OUTPUT, 0 }, /* Mic */
         { 0x13, HDA_OUTPUT, 0 }, /* Line */
         { } /* end */
@@ -1463,6 +1504,7 @@ static int patch_ad1983(struct hda_codec *codec)
         codec->patch_ops = ad198x_patch_ops;
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -1476,12 +1518,12 @@ static int patch_ad1983(struct hda_codec *codec)
 #define AD1981_DAC              0x03
 #define AD1981_ADC              0x04
 
-static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };
-static hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC };
-static hda_nid_t ad1981_capsrc_nids[1] = { 0x15 };
+static const hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };
+static const hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC };
+static const hda_nid_t ad1981_capsrc_nids[1] = { 0x15 };
 
 /* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */
-static struct hda_input_mux ad1981_capture_source = {
+static const struct hda_input_mux ad1981_capture_source = {
         .num_items = 7,
         .items = {
                 { "Front Mic", 0x0 },
@@ -1494,7 +1536,7 @@ static struct hda_input_mux ad1981_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1981_mixers[] = {
+static const struct snd_kcontrol_new ad1981_mixers[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT),
@@ -1513,8 +1555,8 @@ 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("Front Mic Boost", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
         {
@@ -1535,7 +1577,7 @@ static struct snd_kcontrol_new ad1981_mixers[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1981_init_verbs[] = {
+static const struct hda_verb ad1981_init_verbs[] = {
         /* Front, HP, Mono; mute as default */
         {0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
@@ -1583,7 +1625,7 @@ static struct hda_verb ad1981_init_verbs[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1981_loopbacks[] = {
+static const struct hda_amp_list ad1981_loopbacks[] = {
         { 0x12, HDA_OUTPUT, 0 }, /* Front Mic */
         { 0x13, HDA_OUTPUT, 0 }, /* Line */
         { 0x1b, HDA_OUTPUT, 0 }, /* Aux */
@@ -1603,7 +1645,7 @@ static struct hda_amp_list ad1981_loopbacks[] = {
 #define AD1981_HP_EVENT         0x37
 #define AD1981_MIC_EVENT        0x38
 
-static struct hda_verb ad1981_hp_init_verbs[] = {
+static const struct hda_verb ad1981_hp_init_verbs[] = {
         {0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, /* default off */
         /* pin sensing on HP and Mic jacks */
         {0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},
@@ -1632,7 +1674,7 @@ static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,
 }
 
 /* bind volumes of both NID 0x05 and 0x06 */
-static struct hda_bind_ctls ad1981_hp_bind_master_vol = {
+static const struct hda_bind_ctls ad1981_hp_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
@@ -1654,12 +1696,12 @@ static void ad1981_hp_automute(struct hda_codec *codec)
 /* toggle input of built-in and mic jack appropriately */
 static void ad1981_hp_automic(struct hda_codec *codec)
 {
-        static struct hda_verb mic_jack_on[] = {
+        static const struct hda_verb mic_jack_on[] = {
                 {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
                 {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
                 {}
         };
-        static struct hda_verb mic_jack_off[] = {
+        static const struct hda_verb mic_jack_off[] = {
                 {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
                 {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
                 {}
@@ -1688,7 +1730,7 @@ static void ad1981_hp_unsol_event(struct hda_codec *codec,
         }
 }
 
-static struct hda_input_mux ad1981_hp_capture_source = {
+static const struct hda_input_mux ad1981_hp_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -1697,7 +1739,7 @@ static struct hda_input_mux ad1981_hp_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1981_hp_mixers[] = {
+static const struct snd_kcontrol_new ad1981_hp_mixers[] = {
         HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1724,8 +1766,8 @@ static struct snd_kcontrol_new ad1981_hp_mixers[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
 #endif
-        HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x18, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
         {
@@ -1748,7 +1790,7 @@ static int ad1981_hp_init(struct hda_codec *codec)
 }
 
 /* configuration for Toshiba Laptops */
-static struct hda_verb ad1981_toshiba_init_verbs[] = {
+static const struct hda_verb ad1981_toshiba_init_verbs[] = {
         {0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x01 }, /* default on */
         /* pin sensing on HP and Mic jacks */
         {0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},
@@ -1756,14 +1798,14 @@ static struct hda_verb ad1981_toshiba_init_verbs[] = {
         {}
 };
 
-static struct snd_kcontrol_new ad1981_toshiba_mixers[] = {
+static const struct snd_kcontrol_new ad1981_toshiba_mixers[] = {
         HDA_CODEC_VOLUME("Amp Volume", 0x1a, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Amp Switch", 0x1a, 0x0, HDA_OUTPUT),
         { }
 };
 
 /* configuration for Lenovo Thinkpad T60 */
-static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {
+static const struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
@@ -1772,7 +1814,7 @@ static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {
         HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 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("Mic Boost", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
         {
@@ -1793,7 +1835,7 @@ static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {
         { } /* end */
 };
 
-static struct hda_input_mux ad1981_thinkpad_capture_source = {
+static const struct hda_input_mux ad1981_thinkpad_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -1811,14 +1853,14 @@ enum {
         AD1981_MODELS
 };
 
-static const char *ad1981_models[AD1981_MODELS] = {
+static const char * const ad1981_models[AD1981_MODELS] = {
         [AD1981_HP]             = "hp",
         [AD1981_THINKPAD]       = "thinkpad",
         [AD1981_BASIC]          = "basic",
         [AD1981_TOSHIBA]        = "toshiba"
 };
 
-static struct snd_pci_quirk ad1981_cfg_tbl[] = {
+static const 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 */
@@ -1917,6 +1959,7 @@ static int patch_ad1981(struct hda_codec *codec)
         }
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -2012,6 +2055,7 @@ static int patch_ad1981(struct hda_codec *codec)
 enum {
         AD1988_6STACK,
         AD1988_6STACK_DIG,
+        AD1988_6STACK_DIG_FP,
         AD1988_3STACK,
         AD1988_3STACK_DIG,
         AD1988_LAPTOP,
@@ -2031,28 +2075,32 @@ enum {
  * mixers
  */
 
-static hda_nid_t ad1988_6stack_dac_nids[4] = {
+static const hda_nid_t ad1988_6stack_dac_nids[4] = {
         0x04, 0x06, 0x05, 0x0a
 };
 
-static hda_nid_t ad1988_3stack_dac_nids[3] = {
+static const hda_nid_t ad1988_3stack_dac_nids[3] = {
         0x04, 0x05, 0x0a
 };
 
 /* for AD1988A revision-2, DAC2-4 are swapped */
-static hda_nid_t ad1988_6stack_dac_nids_rev2[4] = {
+static const hda_nid_t ad1988_6stack_dac_nids_rev2[4] = {
         0x04, 0x05, 0x0a, 0x06
 };
 
-static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = {
+static const hda_nid_t ad1988_alt_dac_nid[1] = {
+        0x03
+};
+
+static const hda_nid_t ad1988_3stack_dac_nids_rev2[3] = {
         0x04, 0x0a, 0x06
 };
 
-static hda_nid_t ad1988_adc_nids[3] = {
+static const hda_nid_t ad1988_adc_nids[3] = {
         0x08, 0x09, 0x0f
 };
 
-static hda_nid_t ad1988_capsrc_nids[3] = {
+static const hda_nid_t ad1988_capsrc_nids[3] = {
         0x0c, 0x0d, 0x0e
 };
 
@@ -2060,11 +2108,11 @@ static hda_nid_t ad1988_capsrc_nids[3] = {
 #define AD1988_SPDIF_OUT_HDMI   0x0b
 #define AD1988_SPDIF_IN         0x07
 
-static hda_nid_t ad1989b_slave_dig_outs[] = {
+static const hda_nid_t ad1989b_slave_dig_outs[] = {
         AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0
 };
 
-static struct hda_input_mux ad1988_6stack_capture_source = {
+static const struct hda_input_mux ad1988_6stack_capture_source = {
         .num_items = 5,
         .items = {
                 { "Front Mic", 0x1 },   /* port-B */
@@ -2075,7 +2123,7 @@ static struct hda_input_mux ad1988_6stack_capture_source = {
         },
 };
 
-static struct hda_input_mux ad1988_laptop_capture_source = {
+static const struct hda_input_mux ad1988_laptop_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic/Line", 0x1 },    /* port-B */
@@ -2118,7 +2166,7 @@ static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
 }
 
 /* 6-stack mode */
-static struct snd_kcontrol_new ad1988_6stack_mixers1[] = {
+static const struct snd_kcontrol_new ad1988_6stack_mixers1[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x06, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
@@ -2127,7 +2175,7 @@ static struct snd_kcontrol_new ad1988_6stack_mixers1[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {
+static const struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x05, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
@@ -2136,7 +2184,7 @@ static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
+static const struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
         HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),
         HDA_BIND_MUTE("Surround Playback Switch", 0x2a, 2, HDA_INPUT),
         HDA_BIND_MUTE_MONO("Center Playback Switch", 0x27, 1, 2, HDA_INPUT),
@@ -2157,14 +2205,20 @@ static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x3c, 0x0, HDA_OUTPUT),
+
+        { } /* end */
+};
+
+static const struct snd_kcontrol_new ad1988_6stack_fp_mixers[] = {
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
 
         { } /* end */
 };
 
 /* 3-stack mode */
-static struct snd_kcontrol_new ad1988_3stack_mixers1[] = {
+static const struct snd_kcontrol_new ad1988_3stack_mixers1[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
@@ -2172,7 +2226,7 @@ static struct snd_kcontrol_new ad1988_3stack_mixers1[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {
+static const struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT),
@@ -2180,7 +2234,7 @@ static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
+static const struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
         HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),
         HDA_BIND_MUTE("Surround Playback Switch", 0x2c, 2, HDA_INPUT),
         HDA_BIND_MUTE_MONO("Center Playback Switch", 0x26, 1, 2, HDA_INPUT),
@@ -2200,8 +2254,8 @@ static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x3c, 0x0, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -2214,7 +2268,7 @@ static struct snd_kcontrol_new ad1988_3stack_mixers2[] = {
 };
 
 /* laptop mode */
-static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
+static const struct snd_kcontrol_new ad1988_laptop_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x29, 0x0, HDA_INPUT),
         HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),
@@ -2229,7 +2283,7 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
         HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Mic Boost", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x39, 0x0, HDA_OUTPUT),
 
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -2245,7 +2299,7 @@ static struct snd_kcontrol_new ad1988_laptop_mixers[] = {
 };
 
 /* capture */
-static struct snd_kcontrol_new ad1988_capture_mixers[] = {
+static const struct snd_kcontrol_new ad1988_capture_mixers[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -2270,7 +2324,7 @@ static struct snd_kcontrol_new ad1988_capture_mixers[] = {
 static int ad1988_spdif_playback_source_info(struct snd_kcontrol *kcontrol,
                                              struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {
+        static const char * const texts[] = {
                 "PCM", "ADC1", "ADC2", "ADC3"
         };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -2351,7 +2405,7 @@ static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
+static const struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
         HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -2364,12 +2418,12 @@ static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1988_spdif_in_mixers[] = {
+static const struct snd_kcontrol_new ad1988_spdif_in_mixers[] = {
         HDA_CODEC_VOLUME("IEC958 Capture Volume", 0x1c, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1989_spdif_out_mixers[] = {
+static const struct snd_kcontrol_new ad1989_spdif_out_mixers[] = {
         HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("HDMI Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
         { } /* end */
@@ -2382,7 +2436,7 @@ static struct snd_kcontrol_new ad1989_spdif_out_mixers[] = {
 /*
  * for 6-stack (+dig)
  */
-static struct hda_verb ad1988_6stack_init_verbs[] = {
+static const struct hda_verb ad1988_6stack_init_verbs[] = {
         /* Front, Surround, CLFE, side DAC; unmute as default */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -2442,7 +2496,20 @@ static struct hda_verb ad1988_6stack_init_verbs[] = {
         { }
 };
 
-static struct hda_verb ad1988_capture_init_verbs[] = {
+static const struct hda_verb ad1988_6stack_fp_init_verbs[] = {
+        /* Headphone; unmute as default */
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Port-A front headphon path */
+        {0x37, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC0:03h */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+
+        { }
+};
+
+static const struct hda_verb ad1988_capture_init_verbs[] = {
         /* mute analog mix */
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -2460,7 +2527,7 @@ static struct hda_verb ad1988_capture_init_verbs[] = {
         { }
 };
 
-static struct hda_verb ad1988_spdif_init_verbs[] = {
+static const struct hda_verb ad1988_spdif_init_verbs[] = {
         /* SPDIF out sel */
         {0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */
         {0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1 */
@@ -2472,14 +2539,14 @@ static struct hda_verb ad1988_spdif_init_verbs[] = {
         { }
 };
 
-static struct hda_verb ad1988_spdif_in_init_verbs[] = {
+static const struct hda_verb ad1988_spdif_in_init_verbs[] = {
         /* unmute SPDIF input pin */
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { }
 };
 
 /* AD1989 has no ADC -> SPDIF route */
-static struct hda_verb ad1989_spdif_init_verbs[] = {
+static const struct hda_verb ad1989_spdif_init_verbs[] = {
         /* SPDIF-1 out pin */
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
@@ -2492,7 +2559,7 @@ static struct hda_verb ad1989_spdif_init_verbs[] = {
 /*
  * verbs for 3stack (+dig)
  */
-static struct hda_verb ad1988_3stack_ch2_init[] = {
+static const struct hda_verb ad1988_3stack_ch2_init[] = {
         /* set port-C to line-in */
         { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
@@ -2502,7 +2569,7 @@ static struct hda_verb ad1988_3stack_ch2_init[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1988_3stack_ch6_init[] = {
+static const struct hda_verb ad1988_3stack_ch6_init[] = {
         /* set port-C to surround out */
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -2512,12 +2579,12 @@ static struct hda_verb ad1988_3stack_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode ad1988_3stack_modes[2] = {
+static const struct hda_channel_mode ad1988_3stack_modes[2] = {
         { 2, ad1988_3stack_ch2_init },
         { 6, ad1988_3stack_ch6_init },
 };
 
-static struct hda_verb ad1988_3stack_init_verbs[] = {
+static const struct hda_verb ad1988_3stack_init_verbs[] = {
         /* Front, Surround, CLFE, side DAC; unmute as default */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -2577,13 +2644,13 @@ static struct hda_verb ad1988_3stack_init_verbs[] = {
 /*
  * verbs for laptop mode (+dig)
  */
-static struct hda_verb ad1988_laptop_hp_on[] = {
+static const struct hda_verb ad1988_laptop_hp_on[] = {
         /* unmute port-A and mute port-D */
         { 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { } /* end */
 };
-static struct hda_verb ad1988_laptop_hp_off[] = {
+static const struct hda_verb ad1988_laptop_hp_off[] = {
         /* mute port-A and unmute port-D */
         { 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -2592,7 +2659,7 @@ static struct hda_verb ad1988_laptop_hp_off[] = {
 
 #define AD1988_HP_EVENT 0x01
 
-static struct hda_verb ad1988_laptop_init_verbs[] = {
+static const struct hda_verb ad1988_laptop_init_verbs[] = {
         /* Front, Surround, CLFE, side DAC; unmute as default */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -2656,7 +2723,7 @@ static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)
 } 
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1988_loopbacks[] = {
+static const struct hda_amp_list ad1988_loopbacks[] = {
         { 0x20, HDA_INPUT, 0 }, /* Front Mic */
         { 0x20, HDA_INPUT, 1 }, /* Line */
         { 0x20, HDA_INPUT, 4 }, /* Mic */
@@ -2674,7 +2741,7 @@ enum {
         AD_CTL_WIDGET_MUTE,
         AD_CTL_BIND_MUTE,
 };
-static struct snd_kcontrol_new ad1988_control_templates[] = {
+static const struct snd_kcontrol_new ad1988_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
         HDA_BIND_MUTE(NULL, 0, 0, 0),
@@ -2703,18 +2770,18 @@ static int add_control(struct ad198x_spec *spec, int type, const char *name,
 #define AD1988_PIN_CD_NID               0x18
 #define AD1988_PIN_BEEP_NID             0x10
 
-static hda_nid_t ad1988_mixer_nids[8] = {
+static const hda_nid_t ad1988_mixer_nids[8] = {
         /* A     B     C     D     E     F     G     H */
         0x22, 0x2b, 0x2c, 0x29, 0x26, 0x2a, 0x27, 0x28
 };
 
 static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx)
 {
-        static hda_nid_t idx_to_dac[8] = {
+        static const hda_nid_t idx_to_dac[8] = {
                 /* A     B     C     D     E     F     G     H */
                 0x04, 0x06, 0x05, 0x04, 0x0a, 0x06, 0x05, 0x0a
         };
-        static hda_nid_t idx_to_dac_rev2[8] = {
+        static const hda_nid_t idx_to_dac_rev2[8] = {
                 /* A     B     C     D     E     F     G     H */
                 0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06
         };
@@ -2724,13 +2791,13 @@ static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx)
                 return idx_to_dac[idx];
 }
 
-static hda_nid_t ad1988_boost_nids[8] = {
+static const hda_nid_t ad1988_boost_nids[8] = {
         0x38, 0x39, 0x3a, 0x3d, 0x3c, 0x3b, 0, 0
 };
 
 static int ad1988_pin_idx(hda_nid_t nid)
 {
-        static hda_nid_t ad1988_io_pins[8] = {
+        static const hda_nid_t ad1988_io_pins[8] = {
                 0x11, 0x14, 0x15, 0x12, 0x17, 0x16, 0x24, 0x25
         };
         int i;
@@ -2742,7 +2809,7 @@ static int ad1988_pin_idx(hda_nid_t nid)
 
 static int ad1988_pin_to_loopback_idx(hda_nid_t nid)
 {
-        static int loopback_idx[8] = {
+        static const int loopback_idx[8] = {
                 2, 0, 1, 3, 4, 5, 1, 4
         };
         switch (nid) {
@@ -2755,7 +2822,7 @@ static int ad1988_pin_to_loopback_idx(hda_nid_t nid)
 
 static int ad1988_pin_to_adc_idx(hda_nid_t nid)
 {
-        static int adc_idx[8] = {
+        static const int adc_idx[8] = {
                 0, 1, 2, 8, 4, 3, 6, 7
         };
         switch (nid) {
@@ -2778,7 +2845,7 @@ static int ad1988_auto_fill_dac_nids(struct hda_codec *codec,
         /* check the pins hardwired to audio widget */
         for (i = 0; i < cfg->line_outs; i++) {
                 idx = ad1988_pin_idx(cfg->line_out_pins[i]);
-                spec->multiout.dac_nids[i] = ad1988_idx_to_dac(codec, idx);
+                spec->private_dac_nids[i] = ad1988_idx_to_dac(codec, idx);
         }
         spec->multiout.num_dacs = cfg->line_outs;
         return 0;
@@ -2789,7 +2856,9 @@ static int ad1988_auto_create_multi_out_ctls(struct ad198x_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" };
+        static const char * const chname[4] = {
+                "Front", "Surround", NULL /*CLFE*/, "Side"
+        };
         hda_nid_t nid;
         int i, err;
 
@@ -2880,7 +2949,7 @@ static int ad1988_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
 
 /* create input playback/capture controls for the given pin */
 static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,
-                            const char *ctlname, int boost)
+                            const char *ctlname, int ctlidx, int boost)
 {
         char name[32];
         int err, idx;
@@ -2899,7 +2968,7 @@ static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,
                 idx = ad1988_pin_idx(pin);
                 bnid = ad1988_boost_nids[idx];
                 if (bnid) {
-                        sprintf(name, "%s Boost", ctlname);
+                        sprintf(name, "%s Boost Volume", ctlname);
                         return add_control(spec, AD_CTL_WIDGET_VOL, name,
                                            HDA_COMPOSE_AMP_VAL(bnid, 3, idx, HDA_OUTPUT));
 
@@ -2909,25 +2978,27 @@ static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,
 }
 
 /* create playback/capture controls for input pins */
-static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec,
+static int ad1988_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
+        struct ad198x_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux;
-        int i, err;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                err = new_analog_input(spec, cfg->input_pins[i],
-                                       auto_pin_cfg_labels[i],
-                                       i <= AUTO_PIN_FRONT_MIC);
+        int i, err, type, type_idx;
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                const char *label;
+                type = cfg->inputs[i].type;
+                label = hda_get_autocfg_input_label(codec, cfg, i);
+                snd_hda_add_imux_item(imux, label,
+                                      ad1988_pin_to_adc_idx(cfg->inputs[i].pin),
+                                      &type_idx);
+                err = new_analog_input(spec, cfg->inputs[i].pin,
+                                       label, type_idx,
+                                       type == AUTO_PIN_MIC);
                 if (err < 0)
                         return err;
-                imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                imux->items[imux->num_items].index = ad1988_pin_to_adc_idx(cfg->input_pins[i]);
-                imux->num_items++;
         }
-        imux->items[imux->num_items].label = "Mix";
-        imux->items[imux->num_items].index = 9;
-        imux->num_items++;
+        snd_hda_add_imux_item(imux, "Mix", 9, NULL);
 
         if ((err = add_control(spec, AD_CTL_WIDGET_VOL,
                                "Analog Mix Playback Volume",
@@ -2994,12 +3065,12 @@ static void ad1988_auto_init_extra_out(struct hda_codec *codec)
 static void ad1988_auto_init_analog_input(struct hda_codec *codec)
 {
         struct ad198x_spec *spec = codec->spec;
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
         int i, idx;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (! nid)
-                        continue;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                int type = cfg->inputs[i].type;
                 switch (nid) {
                 case 0x15: /* port-C */
                         snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0);
@@ -3009,7 +3080,7 @@ static void ad1988_auto_init_analog_input(struct hda_codec *codec)
                         break;
                 }
                 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                    i <= AUTO_PIN_FRONT_MIC ? PIN_VREF80 : PIN_IN);
+                                    type == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN);
                 if (nid != AD1988_PIN_CD_NID)
                         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
                                             AMP_OUT_MUTE);
@@ -3040,7 +3111,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
                                                 "Speaker")) < 0 ||
             (err = ad1988_auto_create_extra_out(codec, spec->autocfg.hp_pins[0],
                                                 "Headphone")) < 0 ||
-            (err = ad1988_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
+            (err = ad1988_auto_create_analog_input_ctls(codec, &spec->autocfg)) < 0)
                 return err;
 
         spec->multiout.max_channels = spec->multiout.num_dacs * 2;
@@ -3070,13 +3141,13 @@ static int ad1988_auto_init(struct hda_codec *codec)
         return 0;
 }
 
-
 /*
  */
 
-static const char *ad1988_models[AD1988_MODEL_LAST] = {
+static const char * const ad1988_models[AD1988_MODEL_LAST] = {
         [AD1988_6STACK]         = "6stack",
         [AD1988_6STACK_DIG]     = "6stack-dig",
+        [AD1988_6STACK_DIG_FP]  = "6stack-dig-fp",
         [AD1988_3STACK]         = "3stack",
         [AD1988_3STACK_DIG]     = "3stack-dig",
         [AD1988_LAPTOP]         = "laptop",
@@ -3084,10 +3155,11 @@ static const char *ad1988_models[AD1988_MODEL_LAST] = {
         [AD1988_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk ad1988_cfg_tbl[] = {
+static const struct snd_pci_quirk ad1988_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG),
         SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),
         SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG),
+        SND_PCI_QUIRK(0x1043, 0x82c0, "Asus M3N-HT Deluxe", AD1988_6STACK_DIG),
         SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG),
         {}
 };
@@ -3136,6 +3208,7 @@ static int patch_ad1988(struct hda_codec *codec)
         switch (board_config) {
         case AD1988_6STACK:
         case AD1988_6STACK_DIG:
+        case AD1988_6STACK_DIG_FP:
                 spec->multiout.max_channels = 8;
                 spec->multiout.num_dacs = 4;
                 if (is_rev2(codec))
@@ -3151,7 +3224,19 @@ static int patch_ad1988(struct hda_codec *codec)
                 spec->mixers[1] = ad1988_6stack_mixers2;
                 spec->num_init_verbs = 1;
                 spec->init_verbs[0] = ad1988_6stack_init_verbs;
-                if (board_config == AD1988_6STACK_DIG) {
+                if (board_config == AD1988_6STACK_DIG_FP) {
+                        spec->num_mixers++;
+                        spec->mixers[2] = ad1988_6stack_fp_mixers;
+                        spec->num_init_verbs++;
+                        spec->init_verbs[1] = ad1988_6stack_fp_init_verbs;
+                        spec->slave_vols = ad1988_6stack_fp_slave_vols;
+                        spec->slave_sws = ad1988_6stack_fp_slave_sws;
+                        spec->alt_dac_nid = ad1988_alt_dac_nid;
+                        spec->stream_analog_alt_playback =
+                                &ad198x_pcm_analog_alt_playback;
+                }
+                if ((board_config == AD1988_6STACK_DIG) ||
+                        (board_config == AD1988_6STACK_DIG_FP)) {
                         spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
                         spec->dig_in_nid = AD1988_SPDIF_IN;
                 }
@@ -3235,6 +3320,7 @@ static int patch_ad1988(struct hda_codec *codec)
         spec->vmaster_nid = 0x04;
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -3258,21 +3344,21 @@ static int patch_ad1988(struct hda_codec *codec)
  * but no build-up framework is given, so far.
  */
 
-static hda_nid_t ad1884_dac_nids[1] = {
+static const hda_nid_t ad1884_dac_nids[1] = {
         0x04,
 };
 
-static hda_nid_t ad1884_adc_nids[2] = {
+static const hda_nid_t ad1884_adc_nids[2] = {
         0x08, 0x09,
 };
 
-static hda_nid_t ad1884_capsrc_nids[2] = {
+static const hda_nid_t ad1884_capsrc_nids[2] = {
         0x0c, 0x0d,
 };
 
 #define AD1884_SPDIF_OUT        0x02
 
-static struct hda_input_mux ad1884_capture_source = {
+static const struct hda_input_mux ad1884_capture_source = {
         .num_items = 4,
         .items = {
                 { "Front Mic", 0x0 },
@@ -3282,7 +3368,7 @@ static struct hda_input_mux ad1884_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1884_base_mixers[] = {
+static const struct snd_kcontrol_new ad1884_base_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         /* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
@@ -3295,8 +3381,8 @@ 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("Mic Boost", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -3326,7 +3412,7 @@ static struct snd_kcontrol_new ad1884_base_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1984_dmic_mixers[] = {
+static const struct snd_kcontrol_new ad1984_dmic_mixers[] = {
         HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x05, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Digital Mic Capture Switch", 0x05, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Digital Mic Capture Volume", 1, 0x06, 0x0,
@@ -3339,7 +3425,7 @@ static struct snd_kcontrol_new ad1984_dmic_mixers[] = {
 /*
  * initialization verbs
  */
-static struct hda_verb ad1884_init_verbs[] = {
+static const struct hda_verb ad1884_init_verbs[] = {
         /* DACs; mute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -3385,7 +3471,7 @@ static struct hda_verb ad1884_init_verbs[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1884_loopbacks[] = {
+static const struct hda_amp_list ad1884_loopbacks[] = {
         { 0x20, HDA_INPUT, 0 }, /* Front Mic */
         { 0x20, HDA_INPUT, 1 }, /* Mic */
         { 0x20, HDA_INPUT, 2 }, /* CD */
@@ -3394,7 +3480,7 @@ static struct hda_amp_list ad1884_loopbacks[] = {
 };
 #endif
 
-static const char *ad1884_slave_vols[] = {
+static const char * const ad1884_slave_vols[] = {
         "PCM Playback Volume",
         "Mic Playback Volume",
         "Mono Playback Volume",
@@ -3449,6 +3535,7 @@ static int patch_ad1884(struct hda_codec *codec)
         codec->patch_ops = ad198x_patch_ops;
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -3456,7 +3543,7 @@ static int patch_ad1884(struct hda_codec *codec)
 /*
  * Lenovo Thinkpad T61/X61
  */
-static struct hda_input_mux ad1984_thinkpad_capture_source = {
+static const struct hda_input_mux ad1984_thinkpad_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -3470,7 +3557,7 @@ static struct hda_input_mux ad1984_thinkpad_capture_source = {
 /*
  * Dell Precision T3400
  */
-static struct hda_input_mux ad1984_dell_desktop_capture_source = {
+static const struct hda_input_mux ad1984_dell_desktop_capture_source = {
         .num_items = 3,
         .items = {
                 { "Front Mic", 0x0 },
@@ -3480,7 +3567,7 @@ static struct hda_input_mux ad1984_dell_desktop_capture_source = {
 };
 
 
-static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
+static const struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         /* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
@@ -3493,9 +3580,9 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
         HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Docking Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("Docking Mic Playback Switch", 0x20, 0x04, HDA_INPUT),
-        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("Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Dock Mic Boost Volume", 0x25, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -3526,7 +3613,7 @@ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
 };
 
 /* additional verbs */
-static struct hda_verb ad1984_thinkpad_init_verbs[] = {
+static const struct hda_verb ad1984_thinkpad_init_verbs[] = {
         /* Port-E (docking station mic) pin */
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
@@ -3544,7 +3631,7 @@ static struct hda_verb ad1984_thinkpad_init_verbs[] = {
 /*
  * Dell Precision T3400
  */
-static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {
+static const struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT),
@@ -3554,8 +3641,8 @@ 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("Line-In Boost", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line-In Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -3595,7 +3682,7 @@ static int ad1984_pcm_dmic_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream ad1984_pcm_dmic_capture = {
+static const struct hda_pcm_stream ad1984_pcm_dmic_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -3631,13 +3718,13 @@ enum {
         AD1984_MODELS
 };
 
-static const char *ad1984_models[AD1984_MODELS] = {
+static const char * const ad1984_models[AD1984_MODELS] = {
         [AD1984_BASIC]          = "basic",
         [AD1984_THINKPAD]       = "thinkpad",
         [AD1984_DELL_DESKTOP]   = "dell_desktop",
 };
 
-static struct snd_pci_quirk ad1984_cfg_tbl[] = {
+static const struct snd_pci_quirk ad1984_cfg_tbl[] = {
         /* Lenovo Thinkpad T61/X61 */
         SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),
         SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
@@ -3702,7 +3789,7 @@ static int patch_ad1984(struct hda_codec *codec)
  * We share the single DAC for both HP and line-outs (see AD1884/1984).
  */
 
-static hda_nid_t ad1884a_dac_nids[1] = {
+static const hda_nid_t ad1884a_dac_nids[1] = {
         0x03,
 };
 
@@ -3711,7 +3798,7 @@ static hda_nid_t ad1884a_dac_nids[1] = {
 
 #define AD1884A_SPDIF_OUT       0x02
 
-static struct hda_input_mux ad1884a_capture_source = {
+static const struct hda_input_mux ad1884a_capture_source = {
         .num_items = 5,
         .items = {
                 { "Front Mic", 0x0 },
@@ -3722,7 +3809,7 @@ static struct hda_input_mux ad1884a_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1884a_base_mixers[] = {
+static const struct snd_kcontrol_new ad1884a_base_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
@@ -3739,9 +3826,9 @@ 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("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x25, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -3774,7 +3861,7 @@ static struct snd_kcontrol_new ad1884a_base_mixers[] = {
 /*
  * initialization verbs
  */
-static struct hda_verb ad1884a_init_verbs[] = {
+static const struct hda_verb ad1884a_init_verbs[] = {
         /* DACs; unmute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
@@ -3829,7 +3916,7 @@ static struct hda_verb ad1884a_init_verbs[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1884a_loopbacks[] = {
+static const struct hda_amp_list ad1884a_loopbacks[] = {
         { 0x20, HDA_INPUT, 0 }, /* Front Mic */
         { 0x20, HDA_INPUT, 1 }, /* Mic */
         { 0x20, HDA_INPUT, 2 }, /* CD */
@@ -3862,7 +3949,7 @@ static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol,
         return ret;
 }
 
-static struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
+static const struct snd_kcontrol_new ad1884a_laptop_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -3882,15 +3969,15 @@ 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("Mic Boost", 0x14, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Dock Mic Boost Volume", 0x25, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
+static const struct snd_kcontrol_new ad1884a_mobile_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         /*HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/
         {
@@ -4010,7 +4097,7 @@ static int ad1884a_laptop_init(struct hda_codec *codec)
 }
 
 /* additional verbs for laptop model */
-static struct hda_verb ad1884a_laptop_verbs[] = {
+static const struct hda_verb ad1884a_laptop_verbs[] = {
         /* Port-A (HP) pin - always unmuted */
         {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         /* Port-F (int speaker) mixer - route only from analog mixer */
@@ -4041,7 +4128,7 @@ static struct hda_verb ad1884a_laptop_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1884a_mobile_verbs[] = {
+static const struct hda_verb ad1884a_mobile_verbs[] = {
         /* DACs; unmute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
@@ -4096,7 +4183,7 @@ static struct hda_verb ad1884a_mobile_verbs[] = {
  * 0x17 - built-in mic
  */
 
-static struct hda_verb ad1984a_thinkpad_verbs[] = {
+static const struct hda_verb ad1984a_thinkpad_verbs[] = {
         /* HP unmute */
         {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         /* analog mix */
@@ -4113,15 +4200,15 @@ static struct hda_verb ad1984a_thinkpad_verbs[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
+static const struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x14, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x17, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         {
@@ -4134,7 +4221,7 @@ static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = {
         { } /* end */
 };
 
-static struct hda_input_mux ad1984a_thinkpad_capture_source = {
+static const struct hda_input_mux ad1984a_thinkpad_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -4171,6 +4258,84 @@ static int ad1984a_thinkpad_init(struct hda_codec *codec)
 }
 
 /*
+ * Precision R5500
+ * 0x12 - HP/line-out
+ * 0x13 - speaker (mono)
+ * 0x15 - mic-in
+ */
+
+static const struct hda_verb ad1984a_precision_verbs[] = {
+        /* Unmute main output path */
+        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE + 0x1f}, /* 0dB */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) + 0x17}, /* 0dB */
+        /* Analog mixer; mute as default */
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* Select mic as input */
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE + 0x27}, /* 0dB */
+        /* Configure as mic */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */
+        /* HP unmute */
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* turn on EAPD */
+        {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
+        /* unsolicited event for pin-sense */
+        {0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT},
+        { } /* end */
+};
+
+static const struct snd_kcontrol_new ad1984a_precision_mixers[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x15, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Speaker Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
+        { } /* end */
+};
+
+
+/* mute internal speaker if HP is plugged */
+static void ad1984a_precision_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_jack_detect(codec, 0x12);
+        snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+}
+
+
+/* unsolicited event for HP jack sensing */
+static void ad1984a_precision_unsol_event(struct hda_codec *codec,
+                                         unsigned int res)
+{
+        if ((res >> 26) != AD1884A_HP_EVENT)
+                return;
+        ad1984a_precision_automute(codec);
+}
+
+/* initialize jack-sensing, too */
+static int ad1984a_precision_init(struct hda_codec *codec)
+{
+        ad198x_init(codec);
+        ad1984a_precision_automute(codec);
+        return 0;
+}
+
+
+/*
  * HP Touchsmart
  * port-A (0x11)      - front hp-out
  * port-B (0x14)      - unused
@@ -4181,7 +4346,7 @@ static int ad1984a_thinkpad_init(struct hda_codec *codec)
  * digital-mic (0x17) - Internal mic
  */
 
-static struct hda_verb ad1984a_touchsmart_verbs[] = {
+static const struct hda_verb ad1984a_touchsmart_verbs[] = {
         /* DACs; unmute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */
@@ -4233,7 +4398,7 @@ static struct hda_verb ad1984a_touchsmart_verbs[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
+static const struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT),
 /*      HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/
         {
@@ -4249,8 +4414,8 @@ static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = {
         HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x25, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x17, 0x0, HDA_INPUT),
         { } /* end */
 };
 
@@ -4299,18 +4464,21 @@ enum {
         AD1884A_MOBILE,
         AD1884A_THINKPAD,
         AD1984A_TOUCHSMART,
+        AD1984A_PRECISION,
         AD1884A_MODELS
 };
 
-static const char *ad1884a_models[AD1884A_MODELS] = {
+static const char * const ad1884a_models[AD1884A_MODELS] = {
         [AD1884A_DESKTOP]       = "desktop",
         [AD1884A_LAPTOP]        = "laptop",
         [AD1884A_MOBILE]        = "mobile",
         [AD1884A_THINKPAD]      = "thinkpad",
         [AD1984A_TOUCHSMART]    = "touchsmart",
+        [AD1984A_PRECISION]     = "precision",
 };
 
-static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
+static const struct snd_pci_quirk ad1884a_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x1028, 0x04ac, "Precision R5500", AD1984A_PRECISION),
         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),
@@ -4404,6 +4572,14 @@ static int patch_ad1884a(struct hda_codec *codec)
                 codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event;
                 codec->patch_ops.init = ad1984a_thinkpad_init;
                 break;
+        case AD1984A_PRECISION:
+                spec->mixers[0] = ad1984a_precision_mixers;
+                spec->init_verbs[spec->num_init_verbs++] =
+                        ad1984a_precision_verbs;
+                spec->multiout.dig_out_nid = 0;
+                codec->patch_ops.unsol_event = ad1984a_precision_unsol_event;
+                codec->patch_ops.init = ad1984a_precision_init;
+                break;
         case AD1984A_TOUCHSMART:
                 spec->mixers[0] = ad1984a_touchsmart_mixers;
                 spec->init_verbs[0] = ad1984a_touchsmart_verbs;
@@ -4422,6 +4598,7 @@ static int patch_ad1884a(struct hda_codec *codec)
         }
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -4439,22 +4616,22 @@ static int patch_ad1884a(struct hda_codec *codec)
  * port-G - rear clfe-out (6stack)
  */
 
-static hda_nid_t ad1882_dac_nids[3] = {
+static const hda_nid_t ad1882_dac_nids[3] = {
         0x04, 0x03, 0x05
 };
 
-static hda_nid_t ad1882_adc_nids[2] = {
+static const hda_nid_t ad1882_adc_nids[2] = {
         0x08, 0x09,
 };
 
-static hda_nid_t ad1882_capsrc_nids[2] = {
+static const hda_nid_t ad1882_capsrc_nids[2] = {
         0x0c, 0x0d,
 };
 
 #define AD1882_SPDIF_OUT        0x02
 
 /* list: 0x11, 0x39, 0x3a, 0x18, 0x3c, 0x3b, 0x12, 0x20 */
-static struct hda_input_mux ad1882_capture_source = {
+static const struct hda_input_mux ad1882_capture_source = {
         .num_items = 5,
         .items = {
                 { "Front Mic", 0x1 },
@@ -4466,7 +4643,7 @@ static struct hda_input_mux ad1882_capture_source = {
 };
 
 /* list: 0x11, 0x39, 0x3a, 0x3c, 0x18, 0x1f, 0x12, 0x20 */
-static struct hda_input_mux ad1882a_capture_source = {
+static const struct hda_input_mux ad1882a_capture_source = {
         .num_items = 5,
         .items = {
                 { "Front Mic", 0x1 },
@@ -4477,7 +4654,7 @@ static struct hda_input_mux ad1882a_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new ad1882_base_mixers[] = {
+static const struct snd_kcontrol_new ad1882_base_mixers[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
@@ -4487,9 +4664,9 @@ static struct snd_kcontrol_new ad1882_base_mixers[] = {
         HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Line-In Boost", 0x3a, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x3c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x39, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line-In Boost Volume", 0x3a, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
@@ -4519,7 +4696,7 @@ static struct snd_kcontrol_new ad1882_base_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1882_loopback_mixers[] = {
+static const struct snd_kcontrol_new ad1882_loopback_mixers[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT),
@@ -4531,7 +4708,7 @@ static struct snd_kcontrol_new ad1882_loopback_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1882a_loopback_mixers[] = {
+static const struct snd_kcontrol_new ad1882a_loopback_mixers[] = {
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT),
@@ -4540,11 +4717,11 @@ 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("Digital Mic Boost", 0x1f, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Digital Mic Boost Volume", 0x1f, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1882_3stack_mixers[] = {
+static const struct snd_kcontrol_new ad1882_3stack_mixers[] = {
         HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x17, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x17, 2, 0x0, HDA_OUTPUT),
@@ -4558,14 +4735,14 @@ static struct snd_kcontrol_new ad1882_3stack_mixers[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new ad1882_6stack_mixers[] = {
+static const struct snd_kcontrol_new ad1882_6stack_mixers[] = {
         HDA_CODEC_MUTE("Surround Playback Switch", 0x16, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x24, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x24, 2, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct hda_verb ad1882_ch2_init[] = {
+static const struct hda_verb ad1882_ch2_init[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -4575,7 +4752,7 @@ static struct hda_verb ad1882_ch2_init[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1882_ch4_init[] = {
+static const struct hda_verb ad1882_ch4_init[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -4585,7 +4762,7 @@ static struct hda_verb ad1882_ch4_init[] = {
         { } /* end */
 };
 
-static struct hda_verb ad1882_ch6_init[] = {
+static const struct hda_verb ad1882_ch6_init[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -4595,7 +4772,7 @@ static struct hda_verb ad1882_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode ad1882_modes[3] = {
+static const struct hda_channel_mode ad1882_modes[3] = {
         { 2, ad1882_ch2_init },
         { 4, ad1882_ch4_init },
         { 6, ad1882_ch6_init },
@@ -4604,7 +4781,7 @@ static struct hda_channel_mode ad1882_modes[3] = {
 /*
  * initialization verbs
  */
-static struct hda_verb ad1882_init_verbs[] = {
+static const struct hda_verb ad1882_init_verbs[] = {
         /* DACs; mute as default */
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -4673,7 +4850,7 @@ static struct hda_verb ad1882_init_verbs[] = {
 };
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list ad1882_loopbacks[] = {
+static const struct hda_amp_list ad1882_loopbacks[] = {
         { 0x20, HDA_INPUT, 0 }, /* Front Mic */
         { 0x20, HDA_INPUT, 1 }, /* Mic */
         { 0x20, HDA_INPUT, 4 }, /* Line */
@@ -4689,7 +4866,7 @@ enum {
         AD1882_MODELS
 };
 
-static const char *ad1882_models[AD1986A_MODELS] = {
+static const char * const ad1882_models[AD1986A_MODELS] = {
         [AD1882_3STACK]         = "3stack",
         [AD1882_6STACK]         = "6stack",
 };
@@ -4761,6 +4938,7 @@ static int patch_ad1882(struct hda_codec *codec)
         }
 
         codec->no_trigger_sense = 1;
+        codec->no_sticky_stream = 1;
 
         return 0;
 }
@@ -4769,7 +4947,7 @@ static int patch_ad1882(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_analog[] = {
+static const struct hda_codec_preset snd_hda_preset_analog[] = {
         { .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a },
         { .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 },
         { .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a },
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
deleted file mode 100644
index fb684f00156b..000000000000
--- a/sound/pci/hda/patch_atihdmi.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Universal Interface for Intel High Definition Audio Codec
- *
- * HD audio interface patch for ATI HDMI codecs
- *
- * Copyright (c) 2006 ATI Technologies Inc.
- *
- *
- *  This driver is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This driver is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <sound/core.h>
-#include "hda_codec.h"
-#include "hda_local.h"
-
-struct atihdmi_spec {
-        struct hda_multi_out multiout;
-
-        struct hda_pcm pcm_rec;
-};
-
-#define CVT_NID         0x02    /* audio converter */
-#define PIN_NID         0x03    /* HDMI output pin */
-
-static struct hda_verb atihdmi_basic_init[] = {
-        /* enable digital output on pin widget */
-        { 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-        {} /* terminator */
-};
-
-/*
- * Controls
- */
-static int atihdmi_build_controls(struct hda_codec *codec)
-{
-        struct atihdmi_spec *spec = codec->spec;
-        int err;
-
-        err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
-        if (err < 0)
-                return err;
-
-        return 0;
-}
-
-static int atihdmi_init(struct hda_codec *codec)
-{
-        snd_hda_sequence_write(codec, atihdmi_basic_init);
-        /* SI codec requires to unmute the pin */
-        if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
-                snd_hda_codec_write(codec, PIN_NID, 0,
-                                    AC_VERB_SET_AMP_GAIN_MUTE,
-                                    AMP_OUT_UNMUTE);
-        return 0;
-}
-
-/*
- * Digital out
- */
-static int atihdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                     struct hda_codec *codec,
-                                     struct snd_pcm_substream *substream)
-{
-        struct atihdmi_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
-}
-
-static int atihdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                      struct hda_codec *codec,
-                                      struct snd_pcm_substream *substream)
-{
-        struct atihdmi_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
-static int atihdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                            struct hda_codec *codec,
-                                            unsigned int stream_tag,
-                                            unsigned int format,
-                                            struct snd_pcm_substream *substream)
-{
-        struct atihdmi_spec *spec = codec->spec;
-        int chans = substream->runtime->channels;
-        int i, err;
-
-        err = snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
-                                            format, substream);
-        if (err < 0)
-                return err;
-        snd_hda_codec_write(codec, CVT_NID, 0, AC_VERB_SET_CVT_CHAN_COUNT,
-                            chans - 1);
-        /* FIXME: XXX */
-        for (i = 0; i < chans; i++) {
-                snd_hda_codec_write(codec, CVT_NID, 0,
-                                    AC_VERB_SET_HDMI_CHAN_SLOT,
-                                    (i << 4) | i);
-        }
-        return 0;
-}
-
-static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
-        .nid = CVT_NID, /* NID to query formats and rates and setup streams */
-        .ops = {
-                .open = atihdmi_dig_playback_pcm_open,
-                .close = atihdmi_dig_playback_pcm_close,
-                .prepare = atihdmi_dig_playback_pcm_prepare
-        },
-};
-
-static int atihdmi_build_pcms(struct hda_codec *codec)
-{
-        struct atihdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = &spec->pcm_rec;
-        unsigned int chans;
-
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        info->name = "ATI HDMI";
-        info->pcm_type = HDA_PCM_TYPE_HDMI;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = atihdmi_pcm_digital_playback;
-
-        /* FIXME: we must check ELD and change the PCM parameters dynamically
-         */
-        chans = get_wcaps(codec, CVT_NID);
-        chans = get_wcaps_channels(chans);
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
-
-        return 0;
-}
-
-static void atihdmi_free(struct hda_codec *codec)
-{
-        kfree(codec->spec);
-}
-
-static struct hda_codec_ops atihdmi_patch_ops = {
-        .build_controls = atihdmi_build_controls,
-        .build_pcms = atihdmi_build_pcms,
-        .init = atihdmi_init,
-        .free = atihdmi_free,
-};
-
-static int patch_atihdmi(struct hda_codec *codec)
-{
-        struct atihdmi_spec *spec;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        spec->multiout.num_dacs = 0;      /* no analog */
-        spec->multiout.max_channels = 2;
-        /* NID for copying analog to digital,
-         * seems to be unused in pure-digital
-         * case.
-         */
-        spec->multiout.dig_out_nid = CVT_NID;
-
-        codec->patch_ops = atihdmi_patch_ops;
-
-        return 0;
-}
-
-/*
- * patch entries
- */
-static struct hda_codec_preset snd_hda_preset_atihdmi[] = {
-        { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
-        { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
-        { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },
-        { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },
-        { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi },
-        { .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
-        {} /* terminator */
-};
-
-MODULE_ALIAS("snd-hda-codec-id:1002793c");
-MODULE_ALIAS("snd-hda-codec-id:10027919");
-MODULE_ALIAS("snd-hda-codec-id:1002791a");
-MODULE_ALIAS("snd-hda-codec-id:1002aa01");
-MODULE_ALIAS("snd-hda-codec-id:10951390");
-MODULE_ALIAS("snd-hda-codec-id:17e80047");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("ATI HDMI HD-audio codec");
-
-static struct hda_codec_preset_list atihdmi_list = {
-        .preset = snd_hda_preset_atihdmi,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_atihdmi_init(void)
-{
-        return snd_hda_add_codec_preset(&atihdmi_list);
-}
-
-static void __exit patch_atihdmi_exit(void)
-{
-        snd_hda_delete_codec_preset(&atihdmi_list);
-}
-
-module_init(patch_atihdmi_init)
-module_exit(patch_atihdmi_exit)
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index af478019088e..61b92634b161 100644
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
@@ -134,7 +134,7 @@ static int ca0110_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 /*
  */
 
-static char *dirstr[2] = { "Playback", "Capture" };
+static const char * const dirstr[2] = { "Playback", "Capture" };
 
 static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx,
                        int chan, int dir)
@@ -171,7 +171,7 @@ static int ca0110_build_controls(struct hda_codec *codec)
 {
         struct ca0110_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        static char *prefix[AUTO_CFG_MAX_OUTS] = {
+        static const char * const prefix[AUTO_CFG_MAX_OUTS] = {
                 "Front", "Surround", NULL, "Side", "Multi"
         };
         hda_nid_t mutenid;
@@ -259,7 +259,7 @@ static int ca0110_build_controls(struct hda_codec *codec)
 
 /*
  */
-static struct hda_pcm_stream ca0110_pcm_analog_playback = {
+static const struct hda_pcm_stream ca0110_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
@@ -270,7 +270,7 @@ static struct hda_pcm_stream ca0110_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream ca0110_pcm_analog_capture = {
+static const struct hda_pcm_stream ca0110_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -280,7 +280,7 @@ static struct hda_pcm_stream ca0110_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream ca0110_pcm_digital_playback = {
+static const struct hda_pcm_stream ca0110_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -291,7 +291,7 @@ static struct hda_pcm_stream ca0110_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream ca0110_pcm_digital_capture = {
+static const struct hda_pcm_stream ca0110_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -389,7 +389,7 @@ static void ca0110_free(struct hda_codec *codec)
         kfree(codec->spec);
 }
 
-static struct hda_codec_ops ca0110_patch_ops = {
+static const struct hda_codec_ops ca0110_patch_ops = {
         .build_controls = ca0110_build_controls,
         .build_pcms = ca0110_build_pcms,
         .init = ca0110_init,
@@ -468,13 +468,13 @@ static void parse_input(struct hda_codec *codec)
                         spec->dig_in = nid;
                         continue;
                 }
-                for (j = 0; j < AUTO_PIN_LAST; j++)
-                        if (cfg->input_pins[j] == pin)
+                for (j = 0; j < cfg->num_inputs; j++)
+                        if (cfg->inputs[j].pin == pin)
                                 break;
-                if (j >= AUTO_PIN_LAST)
+                if (j >= cfg->num_inputs)
                         continue;
                 spec->input_pins[n] = pin;
-                spec->input_labels[n] = auto_pin_cfg_labels[j];
+                spec->input_labels[n] = hda_get_input_pin_label(codec, pin, 1);
                 spec->adcs[n] = nid;
                 n++;
         }
@@ -489,7 +489,7 @@ static void parse_digital(struct hda_codec *codec)
         if (cfg->dig_outs &&
             snd_hda_get_connections(codec, cfg->dig_out_pins[0],
                                     &spec->dig_out, 1) == 1)
-                spec->multiout.dig_out_nid = cfg->dig_out_pins[0];
+                spec->multiout.dig_out_nid = spec->dig_out;
 }
 
 static int ca0110_parse_auto_config(struct hda_codec *codec)
@@ -539,7 +539,7 @@ static int patch_ca0110(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_ca0110[] = {
+static const struct hda_codec_preset snd_hda_preset_ca0110[] = {
         { .id = 0x1102000a, .name = "CA0110-IBG", .patch = patch_ca0110 },
         { .id = 0x1102000b, .name = "CA0110-IBG", .patch = patch_ca0110 },
         { .id = 0x1102000d, .name = "SB0880 X-Fi", .patch = patch_ca0110 },
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 488fd9ade1ba..26a1521045bb 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -51,7 +51,7 @@ struct cs_spec {
         unsigned int cur_adc_format;
         hda_nid_t dig_in;
 
-        struct hda_bind_ctls *capture_bind[2];
+        const struct hda_bind_ctls *capture_bind[2];
 
         unsigned int gpio_mask;
         unsigned int gpio_dir;
@@ -65,6 +65,7 @@ struct cs_spec {
 
 /* available models */
 enum {
+        CS420X_MBP53,
         CS420X_MBP55,
         CS420X_IMAC27,
         CS420X_AUTO,
@@ -230,7 +231,7 @@ static int cs_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 
 /*
  */
-static struct hda_pcm_stream cs_pcm_analog_playback = {
+static const struct hda_pcm_stream cs_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -241,7 +242,7 @@ static struct hda_pcm_stream cs_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_analog_capture = {
+static const struct hda_pcm_stream cs_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -251,7 +252,7 @@ static struct hda_pcm_stream cs_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_digital_playback = {
+static const struct hda_pcm_stream cs_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -263,7 +264,7 @@ static struct hda_pcm_stream cs_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream cs_pcm_digital_capture = {
+static const struct hda_pcm_stream cs_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -329,12 +330,12 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx)
 {
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t pin = cfg->input_pins[idx];
-        unsigned int val = snd_hda_query_pin_caps(codec, pin);
-        if (!(val & AC_PINCAP_PRES_DETECT))
+        hda_nid_t pin = cfg->inputs[idx].pin;
+        unsigned int val;
+        if (!is_jack_detectable(codec, pin))
                 return 0;
         val = snd_hda_codec_get_pincfg(codec, pin);
-        return (get_defcfg_connect(val) == AC_JACK_PORT_COMPLEX);
+        return (snd_hda_get_input_pin_attr(val) != INPUT_PIN_ATTR_INT);
 }
 
 static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,
@@ -348,8 +349,7 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,
                 hda_nid_t pins[2];
                 unsigned int type;
                 int j, nums;
-                type = (get_wcaps(codec, nid) & AC_WCAP_TYPE)
-                        >> AC_WCAP_TYPE_SHIFT;
+                type = get_wcaps_type(get_wcaps(codec, nid));
                 if (type != AC_WID_AUD_IN)
                         continue;
                 nums = snd_hda_get_connections(codec, nid, pins,
@@ -424,10 +424,8 @@ static int parse_input(struct hda_codec *codec)
         struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t pin = cfg->input_pins[i];
-                if (!pin)
-                        continue;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t pin = cfg->inputs[i].pin;
                 spec->input_idx[spec->num_inputs] = i;
                 spec->capsrc_idx[i] = spec->num_inputs++;
                 spec->cur_input = i;
@@ -438,16 +436,17 @@ static int parse_input(struct hda_codec *codec)
 
         /* check whether the automatic mic switch is available */
         if (spec->num_inputs == 2 &&
-            spec->adc_nid[AUTO_PIN_MIC] && spec->adc_nid[AUTO_PIN_FRONT_MIC]) {
-                if (is_ext_mic(codec, cfg->input_pins[AUTO_PIN_FRONT_MIC])) {
-                        if (!is_ext_mic(codec, cfg->input_pins[AUTO_PIN_MIC])) {
+            cfg->inputs[0].type == AUTO_PIN_MIC &&
+            cfg->inputs[1].type == AUTO_PIN_MIC) {
+                if (is_ext_mic(codec, cfg->inputs[0].pin)) {
+                        if (!is_ext_mic(codec, cfg->inputs[1].pin)) {
                                 spec->mic_detect = 1;
-                                spec->automic_idx = AUTO_PIN_FRONT_MIC;
+                                spec->automic_idx = 0;
                         }
                 } else {
-                        if (is_ext_mic(codec, cfg->input_pins[AUTO_PIN_MIC])) {
+                        if (is_ext_mic(codec, cfg->inputs[1].pin)) {
                                 spec->mic_detect = 1;
-                                spec->automic_idx = AUTO_PIN_MIC;
+                                spec->automic_idx = 1;
                         }
                 }
         }
@@ -490,7 +489,7 @@ static int parse_digital_input(struct hda_codec *codec)
  * create mixer controls
  */
 
-static const char *dir_sfx[2] = { "Playback", "Capture" };
+static const char * const dir_sfx[2] = { "Playback", "Capture" };
 
 static int add_mute(struct hda_codec *codec, const char *name, int index,
                     unsigned int pval, int dir, struct snd_kcontrol **kctlp)
@@ -559,10 +558,10 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx,
         const char *name;
         int err, index;
         struct snd_kcontrol *kctl;
-        static char *speakers[] = {
+        static const char * const speakers[] = {
                 "Front Speaker", "Surround Speaker", "Bass Speaker"
         };
-        static char *line_outs[] = {
+        static const char * const line_outs[] = {
                 "Front Line-Out", "Surround Line-Out", "Bass Line-Out"
         };
 
@@ -642,7 +641,7 @@ static int build_output(struct hda_codec *codec)
 /*
  */
 
-static struct snd_kcontrol_new cs_capture_ctls[] = {
+static const struct snd_kcontrol_new cs_capture_ctls[] = {
         HDA_BIND_SW("Capture Switch", 0),
         HDA_BIND_VOL("Capture Volume", 0),
 };
@@ -674,6 +673,7 @@ static int cs_capture_source_info(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct cs_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         unsigned int idx;
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -682,7 +682,8 @@ static int cs_capture_source_info(struct snd_kcontrol *kcontrol,
         if (uinfo->value.enumerated.item >= spec->num_inputs)
                 uinfo->value.enumerated.item = spec->num_inputs - 1;
         idx = spec->input_idx[uinfo->value.enumerated.item];
-        strcpy(uinfo->value.enumerated.name, auto_pin_cfg_labels[idx]);
+        strcpy(uinfo->value.enumerated.name,
+               hda_get_input_pin_label(codec, cfg->inputs[idx].pin, 1));
         return 0;
 }
 
@@ -708,7 +709,7 @@ static int cs_capture_source_put(struct snd_kcontrol *kcontrol,
         return change_cur_input(codec, idx, 0);
 }
 
-static struct snd_kcontrol_new cs_capture_source = {
+static const struct snd_kcontrol_new cs_capture_source = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Capture Source",
         .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -717,7 +718,7 @@ static struct snd_kcontrol_new cs_capture_source = {
         .put = cs_capture_source_put,
 };
 
-static struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
+static const struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
                                                struct hda_ctl_ops *ops)
 {
         struct cs_spec *spec = codec->spec;
@@ -740,6 +741,27 @@ static struct hda_bind_ctls *make_bind_capture(struct hda_codec *codec,
         return bind;
 }
 
+/* add a (input-boost) volume control to the given input pin */
+static int add_input_volume_control(struct hda_codec *codec,
+                                    struct auto_pin_cfg *cfg,
+                                    int item)
+{
+        hda_nid_t pin = cfg->inputs[item].pin;
+        u32 caps;
+        const char *label;
+        struct snd_kcontrol *kctl;
+                
+        if (!(get_wcaps(codec, pin) & AC_WCAP_IN_AMP))
+                return 0;
+        caps = query_amp_caps(codec, pin, HDA_INPUT);
+        caps = (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT;
+        if (caps <= 1)
+                return 0;
+        label = hda_get_autocfg_input_label(codec, cfg, item);
+        return add_volume(codec, label, 0,
+                          HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_INPUT), 1, &kctl);
+}
+
 static int build_input(struct hda_codec *codec)
 {
         struct cs_spec *spec = codec->spec;
@@ -779,6 +801,12 @@ static int build_input(struct hda_codec *codec)
                         return err;
         }
 
+        for (i = 0; i < spec->num_inputs; i++) {
+                err = add_input_volume_control(codec, &spec->autocfg, i);
+                if (err < 0)
+                        return err;
+        }
+
         return 0;
 }
 
@@ -818,15 +846,14 @@ static void cs_automute(struct hda_codec *codec)
 {
         struct cs_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int caps, hp_present;
+        unsigned int hp_present;
         hda_nid_t nid;
         int i;
 
         hp_present = 0;
         for (i = 0; i < cfg->hp_outs; i++) {
                 nid = cfg->hp_pins[i];
-                caps = snd_hda_query_pin_caps(codec, nid);
-                if (!(caps & AC_PINCAP_PRES_DETECT))
+                if (!is_jack_detectable(codec, nid))
                         continue;
                 hp_present = snd_hda_jack_detect(codec, nid);
                 if (hp_present)
@@ -838,7 +865,8 @@ static void cs_automute(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL,
                                     hp_present ? 0 : PIN_OUT);
         }
-        if (spec->board_config == CS420X_MBP55 ||
+        if (spec->board_config == CS420X_MBP53 ||
+            spec->board_config == CS420X_MBP55 ||
             spec->board_config == CS420X_IMAC27) {
                 unsigned int gpio = hp_present ? 0x02 : 0x08;
                 snd_hda_codec_write(codec, 0x01, 0,
@@ -853,15 +881,12 @@ static void cs_automic(struct hda_codec *codec)
         hda_nid_t nid;
         unsigned int present;
         
-        nid = cfg->input_pins[spec->automic_idx];
+        nid = cfg->inputs[spec->automic_idx].pin;
         present = snd_hda_jack_detect(codec, nid);
         if (present)
                 change_cur_input(codec, spec->automic_idx, 0);
-        else {
-                unsigned int imic = (spec->automic_idx == AUTO_PIN_MIC) ?
-                        AUTO_PIN_FRONT_MIC : AUTO_PIN_MIC;
-                change_cur_input(codec, imic, 0);
-        }
+        else
+                change_cur_input(codec, !spec->automic_idx, 0);
 }
 
 /*
@@ -897,7 +922,7 @@ static void init_output(struct hda_codec *codec)
                                     AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
                 if (!cfg->speaker_outs)
                         continue;
-                if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
+                if (is_jack_detectable(codec, nid)) {
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_UNSOLICITED_ENABLE,
                                             AC_USRSP_EN | HP_EVENT);
@@ -918,14 +943,14 @@ static void init_input(struct hda_codec *codec)
         unsigned int coef;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
+        for (i = 0; i < cfg->num_inputs; i++) {
                 unsigned int ctl;
-                hda_nid_t pin = cfg->input_pins[i];
-                if (!pin || !spec->adc_nid[i])
+                hda_nid_t pin = cfg->inputs[i].pin;
+                if (!spec->adc_nid[i])
                         continue;
                 /* set appropriate pin control and mute first */
                 ctl = PIN_IN;
-                if (i <= AUTO_PIN_FRONT_MIC) {
+                if (cfg->inputs[i].type == AUTO_PIN_MIC) {
                         unsigned int caps = snd_hda_query_pin_caps(codec, pin);
                         caps >>= AC_PINCAP_VREF_SHIFT;
                         if (caps & AC_PINCAP_VREF_80)
@@ -956,7 +981,7 @@ static void init_input(struct hda_codec *codec)
         cs_vendor_coef_set(codec, IDX_ADC_CFG, coef);
 }
 
-static struct hda_verb cs_coef_init_verbs[] = {
+static const struct hda_verb cs_coef_init_verbs[] = {
         {0x11, AC_VERB_SET_PROC_STATE, 1},
         {0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG},
         {0x11, AC_VERB_SET_PROC_COEF,
@@ -990,7 +1015,7 @@ static struct hda_verb cs_coef_init_verbs[] = {
  * blocks, which will alleviate the issue.
  */
 
-static struct hda_verb cs_errata_init_verbs[] = {
+static const struct hda_verb cs_errata_init_verbs[] = {
         {0x01, AC_VERB_SET_POWER_STATE, 0x00}, /* AFG: D0 */
         {0x11, AC_VERB_SET_PROC_STATE, 0x01},  /* VPW: processing on */
 
@@ -1012,9 +1037,11 @@ static struct hda_verb cs_errata_init_verbs[] = {
         {0x11, AC_VERB_SET_PROC_COEF, 0x0008},
         {0x11, AC_VERB_SET_PROC_STATE, 0x00},
 
+#if 0 /* Don't to set to D3 as we are in power-up sequence */
         {0x07, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Rx: D3 */
         {0x08, AC_VERB_SET_POWER_STATE, 0x03}, /* S/PDIF Tx: D3 */
         /*{0x01, AC_VERB_SET_POWER_STATE, 0x03},*/ /* AFG: D3 This is already handled */
+#endif
 
         {} /* terminator */
 };
@@ -1097,7 +1124,7 @@ static void cs_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
-static struct hda_codec_ops cs_patch_ops = {
+static const struct hda_codec_ops cs_patch_ops = {
         .build_controls = cs_build_controls,
         .build_pcms = cs_build_pcms,
         .init = cs_init,
@@ -1129,15 +1156,19 @@ static int cs_parse_auto_config(struct hda_codec *codec)
         return 0;
 }
 
-static const char *cs420x_models[CS420X_MODELS] = {
+static const char * const cs420x_models[CS420X_MODELS] = {
+        [CS420X_MBP53] = "mbp53",
         [CS420X_MBP55] = "mbp55",
         [CS420X_IMAC27] = "imac27",
         [CS420X_AUTO] = "auto",
 };
 
 
-static struct snd_pci_quirk cs420x_cfg_tbl[] = {
+static const struct snd_pci_quirk cs420x_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
+        SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
+        SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
         SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
         {} /* terminator */
 };
@@ -1147,7 +1178,21 @@ struct cs_pincfg {
         u32 val;
 };
 
-static struct cs_pincfg mbp55_pincfgs[] = {
+static const struct cs_pincfg mbp53_pincfgs[] = {
+        { 0x09, 0x012b4050 },
+        { 0x0a, 0x90100141 },
+        { 0x0b, 0x90100140 },
+        { 0x0c, 0x018b3020 },
+        { 0x0d, 0x90a00110 },
+        { 0x0e, 0x400000f0 },
+        { 0x0f, 0x01cbe030 },
+        { 0x10, 0x014be060 },
+        { 0x12, 0x400000f0 },
+        { 0x15, 0x400000f0 },
+        {} /* terminator */
+};
+
+static const struct cs_pincfg mbp55_pincfgs[] = {
         { 0x09, 0x012b4030 },
         { 0x0a, 0x90100121 },
         { 0x0b, 0x90100120 },
@@ -1161,7 +1206,7 @@ static struct cs_pincfg mbp55_pincfgs[] = {
         {} /* terminator */
 };
 
-static struct cs_pincfg imac27_pincfgs[] = {
+static const struct cs_pincfg imac27_pincfgs[] = {
         { 0x09, 0x012b4050 },
         { 0x0a, 0x90100140 },
         { 0x0b, 0x90100142 },
@@ -1175,7 +1220,8 @@ static struct cs_pincfg imac27_pincfgs[] = {
         {} /* terminator */
 };
 
-static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
+static const struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
+        [CS420X_MBP53] = mbp53_pincfgs,
         [CS420X_MBP55] = mbp55_pincfgs,
         [CS420X_IMAC27] = imac27_pincfgs,
 };
@@ -1208,6 +1254,7 @@ static int patch_cs420x(struct hda_codec *codec)
 
         switch (spec->board_config) {
         case CS420X_IMAC27:
+        case CS420X_MBP53:
         case CS420X_MBP55:
                 /* GPIO1 = headphones */
                 /* GPIO3 = speakers */
@@ -1234,7 +1281,7 @@ static int patch_cs420x(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_cirrus[] = {
+static const struct hda_codec_preset snd_hda_preset_cirrus[] = {
         { .id = 0x10134206, .name = "CS4206", .patch = patch_cs420x },
         { .id = 0x10134207, .name = "CS4207", .patch = patch_cs420x },
         {} /* terminator */
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index ff60908f4554..ab3308daa960 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -53,7 +53,7 @@ struct cmi_spec {
         int num_dacs;
 
         /* capture */
-        hda_nid_t *adc_nids;
+        const hda_nid_t *adc_nids;
         hda_nid_t dig_in_nid;
 
         /* capture source */
@@ -110,7 +110,7 @@ static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
  */
 
 /* 3-stack / 2 channel */
-static struct hda_verb cmi9880_ch2_init[] = {
+static const struct hda_verb cmi9880_ch2_init[] = {
         /* set line-in PIN for input */
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         /* set mic PIN for input, also enable vref */
@@ -121,7 +121,7 @@ static struct hda_verb cmi9880_ch2_init[] = {
 };
 
 /* 3-stack / 6 channel */
-static struct hda_verb cmi9880_ch6_init[] = {
+static const struct hda_verb cmi9880_ch6_init[] = {
         /* set line-in PIN for output */
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* set mic PIN for output */
@@ -132,7 +132,7 @@ static struct hda_verb cmi9880_ch6_init[] = {
 };
 
 /* 3-stack+front / 8 channel */
-static struct hda_verb cmi9880_ch8_init[] = {
+static const struct hda_verb cmi9880_ch8_init[] = {
         /* set line-in PIN for output */
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         /* set mic PIN for output */
@@ -142,7 +142,7 @@ static struct hda_verb cmi9880_ch8_init[] = {
         {}
 };
 
-static struct hda_channel_mode cmi9880_channel_modes[3] = {
+static const struct hda_channel_mode cmi9880_channel_modes[3] = {
         { 2, cmi9880_ch2_init },
         { 6, cmi9880_ch6_init },
         { 8, cmi9880_ch8_init },
@@ -174,7 +174,7 @@ static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_va
 
 /*
  */
-static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
+static const struct snd_kcontrol_new cmi9880_basic_mixer[] = {
         /* CMI9880 has no playback volumes! */
         HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), /* front */
         HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0x0, HDA_OUTPUT),
@@ -205,7 +205,7 @@ static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
 /*
  * shared I/O pins
  */
-static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
+static const struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -219,7 +219,7 @@ static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
 /* AUD-in selections:
  * 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x1f 0x20
  */
-static struct hda_input_mux cmi9880_basic_mux = {
+static const struct hda_input_mux cmi9880_basic_mux = {
         .num_items = 4,
         .items = {
                 { "Front Mic", 0x5 },
@@ -229,7 +229,7 @@ static struct hda_input_mux cmi9880_basic_mux = {
         }
 };
 
-static struct hda_input_mux cmi9880_no_line_mux = {
+static const struct hda_input_mux cmi9880_no_line_mux = {
         .num_items = 3,
         .items = {
                 { "Front Mic", 0x5 },
@@ -239,11 +239,11 @@ static struct hda_input_mux cmi9880_no_line_mux = {
 };
 
 /* front, rear, clfe, rear_surr */
-static hda_nid_t cmi9880_dac_nids[4] = {
+static const hda_nid_t cmi9880_dac_nids[4] = {
         0x03, 0x04, 0x05, 0x06
 };
 /* ADC0, ADC1 */
-static hda_nid_t cmi9880_adc_nids[2] = {
+static const hda_nid_t cmi9880_adc_nids[2] = {
         0x08, 0x09
 };
 
@@ -252,7 +252,7 @@ static hda_nid_t cmi9880_adc_nids[2] = {
 
 /*
  */
-static struct hda_verb cmi9880_basic_init[] = {
+static const struct hda_verb cmi9880_basic_init[] = {
         /* port-D for line out (rear panel) */
         { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
@@ -281,7 +281,7 @@ static struct hda_verb cmi9880_basic_init[] = {
         {} /* terminator */
 };
 
-static struct hda_verb cmi9880_allout_init[] = {
+static const struct hda_verb cmi9880_allout_init[] = {
         /* port-D for line out (rear panel) */
         { 0x0b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         /* port-E for HP out (front panel) */
@@ -528,7 +528,7 @@ static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 
 /*
  */
-static struct hda_pcm_stream cmi9880_pcm_analog_playback = {
+static const struct hda_pcm_stream cmi9880_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
@@ -540,7 +540,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream cmi9880_pcm_analog_capture = {
+static const struct hda_pcm_stream cmi9880_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -551,7 +551,7 @@ static struct hda_pcm_stream cmi9880_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
+static const struct hda_pcm_stream cmi9880_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -563,7 +563,7 @@ static struct hda_pcm_stream cmi9880_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream cmi9880_pcm_digital_capture = {
+static const struct hda_pcm_stream cmi9880_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -608,7 +608,7 @@ static void cmi9880_free(struct hda_codec *codec)
 /*
  */
 
-static const char *cmi9880_models[CMI_MODELS] = {
+static const char * const cmi9880_models[CMI_MODELS] = {
         [CMI_MINIMAL]   = "minimal",
         [CMI_MIN_FP]    = "min_fp",
         [CMI_FULL]      = "full",
@@ -617,14 +617,14 @@ static const char *cmi9880_models[CMI_MODELS] = {
         [CMI_AUTO]      = "auto",
 };
 
-static struct snd_pci_quirk cmi9880_cfg_tbl[] = {
+static const struct snd_pci_quirk cmi9880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", CMI_FULL_DIG),
         SND_PCI_QUIRK(0x1854, 0x002b, "LG LS75", CMI_MINIMAL),
         SND_PCI_QUIRK(0x1854, 0x0032, "LG", CMI_FULL_DIG),
         {} /* terminator */
 };
 
-static struct hda_codec_ops cmi9880_patch_ops = {
+static const struct hda_codec_ops cmi9880_patch_ops = {
         .build_controls = cmi9880_build_controls,
         .build_pcms = cmi9880_build_pcms,
         .init = cmi9880_init,
@@ -745,7 +745,7 @@ static int patch_cmi9880(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_cmedia[] = {
+static const struct hda_codec_preset snd_hda_preset_cmedia[] = {
         { .id = 0x13f69880, .name = "CMI9880", .patch = patch_cmi9880 },
         { .id = 0x434d4980, .name = "CMI9880", .patch = patch_cmi9880 },
         {} /* terminator */
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 972e7c453b3d..7bbc5f237a5e 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -39,6 +39,7 @@
 
 #define CONEXANT_HP_EVENT       0x37
 #define CONEXANT_MIC_EVENT      0x38
+#define CONEXANT_LINE_EVENT     0x39
 
 /* Conexant 5051 specific */
 
@@ -49,17 +50,22 @@
 #define AUTO_MIC_PORTB          (1 << 1)
 #define AUTO_MIC_PORTC          (1 << 2)
 
-struct conexant_jack {
-
-        hda_nid_t nid;
+struct pin_dac_pair {
+        hda_nid_t pin;
+        hda_nid_t dac;
         int type;
-        struct snd_jack *jack;
+};
 
+struct imux_info {
+        hda_nid_t pin;          /* input pin NID */
+        hda_nid_t adc;          /* connected ADC NID */ 
+        hda_nid_t boost;        /* optional boost volume NID */
+        int index;              /* corresponding to autocfg.input */
 };
 
 struct conexant_spec {
 
-        struct snd_kcontrol_new *mixers[5];
+        const struct snd_kcontrol_new *mixers[5];
         int num_mixers;
         hda_nid_t vmaster_nid;
 
@@ -76,12 +82,17 @@ struct conexant_spec {
                                          */
         unsigned int cur_eapd;
         unsigned int hp_present;
+        unsigned int line_present;
         unsigned int auto_mic;
+        int auto_mic_ext;               /* imux_pins[] index for ext mic */
+        int auto_mic_dock;              /* imux_pins[] index for dock mic */
+        int auto_mic_int;               /* imux_pins[] index for int mic */
         unsigned int need_dac_fix;
+        hda_nid_t slave_dig_outs[2];
 
         /* capture */
         unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
+        const hda_nid_t *adc_nids;
         hda_nid_t dig_in_nid;           /* digital-in NID; optional */
 
         unsigned int cur_adc_idx;
@@ -89,9 +100,11 @@ struct conexant_spec {
         unsigned int cur_adc_stream_tag;
         unsigned int cur_adc_format;
 
+        const struct hda_pcm_stream *capture_stream;
+
         /* capture source */
         const struct hda_input_mux *input_mux;
-        hda_nid_t *capsrc_nids;
+        const hda_nid_t *capsrc_nids;
         unsigned int cur_mux[3];
 
         /* channel model */
@@ -103,20 +116,28 @@ struct conexant_spec {
 
         unsigned int spdif_route;
 
-        /* jack detection */
-        struct snd_array jacks;
-
         /* dynamic controls, init_verbs and input_mux */
         struct auto_pin_cfg autocfg;
         struct hda_input_mux private_imux;
+        struct imux_info imux_info[HDA_MAX_NUM_INPUTS];
+        hda_nid_t private_adc_nids[HDA_MAX_NUM_INPUTS];
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
+        struct pin_dac_pair dac_info[8];
+        int dac_info_filled;
 
-        unsigned int dell_automute;
         unsigned int port_d_mode;
+        unsigned int auto_mute:1;       /* used in auto-parser */
+        unsigned int detect_line:1;     /* Line-out detection enabled */
+        unsigned int automute_lines:1;  /* automute line-out as well */
+        unsigned int automute_hp_lo:1;  /* both HP and LO available */
+        unsigned int dell_automute:1;
         unsigned int dell_vostro:1;
         unsigned int ideapad:1;
         unsigned int thinkpad:1;
         unsigned int hp_laptop:1;
+        unsigned int asus:1;
+
+        unsigned int adc_switching:1;
 
         unsigned int ext_mic_present;
         unsigned int recording;
@@ -226,7 +247,7 @@ static int conexant_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 
 
 
-static struct hda_pcm_stream conexant_pcm_analog_playback = {
+static const struct hda_pcm_stream conexant_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -238,7 +259,7 @@ static struct hda_pcm_stream conexant_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream conexant_pcm_analog_capture = {
+static const struct hda_pcm_stream conexant_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -250,7 +271,7 @@ static struct hda_pcm_stream conexant_pcm_analog_capture = {
 };
 
 
-static struct hda_pcm_stream conexant_pcm_digital_playback = {
+static const struct hda_pcm_stream conexant_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -262,7 +283,7 @@ static struct hda_pcm_stream conexant_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream conexant_pcm_digital_capture = {
+static const struct hda_pcm_stream conexant_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -293,7 +314,7 @@ static int cx5051_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream cx5051_pcm_analog_capture = {
+static const struct hda_pcm_stream cx5051_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -318,13 +339,19 @@ static int conexant_build_pcms(struct hda_codec *codec)
                 spec->multiout.max_channels;
         info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
                 spec->multiout.dac_nids[0];
-        if (codec->vendor_id == 0x14f15051)
-                info->stream[SNDRV_PCM_STREAM_CAPTURE] =
-                        cx5051_pcm_analog_capture;
-        else
-                info->stream[SNDRV_PCM_STREAM_CAPTURE] =
-                        conexant_pcm_analog_capture;
-        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adc_nids;
+        if (spec->capture_stream)
+                info->stream[SNDRV_PCM_STREAM_CAPTURE] = *spec->capture_stream;
+        else {
+                if (codec->vendor_id == 0x14f15051)
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] =
+                                cx5051_pcm_analog_capture;
+                else {
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] =
+                                conexant_pcm_analog_capture;
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams =
+                                spec->num_adc_nids;
+                }
+        }
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
 
         if (spec->multiout.dig_out_nid) {
@@ -342,6 +369,8 @@ static int conexant_build_pcms(struct hda_codec *codec)
                         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
                                 spec->dig_in_nid;
                 }
+                if (spec->slave_dig_outs[0])
+                        codec->slave_dig_outs = spec->slave_dig_outs;
         }
 
         return 0;
@@ -379,65 +408,9 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
                                      &spec->cur_mux[adc_idx]);
 }
 
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-static void conexant_free_jack_priv(struct snd_jack *jack)
-{
-        struct conexant_jack *jacks = jack->private_data;
-        jacks->nid = 0;
-        jacks->jack = NULL;
-}
-
-static int conexant_add_jack(struct hda_codec *codec,
-                hda_nid_t nid, int type)
-{
-        struct conexant_spec *spec;
-        struct conexant_jack *jack;
-        const char *name;
-        int err;
-
-        spec = codec->spec;
-        snd_array_init(&spec->jacks, sizeof(*jack), 32);
-        jack = snd_array_new(&spec->jacks);
-        name = (type == SND_JACK_HEADPHONE) ? "Headphone" : "Mic" ;
-
-        if (!jack)
-                return -ENOMEM;
-
-        jack->nid = nid;
-        jack->type = type;
-
-        err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
-        if (err < 0)
-                return err;
-        jack->jack->private_data = jack;
-        jack->jack->private_free = conexant_free_jack_priv;
-        return 0;
-}
-
-static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
-{
-        struct conexant_spec *spec = codec->spec;
-        struct conexant_jack *jacks = spec->jacks.list;
-
-        if (jacks) {
-                int i;
-                for (i = 0; i < spec->jacks.used; i++) {
-                        if (jacks->nid == nid) {
-                                unsigned int present;
-                                present = snd_hda_jack_detect(codec, nid);
-
-                                present = (present) ? jacks->type : 0 ;
-
-                                snd_jack_report(jacks->jack,
-                                                present);
-                        }
-                        jacks++;
-                }
-        }
-}
-
 static int conexant_init_jacks(struct hda_codec *codec)
 {
+#ifdef CONFIG_SND_HDA_INPUT_JACK
         struct conexant_spec *spec = codec->spec;
         int i;
 
@@ -449,15 +422,15 @@ static int conexant_init_jacks(struct hda_codec *codec)
                         int err = 0;
                         switch (hv->param ^ AC_USRSP_EN) {
                         case CONEXANT_HP_EVENT:
-                                err = conexant_add_jack(codec, hv->nid,
-                                                SND_JACK_HEADPHONE);
-                                conexant_report_jack(codec, hv->nid);
+                                err = snd_hda_input_jack_add(codec, hv->nid,
+                                                SND_JACK_HEADPHONE, NULL);
+                                snd_hda_input_jack_report(codec, hv->nid);
                                 break;
                         case CXT5051_PORTC_EVENT:
                         case CONEXANT_MIC_EVENT:
-                                err = conexant_add_jack(codec, hv->nid,
-                                                SND_JACK_MICROPHONE);
-                                conexant_report_jack(codec, hv->nid);
+                                err = snd_hda_input_jack_add(codec, hv->nid,
+                                                SND_JACK_MICROPHONE, NULL);
+                                snd_hda_input_jack_report(codec, hv->nid);
                                 break;
                         }
                         if (err < 0)
@@ -465,19 +438,9 @@ static int conexant_init_jacks(struct hda_codec *codec)
                         ++hv;
                 }
         }
-        return 0;
-
-}
-#else
-static inline void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
-{
-}
-
-static inline int conexant_init_jacks(struct hda_codec *codec)
-{
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
         return 0;
 }
-#endif
 
 static int conexant_init(struct hda_codec *codec)
 {
@@ -491,23 +454,12 @@ static int conexant_init(struct hda_codec *codec)
 
 static void conexant_free(struct hda_codec *codec)
 {
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-        struct conexant_spec *spec = codec->spec;
-        if (spec->jacks.list) {
-                struct conexant_jack *jacks = spec->jacks.list;
-                int i;
-                for (i = 0; i < spec->jacks.used; i++, jacks++) {
-                        if (jacks->jack)
-                                snd_device_free(codec->bus->card, jacks->jack);
-                }
-                snd_array_free(&spec->jacks);
-        }
-#endif
+        snd_hda_input_jack_free(codec);
         snd_hda_detach_beep_device(codec);
         kfree(codec->spec);
 }
 
-static struct snd_kcontrol_new cxt_capture_mixers[] = {
+static const struct snd_kcontrol_new cxt_capture_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Capture Source",
@@ -520,22 +472,28 @@ static struct snd_kcontrol_new cxt_capture_mixers[] = {
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
 /* additional beep mixers; the actual parameters are overwritten at build */
-static struct snd_kcontrol_new cxt_beep_mixer[] = {
+static const struct snd_kcontrol_new cxt_beep_mixer[] = {
         HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE_BEEP_MONO("Beep Playback Switch", 0, 1, 0, HDA_OUTPUT),
         { } /* end */
 };
 #endif
 
-static const char *slave_vols[] = {
+static const char * const slave_vols[] = {
         "Headphone Playback Volume",
         "Speaker Playback Volume",
+        "Front Playback Volume",
+        "Surround Playback Volume",
+        "CLFE Playback Volume",
         NULL
 };
 
-static const char *slave_sws[] = {
+static const char * const slave_sws[] = {
         "Headphone Playback Switch",
         "Speaker Playback Switch",
+        "Front Playback Switch",
+        "Surround Playback Switch",
+        "CLFE Playback Switch",
         NULL
 };
 
@@ -595,7 +553,7 @@ static int conexant_build_controls(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
         /* create beep controls if needed */
         if (spec->beep_amp) {
-                struct snd_kcontrol_new *knew;
+                const struct snd_kcontrol_new *knew;
                 for (knew = cxt_beep_mixer; knew->name; knew++) {
                         struct snd_kcontrol *kctl;
                         kctl = snd_ctl_new1(knew, codec);
@@ -620,7 +578,7 @@ static int conexant_suspend(struct hda_codec *codec, pm_message_t state)
 }
 #endif
 
-static struct hda_codec_ops conexant_patch_ops = {
+static const struct hda_codec_ops conexant_patch_ops = {
         .build_controls = conexant_build_controls,
         .build_pcms = conexant_build_pcms,
         .init = conexant_init,
@@ -638,6 +596,7 @@ static struct hda_codec_ops conexant_patch_ops = {
 #define set_beep_amp(spec, nid, idx, dir) /* NOP */
 #endif
 
+static int patch_conexant_auto(struct hda_codec *codec);
 /*
  * EAPD control
  * the private value = nid | (invert << 8)
@@ -736,16 +695,16 @@ static int conexant_ch_mode_put(struct snd_kcontrol *kcontrol,
 
 /* Conexant 5045 specific */
 
-static hda_nid_t cxt5045_dac_nids[1] = { 0x19 };
-static hda_nid_t cxt5045_adc_nids[1] = { 0x1a };
-static hda_nid_t cxt5045_capsrc_nids[1] = { 0x1a };
+static const hda_nid_t cxt5045_dac_nids[1] = { 0x19 };
+static const hda_nid_t cxt5045_adc_nids[1] = { 0x1a };
+static const hda_nid_t cxt5045_capsrc_nids[1] = { 0x1a };
 #define CXT5045_SPDIF_OUT       0x18
 
-static struct hda_channel_mode cxt5045_modes[1] = {
+static const struct hda_channel_mode cxt5045_modes[1] = {
         { 2, NULL },
 };
 
-static struct hda_input_mux cxt5045_capture_source = {
+static const struct hda_input_mux cxt5045_capture_source = {
         .num_items = 2,
         .items = {
                 { "IntMic", 0x1 },
@@ -753,7 +712,7 @@ static struct hda_input_mux cxt5045_capture_source = {
         }
 };
 
-static struct hda_input_mux cxt5045_capture_source_benq = {
+static const struct hda_input_mux cxt5045_capture_source_benq = {
         .num_items = 5,
         .items = {
                 { "IntMic", 0x1 },
@@ -764,7 +723,7 @@ static struct hda_input_mux cxt5045_capture_source_benq = {
         }
 };
 
-static struct hda_input_mux cxt5045_capture_source_hp530 = {
+static const struct hda_input_mux cxt5045_capture_source_hp530 = {
         .num_items = 2,
         .items = {
                 { "ExtMic", 0x1 },
@@ -797,7 +756,7 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,
 }
 
 /* bind volumes of both NID 0x10 and 0x11 */
-static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
+static const struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
@@ -809,12 +768,12 @@ static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
 /* toggle input of built-in and mic jack appropriately */
 static void cxt5045_hp_automic(struct hda_codec *codec)
 {
-        static struct hda_verb mic_jack_on[] = {
+        static const struct hda_verb mic_jack_on[] = {
                 {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
                 {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
                 {}
         };
-        static struct hda_verb mic_jack_off[] = {
+        static const struct hda_verb mic_jack_off[] = {
                 {0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
                 {0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
                 {}
@@ -858,17 +817,17 @@ static void cxt5045_hp_unsol_event(struct hda_codec *codec,
         }
 }
 
-static struct snd_kcontrol_new cxt5045_mixers[] = {
-        HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
+static const struct snd_kcontrol_new cxt5045_mixers[] = {
+        HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
         HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -882,7 +841,7 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
+static const struct snd_kcontrol_new cxt5045_benq_mixers[] = {
         HDA_CODEC_VOLUME("CD Capture Volume", 0x1a, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Capture Switch", 0x1a, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
@@ -899,17 +858,17 @@ static struct snd_kcontrol_new cxt5045_benq_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
-        HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
+static const struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
+        HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x1a, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Capture Switch", 0x1a, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Capture Volume", 0x1a, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Capture Switch", 0x1a, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x2, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x17, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x17, 0x1, HDA_INPUT),
         HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -923,7 +882,7 @@ static struct snd_kcontrol_new cxt5045_mixers_hp530[] = {
         {}
 };
 
-static struct hda_verb cxt5045_init_verbs[] = {
+static const struct hda_verb cxt5045_init_verbs[] = {
         /* Line in, Mic */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
@@ -937,7 +896,7 @@ static struct hda_verb cxt5045_init_verbs[] = {
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        /* Record selector: Int mic */
+        /* Record selector: Internal mic */
         {0x1a, AC_VERB_SET_CONNECT_SEL,0x1},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
          AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
@@ -949,8 +908,8 @@ static struct hda_verb cxt5045_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5045_benq_init_verbs[] = {
-        /* Int Mic, Mic */
+static const struct hda_verb cxt5045_benq_init_verbs[] = {
+        /* Internal Mic, Mic */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_80 },
         /* Line In,HP, Amp  */
@@ -963,7 +922,7 @@ static struct hda_verb cxt5045_benq_init_verbs[] = {
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
-        /* Record selector: Int mic */
+        /* Record selector: Internal mic */
         {0x1a, AC_VERB_SET_CONNECT_SEL, 0x1},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE,
          AC_AMP_SET_INPUT|AC_AMP_SET_RIGHT|AC_AMP_SET_LEFT|0x17},
@@ -975,13 +934,13 @@ static struct hda_verb cxt5045_benq_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5045_hp_sense_init_verbs[] = {
+static const struct hda_verb cxt5045_hp_sense_init_verbs[] = {
         /* pin sensing on HP jack */
         {0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
         { } /* end */
 };
 
-static struct hda_verb cxt5045_mic_sense_init_verbs[] = {
+static const struct hda_verb cxt5045_mic_sense_init_verbs[] = {
         /* pin sensing on HP jack */
         {0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
         { } /* end */
@@ -991,7 +950,7 @@ static struct hda_verb cxt5045_mic_sense_init_verbs[] = {
 /* Test configuration for debugging, modelled after the ALC260 test
  * configuration.
  */
-static struct hda_input_mux cxt5045_test_capture_source = {
+static const struct hda_input_mux cxt5045_test_capture_source = {
         .num_items = 5,
         .items = {
                 { "MIXER", 0x0 },
@@ -1002,7 +961,7 @@ static struct hda_input_mux cxt5045_test_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new cxt5045_test_mixer[] = {
+static const struct snd_kcontrol_new cxt5045_test_mixer[] = {
 
         /* Output controls */
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x10, 0x0, HDA_OUTPUT),
@@ -1052,7 +1011,7 @@ static struct snd_kcontrol_new cxt5045_test_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5045_test_init_verbs[] = {
+static const struct hda_verb cxt5045_test_init_verbs[] = {
         /* Set connections */
         { 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 },
         { 0x11, AC_VERB_SET_CONNECT_SEL, 0x0 },
@@ -1121,10 +1080,11 @@ enum {
 #ifdef CONFIG_SND_DEBUG
         CXT5045_TEST,
 #endif
+        CXT5045_AUTO,
         CXT5045_MODELS
 };
 
-static const char *cxt5045_models[CXT5045_MODELS] = {
+static const char * const cxt5045_models[CXT5045_MODELS] = {
         [CXT5045_LAPTOP_HPSENSE]        = "laptop-hpsense",
         [CXT5045_LAPTOP_MICSENSE]       = "laptop-micsense",
         [CXT5045_LAPTOP_HPMICSENSE]     = "laptop-hpmicsense",
@@ -1133,9 +1093,10 @@ static const char *cxt5045_models[CXT5045_MODELS] = {
 #ifdef CONFIG_SND_DEBUG
         [CXT5045_TEST]          = "test",
 #endif
+        [CXT5045_AUTO]                  = "auto",
 };
 
-static struct snd_pci_quirk cxt5045_cfg_tbl[] = {
+static const struct snd_pci_quirk cxt5045_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530),
         SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
                            CXT5045_LAPTOP_HPSENSE),
@@ -1159,6 +1120,16 @@ static int patch_cxt5045(struct hda_codec *codec)
         struct conexant_spec *spec;
         int board_config;
 
+        board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
+                                                  cxt5045_models,
+                                                  cxt5045_cfg_tbl);
+#if 0 /* use the old method just for safety */
+        if (board_config < 0)
+                board_config = CXT5045_AUTO;
+#endif
+        if (board_config == CXT5045_AUTO)
+                return patch_conexant_auto(codec);
+
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
                 return -ENOMEM;
@@ -1185,9 +1156,6 @@ static int patch_cxt5045(struct hda_codec *codec)
 
         codec->patch_ops = conexant_patch_ops;
 
-        board_config = snd_hda_check_board_config(codec, CXT5045_MODELS,
-                                                  cxt5045_models,
-                                                  cxt5045_cfg_tbl);
         switch (board_config) {
         case CXT5045_LAPTOP_HPSENSE:
                 codec->patch_ops.unsol_event = cxt5045_hp_unsol_event;
@@ -1270,15 +1238,15 @@ static int patch_cxt5045(struct hda_codec *codec)
 /* Conexant 5047 specific */
 #define CXT5047_SPDIF_OUT       0x11
 
-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 };
+static const hda_nid_t cxt5047_dac_nids[1] = { 0x10 }; /* 0x1c */
+static const hda_nid_t cxt5047_adc_nids[1] = { 0x12 };
+static const hda_nid_t cxt5047_capsrc_nids[1] = { 0x1a };
 
-static struct hda_channel_mode cxt5047_modes[1] = {
+static const struct hda_channel_mode cxt5047_modes[1] = {
         { 2, NULL },
 };
 
-static struct hda_input_mux cxt5047_toshiba_capture_source = {
+static const struct hda_input_mux cxt5047_toshiba_capture_source = {
         .num_items = 2,
         .items = {
                 { "ExtMic", 0x2 },
@@ -1330,12 +1298,12 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
 /* toggle input of built-in and mic jack appropriately */
 static void cxt5047_hp_automic(struct hda_codec *codec)
 {
-        static struct hda_verb mic_jack_on[] = {
+        static const struct hda_verb mic_jack_on[] = {
                 {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
                 {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
                 {}
         };
-        static struct hda_verb mic_jack_off[] = {
+        static const struct hda_verb mic_jack_off[] = {
                 {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
                 {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
                 {}
@@ -1363,10 +1331,10 @@ static void cxt5047_hp_unsol_event(struct hda_codec *codec,
         }
 }
 
-static struct snd_kcontrol_new cxt5047_base_mixers[] = {
+static const 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("Mic Boost Volume", 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),
@@ -1383,19 +1351,19 @@ static struct snd_kcontrol_new cxt5047_base_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5047_hp_spk_mixers[] = {
+static const 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[] = {
+static const struct snd_kcontrol_new cxt5047_hp_only_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x13, 0x00, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct hda_verb cxt5047_init_verbs[] = {
+static const struct hda_verb cxt5047_init_verbs[] = {
         /* Line in, Mic, Built-in Mic */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
@@ -1422,7 +1390,7 @@ static struct hda_verb cxt5047_init_verbs[] = {
 };
 
 /* configuration for Toshiba Laptops */
-static struct hda_verb cxt5047_toshiba_init_verbs[] = {
+static const struct hda_verb cxt5047_toshiba_init_verbs[] = {
         {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0}, /* default off */
         {}
 };
@@ -1431,7 +1399,7 @@ static struct hda_verb cxt5047_toshiba_init_verbs[] = {
  * configuration.
  */
 #ifdef CONFIG_SND_DEBUG
-static struct hda_input_mux cxt5047_test_capture_source = {
+static const struct hda_input_mux cxt5047_test_capture_source = {
         .num_items = 4,
         .items = {
                 { "LINE1 pin", 0x0 },
@@ -1441,7 +1409,7 @@ static struct hda_input_mux cxt5047_test_capture_source = {
         },
 };
 
-static struct snd_kcontrol_new cxt5047_test_mixer[] = {
+static const struct snd_kcontrol_new cxt5047_test_mixer[] = {
 
         /* Output only controls */
         HDA_CODEC_VOLUME("OutAmp-1 Volume", 0x10, 0x0, HDA_OUTPUT),
@@ -1494,7 +1462,7 @@ static struct snd_kcontrol_new cxt5047_test_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5047_test_init_verbs[] = {
+static const struct hda_verb cxt5047_test_init_verbs[] = {
         /* Enable retasking pins as output, initially without power amp */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -1566,19 +1534,21 @@ enum {
 #ifdef CONFIG_SND_DEBUG
         CXT5047_TEST,
 #endif
+        CXT5047_AUTO,
         CXT5047_MODELS
 };
 
-static const char *cxt5047_models[CXT5047_MODELS] = {
+static const char * const cxt5047_models[CXT5047_MODELS] = {
         [CXT5047_LAPTOP]        = "laptop",
         [CXT5047_LAPTOP_HP]     = "laptop-hp",
         [CXT5047_LAPTOP_EAPD]   = "laptop-eapd",
 #ifdef CONFIG_SND_DEBUG
         [CXT5047_TEST]          = "test",
 #endif
+        [CXT5047_AUTO]          = "auto",
 };
 
-static struct snd_pci_quirk cxt5047_cfg_tbl[] = {
+static const struct snd_pci_quirk cxt5047_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30a5, "HP DV5200T/DV8000T", CXT5047_LAPTOP_HP),
         SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3000, "HP DV Series",
                            CXT5047_LAPTOP),
@@ -1591,6 +1561,16 @@ static int patch_cxt5047(struct hda_codec *codec)
         struct conexant_spec *spec;
         int board_config;
 
+        board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,
+                                                  cxt5047_models,
+                                                  cxt5047_cfg_tbl);
+#if 0 /* not enabled as default, as BIOS often broken for this codec */
+        if (board_config < 0)
+                board_config = CXT5047_AUTO;
+#endif
+        if (board_config == CXT5047_AUTO)
+                return patch_conexant_auto(codec);
+
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
                 return -ENOMEM;
@@ -1614,9 +1594,6 @@ static int patch_cxt5047(struct hda_codec *codec)
 
         codec->patch_ops = conexant_patch_ops;
 
-        board_config = snd_hda_check_board_config(codec, CXT5047_MODELS,
-                                                  cxt5047_models,
-                                                  cxt5047_cfg_tbl);
         switch (board_config) {
         case CXT5047_LAPTOP:
                 spec->num_mixers = 2;
@@ -1665,10 +1642,10 @@ static int patch_cxt5047(struct hda_codec *codec)
 }
 
 /* Conexant 5051 specific */
-static hda_nid_t cxt5051_dac_nids[1] = { 0x10 };
-static hda_nid_t cxt5051_adc_nids[2] = { 0x14, 0x15 };
+static const hda_nid_t cxt5051_dac_nids[1] = { 0x10 };
+static const hda_nid_t cxt5051_adc_nids[2] = { 0x14, 0x15 };
 
-static struct hda_channel_mode cxt5051_modes[1] = {
+static const struct hda_channel_mode cxt5051_modes[1] = {
         { 2, NULL },
 };
 
@@ -1767,10 +1744,10 @@ static void cxt5051_hp_unsol_event(struct hda_codec *codec,
                 cxt5051_portc_automic(codec);
                 break;
         }
-        conexant_report_jack(codec, nid);
+        snd_hda_input_jack_report(codec, nid);
 }
 
-static struct snd_kcontrol_new cxt5051_playback_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_playback_mixers[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1783,45 +1760,45 @@ static struct snd_kcontrol_new cxt5051_playback_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5051_capture_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_capture_mixers[] = {
         HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Switch", 0x14, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Docking Mic Volume", 0x15, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Docking Mic Switch", 0x15, 0x00, HDA_INPUT),
         {}
 };
 
-static struct snd_kcontrol_new cxt5051_hp_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_hp_mixers[] = {
         HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("External Mic Volume", 0x15, 0x00, HDA_INPUT),
-        HDA_CODEC_MUTE("External Mic Switch", 0x15, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Volume", 0x15, 0x00, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Switch", 0x15, 0x00, HDA_INPUT),
         {}
 };
 
-static struct snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x14, 0x00, HDA_INPUT),
         {}
 };
 
-static struct snd_kcontrol_new cxt5051_f700_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_f700_mixers[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x14, 0x01, HDA_INPUT),
         {}
 };
 
-static struct snd_kcontrol_new cxt5051_toshiba_mixers[] = {
+static const struct snd_kcontrol_new cxt5051_toshiba_mixers[] = {
         HDA_CODEC_VOLUME("Internal Mic Volume", 0x14, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Internal Mic Switch", 0x14, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("External Mic Volume", 0x14, 0x01, HDA_INPUT),
-        HDA_CODEC_MUTE("External Mic Switch", 0x14, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Switch", 0x14, 0x01, HDA_INPUT),
         {}
 };
 
-static struct hda_verb cxt5051_init_verbs[] = {
+static const struct hda_verb cxt5051_init_verbs[] = {
         /* Line in, Mic */
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
         {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
@@ -1837,7 +1814,7 @@ static struct hda_verb cxt5051_init_verbs[] = {
         {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* DAC1 */      
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Record selector: Int mic */
+        /* Record selector: Internal 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},
@@ -1850,7 +1827,7 @@ static struct hda_verb cxt5051_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = {
+static const 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},
@@ -1864,7 +1841,7 @@ static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = {
         {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* DAC1 */
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Record selector: Int mic */
+        /* Record selector: Internal mic */
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x1},
         /* SPDIF route: PCM */
@@ -1875,7 +1852,7 @@ static struct hda_verb cxt5051_hp_dv6736_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
+static const 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},
@@ -1894,7 +1871,7 @@ static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
         {0x19, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* DAC1 */
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Record selector: Int mic */
+        /* Record selector: Internal 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},
@@ -1908,7 +1885,7 @@ static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5051_f700_init_verbs[] = {
+static const struct hda_verb cxt5051_f700_init_verbs[] = {
         /* Line in, Mic */
         {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
         {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
@@ -1922,7 +1899,7 @@ static struct hda_verb cxt5051_f700_init_verbs[] = {
         {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* DAC1 */
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Record selector: Int mic */
+        /* Record selector: Internal mic */
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x1},
         /* SPDIF route: PCM */
@@ -1939,13 +1916,11 @@ static void cxt5051_init_mic_port(struct hda_codec *codec, hda_nid_t nid,
         snd_hda_codec_write(codec, nid, 0,
                             AC_VERB_SET_UNSOLICITED_ENABLE,
                             AC_USRSP_EN | event);
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-        conexant_add_jack(codec, nid, SND_JACK_MICROPHONE);
-        conexant_report_jack(codec, nid);
-#endif
+        snd_hda_input_jack_add(codec, nid, SND_JACK_MICROPHONE, NULL);
+        snd_hda_input_jack_report(codec, nid);
 }
 
-static struct hda_verb cxt5051_ideapad_init_verbs[] = {
+static const struct hda_verb cxt5051_ideapad_init_verbs[] = {
         /* Subwoofer */
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -1982,10 +1957,11 @@ enum {
         CXT5051_F700,       /* HP Compaq Presario F700 */
         CXT5051_TOSHIBA,        /* Toshiba M300 & co */
         CXT5051_IDEAPAD,        /* Lenovo IdeaPad Y430 */
+        CXT5051_AUTO,           /* auto-parser */
         CXT5051_MODELS
 };
 
-static const char *cxt5051_models[CXT5051_MODELS] = {
+static const char *const cxt5051_models[CXT5051_MODELS] = {
         [CXT5051_LAPTOP]        = "laptop",
         [CXT5051_HP]            = "hp",
         [CXT5051_HP_DV6736]     = "hp-dv6736",
@@ -1993,9 +1969,10 @@ static const char *cxt5051_models[CXT5051_MODELS] = {
         [CXT5051_F700]          = "hp-700",
         [CXT5051_TOSHIBA]       = "toshiba",
         [CXT5051_IDEAPAD]       = "ideapad",
+        [CXT5051_AUTO]          = "auto",
 };
 
-static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
+static const struct snd_pci_quirk cxt5051_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736),
         SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP),
         SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700),
@@ -2013,6 +1990,16 @@ static int patch_cxt5051(struct hda_codec *codec)
         struct conexant_spec *spec;
         int board_config;
 
+        board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
+                                                  cxt5051_models,
+                                                  cxt5051_cfg_tbl);
+#if 0 /* use the old method just for safety */
+        if (board_config < 0)
+                board_config = CXT5051_AUTO;
+#endif
+        if (board_config == CXT5051_AUTO)
+                return patch_conexant_auto(codec);
+
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
                 return -ENOMEM;
@@ -2043,9 +2030,6 @@ static int patch_cxt5051(struct hda_codec *codec)
 
         codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
 
-        board_config = snd_hda_check_board_config(codec, CXT5051_MODELS,
-                                                  cxt5051_models,
-                                                  cxt5051_cfg_tbl);
         spec->auto_mic = AUTO_MIC_PORTB | AUTO_MIC_PORTC;
         switch (board_config) {
         case CXT5051_HP:
@@ -2087,39 +2071,49 @@ static int patch_cxt5051(struct hda_codec *codec)
 
 /* Conexant 5066 specific */
 
-static hda_nid_t cxt5066_dac_nids[1] = { 0x10 };
-static hda_nid_t cxt5066_adc_nids[3] = { 0x14, 0x15, 0x16 };
-static hda_nid_t cxt5066_capsrc_nids[1] = { 0x17 };
-#define CXT5066_SPDIF_OUT       0x21
+static const hda_nid_t cxt5066_dac_nids[1] = { 0x10 };
+static const hda_nid_t cxt5066_adc_nids[3] = { 0x14, 0x15, 0x16 };
+static const hda_nid_t cxt5066_capsrc_nids[1] = { 0x17 };
+static const hda_nid_t cxt5066_digout_pin_nids[2] = { 0x20, 0x22 };
 
 /* OLPC's microphone port is DC coupled for use with external sensors,
  * therefore we use a 50% mic bias in order to center the input signal with
  * the DC input range of the codec. */
 #define CXT5066_OLPC_EXT_MIC_BIAS PIN_VREF50
 
-static struct hda_channel_mode cxt5066_modes[1] = {
+static const struct hda_channel_mode cxt5066_modes[1] = {
         { 2, NULL },
 };
 
+#define HP_PRESENT_PORT_A       (1 << 0)
+#define HP_PRESENT_PORT_D       (1 << 1)
+#define hp_port_a_present(spec) ((spec)->hp_present & HP_PRESENT_PORT_A)
+#define hp_port_d_present(spec) ((spec)->hp_present & HP_PRESENT_PORT_D)
+
 static void cxt5066_update_speaker(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
         unsigned int pinctl;
 
-        snd_printdd("CXT5066: update speaker, hp_present=%d\n",
-                spec->hp_present);
+        snd_printdd("CXT5066: update speaker, hp_present=%d, cur_eapd=%d\n",
+                    spec->hp_present, spec->cur_eapd);
 
         /* Port A (HP) */
-        pinctl = ((spec->hp_present & 1) && spec->cur_eapd) ? PIN_HP : 0;
+        pinctl = (hp_port_a_present(spec) && spec->cur_eapd) ? PIN_HP : 0;
         snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                         pinctl);
 
         /* Port D (HP/LO) */
-        pinctl = ((spec->hp_present & 2) && spec->cur_eapd)
-                ? spec->port_d_mode : 0;
-        /* Mute if Port A is connected on Thinkpad */
-        if (spec->thinkpad && (spec->hp_present & 1))
-                pinctl = 0;
+        pinctl = spec->cur_eapd ? spec->port_d_mode : 0;
+        if (spec->dell_automute || spec->thinkpad) {
+                /* Mute if Port A is connected */
+                if (hp_port_a_present(spec))
+                        pinctl = 0;
+        } else {
+                /* Thinkpad/Dell doesn't give pin-D status */
+                if (!hp_port_d_present(spec))
+                        pinctl = 0;
+        }
         snd_hda_codec_write(codec, 0x1c, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                         pinctl);
 
@@ -2127,14 +2121,6 @@ static void cxt5066_update_speaker(struct hda_codec *codec)
         pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
         snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                         pinctl);
-
-        if (spec->dell_automute) {
-                /* DELL AIO Port Rule: PortA > PortD > IntSpk */
-                pinctl = (!(spec->hp_present & 1) && spec->cur_eapd)
-                        ? PIN_OUT : 0;
-                snd_hda_codec_write(codec, 0x1c, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
-        }
 }
 
 /* turn on/off EAPD (+ mute HP) as a master switch */
@@ -2250,7 +2236,7 @@ static void cxt5066_vostro_automic(struct hda_codec *codec)
                 {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
-        static struct hda_verb ext_mic_absent[] = {
+        static const struct hda_verb ext_mic_absent[] = {
                 /* enable internal mic, port C */
                 {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 
@@ -2283,7 +2269,7 @@ static void cxt5066_ideapad_automic(struct hda_codec *codec)
                 {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
-        static struct hda_verb ext_mic_absent[] = {
+        static const struct hda_verb ext_mic_absent[] = {
                 {0x14, AC_VERB_SET_CONNECT_SEL, 2},
                 {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
                 {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
@@ -2300,6 +2286,19 @@ static void cxt5066_ideapad_automic(struct hda_codec *codec)
         }
 }
 
+
+/* toggle input of built-in digital mic and mic jack appropriately */
+static void cxt5066_asus_automic(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_jack_detect(codec, 0x1b);
+        snd_printdd("CXT5066: external microphone present=%d\n", present);
+        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_CONNECT_SEL,
+                            present ? 1 : 0);
+}
+
+
 /* toggle input of built-in digital mic and mic jack appropriately */
 static void cxt5066_hp_laptop_automic(struct hda_codec *codec)
 {
@@ -2318,7 +2317,7 @@ static void cxt5066_thinkpad_automic(struct hda_codec *codec)
 {
         unsigned int ext_present, dock_present;
 
-        static struct hda_verb ext_mic_present[] = {
+        static const struct hda_verb ext_mic_present[] = {
                 {0x14, AC_VERB_SET_CONNECT_SEL, 0},
                 {0x17, AC_VERB_SET_CONNECT_SEL, 1},
                 {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
@@ -2326,7 +2325,7 @@ static void cxt5066_thinkpad_automic(struct hda_codec *codec)
                 {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
-        static struct hda_verb dock_mic_present[] = {
+        static const struct hda_verb dock_mic_present[] = {
                 {0x14, AC_VERB_SET_CONNECT_SEL, 0},
                 {0x17, AC_VERB_SET_CONNECT_SEL, 0},
                 {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
@@ -2334,7 +2333,7 @@ static void cxt5066_thinkpad_automic(struct hda_codec *codec)
                 {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
                 {}
         };
-        static struct hda_verb ext_mic_absent[] = {
+        static const struct hda_verb ext_mic_absent[] = {
                 {0x14, AC_VERB_SET_CONNECT_SEL, 2},
                 {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
                 {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
@@ -2368,86 +2367,62 @@ static void cxt5066_hp_automute(struct hda_codec *codec)
         /* Port D */
         portD = snd_hda_jack_detect(codec, 0x1c);
 
-        spec->hp_present = !!(portA);
-        spec->hp_present |= portD ? 2 : 0;
+        spec->hp_present = portA ? HP_PRESENT_PORT_A : 0;
+        spec->hp_present |= portD ? HP_PRESENT_PORT_D : 0;
         snd_printdd("CXT5066: hp automute portA=%x portD=%x present=%d\n",
                 portA, portD, spec->hp_present);
         cxt5066_update_speaker(codec);
 }
 
-/* unsolicited event for jack sensing */
-static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)
+/* Dispatch the right mic autoswitch function */
+static void cxt5066_automic(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
-        snd_printdd("CXT5066: unsol event %x (%x)\n", res, res >> 26);
-        switch (res >> 26) {
-        case CONEXANT_HP_EVENT:
-                cxt5066_hp_automute(codec);
-                break;
-        case CONEXANT_MIC_EVENT:
-                /* ignore mic events in DC mode; we're always using the jack */
-                if (!spec->dc_enable)
-                        cxt5066_olpc_automic(codec);
-                break;
-        }
-}
 
-/* unsolicited event for jack sensing */
-static void cxt5066_vostro_event(struct hda_codec *codec, unsigned int res)
-{
-        snd_printdd("CXT5066_vostro: unsol event %x (%x)\n", res, res >> 26);
-        switch (res >> 26) {
-        case CONEXANT_HP_EVENT:
-                cxt5066_hp_automute(codec);
-                break;
-        case CONEXANT_MIC_EVENT:
+        if (spec->dell_vostro)
                 cxt5066_vostro_automic(codec);
-                break;
-        }
-}
-
-/* unsolicited event for jack sensing */
-static void cxt5066_ideapad_event(struct hda_codec *codec, unsigned int res)
-{
-        snd_printdd("CXT5066_ideapad: unsol event %x (%x)\n", res, res >> 26);
-        switch (res >> 26) {
-        case CONEXANT_HP_EVENT:
-                cxt5066_hp_automute(codec);
-                break;
-        case CONEXANT_MIC_EVENT:
+        else if (spec->ideapad)
                 cxt5066_ideapad_automic(codec);
-                break;
-        }
+        else if (spec->thinkpad)
+                cxt5066_thinkpad_automic(codec);
+        else if (spec->hp_laptop)
+                cxt5066_hp_laptop_automic(codec);
+        else if (spec->asus)
+                cxt5066_asus_automic(codec);
 }
 
 /* unsolicited event for jack sensing */
-static void cxt5066_hp_laptop_event(struct hda_codec *codec, unsigned int res)
+static void cxt5066_olpc_unsol_event(struct hda_codec *codec, unsigned int res)
 {
-        snd_printdd("CXT5066_hp_laptop: unsol event %x (%x)\n", res, res >> 26);
+        struct conexant_spec *spec = codec->spec;
+        snd_printdd("CXT5066: unsol event %x (%x)\n", res, res >> 26);
         switch (res >> 26) {
         case CONEXANT_HP_EVENT:
                 cxt5066_hp_automute(codec);
                 break;
         case CONEXANT_MIC_EVENT:
-                cxt5066_hp_laptop_automic(codec);
+                /* ignore mic events in DC mode; we're always using the jack */
+                if (!spec->dc_enable)
+                        cxt5066_olpc_automic(codec);
                 break;
         }
 }
 
 /* unsolicited event for jack sensing */
-static void cxt5066_thinkpad_event(struct hda_codec *codec, unsigned int res)
+static void cxt5066_unsol_event(struct hda_codec *codec, unsigned int res)
 {
-        snd_printdd("CXT5066_thinkpad: unsol event %x (%x)\n", res, res >> 26);
+        snd_printdd("CXT5066: unsol event %x (%x)\n", res, res >> 26);
         switch (res >> 26) {
         case CONEXANT_HP_EVENT:
                 cxt5066_hp_automute(codec);
                 break;
         case CONEXANT_MIC_EVENT:
-                cxt5066_thinkpad_automic(codec);
+                cxt5066_automic(codec);
                 break;
         }
 }
 
+
 static const struct hda_input_mux cxt5066_analog_mic_boost = {
         .num_items = 5,
         .items = {
@@ -2621,7 +2596,28 @@ static void cxt5066_olpc_capture_cleanup(struct hda_codec *codec)
         spec->recording = 0;
 }
 
-static struct hda_input_mux cxt5066_capture_source = {
+static void conexant_check_dig_outs(struct hda_codec *codec,
+                                    const hda_nid_t *dig_pins,
+                                    int num_pins)
+{
+        struct conexant_spec *spec = codec->spec;
+        hda_nid_t *nid_loc = &spec->multiout.dig_out_nid;
+        int i;
+
+        for (i = 0; i < num_pins; i++, dig_pins++) {
+                unsigned int cfg = snd_hda_codec_get_pincfg(codec, *dig_pins);
+                if (get_defcfg_connect(cfg) == AC_JACK_PORT_NONE)
+                        continue;
+                if (snd_hda_get_connections(codec, *dig_pins, nid_loc, 1) != 1)
+                        continue;
+                if (spec->slave_dig_outs[0])
+                        nid_loc++;
+                else
+                        nid_loc = spec->slave_dig_outs;
+        }
+}
+
+static const struct hda_input_mux cxt5066_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic B", 0 },
@@ -2631,7 +2627,7 @@ static struct hda_input_mux cxt5066_capture_source = {
         },
 };
 
-static struct hda_bind_ctls cxt5066_bind_capture_vol_others = {
+static const struct hda_bind_ctls cxt5066_bind_capture_vol_others = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_INPUT),
@@ -2640,7 +2636,7 @@ static struct hda_bind_ctls cxt5066_bind_capture_vol_others = {
         },
 };
 
-static struct hda_bind_ctls cxt5066_bind_capture_sw_others = {
+static const struct hda_bind_ctls cxt5066_bind_capture_sw_others = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_INPUT),
@@ -2649,12 +2645,12 @@ static struct hda_bind_ctls cxt5066_bind_capture_sw_others = {
         },
 };
 
-static struct snd_kcontrol_new cxt5066_mixer_master[] = {
+static const struct snd_kcontrol_new cxt5066_mixer_master[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT),
         {}
 };
 
-static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {
+static const struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Volume",
@@ -2673,7 +2669,7 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5066_mixer_olpc_dc[] = {
+static const struct snd_kcontrol_new cxt5066_mixer_olpc_dc[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "DC Mode Enable Switch",
@@ -2691,7 +2687,7 @@ static struct snd_kcontrol_new cxt5066_mixer_olpc_dc[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5066_mixers[] = {
+static const struct snd_kcontrol_new cxt5066_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -2714,10 +2710,10 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {
         {}
 };
 
-static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
+static const struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Int Mic Boost Capture Enum",
+                .name = "Internal Mic Boost Capture Enum",
                 .info = cxt5066_mic_boost_mux_enum_info,
                 .get = cxt5066_mic_boost_mux_enum_get,
                 .put = cxt5066_mic_boost_mux_enum_put,
@@ -2726,7 +2722,7 @@ static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
         {}
 };
 
-static struct hda_verb cxt5066_init_verbs[] = {
+static const struct hda_verb cxt5066_init_verbs[] = {
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
         {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */
@@ -2781,7 +2777,7 @@ static struct hda_verb cxt5066_init_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5066_init_verbs_olpc[] = {
+static const struct hda_verb cxt5066_init_verbs_olpc[] = {
         /* Port A: headphones */
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
@@ -2842,7 +2838,7 @@ static struct hda_verb cxt5066_init_verbs_olpc[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5066_init_verbs_vostro[] = {
+static const struct hda_verb cxt5066_init_verbs_vostro[] = {
         /* Port A: headphones */
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
         {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */
@@ -2903,7 +2899,7 @@ static struct hda_verb cxt5066_init_verbs_vostro[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5066_init_verbs_ideapad[] = {
+static const struct hda_verb cxt5066_init_verbs_ideapad[] = {
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
         {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */
@@ -2943,7 +2939,7 @@ static struct hda_verb cxt5066_init_verbs_ideapad[] = {
         {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
 
         /* internal microphone */
-        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable internal mic */
 
         /* EAPD */
         {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
@@ -2953,7 +2949,7 @@ static struct hda_verb cxt5066_init_verbs_ideapad[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5066_init_verbs_thinkpad[] = {
+static const struct hda_verb cxt5066_init_verbs_thinkpad[] = {
         {0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port F */
         {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* Port E */
 
@@ -2998,7 +2994,7 @@ static struct hda_verb cxt5066_init_verbs_thinkpad[] = {
         {0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
 
         /* internal microphone */
-        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable int mic */
+        {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* enable internal mic */
 
         /* EAPD */
         {0x1d, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
@@ -3011,13 +3007,13 @@ static struct hda_verb cxt5066_init_verbs_thinkpad[] = {
         { } /* end */
 };
 
-static struct hda_verb cxt5066_init_verbs_portd_lo[] = {
+static const struct hda_verb cxt5066_init_verbs_portd_lo[] = {
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         { } /* end */
 };
 
 
-static struct hda_verb cxt5066_init_verbs_hp_laptop[] = {
+static const struct hda_verb cxt5066_init_verbs_hp_laptop[] = {
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x0},
         {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
@@ -3027,20 +3023,11 @@ static struct hda_verb cxt5066_init_verbs_hp_laptop[] = {
 /* initialize jack-sensing, too */
 static int cxt5066_init(struct hda_codec *codec)
 {
-        struct conexant_spec *spec = codec->spec;
-
         snd_printdd("CXT5066: init\n");
         conexant_init(codec);
         if (codec->patch_ops.unsol_event) {
                 cxt5066_hp_automute(codec);
-                if (spec->dell_vostro)
-                        cxt5066_vostro_automic(codec);
-                else if (spec->ideapad)
-                        cxt5066_ideapad_automic(codec);
-                else if (spec->thinkpad)
-                        cxt5066_thinkpad_automic(codec);
-                else if (spec->hp_laptop)
-                        cxt5066_hp_laptop_automic(codec);
+                cxt5066_automic(codec);
         }
         cxt5066_set_mic_boost(codec);
         return 0;
@@ -3065,45 +3052,58 @@ enum {
         CXT5066_LAPTOP,         /* Laptops w/ EAPD support */
         CXT5066_DELL_LAPTOP,    /* Dell Laptop */
         CXT5066_OLPC_XO_1_5,    /* OLPC XO 1.5 */
-        CXT5066_DELL_VOSTO,     /* Dell Vostro 1015i */
+        CXT5066_DELL_VOSTRO,    /* Dell Vostro 1015i */
         CXT5066_IDEAPAD,        /* Lenovo IdeaPad U150 */
         CXT5066_THINKPAD,       /* Lenovo ThinkPad T410s, others? */
+        CXT5066_ASUS,           /* Asus K52JU, Lenovo G560 - Int mic at 0x1a and Ext mic at 0x1b */
         CXT5066_HP_LAPTOP,      /* HP Laptop */
+        CXT5066_AUTO,           /* BIOS auto-parser */
         CXT5066_MODELS
 };
 
-static const char *cxt5066_models[CXT5066_MODELS] = {
+static const char * const cxt5066_models[CXT5066_MODELS] = {
         [CXT5066_LAPTOP]        = "laptop",
         [CXT5066_DELL_LAPTOP]   = "dell-laptop",
         [CXT5066_OLPC_XO_1_5]   = "olpc-xo-1_5",
-        [CXT5066_DELL_VOSTO]    = "dell-vostro",
+        [CXT5066_DELL_VOSTRO]   = "dell-vostro",
         [CXT5066_IDEAPAD]       = "ideapad",
         [CXT5066_THINKPAD]      = "thinkpad",
+        [CXT5066_ASUS]          = "asus",
         [CXT5066_HP_LAPTOP]     = "hp-laptop",
+        [CXT5066_AUTO]          = "auto",
 };
 
-static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
-                      CXT5066_LAPTOP),
-        SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",
-                      CXT5066_DELL_LAPTOP),
-        SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
-        SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTO),
-        SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),
+static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
+        SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT5066_AUTO),
+        SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
+        SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1028, 0x0401, "Dell Vostro 1014", CXT5066_DELL_VOSTRO),
+        SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),
         SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1028, 0x050f, "Dell Inspiron", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x1028, 0x0510, "Dell Vostro", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),
+        SND_PCI_QUIRK(0x1043, 0x13f3, "Asus A52J", CXT5066_ASUS),
+        SND_PCI_QUIRK(0x1043, 0x1643, "Asus K52JU", CXT5066_ASUS),
+        SND_PCI_QUIRK(0x1043, 0x1993, "Asus U50F", CXT5066_ASUS),
         SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
         SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+        SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
+                      CXT5066_LAPTOP),
+        SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),
-        SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),
-        SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD),
-        SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
         SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
-        SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G series", CXT5066_IDEAPAD),
-        SND_PCI_QUIRK(0x17aa, 0x390a, "Lenovo S10-3t", CXT5066_IDEAPAD),
-        SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G series (AMD)", CXT5066_IDEAPAD),
-        SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
+        SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS),
+        SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),
+        SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G565", CXT5066_AUTO),
+        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback for Lenovos without dock mic */
+        SND_PCI_QUIRK(0x1b0a, 0x2092, "CyberpowerPC Gamer Xplorer N57001", CXT5066_AUTO),
         {}
 };
 
@@ -3112,6 +3112,15 @@ static int patch_cxt5066(struct hda_codec *codec)
         struct conexant_spec *spec;
         int board_config;
 
+        board_config = snd_hda_check_board_config(codec, CXT5066_MODELS,
+                                                  cxt5066_models, cxt5066_cfg_tbl);
+#if 0 /* use the old method just for safety */
+        if (board_config < 0)
+                board_config = CXT5066_AUTO;
+#endif
+        if (board_config == CXT5066_AUTO)
+                return patch_conexant_auto(codec);
+
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
                 return -ENOMEM;
@@ -3124,7 +3133,8 @@ static int patch_cxt5066(struct hda_codec *codec)
         spec->multiout.max_channels = 2;
         spec->multiout.num_dacs = ARRAY_SIZE(cxt5066_dac_nids);
         spec->multiout.dac_nids = cxt5066_dac_nids;
-        spec->multiout.dig_out_nid = CXT5066_SPDIF_OUT;
+        conexant_check_dig_outs(codec, cxt5066_digout_pin_nids,
+            ARRAY_SIZE(cxt5066_digout_pin_nids));
         spec->num_adc_nids = 1;
         spec->adc_nids = cxt5066_adc_nids;
         spec->capsrc_nids = cxt5066_capsrc_nids;
@@ -3141,8 +3151,6 @@ static int patch_cxt5066(struct hda_codec *codec)
 
         set_beep_amp(spec, 0x13, 0, HDA_OUTPUT);
 
-        board_config = snd_hda_check_board_config(codec, CXT5066_MODELS,
-                                                  cxt5066_models, cxt5066_cfg_tbl);
         switch (board_config) {
         default:
         case CXT5066_LAPTOP:
@@ -3158,17 +3166,20 @@ static int patch_cxt5066(struct hda_codec *codec)
                 spec->num_init_verbs++;
                 spec->dell_automute = 1;
                 break;
+        case CXT5066_ASUS:
         case CXT5066_HP_LAPTOP:
                 codec->patch_ops.init = cxt5066_init;
-                codec->patch_ops.unsol_event = cxt5066_hp_laptop_event;
+                codec->patch_ops.unsol_event = cxt5066_unsol_event;
                 spec->init_verbs[spec->num_init_verbs] =
                         cxt5066_init_verbs_hp_laptop;
                 spec->num_init_verbs++;
-                spec->hp_laptop = 1;
+                spec->hp_laptop = board_config == CXT5066_HP_LAPTOP;
+                spec->asus = board_config == CXT5066_ASUS;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixers;
                 /* no S/PDIF out */
-                spec->multiout.dig_out_nid = 0;
+                if (board_config == CXT5066_HP_LAPTOP)
+                        spec->multiout.dig_out_nid = 0;
                 /* input source automatically selected */
                 spec->input_mux = NULL;
                 spec->port_d_mode = 0;
@@ -3196,9 +3207,9 @@ static int patch_cxt5066(struct hda_codec *codec)
                 spec->capture_prepare = cxt5066_olpc_capture_prepare;
                 spec->capture_cleanup = cxt5066_olpc_capture_cleanup;
                 break;
-        case CXT5066_DELL_VOSTO:
+        case CXT5066_DELL_VOSTRO:
                 codec->patch_ops.init = cxt5066_init;
-                codec->patch_ops.unsol_event = cxt5066_vostro_event;
+                codec->patch_ops.unsol_event = cxt5066_unsol_event;
                 spec->init_verbs[0] = cxt5066_init_verbs_vostro;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixers;
@@ -3215,7 +3226,7 @@ static int patch_cxt5066(struct hda_codec *codec)
                 break;
         case CXT5066_IDEAPAD:
                 codec->patch_ops.init = cxt5066_init;
-                codec->patch_ops.unsol_event = cxt5066_ideapad_event;
+                codec->patch_ops.unsol_event = cxt5066_unsol_event;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixers;
                 spec->init_verbs[0] = cxt5066_init_verbs_ideapad;
@@ -3231,7 +3242,7 @@ static int patch_cxt5066(struct hda_codec *codec)
                 break;
         case CXT5066_THINKPAD:
                 codec->patch_ops.init = cxt5066_init;
-                codec->patch_ops.unsol_event = cxt5066_thinkpad_event;
+                codec->patch_ops.unsol_event = cxt5066_unsol_event;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixer_master;
                 spec->mixers[spec->num_mixers++] = cxt5066_mixers;
                 spec->init_verbs[0] = cxt5066_init_verbs_thinkpad;
@@ -3254,9 +3265,1117 @@ static int patch_cxt5066(struct hda_codec *codec)
 }
 
 /*
+ * Automatic parser for CX20641 & co
+ */
+
+static int cx_auto_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       struct snd_pcm_substream *substream)
+{
+        struct conexant_spec *spec = codec->spec;
+        hda_nid_t adc = spec->imux_info[spec->cur_mux[0]].adc;
+        if (spec->adc_switching) {
+                spec->cur_adc = adc;
+                spec->cur_adc_stream_tag = stream_tag;
+                spec->cur_adc_format = format;
+        }
+        snd_hda_codec_setup_stream(codec, adc, stream_tag, 0, format);
+        return 0;
+}
+
+static int cx_auto_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       struct snd_pcm_substream *substream)
+{
+        struct conexant_spec *spec = codec->spec;
+        snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
+        spec->cur_adc = 0;
+        return 0;
+}
+
+static const struct hda_pcm_stream cx_auto_pcm_analog_capture = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = 0, /* fill later */
+        .ops = {
+                .prepare = cx_auto_capture_pcm_prepare,
+                .cleanup = cx_auto_capture_pcm_cleanup
+        },
+};
+
+static const hda_nid_t cx_auto_adc_nids[] = { 0x14 };
+
+/* get the connection index of @nid in the widget @mux */
+static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,
+                                hda_nid_t nid)
+{
+        hda_nid_t conn[HDA_MAX_NUM_INPUTS];
+        int i, nums;
+
+        nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));
+        for (i = 0; i < nums; i++)
+                if (conn[i] == nid)
+                        return i;
+        return -1;
+}
+
+/* get an unassigned DAC from the given list.
+ * Return the nid if found and reduce the DAC list, or return zero if
+ * not found
+ */
+static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t pin,
+                                    hda_nid_t *dacs, int *num_dacs)
+{
+        int i, nums = *num_dacs;
+        hda_nid_t ret = 0;
+
+        for (i = 0; i < nums; i++) {
+                if (get_connection_index(codec, pin, dacs[i]) >= 0) {
+                        ret = dacs[i];
+                        break;
+                }
+        }
+        if (!ret)
+                return 0;
+        if (--nums > 0)
+                memmove(dacs, dacs + 1, nums * sizeof(hda_nid_t));
+        *num_dacs = nums;
+        return ret;
+}
+
+#define MAX_AUTO_DACS   5
+
+/* fill analog DAC list from the widget tree */
+static int fill_cx_auto_dacs(struct hda_codec *codec, hda_nid_t *dacs)
+{
+        hda_nid_t nid, end_nid;
+        int nums = 0;
+
+        end_nid = codec->start_nid + codec->num_nodes;
+        for (nid = codec->start_nid; nid < end_nid; nid++) {
+                unsigned int wcaps = get_wcaps(codec, nid);
+                unsigned int type = get_wcaps_type(wcaps);
+                if (type == AC_WID_AUD_OUT && !(wcaps & AC_WCAP_DIGITAL)) {
+                        dacs[nums++] = nid;
+                        if (nums >= MAX_AUTO_DACS)
+                                break;
+                }
+        }
+        return nums;
+}
+
+/* fill pin_dac_pair list from the pin and dac list */
+static int fill_dacs_for_pins(struct hda_codec *codec, hda_nid_t *pins,
+                              int num_pins, hda_nid_t *dacs, int *rest,
+                              struct pin_dac_pair *filled, int type)
+{
+        int i, nums;
+
+        nums = 0;
+        for (i = 0; i < num_pins; i++) {
+                filled[nums].pin = pins[i];
+                filled[nums].type = type;
+                filled[nums].dac = get_unassigned_dac(codec, pins[i], dacs, rest);
+                nums++;
+        }
+        return nums;
+}
+
+/* parse analog output paths */
+static void cx_auto_parse_output(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        hda_nid_t dacs[MAX_AUTO_DACS];
+        int i, j, nums, rest;
+
+        rest = fill_cx_auto_dacs(codec, dacs);
+        /* parse all analog output pins */
+        nums = fill_dacs_for_pins(codec, cfg->line_out_pins, cfg->line_outs,
+                                  dacs, &rest, spec->dac_info,
+                                  AUTO_PIN_LINE_OUT);
+        nums += fill_dacs_for_pins(codec, cfg->hp_pins, cfg->hp_outs,
+                                  dacs, &rest, spec->dac_info + nums,
+                                  AUTO_PIN_HP_OUT);
+        nums += fill_dacs_for_pins(codec, cfg->speaker_pins, cfg->speaker_outs,
+                                  dacs, &rest, spec->dac_info + nums,
+                                  AUTO_PIN_SPEAKER_OUT);
+        spec->dac_info_filled = nums;
+        /* fill multiout struct */
+        for (i = 0; i < nums; i++) {
+                hda_nid_t dac = spec->dac_info[i].dac;
+                if (!dac)
+                        continue;
+                switch (spec->dac_info[i].type) {
+                case AUTO_PIN_LINE_OUT:
+                        spec->private_dac_nids[spec->multiout.num_dacs] = dac;
+                        spec->multiout.num_dacs++;
+                        break;
+                case AUTO_PIN_HP_OUT:
+                case AUTO_PIN_SPEAKER_OUT:
+                        if (!spec->multiout.hp_nid) {
+                                spec->multiout.hp_nid = dac;
+                                break;
+                        }
+                        for (j = 0; j < ARRAY_SIZE(spec->multiout.extra_out_nid); j++)
+                                if (!spec->multiout.extra_out_nid[j]) {
+                                        spec->multiout.extra_out_nid[j] = dac;
+                                        break;
+                                }
+                        break;
+                }
+        }
+        spec->multiout.dac_nids = spec->private_dac_nids;
+        spec->multiout.max_channels = spec->multiout.num_dacs * 2;
+
+        for (i = 0; i < cfg->hp_outs; i++) {
+                if (is_jack_detectable(codec, cfg->hp_pins[i])) {
+                        spec->auto_mute = 1;
+                        break;
+                }
+        }
+        if (spec->auto_mute &&
+            cfg->line_out_pins[0] &&
+            cfg->line_out_type != AUTO_PIN_SPEAKER_OUT &&
+            cfg->line_out_pins[0] != cfg->hp_pins[0] &&
+            cfg->line_out_pins[0] != cfg->speaker_pins[0]) {
+                for (i = 0; i < cfg->line_outs; i++) {
+                        if (is_jack_detectable(codec, cfg->line_out_pins[i])) {
+                                spec->detect_line = 1;
+                                break;
+                        }
+                }
+                spec->automute_lines = spec->detect_line;
+        }
+
+        spec->vmaster_nid = spec->private_dac_nids[0];
+}
+
+static void cx_auto_turn_eapd(struct hda_codec *codec, int num_pins,
+                              hda_nid_t *pins, bool on);
+
+static void do_automute(struct hda_codec *codec, int num_pins,
+                        hda_nid_t *pins, bool on)
+{
+        int i;
+        for (i = 0; i < num_pins; i++)
+                snd_hda_codec_write(codec, pins[i], 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                    on ? PIN_OUT : 0);
+        cx_auto_turn_eapd(codec, num_pins, pins, on);
+}
+
+static int detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins)
+{
+        int i, present = 0;
+
+        for (i = 0; i < num_pins; i++) {
+                hda_nid_t nid = pins[i];
+                if (!nid || !is_jack_detectable(codec, nid))
+                        break;
+                snd_hda_input_jack_report(codec, nid);
+                present |= snd_hda_jack_detect(codec, nid);
+        }
+        return present;
+}
+
+/* auto-mute/unmute speaker and line outs according to headphone jack */
+static void cx_auto_update_speakers(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int on = 1;
+
+        /* turn on HP EAPD when HP jacks are present */
+        if (spec->auto_mute)
+                on = spec->hp_present;
+        cx_auto_turn_eapd(codec, cfg->hp_outs, cfg->hp_pins, on);
+        /* mute speakers in auto-mode if HP or LO jacks are plugged */
+        if (spec->auto_mute)
+                on = !(spec->hp_present ||
+                       (spec->detect_line && spec->line_present));
+        do_automute(codec, cfg->speaker_outs, cfg->speaker_pins, on);
+
+        /* toggle line-out mutes if needed, too */
+        /* if LO is a copy of either HP or Speaker, don't need to handle it */
+        if (cfg->line_out_pins[0] == cfg->hp_pins[0] ||
+            cfg->line_out_pins[0] == cfg->speaker_pins[0])
+                return;
+        if (spec->auto_mute) {
+                /* mute LO in auto-mode when HP jack is present */
+                if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT ||
+                    spec->automute_lines)
+                        on = !spec->hp_present;
+                else
+                        on = 1;
+        }
+        do_automute(codec, cfg->line_outs, cfg->line_out_pins, on);
+}
+
+static void cx_auto_hp_automute(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+
+        if (!spec->auto_mute)
+                return;
+        spec->hp_present = detect_jacks(codec, cfg->hp_outs, cfg->hp_pins);
+        cx_auto_update_speakers(codec);
+}
+
+static void cx_auto_line_automute(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+
+        if (!spec->auto_mute || !spec->detect_line)
+                return;
+        spec->line_present = detect_jacks(codec, cfg->line_outs,
+                                          cfg->line_out_pins);
+        cx_auto_update_speakers(codec);
+}
+
+static int cx_automute_mode_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        static const char * const texts2[] = {
+                "Disabled", "Enabled"
+        };
+        static const char * const texts3[] = {
+                "Disabled", "Speaker Only", "Line-Out+Speaker"
+        };
+        const char * const *texts;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        if (spec->automute_hp_lo) {
+                uinfo->value.enumerated.items = 3;
+                texts = texts3;
+        } else {
+                uinfo->value.enumerated.items = 2;
+                texts = texts2;
+        }
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int cx_automute_mode_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+        unsigned int val;
+        if (!spec->auto_mute)
+                val = 0;
+        else if (!spec->automute_lines)
+                val = 1;
+        else
+                val = 2;
+        ucontrol->value.enumerated.item[0] = val;
+        return 0;
+}
+
+static int cx_automute_mode_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+
+        switch (ucontrol->value.enumerated.item[0]) {
+        case 0:
+                if (!spec->auto_mute)
+                        return 0;
+                spec->auto_mute = 0;
+                break;
+        case 1:
+                if (spec->auto_mute && !spec->automute_lines)
+                        return 0;
+                spec->auto_mute = 1;
+                spec->automute_lines = 0;
+                break;
+        case 2:
+                if (!spec->automute_hp_lo)
+                        return -EINVAL;
+                if (spec->auto_mute && spec->automute_lines)
+                        return 0;
+                spec->auto_mute = 1;
+                spec->automute_lines = 1;
+                break;
+        default:
+                return -EINVAL;
+        }
+        cx_auto_update_speakers(codec);
+        return 1;
+}
+
+static const struct snd_kcontrol_new cx_automute_mode_enum[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Auto-Mute Mode",
+                .info = cx_automute_mode_info,
+                .get = cx_automute_mode_get,
+                .put = cx_automute_mode_put,
+        },
+        { }
+};
+
+static int cx_auto_mux_enum_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+
+        return snd_hda_input_mux_info(&spec->private_imux, uinfo);
+}
+
+static int cx_auto_mux_enum_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+
+        ucontrol->value.enumerated.item[0] = spec->cur_mux[0];
+        return 0;
+}
+
+/* look for the route the given pin from mux and return the index;
+ * if do_select is set, actually select the route.
+ */
+static int __select_input_connection(struct hda_codec *codec, hda_nid_t mux,
+                                     hda_nid_t pin, hda_nid_t *srcp,
+                                     bool do_select, int depth)
+{
+        hda_nid_t conn[HDA_MAX_NUM_INPUTS];
+        int i, nums;
+
+        switch (get_wcaps_type(get_wcaps(codec, mux))) {
+        case AC_WID_AUD_IN:
+        case AC_WID_AUD_SEL:
+        case AC_WID_AUD_MIX:
+                break;
+        default:
+                return -1;
+        }
+
+        nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));
+        for (i = 0; i < nums; i++)
+                if (conn[i] == pin) {
+                        if (do_select)
+                                snd_hda_codec_write(codec, mux, 0,
+                                                    AC_VERB_SET_CONNECT_SEL, i);
+                        if (srcp)
+                                *srcp = mux;
+                        return i;
+                }
+        depth++;
+        if (depth == 2)
+                return -1;
+        for (i = 0; i < nums; i++) {
+                int ret  = __select_input_connection(codec, conn[i], pin, srcp,
+                                                     do_select, depth);
+                if (ret >= 0) {
+                        if (do_select)
+                                snd_hda_codec_write(codec, mux, 0,
+                                                    AC_VERB_SET_CONNECT_SEL, i);
+                        return i;
+                }
+        }
+        return -1;
+}
+
+static void select_input_connection(struct hda_codec *codec, hda_nid_t mux,
+                                   hda_nid_t pin)
+{
+        __select_input_connection(codec, mux, pin, NULL, true, 0);
+}
+
+static int get_input_connection(struct hda_codec *codec, hda_nid_t mux,
+                                hda_nid_t pin)
+{
+        return __select_input_connection(codec, mux, pin, NULL, false, 0);
+}
+
+static int cx_auto_mux_enum_update(struct hda_codec *codec,
+                                   const struct hda_input_mux *imux,
+                                   unsigned int idx)
+{
+        struct conexant_spec *spec = codec->spec;
+        hda_nid_t adc;
+        int changed = 1;
+
+        if (!imux->num_items)
+                return 0;
+        if (idx >= imux->num_items)
+                idx = imux->num_items - 1;
+        if (spec->cur_mux[0] == idx)
+                changed = 0;
+        adc = spec->imux_info[idx].adc;
+        select_input_connection(codec, spec->imux_info[idx].adc,
+                                spec->imux_info[idx].pin);
+        if (spec->cur_adc && spec->cur_adc != adc) {
+                /* stream is running, let's swap the current ADC */
+                __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
+                spec->cur_adc = adc;
+                snd_hda_codec_setup_stream(codec, adc,
+                                           spec->cur_adc_stream_tag, 0,
+                                           spec->cur_adc_format);
+        }
+        spec->cur_mux[0] = idx;
+        return changed;
+}
+
+static int cx_auto_mux_enum_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct conexant_spec *spec = codec->spec;
+
+        return cx_auto_mux_enum_update(codec, &spec->private_imux,
+                                       ucontrol->value.enumerated.item[0]);
+}
+
+static const struct snd_kcontrol_new cx_auto_capture_mixers[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = cx_auto_mux_enum_info,
+                .get = cx_auto_mux_enum_get,
+                .put = cx_auto_mux_enum_put
+        },
+        {}
+};
+
+static bool select_automic(struct hda_codec *codec, int idx, bool detect)
+{
+        struct conexant_spec *spec = codec->spec;
+        if (idx < 0)
+                return false;
+        if (detect && !snd_hda_jack_detect(codec, spec->imux_info[idx].pin))
+                return false;
+        cx_auto_mux_enum_update(codec, &spec->private_imux, idx);
+        return true;
+}
+
+/* automatic switch internal and external mic */
+static void cx_auto_automic(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+
+        if (!spec->auto_mic)
+                return;
+        if (!select_automic(codec, spec->auto_mic_ext, true))
+                if (!select_automic(codec, spec->auto_mic_dock, true))
+                        select_automic(codec, spec->auto_mic_int, false);
+}
+
+static void cx_auto_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        int nid = (res & AC_UNSOL_RES_SUBTAG) >> 20;
+        switch (res >> 26) {
+        case CONEXANT_HP_EVENT:
+                cx_auto_hp_automute(codec);
+                break;
+        case CONEXANT_LINE_EVENT:
+                cx_auto_line_automute(codec);
+                break;
+        case CONEXANT_MIC_EVENT:
+                cx_auto_automic(codec);
+                snd_hda_input_jack_report(codec, nid);
+                break;
+        }
+}
+
+/* check whether the pin config is suitable for auto-mic switching;
+ * auto-mic is enabled only when one int-mic and one ext- and/or
+ * one dock-mic exist
+ */
+static void cx_auto_check_auto_mic(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        int pset[INPUT_PIN_ATTR_NORMAL + 1];
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pset); i++)
+                pset[i] = -1;
+        for (i = 0; i < spec->private_imux.num_items; i++) {
+                hda_nid_t pin = spec->imux_info[i].pin;
+                unsigned int def_conf = snd_hda_codec_get_pincfg(codec, pin);
+                int type, attr;
+                attr = snd_hda_get_input_pin_attr(def_conf);
+                if (attr == INPUT_PIN_ATTR_UNUSED)
+                        return; /* invalid entry */
+                if (attr > INPUT_PIN_ATTR_NORMAL)
+                        attr = INPUT_PIN_ATTR_NORMAL;
+                if (attr != INPUT_PIN_ATTR_INT &&
+                    !is_jack_detectable(codec, pin))
+                        return; /* non-detectable pin */
+                type = get_defcfg_device(def_conf);
+                if (type != AC_JACK_MIC_IN &&
+                    (attr != INPUT_PIN_ATTR_DOCK || type != AC_JACK_LINE_IN))
+                        return; /* no valid input type */
+                if (pset[attr] >= 0)
+                        return; /* already occupied */
+                pset[attr] = i;
+        }
+        if (pset[INPUT_PIN_ATTR_INT] < 0 ||
+            (pset[INPUT_PIN_ATTR_NORMAL] < 0 && pset[INPUT_PIN_ATTR_DOCK]))
+                return; /* no input to switch*/
+        spec->auto_mic = 1;
+        spec->auto_mic_ext = pset[INPUT_PIN_ATTR_NORMAL];
+        spec->auto_mic_dock = pset[INPUT_PIN_ATTR_DOCK];
+        spec->auto_mic_int = pset[INPUT_PIN_ATTR_INT];
+}
+
+static void cx_auto_parse_input(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        struct hda_input_mux *imux;
+        int i, j;
+
+        imux = &spec->private_imux;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                for (j = 0; j < spec->num_adc_nids; j++) {
+                        hda_nid_t adc = spec->adc_nids[j];
+                        int idx = get_input_connection(codec, adc,
+                                                       cfg->inputs[i].pin);
+                        if (idx >= 0) {
+                                const char *label;
+                                label = hda_get_autocfg_input_label(codec, cfg, i);
+                                spec->imux_info[imux->num_items].index = i;
+                                spec->imux_info[imux->num_items].boost = 0;
+                                spec->imux_info[imux->num_items].adc = adc;
+                                spec->imux_info[imux->num_items].pin =
+                                        cfg->inputs[i].pin;
+                                snd_hda_add_imux_item(imux, label, idx, NULL);
+                                break;
+                        }
+                }
+        }
+        if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items)
+                cx_auto_check_auto_mic(codec);
+        if (imux->num_items > 1 && !spec->auto_mic) {
+                for (i = 1; i < imux->num_items; i++) {
+                        if (spec->imux_info[i].adc != spec->imux_info[0].adc) {
+                                spec->adc_switching = 1;
+                                break;
+                        }
+                }
+        }
+}
+
+/* get digital-input audio widget corresponding to the given pin */
+static hda_nid_t cx_auto_get_dig_in(struct hda_codec *codec, hda_nid_t pin)
+{
+        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 wcaps = get_wcaps(codec, nid);
+                unsigned int type = get_wcaps_type(wcaps);
+                if (type == AC_WID_AUD_IN && (wcaps & AC_WCAP_DIGITAL)) {
+                        if (get_connection_index(codec, nid, pin) >= 0)
+                                return nid;
+                }
+        }
+        return 0;
+}
+
+static void cx_auto_parse_digital(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        hda_nid_t nid;
+
+        if (cfg->dig_outs &&
+            snd_hda_get_connections(codec, cfg->dig_out_pins[0], &nid, 1) == 1)
+                spec->multiout.dig_out_nid = nid;
+        if (cfg->dig_in_pin)
+                spec->dig_in_nid = cx_auto_get_dig_in(codec, cfg->dig_in_pin);
+}
+
+#ifdef CONFIG_SND_HDA_INPUT_BEEP
+static void cx_auto_parse_beep(struct hda_codec *codec)
+{
+        struct conexant_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++)
+                if (get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_BEEP) {
+                        set_beep_amp(spec, nid, 0, HDA_OUTPUT);
+                        break;
+                }
+}
+#else
+#define cx_auto_parse_beep(codec)
+#endif
+
+static int cx_auto_parse_auto_config(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        int err;
+
+        err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL);
+        if (err < 0)
+                return err;
+
+        cx_auto_parse_output(codec);
+        cx_auto_parse_input(codec);
+        cx_auto_parse_digital(codec);
+        cx_auto_parse_beep(codec);
+        return 0;
+}
+
+static void cx_auto_turn_eapd(struct hda_codec *codec, int num_pins,
+                              hda_nid_t *pins, bool on)
+{
+        int i;
+        for (i = 0; i < num_pins; i++) {
+                if (snd_hda_query_pin_caps(codec, pins[i]) & AC_PINCAP_EAPD)
+                        snd_hda_codec_write(codec, pins[i], 0,
+                                            AC_VERB_SET_EAPD_BTLENABLE,
+                                            on ? 0x02 : 0);
+        }
+}
+
+static void select_connection(struct hda_codec *codec, hda_nid_t pin,
+                              hda_nid_t src)
+{
+        int idx = get_connection_index(codec, pin, src);
+        if (idx >= 0)
+                snd_hda_codec_write(codec, pin, 0,
+                                    AC_VERB_SET_CONNECT_SEL, idx);
+}
+
+static void mute_outputs(struct hda_codec *codec, int num_nids,
+                         const hda_nid_t *nids)
+{
+        int i, val;
+
+        for (i = 0; i < num_nids; i++) {
+                hda_nid_t nid = nids[i];
+                if (!(get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
+                        continue;
+                if (query_amp_caps(codec, nid, HDA_OUTPUT) & AC_AMPCAP_MUTE)
+                        val = AMP_OUT_MUTE;
+                else
+                        val = AMP_OUT_ZERO;
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, val);
+        }
+}
+
+static void enable_unsol_pins(struct hda_codec *codec, int num_pins,
+                              hda_nid_t *pins, unsigned int tag)
+{
+        int i;
+        for (i = 0; i < num_pins; i++)
+                snd_hda_codec_write(codec, pins[i], 0,
+                                    AC_VERB_SET_UNSOLICITED_ENABLE,
+                                    AC_USRSP_EN | tag);
+}
+
+static void cx_auto_init_output(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        hda_nid_t nid;
+        int i;
+
+        mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids);
+        for (i = 0; i < cfg->hp_outs; i++)
+                snd_hda_codec_write(codec, cfg->hp_pins[i], 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
+        mute_outputs(codec, cfg->hp_outs, cfg->hp_pins);
+        mute_outputs(codec, cfg->line_outs, cfg->line_out_pins);
+        mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins);
+        for (i = 0; i < spec->dac_info_filled; i++) {
+                nid = spec->dac_info[i].dac;
+                if (!nid)
+                        nid = spec->multiout.dac_nids[0];
+                select_connection(codec, spec->dac_info[i].pin, nid);
+        }
+        if (spec->auto_mute) {
+                enable_unsol_pins(codec, cfg->hp_outs, cfg->hp_pins,
+                                  CONEXANT_HP_EVENT);
+                spec->hp_present = detect_jacks(codec, cfg->hp_outs,
+                                                cfg->hp_pins);
+                if (spec->detect_line) {
+                        enable_unsol_pins(codec, cfg->line_outs,
+                                          cfg->line_out_pins,
+                                          CONEXANT_LINE_EVENT);
+                        spec->line_present =
+                                detect_jacks(codec, cfg->line_outs,
+                                             cfg->line_out_pins);
+                }
+        }
+        cx_auto_update_speakers(codec);
+}
+
+static void cx_auto_init_input(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int i, val;
+
+        for (i = 0; i < spec->num_adc_nids; i++) {
+                hda_nid_t nid = spec->adc_nids[i];
+                if (!(get_wcaps(codec, nid) & AC_WCAP_IN_AMP))
+                        continue;
+                if (query_amp_caps(codec, nid, HDA_INPUT) & AC_AMPCAP_MUTE)
+                        val = AMP_IN_MUTE(0);
+                else
+                        val = AMP_IN_UNMUTE(0);
+                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                                    val);
+        }
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                unsigned int type;
+                if (cfg->inputs[i].type == AUTO_PIN_MIC)
+                        type = PIN_VREF80;
+                else
+                        type = PIN_IN;
+                snd_hda_codec_write(codec, cfg->inputs[i].pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, type);
+        }
+
+        if (spec->auto_mic) {
+                if (spec->auto_mic_ext >= 0) {
+                        snd_hda_codec_write(codec,
+                                cfg->inputs[spec->auto_mic_ext].pin, 0,
+                                AC_VERB_SET_UNSOLICITED_ENABLE,
+                                AC_USRSP_EN | CONEXANT_MIC_EVENT);
+                }
+                if (spec->auto_mic_dock >= 0) {
+                        snd_hda_codec_write(codec,
+                                cfg->inputs[spec->auto_mic_dock].pin, 0,
+                                AC_VERB_SET_UNSOLICITED_ENABLE,
+                                AC_USRSP_EN | CONEXANT_MIC_EVENT);
+                }
+                cx_auto_automic(codec);
+        } else {
+                select_input_connection(codec, spec->imux_info[0].adc,
+                                        spec->imux_info[0].pin);
+        }
+}
+
+static void cx_auto_init_digital(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+
+        if (spec->multiout.dig_out_nid)
+                snd_hda_codec_write(codec, cfg->dig_out_pins[0], 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+        if (spec->dig_in_nid)
+                snd_hda_codec_write(codec, cfg->dig_in_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN);
+}
+
+static int cx_auto_init(struct hda_codec *codec)
+{
+        /*snd_hda_sequence_write(codec, cx_auto_init_verbs);*/
+        cx_auto_init_output(codec);
+        cx_auto_init_input(codec);
+        cx_auto_init_digital(codec);
+        return 0;
+}
+
+static int cx_auto_add_volume_idx(struct hda_codec *codec, const char *basename,
+                              const char *dir, int cidx,
+                              hda_nid_t nid, int hda_dir, int amp_idx)
+{
+        static char name[32];
+        static struct snd_kcontrol_new knew[] = {
+                HDA_CODEC_VOLUME(name, 0, 0, 0),
+                HDA_CODEC_MUTE(name, 0, 0, 0),
+        };
+        static const char * const sfx[2] = { "Volume", "Switch" };
+        int i, err;
+
+        for (i = 0; i < 2; i++) {
+                struct snd_kcontrol *kctl;
+                knew[i].private_value = HDA_COMPOSE_AMP_VAL(nid, 3, amp_idx,
+                                                            hda_dir);
+                knew[i].subdevice = HDA_SUBDEV_AMP_FLAG;
+                knew[i].index = cidx;
+                snprintf(name, sizeof(name), "%s%s %s", basename, dir, sfx[i]);
+                kctl = snd_ctl_new1(&knew[i], codec);
+                if (!kctl)
+                        return -ENOMEM;
+                err = snd_hda_ctl_add(codec, nid, kctl);
+                if (err < 0)
+                        return err;
+                if (!(query_amp_caps(codec, nid, hda_dir) & AC_AMPCAP_MUTE))
+                        break;
+        }
+        return 0;
+}
+
+#define cx_auto_add_volume(codec, str, dir, cidx, nid, hda_dir)         \
+        cx_auto_add_volume_idx(codec, str, dir, cidx, nid, hda_dir, 0)
+
+#define cx_auto_add_pb_volume(codec, nid, str, idx)                     \
+        cx_auto_add_volume(codec, str, " Playback", idx, nid, HDA_OUTPUT)
+
+static int try_add_pb_volume(struct hda_codec *codec, hda_nid_t dac,
+                             hda_nid_t pin, const char *name, int idx)
+{
+        unsigned int caps;
+        caps = query_amp_caps(codec, dac, HDA_OUTPUT);
+        if (caps & AC_AMPCAP_NUM_STEPS)
+                return cx_auto_add_pb_volume(codec, dac, name, idx);
+        caps = query_amp_caps(codec, pin, HDA_OUTPUT);
+        if (caps & AC_AMPCAP_NUM_STEPS)
+                return cx_auto_add_pb_volume(codec, pin, name, idx);
+        return 0;
+}
+
+static int cx_auto_build_output_controls(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        int i, err;
+        int num_line = 0, num_hp = 0, num_spk = 0;
+        static const char * const texts[3] = { "Front", "Surround", "CLFE" };
+
+        if (spec->dac_info_filled == 1)
+                return try_add_pb_volume(codec, spec->dac_info[0].dac,
+                                         spec->dac_info[0].pin,
+                                         "Master", 0);
+
+        for (i = 0; i < spec->dac_info_filled; i++) {
+                const char *label;
+                int idx, type;
+                if (!spec->dac_info[i].dac)
+                        continue;
+                type = spec->dac_info[i].type;
+                if (type == AUTO_PIN_LINE_OUT)
+                        type = spec->autocfg.line_out_type;
+                switch (type) {
+                case AUTO_PIN_LINE_OUT:
+                default:
+                        label = texts[num_line++];
+                        idx = 0;
+                        break;
+                case AUTO_PIN_HP_OUT:
+                        label = "Headphone";
+                        idx = num_hp++;
+                        break;
+                case AUTO_PIN_SPEAKER_OUT:
+                        label = "Speaker";
+                        idx = num_spk++;
+                        break;
+                }
+                err = try_add_pb_volume(codec, spec->dac_info[i].dac,
+                                        spec->dac_info[i].pin,
+                                        label, idx);
+                if (err < 0)
+                        return err;
+        }
+
+        if (spec->auto_mute) {
+                err = snd_hda_add_new_ctls(codec, cx_automute_mode_enum);
+                if (err < 0)
+                        return err;
+        }
+        
+        return 0;
+}
+
+static int cx_auto_add_capture_volume(struct hda_codec *codec, hda_nid_t nid,
+                                      const char *label, const char *pfx,
+                                      int cidx)
+{
+        struct conexant_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->num_adc_nids; i++) {
+                hda_nid_t adc_nid = spec->adc_nids[i];
+                int idx = get_input_connection(codec, adc_nid, nid);
+                if (idx < 0)
+                        continue;
+                return cx_auto_add_volume_idx(codec, label, pfx,
+                                              cidx, adc_nid, HDA_INPUT, idx);
+        }
+        return 0;
+}
+
+static int cx_auto_add_boost_volume(struct hda_codec *codec, int idx,
+                                    const char *label, int cidx)
+{
+        struct conexant_spec *spec = codec->spec;
+        hda_nid_t mux, nid;
+        int i, con;
+
+        nid = spec->imux_info[idx].pin;
+        if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)
+                return cx_auto_add_volume(codec, label, " Boost", cidx,
+                                          nid, HDA_INPUT);
+        con = __select_input_connection(codec, spec->imux_info[idx].adc, nid,
+                                        &mux, false, 0);
+        if (con < 0)
+                return 0;
+        for (i = 0; i < idx; i++) {
+                if (spec->imux_info[i].boost == mux)
+                        return 0; /* already present */
+        }
+
+        if (get_wcaps(codec, mux) & AC_WCAP_OUT_AMP) {
+                spec->imux_info[idx].boost = mux;
+                return cx_auto_add_volume(codec, label, " Boost", 0,
+                                          mux, HDA_OUTPUT);
+        }
+        return 0;
+}
+
+static int cx_auto_build_input_controls(struct hda_codec *codec)
+{
+        struct conexant_spec *spec = codec->spec;
+        struct hda_input_mux *imux = &spec->private_imux;
+        const char *prev_label;
+        int input_conn[HDA_MAX_NUM_INPUTS];
+        int i, err, cidx;
+        int multi_connection;
+
+        multi_connection = 0;
+        for (i = 0; i < imux->num_items; i++) {
+                cidx = get_input_connection(codec, spec->imux_info[i].adc,
+                                            spec->imux_info[i].pin);
+                input_conn[i] = (spec->imux_info[i].adc << 8) | cidx;
+                if (i > 0 && input_conn[i] != input_conn[0])
+                        multi_connection = 1;
+        }
+
+        prev_label = NULL;
+        cidx = 0;
+        for (i = 0; i < imux->num_items; i++) {
+                hda_nid_t nid = spec->imux_info[i].pin;
+                const char *label;
+
+                label = hda_get_autocfg_input_label(codec, &spec->autocfg,
+                                                    spec->imux_info[i].index);
+                if (label == prev_label)
+                        cidx++;
+                else
+                        cidx = 0;
+                prev_label = label;
+
+                err = cx_auto_add_boost_volume(codec, i, label, cidx);
+                if (err < 0)
+                        return err;
+
+                if (!multi_connection) {
+                        if (i > 0)
+                                continue;
+                        err = cx_auto_add_capture_volume(codec, nid,
+                                                         "Capture", "", cidx);
+                } else {
+                        err = cx_auto_add_capture_volume(codec, nid,
+                                                         label, " Capture", cidx);
+                }
+                if (err < 0)
+                        return err;
+        }
+
+        if (spec->private_imux.num_items > 1 && !spec->auto_mic) {
+                err = snd_hda_add_new_ctls(codec, cx_auto_capture_mixers);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int cx_auto_build_controls(struct hda_codec *codec)
+{
+        int err;
+
+        err = cx_auto_build_output_controls(codec);
+        if (err < 0)
+                return err;
+        err = cx_auto_build_input_controls(codec);
+        if (err < 0)
+                return err;
+        return conexant_build_controls(codec);
+}
+
+static int cx_auto_search_adcs(struct hda_codec *codec)
+{
+        struct conexant_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 caps = get_wcaps(codec, nid);
+                if (get_wcaps_type(caps) != AC_WID_AUD_IN)
+                        continue;
+                if (caps & AC_WCAP_DIGITAL)
+                        continue;
+                if (snd_BUG_ON(spec->num_adc_nids >=
+                               ARRAY_SIZE(spec->private_adc_nids)))
+                        break;
+                spec->private_adc_nids[spec->num_adc_nids++] = nid;
+        }
+        spec->adc_nids = spec->private_adc_nids;
+        return 0;
+}
+
+
+static const struct hda_codec_ops cx_auto_patch_ops = {
+        .build_controls = cx_auto_build_controls,
+        .build_pcms = conexant_build_pcms,
+        .init = cx_auto_init,
+        .free = conexant_free,
+        .unsol_event = cx_auto_unsol_event,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        .suspend = conexant_suspend,
+#endif
+        .reboot_notify = snd_hda_shutup_pins,
+};
+
+static int patch_conexant_auto(struct hda_codec *codec)
+{
+        struct conexant_spec *spec;
+        int err;
+
+        printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
+               codec->chip_name);
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (!spec)
+                return -ENOMEM;
+        codec->spec = spec;
+        codec->pin_amp_workaround = 1;
+        err = cx_auto_search_adcs(codec);
+        if (err < 0)
+                return err;
+        err = cx_auto_parse_auto_config(codec);
+        if (err < 0) {
+                kfree(codec->spec);
+                codec->spec = NULL;
+                return err;
+        }
+        spec->capture_stream = &cx_auto_pcm_analog_capture;
+        codec->patch_ops = cx_auto_patch_ops;
+        if (spec->beep_amp)
+                snd_hda_attach_beep_device(codec, spec->beep_amp);
+        return 0;
+}
+
+/*
  */
 
-static struct hda_codec_preset snd_hda_preset_conexant[] = {
+static const struct hda_codec_preset snd_hda_preset_conexant[] = {
         { .id = 0x14f15045, .name = "CX20549 (Venice)",
           .patch = patch_cxt5045 },
         { .id = 0x14f15047, .name = "CX20551 (Waikiki)",
@@ -3271,6 +4390,26 @@ static struct hda_codec_preset snd_hda_preset_conexant[] = {
           .patch = patch_cxt5066 },
         { .id = 0x14f15069, .name = "CX20585",
           .patch = patch_cxt5066 },
+        { .id = 0x14f1506c, .name = "CX20588",
+          .patch = patch_cxt5066 },
+        { .id = 0x14f1506e, .name = "CX20590",
+          .patch = patch_cxt5066 },
+        { .id = 0x14f15097, .name = "CX20631",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f15098, .name = "CX20632",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150a1, .name = "CX20641",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150a2, .name = "CX20642",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150ab, .name = "CX20651",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150ac, .name = "CX20652",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150b8, .name = "CX20664",
+          .patch = patch_conexant_auto },
+        { .id = 0x14f150b9, .name = "CX20665",
+          .patch = patch_conexant_auto },
         {} /* terminator */
 };
 
@@ -3281,6 +4420,16 @@ MODULE_ALIAS("snd-hda-codec-id:14f15066");
 MODULE_ALIAS("snd-hda-codec-id:14f15067");
 MODULE_ALIAS("snd-hda-codec-id:14f15068");
 MODULE_ALIAS("snd-hda-codec-id:14f15069");
+MODULE_ALIAS("snd-hda-codec-id:14f1506c");
+MODULE_ALIAS("snd-hda-codec-id:14f1506e");
+MODULE_ALIAS("snd-hda-codec-id:14f15097");
+MODULE_ALIAS("snd-hda-codec-id:14f15098");
+MODULE_ALIAS("snd-hda-codec-id:14f150a1");
+MODULE_ALIAS("snd-hda-codec-id:14f150a2");
+MODULE_ALIAS("snd-hda-codec-id:14f150ab");
+MODULE_ALIAS("snd-hda-codec-id:14f150ac");
+MODULE_ALIAS("snd-hda-codec-id:14f150b8");
+MODULE_ALIAS("snd-hda-codec-id:14f150b9");
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Conexant HD-audio codec");
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index afd6022a96a7..bd0ae697f9c4 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -3,6 +3,9 @@
  *  patch_hdmi.c - routines for HDMI/DisplayPort codecs
  *
  *  Copyright(c) 2008-2010 Intel Corporation. All rights reserved.
+ *  Copyright (c) 2006 ATI Technologies Inc.
+ *  Copyright (c) 2008 NVIDIA Corp.  All rights reserved.
+ *  Copyright (c) 2008 Wei Ni <wni@nvidia.com>
  *
  *  Authors:
  *                      Wu Fengguang <wfg@linux.intel.com>
@@ -25,6 +28,28 @@
  *  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/moduleparam.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include "hda_codec.h"
+#include "hda_local.h"
+
+static bool static_hdmi_pcm;
+module_param(static_hdmi_pcm, bool, 0644);
+MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
+
+/*
+ * The HDMI/DisplayPort configuration can be highly dynamic. A graphics device
+ * could support two independent pipes, each of them can be connected to one or
+ * more ports (DVI, HDMI or DisplayPort).
+ *
+ * The HDA correspondence of pipes/ports are converter/pin nodes.
+ */
+#define MAX_HDMI_CVTS   4
+#define MAX_HDMI_PINS   4
 
 struct hdmi_spec {
         int num_cvts;
@@ -49,14 +74,10 @@ struct hdmi_spec {
         struct hda_pcm_stream codec_pcm_pars[MAX_HDMI_CVTS];
 
         /*
-         * nvhdmi specific
+         * ati/nvhdmi specific
          */
         struct hda_multi_out multiout;
-        unsigned int codec_type;
-
-        /* misc flags */
-        /* PD bit indicates only the update, not the current state */
-        unsigned int old_pin_detect:1;
+        const struct hda_pcm_stream *pcm_playback;
 };
 
 
@@ -65,13 +86,31 @@ struct hdmi_audio_infoframe {
         u8 ver;  /* 0x01 */
         u8 len;  /* 0x0a */
 
-        u8 checksum;    /* PB0 */
+        u8 checksum;
+
         u8 CC02_CT47;   /* CC in bits 0:2, CT in 4:7 */
         u8 SS01_SF24;
         u8 CXT04;
         u8 CA;
         u8 LFEPBL01_LSV36_DM_INH7;
-        u8 reserved[5]; /* PB6 - PB10 */
+};
+
+struct dp_audio_infoframe {
+        u8 type; /* 0x84 */
+        u8 len;  /* 0x1b */
+        u8 ver;  /* 0x11 << 2 */
+
+        u8 CC02_CT47;   /* match with HDMI infoframe from this on */
+        u8 SS01_SF24;
+        u8 CXT04;
+        u8 CA;
+        u8 LFEPBL01_LSV36_DM_INH7;
+};
+
+union audio_infoframe {
+        struct hdmi_audio_infoframe hdmi;
+        struct dp_audio_infoframe dp;
+        u8 bytes[0];
 };
 
 /*
@@ -162,7 +201,7 @@ static int hdmi_channel_mapping[0x32][8] = {
         /* 4ch */
         [0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 },
         /* surround41 */
-        [0x09] = { 0x00, 0x11, 0x24, 0x34, 0x43, 0xf2, 0xf6, 0xf7 },
+        [0x09] = { 0x00, 0x11, 0x24, 0x35, 0x42, 0xf3, 0xf6, 0xf7 },
         /* surround50 */
         [0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 },
         /* surround51 */
@@ -175,7 +214,7 @@ static int hdmi_channel_mapping[0x32][8] = {
  * This is an ordered list!
  *
  * The preceding ones have better chances to be selected by
- * hdmi_setup_channel_allocation().
+ * hdmi_channel_allocation().
  */
 static struct cea_channel_speaker_allocation channel_allocations[] = {
 /*                        channel:   7     6    5    4    3     2    1    0  */
@@ -257,13 +296,6 @@ static int hda_node_index(hda_nid_t *nids, hda_nid_t nid)
         return -EINVAL;
 }
 
-static void hdmi_get_show_eld(struct hda_codec *codec, hda_nid_t pin_nid,
-                              struct hdmi_eld *eld)
-{
-        if (!snd_hdmi_get_eld(eld, codec, pin_nid))
-                snd_hdmi_show_eld(eld);
-}
-
 #ifdef BE_PARANOID
 static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,
                                 int *packet_index, int *byte_index)
@@ -352,14 +384,14 @@ static void init_channel_allocations(void)
  *
  * TODO: it could select the wrong CA from multiple candidates.
 */
-static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid,
-                                         struct hdmi_audio_infoframe *ai)
+static int hdmi_channel_allocation(struct hda_codec *codec, hda_nid_t nid,
+                                   int channels)
 {
         struct hdmi_spec *spec = codec->spec;
         struct hdmi_eld *eld;
         int i;
+        int ca = 0;
         int spk_mask = 0;
-        int channels = 1 + (ai->CC02_CT47 & 0x7);
         char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
 
         /*
@@ -397,16 +429,16 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid,
                 if (channels == channel_allocations[i].channels &&
                     (spk_mask & channel_allocations[i].spk_mask) ==
                                 channel_allocations[i].spk_mask) {
-                        ai->CA = channel_allocations[i].ca_index;
+                        ca = channel_allocations[i].ca_index;
                         break;
                 }
         }
 
         snd_print_channel_allocation(eld->spk_alloc, buf, sizeof(buf));
         snd_printdd("HDMI: select CA 0x%x for %d-channel allocation: %s\n",
-                    ai->CA, channels, buf);
+                    ca, channels, buf);
 
-        return ai->CA;
+        return ca;
 }
 
 static void hdmi_debug_channel_mapping(struct hda_codec *codec,
@@ -428,10 +460,9 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec,
 
 static void hdmi_setup_channel_mapping(struct hda_codec *codec,
                                        hda_nid_t pin_nid,
-                                       struct hdmi_audio_infoframe *ai)
+                                       int ca)
 {
         int i;
-        int ca = ai->CA;
         int err;
 
         if (hdmi_channel_mapping[ca][1] == 0) {
@@ -528,41 +559,37 @@ static void hdmi_clear_dip_buffers(struct hda_codec *codec, hda_nid_t pin_nid)
 #endif
 }
 
-static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *ai)
+static void hdmi_checksum_audio_infoframe(struct hdmi_audio_infoframe *hdmi_ai)
 {
-        u8 *bytes = (u8 *)ai;
+        u8 *bytes = (u8 *)hdmi_ai;
         u8 sum = 0;
         int i;
 
-        ai->checksum = 0;
+        hdmi_ai->checksum = 0;
 
-        for (i = 0; i < sizeof(*ai); i++)
+        for (i = 0; i < sizeof(*hdmi_ai); i++)
                 sum += bytes[i];
 
-        ai->checksum = -sum;
+        hdmi_ai->checksum = -sum;
 }
 
 static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
                                       hda_nid_t pin_nid,
-                                      struct hdmi_audio_infoframe *ai)
+                                      u8 *dip, int size)
 {
-        u8 *bytes = (u8 *)ai;
         int i;
 
         hdmi_debug_dip_size(codec, pin_nid);
         hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */
 
-        hdmi_checksum_audio_infoframe(ai);
-
         hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
-        for (i = 0; i < sizeof(*ai); i++)
-                hdmi_write_dip_byte(codec, pin_nid, bytes[i]);
+        for (i = 0; i < size; i++)
+                hdmi_write_dip_byte(codec, pin_nid, dip[i]);
 }
 
 static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
-                                    struct hdmi_audio_infoframe *ai)
+                                    u8 *dip, int size)
 {
-        u8 *bytes = (u8 *)ai;
         u8 val;
         int i;
 
@@ -571,10 +598,10 @@ static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
                 return false;
 
         hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
-        for (i = 0; i < sizeof(*ai); i++) {
+        for (i = 0; i < size; i++) {
                 val = snd_hda_codec_read(codec, pin_nid, 0,
                                          AC_VERB_GET_HDMI_DIP_DATA, 0);
-                if (val != bytes[i])
+                if (val != dip[i])
                         return false;
         }
 
@@ -586,15 +613,12 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
 {
         struct hdmi_spec *spec = codec->spec;
         hda_nid_t pin_nid;
+        int channels = substream->runtime->channels;
+        int ca;
         int i;
-        struct hdmi_audio_infoframe ai = {
-                .type           = 0x84,
-                .ver            = 0x01,
-                .len            = 0x0a,
-                .CC02_CT47      = substream->runtime->channels - 1,
-        };
+        union audio_infoframe ai;
 
-        hdmi_setup_channel_allocation(codec, nid, &ai);
+        ca = hdmi_channel_allocation(codec, nid, channels);
 
         for (i = 0; i < spec->num_pins; i++) {
                 if (spec->pin_cvt[i] != nid)
@@ -603,14 +627,46 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
                         continue;
 
                 pin_nid = spec->pin[i];
-                if (!hdmi_infoframe_uptodate(codec, pin_nid, &ai)) {
+
+                memset(&ai, 0, sizeof(ai));
+                if (spec->sink_eld[i].conn_type == 0) { /* HDMI */
+                        struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
+
+                        hdmi_ai->type           = 0x84;
+                        hdmi_ai->ver            = 0x01;
+                        hdmi_ai->len            = 0x0a;
+                        hdmi_ai->CC02_CT47      = channels - 1;
+                        hdmi_ai->CA             = ca;
+                        hdmi_checksum_audio_infoframe(hdmi_ai);
+                } else if (spec->sink_eld[i].conn_type == 1) { /* DisplayPort */
+                        struct dp_audio_infoframe *dp_ai = &ai.dp;
+
+                        dp_ai->type             = 0x84;
+                        dp_ai->len              = 0x1b;
+                        dp_ai->ver              = 0x11 << 2;
+                        dp_ai->CC02_CT47        = channels - 1;
+                        dp_ai->CA               = ca;
+                } else {
+                        snd_printd("HDMI: unknown connection type at pin %d\n",
+                                   pin_nid);
+                        continue;
+                }
+
+                /*
+                 * sizeof(ai) is used instead of sizeof(*hdmi_ai) or
+                 * sizeof(*dp_ai) to avoid partial match/update problems when
+                 * the user switches between HDMI/DP monitors.
+                 */
+                if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes,
+                                             sizeof(ai))) {
                         snd_printdd("hdmi_setup_audio_infoframe: "
                                     "cvt=%d pin=%d channels=%d\n",
                                     nid, pin_nid,
-                                    substream->runtime->channels);
-                        hdmi_setup_channel_mapping(codec, pin_nid, &ai);
+                                    channels);
+                        hdmi_setup_channel_mapping(codec, pin_nid, ca);
                         hdmi_stop_infoframe_trans(codec, pin_nid);
-                        hdmi_fill_audio_infoframe(codec, pin_nid, &ai);
+                        hdmi_fill_audio_infoframe(codec, pin_nid,
+                                                  ai.bytes, sizeof(ai));
                         hdmi_start_infoframe_trans(codec, pin_nid);
                 }
         }
@@ -627,33 +683,20 @@ static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
 static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
 {
         struct hdmi_spec *spec = codec->spec;
-        int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
-        int pind = !!(res & AC_UNSOL_RES_PD);
+        int pin_nid = res >> AC_UNSOL_RES_TAG_SHIFT;
+        int pd = !!(res & AC_UNSOL_RES_PD);
         int eldv = !!(res & AC_UNSOL_RES_ELDV);
         int index;
 
         printk(KERN_INFO
                 "HDMI hot plug event: Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
-                tag, pind, eldv);
+                pin_nid, pd, eldv);
 
-        index = hda_node_index(spec->pin, tag);
+        index = hda_node_index(spec->pin, pin_nid);
         if (index < 0)
                 return;
 
-        if (spec->old_pin_detect) {
-                if (pind)
-                        hdmi_present_sense(codec, tag, &spec->sink_eld[index]);
-                pind = spec->sink_eld[index].monitor_present;
-        }
-
-        spec->sink_eld[index].monitor_present = pind;
-        spec->sink_eld[index].eld_valid = eldv;
-
-        if (pind && eldv) {
-                hdmi_get_show_eld(codec, spec->pin[index],
-                                  &spec->sink_eld[index]);
-                /* TODO: do real things about ELD */
-        }
+        hdmi_present_sense(codec, pin_nid, &spec->sink_eld[index]);
 }
 
 static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
@@ -757,6 +800,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
         struct hdmi_spec *spec = codec->spec;
         struct hdmi_eld *eld;
         struct hda_pcm_stream *codec_pars;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         unsigned int idx;
 
         for (idx = 0; idx < spec->num_cvts; idx++)
@@ -772,26 +816,32 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
                 *codec_pars = *hinfo;
 
         eld = &spec->sink_eld[idx];
-        if (eld->sad_count > 0) {
+        if (!static_hdmi_pcm && eld->eld_valid && eld->sad_count > 0) {
                 hdmi_eld_update_pcm_info(eld, hinfo, codec_pars);
                 if (hinfo->channels_min > hinfo->channels_max ||
                     !hinfo->rates || !hinfo->formats)
                         return -ENODEV;
         } else {
                 /* fallback to the codec default */
-                hinfo->channels_min = codec_pars->channels_min;
                 hinfo->channels_max = codec_pars->channels_max;
                 hinfo->rates = codec_pars->rates;
                 hinfo->formats = codec_pars->formats;
                 hinfo->maxbps = codec_pars->maxbps;
         }
+        /* store the updated parameters */
+        runtime->hw.channels_min = hinfo->channels_min;
+        runtime->hw.channels_max = hinfo->channels_max;
+        runtime->hw.formats = hinfo->formats;
+        runtime->hw.rates = hinfo->rates;
+
+        snd_pcm_hw_constraint_step(substream->runtime, 0,
+                                   SNDRV_PCM_HW_PARAM_CHANNELS, 2);
         return 0;
 }
 
 /*
  * HDA/HDMI auto parsing
  */
-
 static int hdmi_read_pin_conn(struct hda_codec *codec, hda_nid_t pin_nid)
 {
         struct hdmi_spec *spec = codec->spec;
@@ -827,18 +877,39 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, hda_nid_t pin_nid)
 static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
                                struct hdmi_eld *eld)
 {
+        /*
+         * Always execute a GetPinSense verb here, even when called from
+         * hdmi_intrinsic_event; for some NVIDIA HW, the unsolicited
+         * response's PD bit is not the real PD value, but indicates that
+         * the real PD value changed. An older version of the HD-audio
+         * specification worked this way. Hence, we just ignore the data in
+         * the unsolicited response to avoid custom WARs.
+         */
         int present = snd_hda_pin_sense(codec, pin_nid);
 
+        memset(eld, 0, sizeof(*eld));
+
         eld->monitor_present    = !!(present & AC_PINSENSE_PRESENCE);
-        eld->eld_valid          = !!(present & AC_PINSENSE_ELDV);
+        if (eld->monitor_present)
+                eld->eld_valid  = !!(present & AC_PINSENSE_ELDV);
+        else
+                eld->eld_valid  = 0;
+
+        printk(KERN_INFO
+                "HDMI status: Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
+                pin_nid, eld->monitor_present, eld->eld_valid);
 
-        if (present & AC_PINSENSE_ELDV)
-                hdmi_get_show_eld(codec, pin_nid, eld);
+        if (eld->eld_valid)
+                if (!snd_hdmi_get_eld(eld, codec, pin_nid))
+                        snd_hdmi_show_eld(eld);
+
+        snd_hda_input_jack_report(codec, pin_nid);
 }
 
 static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
 {
         struct hdmi_spec *spec = codec->spec;
+        int err;
 
         if (spec->num_pins >= MAX_HDMI_PINS) {
                 snd_printk(KERN_WARNING
@@ -846,28 +917,38 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
                 return -E2BIG;
         }
 
+        err = snd_hda_input_jack_add(codec, pin_nid,
+                                     SND_JACK_VIDEOOUT, NULL);
+        if (err < 0)
+                return err;
+
         hdmi_present_sense(codec, pin_nid, &spec->sink_eld[spec->num_pins]);
 
         spec->pin[spec->num_pins] = pin_nid;
         spec->num_pins++;
 
-        /*
-         * It is assumed that converter nodes come first in the node list and
-         * hence have been registered and usable now.
-         */
         return hdmi_read_pin_conn(codec, pin_nid);
 }
 
 static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t nid)
 {
+        int i, found_pin = 0;
         struct hdmi_spec *spec = codec->spec;
 
-        if (spec->num_cvts >= MAX_HDMI_CVTS) {
-                snd_printk(KERN_WARNING
-                           "HDMI: no space for converter %d\n", nid);
-                return -E2BIG;
+        for (i = 0; i < spec->num_pins; i++)
+                if (nid == spec->pin_cvt[i]) {
+                        found_pin = 1;
+                        break;
+                }
+
+        if (!found_pin) {
+                snd_printdd("HDMI: Skipping node %d (no connection)\n", nid);
+                return -EINVAL;
         }
 
+        if (snd_BUG_ON(spec->num_cvts >= MAX_HDMI_CVTS))
+                return -E2BIG;
+
         spec->cvt[spec->num_cvts] = nid;
         spec->num_cvts++;
 
@@ -878,6 +959,8 @@ static int hdmi_parse_codec(struct hda_codec *codec)
 {
         hda_nid_t nid;
         int i, nodes;
+        int num_tmp_cvts = 0;
+        hda_nid_t tmp_cvt[MAX_HDMI_CVTS];
 
         nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
         if (!nid || nodes < 0) {
@@ -888,6 +971,7 @@ static int hdmi_parse_codec(struct hda_codec *codec)
         for (i = 0; i < nodes; i++, nid++) {
                 unsigned int caps;
                 unsigned int type;
+                unsigned int config;
 
                 caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP);
                 type = get_wcaps_type(caps);
@@ -897,17 +981,32 @@ static int hdmi_parse_codec(struct hda_codec *codec)
 
                 switch (type) {
                 case AC_WID_AUD_OUT:
-                        hdmi_add_cvt(codec, nid);
+                        if (num_tmp_cvts >= MAX_HDMI_CVTS) {
+                                snd_printk(KERN_WARNING
+                                           "HDMI: no space for converter %d\n", nid);
+                                continue;
+                        }
+                        tmp_cvt[num_tmp_cvts] = nid;
+                        num_tmp_cvts++;
                         break;
                 case AC_WID_PIN:
                         caps = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
                         if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP)))
                                 continue;
+
+                        config = snd_hda_codec_read(codec, nid, 0,
+                                             AC_VERB_GET_CONFIG_DEFAULT, 0);
+                        if (get_defcfg_connect(config) == AC_JACK_PORT_NONE)
+                                continue;
+
                         hdmi_add_pin(codec, nid);
                         break;
                 }
         }
 
+        for (i = 0; i < num_tmp_cvts; i++)
+                hdmi_add_cvt(codec, tmp_cvt[i]);
+
         /*
          * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event
          * can be lost and presence sense verb will become inaccurate if the
@@ -922,3 +1021,723 @@ static int hdmi_parse_codec(struct hda_codec *codec)
         return 0;
 }
 
+/*
+ */
+static char *generic_hdmi_pcm_names[MAX_HDMI_CVTS] = {
+        "HDMI 0",
+        "HDMI 1",
+        "HDMI 2",
+        "HDMI 3",
+};
+
+/*
+ * HDMI callbacks
+ */
+
+static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                           struct hda_codec *codec,
+                                           unsigned int stream_tag,
+                                           unsigned int format,
+                                           struct snd_pcm_substream *substream)
+{
+        hdmi_set_channel_count(codec, hinfo->nid,
+                               substream->runtime->channels);
+
+        hdmi_setup_audio_infoframe(codec, hinfo->nid, substream);
+
+        return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
+}
+
+static const struct hda_pcm_stream generic_hdmi_pcm_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .ops = {
+                .open = hdmi_pcm_open,
+                .prepare = generic_hdmi_playback_pcm_prepare,
+        },
+};
+
+static int generic_hdmi_build_pcms(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info = spec->pcm_rec;
+        int i;
+
+        codec->num_pcms = spec->num_cvts;
+        codec->pcm_info = info;
+
+        for (i = 0; i < codec->num_pcms; i++, info++) {
+                unsigned int chans;
+                struct hda_pcm_stream *pstr;
+
+                chans = get_wcaps(codec, spec->cvt[i]);
+                chans = get_wcaps_channels(chans);
+
+                info->name = generic_hdmi_pcm_names[i];
+                info->pcm_type = HDA_PCM_TYPE_HDMI;
+                pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK];
+                if (spec->pcm_playback)
+                        *pstr = *spec->pcm_playback;
+                else
+                        *pstr = generic_hdmi_pcm_playback;
+                pstr->nid = spec->cvt[i];
+                if (pstr->channels_max <= 2 && chans && chans <= 16)
+                        pstr->channels_max = chans;
+        }
+
+        return 0;
+}
+
+static int generic_hdmi_build_controls(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int err;
+        int i;
+
+        for (i = 0; i < codec->num_pcms; i++) {
+                err = snd_hda_create_spdif_out_ctls(codec, spec->cvt[i]);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int generic_hdmi_init(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; spec->pin[i]; i++) {
+                hdmi_enable_output(codec, spec->pin[i]);
+                snd_hda_codec_write(codec, spec->pin[i], 0,
+                                    AC_VERB_SET_UNSOLICITED_ENABLE,
+                                    AC_USRSP_EN | spec->pin[i]);
+        }
+        return 0;
+}
+
+static void generic_hdmi_free(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+
+        for (i = 0; i < spec->num_pins; i++)
+                snd_hda_eld_proc_free(codec, &spec->sink_eld[i]);
+        snd_hda_input_jack_free(codec);
+
+        kfree(spec);
+}
+
+static const struct hda_codec_ops generic_hdmi_patch_ops = {
+        .init                   = generic_hdmi_init,
+        .free                   = generic_hdmi_free,
+        .build_pcms             = generic_hdmi_build_pcms,
+        .build_controls         = generic_hdmi_build_controls,
+        .unsol_event            = hdmi_unsol_event,
+};
+
+static int patch_generic_hdmi(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+        int i;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+        if (hdmi_parse_codec(codec) < 0) {
+                codec->spec = NULL;
+                kfree(spec);
+                return -EINVAL;
+        }
+        codec->patch_ops = generic_hdmi_patch_ops;
+
+        for (i = 0; i < spec->num_pins; i++)
+                snd_hda_eld_proc_new(codec, &spec->sink_eld[i], i);
+
+        init_channel_allocations();
+
+        return 0;
+}
+
+/*
+ * Nvidia specific implementations
+ */
+
+#define Nv_VERB_SET_Channel_Allocation          0xF79
+#define Nv_VERB_SET_Info_Frame_Checksum         0xF7A
+#define Nv_VERB_SET_Audio_Protection_On         0xF98
+#define Nv_VERB_SET_Audio_Protection_Off        0xF99
+
+#define nvhdmi_master_con_nid_7x        0x04
+#define nvhdmi_master_pin_nid_7x        0x05
+
+static const hda_nid_t nvhdmi_con_nids_7x[4] = {
+        /*front, rear, clfe, rear_surr */
+        0x6, 0x8, 0xa, 0xc,
+};
+
+static const struct hda_verb nvhdmi_basic_init_7x[] = {
+        /* set audio protect on */
+        { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},
+        /* enable digital output on pin widget */
+        { 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
+        { 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
+        { 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
+        { 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
+        { 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
+        {} /* terminator */
+};
+
+#ifdef LIMITED_RATE_FMT_SUPPORT
+/* support only the safe format and rate */
+#define SUPPORTED_RATES         SNDRV_PCM_RATE_48000
+#define SUPPORTED_MAXBPS        16
+#define SUPPORTED_FORMATS       SNDRV_PCM_FMTBIT_S16_LE
+#else
+/* support all rates and formats */
+#define SUPPORTED_RATES \
+        (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+        SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\
+         SNDRV_PCM_RATE_192000)
+#define SUPPORTED_MAXBPS        24
+#define SUPPORTED_FORMATS \
+        (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
+#endif
+
+static int nvhdmi_7x_init(struct hda_codec *codec)
+{
+        snd_hda_sequence_write(codec, nvhdmi_basic_init_7x);
+        return 0;
+}
+
+static unsigned int channels_2_6_8[] = {
+        2, 6, 8
+};
+
+static unsigned int channels_2_8[] = {
+        2, 8
+};
+
+static struct snd_pcm_hw_constraint_list hw_constraints_2_6_8_channels = {
+        .count = ARRAY_SIZE(channels_2_6_8),
+        .list = channels_2_6_8,
+        .mask = 0,
+};
+
+static struct snd_pcm_hw_constraint_list hw_constraints_2_8_channels = {
+        .count = ARRAY_SIZE(channels_2_8),
+        .list = channels_2_8,
+        .mask = 0,
+};
+
+static int simple_playback_pcm_open(struct hda_pcm_stream *hinfo,
+                                    struct hda_codec *codec,
+                                    struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct snd_pcm_hw_constraint_list *hw_constraints_channels = NULL;
+
+        switch (codec->preset->id) {
+        case 0x10de0002:
+        case 0x10de0003:
+        case 0x10de0005:
+        case 0x10de0006:
+                hw_constraints_channels = &hw_constraints_2_8_channels;
+                break;
+        case 0x10de0007:
+                hw_constraints_channels = &hw_constraints_2_6_8_channels;
+                break;
+        default:
+                break;
+        }
+
+        if (hw_constraints_channels != NULL) {
+                snd_pcm_hw_constraint_list(substream->runtime, 0,
+                                SNDRV_PCM_HW_PARAM_CHANNELS,
+                                hw_constraints_channels);
+        } else {
+                snd_pcm_hw_constraint_step(substream->runtime, 0,
+                                           SNDRV_PCM_HW_PARAM_CHANNELS, 2);
+        }
+
+        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
+}
+
+static int simple_playback_pcm_close(struct hda_pcm_stream *hinfo,
+                                     struct hda_codec *codec,
+                                     struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
+static int simple_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                       struct hda_codec *codec,
+                                       unsigned int stream_tag,
+                                       unsigned int format,
+                                       struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        return snd_hda_multi_out_dig_prepare(codec, &spec->multiout,
+                                             stream_tag, format, substream);
+}
+
+static void nvhdmi_8ch_7x_set_info_frame_parameters(struct hda_codec *codec,
+                                                    int channels)
+{
+        unsigned int chanmask;
+        int chan = channels ? (channels - 1) : 1;
+
+        switch (channels) {
+        default:
+        case 0:
+        case 2:
+                chanmask = 0x00;
+                break;
+        case 4:
+                chanmask = 0x08;
+                break;
+        case 6:
+                chanmask = 0x0b;
+                break;
+        case 8:
+                chanmask = 0x13;
+                break;
+        }
+
+        /* Set the audio infoframe channel allocation and checksum fields.  The
+         * channel count is computed implicitly by the hardware. */
+        snd_hda_codec_write(codec, 0x1, 0,
+                        Nv_VERB_SET_Channel_Allocation, chanmask);
+
+        snd_hda_codec_write(codec, 0x1, 0,
+                        Nv_VERB_SET_Info_Frame_Checksum,
+                        (0x71 - chan - chanmask));
+}
+
+static int nvhdmi_8ch_7x_pcm_close(struct hda_pcm_stream *hinfo,
+                                   struct hda_codec *codec,
+                                   struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int i;
+
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x,
+                        0, AC_VERB_SET_CHANNEL_STREAMID, 0);
+        for (i = 0; i < 4; i++) {
+                /* set the stream id */
+                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
+                                AC_VERB_SET_CHANNEL_STREAMID, 0);
+                /* set the stream format */
+                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
+                                AC_VERB_SET_STREAM_FORMAT, 0);
+        }
+
+        /* The audio hardware sends a channel count of 0x7 (8ch) when all the
+         * streams are disabled. */
+        nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);
+
+        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
+}
+
+static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                     struct hda_codec *codec,
+                                     unsigned int stream_tag,
+                                     unsigned int format,
+                                     struct snd_pcm_substream *substream)
+{
+        int chs;
+        unsigned int dataDCC1, dataDCC2, channel_id;
+        int i;
+
+        mutex_lock(&codec->spdif_mutex);
+
+        chs = substream->runtime->channels;
+
+        dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;
+        dataDCC2 = 0x2;
+
+        /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
+        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
+                snd_hda_codec_write(codec,
+                                nvhdmi_master_con_nid_7x,
+                                0,
+                                AC_VERB_SET_DIGI_CONVERT_1,
+                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
+
+        /* set the stream id */
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
+                        AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0);
+
+        /* set the stream format */
+        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
+                        AC_VERB_SET_STREAM_FORMAT, format);
+
+        /* turn on again (if needed) */
+        /* enable and set the channel status audio/data flag */
+        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) {
+                snd_hda_codec_write(codec,
+                                nvhdmi_master_con_nid_7x,
+                                0,
+                                AC_VERB_SET_DIGI_CONVERT_1,
+                                codec->spdif_ctls & 0xff);
+                snd_hda_codec_write(codec,
+                                nvhdmi_master_con_nid_7x,
+                                0,
+                                AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
+        }
+
+        for (i = 0; i < 4; i++) {
+                if (chs == 2)
+                        channel_id = 0;
+                else
+                        channel_id = i * 2;
+
+                /* turn off SPDIF once;
+                 *otherwise the IEC958 bits won't be updated
+                 */
+                if (codec->spdif_status_reset &&
+                (codec->spdif_ctls & AC_DIG1_ENABLE))
+                        snd_hda_codec_write(codec,
+                                nvhdmi_con_nids_7x[i],
+                                0,
+                                AC_VERB_SET_DIGI_CONVERT_1,
+                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
+                /* set the stream id */
+                snd_hda_codec_write(codec,
+                                nvhdmi_con_nids_7x[i],
+                                0,
+                                AC_VERB_SET_CHANNEL_STREAMID,
+                                (stream_tag << 4) | channel_id);
+                /* set the stream format */
+                snd_hda_codec_write(codec,
+                                nvhdmi_con_nids_7x[i],
+                                0,
+                                AC_VERB_SET_STREAM_FORMAT,
+                                format);
+                /* turn on again (if needed) */
+                /* enable and set the channel status audio/data flag */
+                if (codec->spdif_status_reset &&
+                (codec->spdif_ctls & AC_DIG1_ENABLE)) {
+                        snd_hda_codec_write(codec,
+                                        nvhdmi_con_nids_7x[i],
+                                        0,
+                                        AC_VERB_SET_DIGI_CONVERT_1,
+                                        codec->spdif_ctls & 0xff);
+                        snd_hda_codec_write(codec,
+                                        nvhdmi_con_nids_7x[i],
+                                        0,
+                                        AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
+                }
+        }
+
+        nvhdmi_8ch_7x_set_info_frame_parameters(codec, chs);
+
+        mutex_unlock(&codec->spdif_mutex);
+        return 0;
+}
+
+static const struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 8,
+        .nid = nvhdmi_master_con_nid_7x,
+        .rates = SUPPORTED_RATES,
+        .maxbps = SUPPORTED_MAXBPS,
+        .formats = SUPPORTED_FORMATS,
+        .ops = {
+                .open = simple_playback_pcm_open,
+                .close = nvhdmi_8ch_7x_pcm_close,
+                .prepare = nvhdmi_8ch_7x_pcm_prepare
+        },
+};
+
+static const struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = nvhdmi_master_con_nid_7x,
+        .rates = SUPPORTED_RATES,
+        .maxbps = SUPPORTED_MAXBPS,
+        .formats = SUPPORTED_FORMATS,
+        .ops = {
+                .open = simple_playback_pcm_open,
+                .close = simple_playback_pcm_close,
+                .prepare = simple_playback_pcm_prepare
+        },
+};
+
+static const struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
+        .build_controls = generic_hdmi_build_controls,
+        .build_pcms = generic_hdmi_build_pcms,
+        .init = nvhdmi_7x_init,
+        .free = generic_hdmi_free,
+};
+
+static const struct hda_codec_ops nvhdmi_patch_ops_2ch = {
+        .build_controls = generic_hdmi_build_controls,
+        .build_pcms = generic_hdmi_build_pcms,
+        .init = nvhdmi_7x_init,
+        .free = generic_hdmi_free,
+};
+
+static int patch_nvhdmi_2ch(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        spec->multiout.num_dacs = 0;  /* no analog */
+        spec->multiout.max_channels = 2;
+        spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;
+        spec->num_cvts = 1;
+        spec->cvt[0] = nvhdmi_master_con_nid_7x;
+        spec->pcm_playback = &nvhdmi_pcm_playback_2ch;
+
+        codec->patch_ops = nvhdmi_patch_ops_2ch;
+
+        return 0;
+}
+
+static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+        int err = patch_nvhdmi_2ch(codec);
+
+        if (err < 0)
+                return err;
+        spec = codec->spec;
+        spec->multiout.max_channels = 8;
+        spec->pcm_playback = &nvhdmi_pcm_playback_8ch_7x;
+        codec->patch_ops = nvhdmi_patch_ops_8ch_7x;
+
+        /* Initialize the audio infoframe channel mask and checksum to something
+         * valid */
+        nvhdmi_8ch_7x_set_info_frame_parameters(codec, 8);
+
+        return 0;
+}
+
+/*
+ * ATI-specific implementations
+ *
+ * FIXME: we may omit the whole this and use the generic code once after
+ * it's confirmed to work.
+ */
+
+#define ATIHDMI_CVT_NID         0x02    /* audio converter */
+#define ATIHDMI_PIN_NID         0x03    /* HDMI output pin */
+
+static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
+                                        struct hda_codec *codec,
+                                        unsigned int stream_tag,
+                                        unsigned int format,
+                                        struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        int chans = substream->runtime->channels;
+        int i, err;
+
+        err = simple_playback_pcm_prepare(hinfo, codec, stream_tag, format,
+                                          substream);
+        if (err < 0)
+                return err;
+        snd_hda_codec_write(codec, spec->cvt[0], 0, AC_VERB_SET_CVT_CHAN_COUNT,
+                            chans - 1);
+        /* FIXME: XXX */
+        for (i = 0; i < chans; i++) {
+                snd_hda_codec_write(codec, spec->cvt[0], 0,
+                                    AC_VERB_SET_HDMI_CHAN_SLOT,
+                                    (i << 4) | i);
+        }
+        return 0;
+}
+
+static const struct hda_pcm_stream atihdmi_pcm_digital_playback = {
+        .substreams = 1,
+        .channels_min = 2,
+        .channels_max = 2,
+        .nid = ATIHDMI_CVT_NID,
+        .ops = {
+                .open = simple_playback_pcm_open,
+                .close = simple_playback_pcm_close,
+                .prepare = atihdmi_playback_pcm_prepare
+        },
+};
+
+static const struct hda_verb atihdmi_basic_init[] = {
+        /* enable digital output on pin widget */
+        { 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        {} /* terminator */
+};
+
+static int atihdmi_init(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec = codec->spec;
+
+        snd_hda_sequence_write(codec, atihdmi_basic_init);
+        /* SI codec requires to unmute the pin */
+        if (get_wcaps(codec, spec->pin[0]) & AC_WCAP_OUT_AMP)
+                snd_hda_codec_write(codec, spec->pin[0], 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_OUT_UNMUTE);
+        return 0;
+}
+
+static const struct hda_codec_ops atihdmi_patch_ops = {
+        .build_controls = generic_hdmi_build_controls,
+        .build_pcms = generic_hdmi_build_pcms,
+        .init = atihdmi_init,
+        .free = generic_hdmi_free,
+};
+
+
+static int patch_atihdmi(struct hda_codec *codec)
+{
+        struct hdmi_spec *spec;
+
+        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
+        if (spec == NULL)
+                return -ENOMEM;
+
+        codec->spec = spec;
+
+        spec->multiout.num_dacs = 0;      /* no analog */
+        spec->multiout.max_channels = 2;
+        spec->multiout.dig_out_nid = ATIHDMI_CVT_NID;
+        spec->num_cvts = 1;
+        spec->cvt[0] = ATIHDMI_CVT_NID;
+        spec->pin[0] = ATIHDMI_PIN_NID;
+        spec->pcm_playback = &atihdmi_pcm_digital_playback;
+
+        codec->patch_ops = atihdmi_patch_ops;
+
+        return 0;
+}
+
+
+/*
+ * patch entries
+ */
+static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
+{ .id = 0x1002793c, .name = "RS600 HDMI",       .patch = patch_atihdmi },
+{ .id = 0x10027919, .name = "RS600 HDMI",       .patch = patch_atihdmi },
+{ .id = 0x1002791a, .name = "RS690/780 HDMI",   .patch = patch_atihdmi },
+{ .id = 0x1002aa01, .name = "R6xx HDMI",        .patch = patch_generic_hdmi },
+{ .id = 0x10951390, .name = "SiI1390 HDMI",     .patch = patch_generic_hdmi },
+{ .id = 0x10951392, .name = "SiI1392 HDMI",     .patch = patch_generic_hdmi },
+{ .id = 0x17e80047, .name = "Chrontel HDMI",    .patch = patch_generic_hdmi },
+{ .id = 0x10de0002, .name = "MCP77/78 HDMI",    .patch = patch_nvhdmi_8ch_7x },
+{ .id = 0x10de0003, .name = "MCP77/78 HDMI",    .patch = patch_nvhdmi_8ch_7x },
+{ .id = 0x10de0005, .name = "MCP77/78 HDMI",    .patch = patch_nvhdmi_8ch_7x },
+{ .id = 0x10de0006, .name = "MCP77/78 HDMI",    .patch = patch_nvhdmi_8ch_7x },
+{ .id = 0x10de0007, .name = "MCP79/7A HDMI",    .patch = patch_nvhdmi_8ch_7x },
+{ .id = 0x10de000a, .name = "GPU 0a HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de000b, .name = "GPU 0b HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de000c, .name = "MCP89 HDMI",       .patch = patch_generic_hdmi },
+{ .id = 0x10de000d, .name = "GPU 0d HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0010, .name = "GPU 10 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0011, .name = "GPU 11 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0012, .name = "GPU 12 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0013, .name = "GPU 13 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0014, .name = "GPU 14 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0015, .name = "GPU 15 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0016, .name = "GPU 16 HDMI/DP",   .patch = patch_generic_hdmi },
+/* 17 is known to be absent */
+{ .id = 0x10de0018, .name = "GPU 18 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0019, .name = "GPU 19 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de001a, .name = "GPU 1a HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de001b, .name = "GPU 1b HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de001c, .name = "GPU 1c HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0040, .name = "GPU 40 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0041, .name = "GPU 41 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0042, .name = "GPU 42 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0043, .name = "GPU 43 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0044, .name = "GPU 44 HDMI/DP",   .patch = patch_generic_hdmi },
+{ .id = 0x10de0067, .name = "MCP67 HDMI",       .patch = patch_nvhdmi_2ch },
+{ .id = 0x10de8001, .name = "MCP73 HDMI",       .patch = patch_nvhdmi_2ch },
+{ .id = 0x80860054, .name = "IbexPeak HDMI",    .patch = patch_generic_hdmi },
+{ .id = 0x80862801, .name = "Bearlake HDMI",    .patch = patch_generic_hdmi },
+{ .id = 0x80862802, .name = "Cantiga HDMI",     .patch = patch_generic_hdmi },
+{ .id = 0x80862803, .name = "Eaglelake HDMI",   .patch = patch_generic_hdmi },
+{ .id = 0x80862804, .name = "IbexPeak HDMI",    .patch = patch_generic_hdmi },
+{ .id = 0x80862805, .name = "CougarPoint HDMI", .patch = patch_generic_hdmi },
+{ .id = 0x80862806, .name = "PantherPoint HDMI", .patch = patch_generic_hdmi },
+{ .id = 0x808629fb, .name = "Crestline HDMI",   .patch = patch_generic_hdmi },
+{} /* terminator */
+};
+
+MODULE_ALIAS("snd-hda-codec-id:1002793c");
+MODULE_ALIAS("snd-hda-codec-id:10027919");
+MODULE_ALIAS("snd-hda-codec-id:1002791a");
+MODULE_ALIAS("snd-hda-codec-id:1002aa01");
+MODULE_ALIAS("snd-hda-codec-id:10951390");
+MODULE_ALIAS("snd-hda-codec-id:10951392");
+MODULE_ALIAS("snd-hda-codec-id:10de0002");
+MODULE_ALIAS("snd-hda-codec-id:10de0003");
+MODULE_ALIAS("snd-hda-codec-id:10de0005");
+MODULE_ALIAS("snd-hda-codec-id:10de0006");
+MODULE_ALIAS("snd-hda-codec-id:10de0007");
+MODULE_ALIAS("snd-hda-codec-id:10de000a");
+MODULE_ALIAS("snd-hda-codec-id:10de000b");
+MODULE_ALIAS("snd-hda-codec-id:10de000c");
+MODULE_ALIAS("snd-hda-codec-id:10de000d");
+MODULE_ALIAS("snd-hda-codec-id:10de0010");
+MODULE_ALIAS("snd-hda-codec-id:10de0011");
+MODULE_ALIAS("snd-hda-codec-id:10de0012");
+MODULE_ALIAS("snd-hda-codec-id:10de0013");
+MODULE_ALIAS("snd-hda-codec-id:10de0014");
+MODULE_ALIAS("snd-hda-codec-id:10de0015");
+MODULE_ALIAS("snd-hda-codec-id:10de0016");
+MODULE_ALIAS("snd-hda-codec-id:10de0018");
+MODULE_ALIAS("snd-hda-codec-id:10de0019");
+MODULE_ALIAS("snd-hda-codec-id:10de001a");
+MODULE_ALIAS("snd-hda-codec-id:10de001b");
+MODULE_ALIAS("snd-hda-codec-id:10de001c");
+MODULE_ALIAS("snd-hda-codec-id:10de0040");
+MODULE_ALIAS("snd-hda-codec-id:10de0041");
+MODULE_ALIAS("snd-hda-codec-id:10de0042");
+MODULE_ALIAS("snd-hda-codec-id:10de0043");
+MODULE_ALIAS("snd-hda-codec-id:10de0044");
+MODULE_ALIAS("snd-hda-codec-id:10de0067");
+MODULE_ALIAS("snd-hda-codec-id:10de8001");
+MODULE_ALIAS("snd-hda-codec-id:17e80047");
+MODULE_ALIAS("snd-hda-codec-id:80860054");
+MODULE_ALIAS("snd-hda-codec-id:80862801");
+MODULE_ALIAS("snd-hda-codec-id:80862802");
+MODULE_ALIAS("snd-hda-codec-id:80862803");
+MODULE_ALIAS("snd-hda-codec-id:80862804");
+MODULE_ALIAS("snd-hda-codec-id:80862805");
+MODULE_ALIAS("snd-hda-codec-id:80862806");
+MODULE_ALIAS("snd-hda-codec-id:808629fb");
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("HDMI HD-audio codec");
+MODULE_ALIAS("snd-hda-codec-intelhdmi");
+MODULE_ALIAS("snd-hda-codec-nvhdmi");
+MODULE_ALIAS("snd-hda-codec-atihdmi");
+
+static struct hda_codec_preset_list intel_list = {
+        .preset = snd_hda_preset_hdmi,
+        .owner = THIS_MODULE,
+};
+
+static int __init patch_hdmi_init(void)
+{
+        return snd_hda_add_codec_preset(&intel_list);
+}
+
+static void __exit patch_hdmi_exit(void)
+{
+        snd_hda_delete_codec_preset(&intel_list);
+}
+
+module_init(patch_hdmi_init)
+module_exit(patch_hdmi_exit)
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
deleted file mode 100644
index 36a9b83a6174..000000000000
--- a/sound/pci/hda/patch_intelhdmi.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *
- *  patch_intelhdmi.c - Patch for Intel HDMI codecs
- *
- *  Copyright(c) 2008 Intel Corporation. All rights reserved.
- *
- *  Authors:
- *                      Jiang Zhe <zhe.jiang@intel.com>
- *                      Wu Fengguang <wfg@linux.intel.com>
- *
- *  Maintained by:
- *                      Wu Fengguang <wfg@linux.intel.com>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <sound/core.h>
-#include "hda_codec.h"
-#include "hda_local.h"
-
-/*
- * The HDMI/DisplayPort configuration can be highly dynamic. A graphics device
- * could support two independent pipes, each of them can be connected to one or
- * more ports (DVI, HDMI or DisplayPort).
- *
- * The HDA correspondence of pipes/ports are converter/pin nodes.
- */
-#define MAX_HDMI_CVTS   3
-#define MAX_HDMI_PINS   3
-
-#include "patch_hdmi.c"
-
-static char *intel_hdmi_pcm_names[MAX_HDMI_CVTS] = {
-        "INTEL HDMI 0",
-        "INTEL HDMI 1",
-        "INTEL HDMI 2",
-};
-
-/*
- * HDMI callbacks
- */
-
-static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
-                                           struct hda_codec *codec,
-                                           unsigned int stream_tag,
-                                           unsigned int format,
-                                           struct snd_pcm_substream *substream)
-{
-        hdmi_set_channel_count(codec, hinfo->nid,
-                               substream->runtime->channels);
-
-        hdmi_setup_audio_infoframe(codec, hinfo->nid, substream);
-
-        return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
-}
-
-static struct hda_pcm_stream intel_hdmi_pcm_playback = {
-        .substreams = 1,
-        .channels_min = 2,
-        .ops = {
-                .open = hdmi_pcm_open,
-                .prepare = intel_hdmi_playback_pcm_prepare,
-        },
-};
-
-static int intel_hdmi_build_pcms(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-        int i;
-
-        codec->num_pcms = spec->num_cvts;
-        codec->pcm_info = info;
-
-        for (i = 0; i < codec->num_pcms; i++, info++) {
-                unsigned int chans;
-
-                chans = get_wcaps(codec, spec->cvt[i]);
-                chans = get_wcaps_channels(chans);
-
-                info->name = intel_hdmi_pcm_names[i];
-                info->pcm_type = HDA_PCM_TYPE_HDMI;
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
-                                                        intel_hdmi_pcm_playback;
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->cvt[i];
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
-        }
-
-        return 0;
-}
-
-static int intel_hdmi_build_controls(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int err;
-        int i;
-
-        for (i = 0; i < codec->num_pcms; i++) {
-                err = snd_hda_create_spdif_out_ctls(codec, spec->cvt[i]);
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
-
-static int intel_hdmi_init(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; spec->pin[i]; i++) {
-                hdmi_enable_output(codec, spec->pin[i]);
-                snd_hda_codec_write(codec, spec->pin[i], 0,
-                                    AC_VERB_SET_UNSOLICITED_ENABLE,
-                                    AC_USRSP_EN | spec->pin[i]);
-        }
-        return 0;
-}
-
-static void intel_hdmi_free(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int i;
-
-        for (i = 0; i < spec->num_pins; i++)
-                snd_hda_eld_proc_free(codec, &spec->sink_eld[i]);
-
-        kfree(spec);
-}
-
-static struct hda_codec_ops intel_hdmi_patch_ops = {
-        .init                   = intel_hdmi_init,
-        .free                   = intel_hdmi_free,
-        .build_pcms             = intel_hdmi_build_pcms,
-        .build_controls         = intel_hdmi_build_controls,
-        .unsol_event            = hdmi_unsol_event,
-};
-
-static int patch_intel_hdmi(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec;
-        int i;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-        if (hdmi_parse_codec(codec) < 0) {
-                codec->spec = NULL;
-                kfree(spec);
-                return -EINVAL;
-        }
-        codec->patch_ops = intel_hdmi_patch_ops;
-
-        for (i = 0; i < spec->num_pins; i++)
-                snd_hda_eld_proc_new(codec, &spec->sink_eld[i], i);
-
-        init_channel_allocations();
-
-        return 0;
-}
-
-static struct hda_codec_preset snd_hda_preset_intelhdmi[] = {
-{ .id = 0x808629fb, .name = "Crestline HDMI",   .patch = patch_intel_hdmi },
-{ .id = 0x80862801, .name = "Bearlake HDMI",    .patch = patch_intel_hdmi },
-{ .id = 0x80862802, .name = "Cantiga HDMI",     .patch = patch_intel_hdmi },
-{ .id = 0x80862803, .name = "Eaglelake HDMI",   .patch = patch_intel_hdmi },
-{ .id = 0x80862804, .name = "IbexPeak HDMI",    .patch = patch_intel_hdmi },
-{ .id = 0x80860054, .name = "IbexPeak HDMI",    .patch = patch_intel_hdmi },
-{ .id = 0x80862805, .name = "CougarPoint HDMI", .patch = patch_intel_hdmi },
-{ .id = 0x10951392, .name = "SiI1392 HDMI",     .patch = patch_intel_hdmi },
-{} /* terminator */
-};
-
-MODULE_ALIAS("snd-hda-codec-id:808629fb");
-MODULE_ALIAS("snd-hda-codec-id:80862801");
-MODULE_ALIAS("snd-hda-codec-id:80862802");
-MODULE_ALIAS("snd-hda-codec-id:80862803");
-MODULE_ALIAS("snd-hda-codec-id:80862804");
-MODULE_ALIAS("snd-hda-codec-id:80862805");
-MODULE_ALIAS("snd-hda-codec-id:80860054");
-MODULE_ALIAS("snd-hda-codec-id:10951392");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Intel HDMI HD-audio codec");
-
-static struct hda_codec_preset_list intel_list = {
-        .preset = snd_hda_preset_intelhdmi,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_intelhdmi_init(void)
-{
-        return snd_hda_add_codec_preset(&intel_list);
-}
-
-static void __exit patch_intelhdmi_exit(void)
-{
-        snd_hda_delete_codec_preset(&intel_list);
-}
-
-module_init(patch_intelhdmi_init)
-module_exit(patch_intelhdmi_exit)
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
deleted file mode 100644
index baa108b9d6aa..000000000000
--- a/sound/pci/hda/patch_nvhdmi.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * Universal Interface for Intel High Definition Audio Codec
- *
- * HD audio interface patch for NVIDIA HDMI codecs
- *
- * Copyright (c) 2008 NVIDIA Corp.  All rights reserved.
- * Copyright (c) 2008 Wei Ni <wni@nvidia.com>
- *
- *
- *  This driver is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This driver is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <sound/core.h>
-#include "hda_codec.h"
-#include "hda_local.h"
-
-#define MAX_HDMI_CVTS   1
-#define MAX_HDMI_PINS   1
-
-#include "patch_hdmi.c"
-
-static char *nvhdmi_pcm_names[MAX_HDMI_CVTS] = {
-        "NVIDIA HDMI",
-};
-
-/* define below to restrict the supported rates and formats */
-/* #define LIMITED_RATE_FMT_SUPPORT */
-
-enum HDACodec {
-        HDA_CODEC_NVIDIA_MCP7X,
-        HDA_CODEC_NVIDIA_MCP89,
-        HDA_CODEC_NVIDIA_GT21X,
-        HDA_CODEC_INVALID
-};
-
-#define Nv_VERB_SET_Channel_Allocation          0xF79
-#define Nv_VERB_SET_Info_Frame_Checksum         0xF7A
-#define Nv_VERB_SET_Audio_Protection_On         0xF98
-#define Nv_VERB_SET_Audio_Protection_Off        0xF99
-
-#define nvhdmi_master_con_nid_7x        0x04
-#define nvhdmi_master_pin_nid_7x        0x05
-
-#define nvhdmi_master_con_nid_89        0x04
-#define nvhdmi_master_pin_nid_89        0x05
-
-static hda_nid_t nvhdmi_con_nids_7x[4] = {
-        /*front, rear, clfe, rear_surr */
-        0x6, 0x8, 0xa, 0xc,
-};
-
-static struct hda_verb nvhdmi_basic_init_7x[] = {
-        /* set audio protect on */
-        { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},
-        /* enable digital output on pin widget */
-        { 0x5, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
-        { 0x7, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
-        { 0x9, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
-        { 0xb, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
-        { 0xd, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | 0x5 },
-        {} /* terminator */
-};
-
-#ifdef LIMITED_RATE_FMT_SUPPORT
-/* support only the safe format and rate */
-#define SUPPORTED_RATES         SNDRV_PCM_RATE_48000
-#define SUPPORTED_MAXBPS        16
-#define SUPPORTED_FORMATS       SNDRV_PCM_FMTBIT_S16_LE
-#else
-/* support all rates and formats */
-#define SUPPORTED_RATES \
-        (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
-        SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\
-         SNDRV_PCM_RATE_192000)
-#define SUPPORTED_MAXBPS        24
-#define SUPPORTED_FORMATS \
-        (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE)
-#endif
-
-/*
- * Controls
- */
-static int nvhdmi_build_controls(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int err;
-        int i;
-
-        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
-        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
-                for (i = 0; i < codec->num_pcms; i++) {
-                        err = snd_hda_create_spdif_out_ctls(codec,
-                                                            spec->cvt[i]);
-                        if (err < 0)
-                                return err;
-                }
-        } else {
-                err = snd_hda_create_spdif_out_ctls(codec,
-                                                    spec->multiout.dig_out_nid);
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
-
-static int nvhdmi_init(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int i;
-        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
-        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
-                for (i = 0; spec->pin[i]; i++) {
-                        hdmi_enable_output(codec, spec->pin[i]);
-                        snd_hda_codec_write(codec, spec->pin[i], 0,
-                                            AC_VERB_SET_UNSOLICITED_ENABLE,
-                                            AC_USRSP_EN | spec->pin[i]);
-                }
-        } else {
-                snd_hda_sequence_write(codec, nvhdmi_basic_init_7x);
-        }
-        return 0;
-}
-
-static void nvhdmi_free(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int i;
-
-        if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89)
-        || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) {
-                for (i = 0; i < spec->num_pins; i++)
-                        snd_hda_eld_proc_free(codec, &spec->sink_eld[i]);
-        }
-
-        kfree(spec);
-}
-
-/*
- * Digital out
- */
-static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct hdmi_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_open(codec, &spec->multiout);
-}
-
-static int nvhdmi_dig_playback_pcm_close_8ch_7x(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct hdmi_spec *spec = codec->spec;
-        int i;
-
-        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x,
-                        0, AC_VERB_SET_CHANNEL_STREAMID, 0);
-        for (i = 0; i < 4; i++) {
-                /* set the stream id */
-                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
-                                AC_VERB_SET_CHANNEL_STREAMID, 0);
-                /* set the stream format */
-                snd_hda_codec_write(codec, nvhdmi_con_nids_7x[i], 0,
-                                AC_VERB_SET_STREAM_FORMAT, 0);
-        }
-
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
-static int nvhdmi_dig_playback_pcm_close_2ch(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
-{
-        struct hdmi_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_close(codec, &spec->multiout);
-}
-
-static int nvhdmi_dig_playback_pcm_prepare_8ch_89(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        unsigned int stream_tag,
-                                        unsigned int format,
-                                        struct snd_pcm_substream *substream)
-{
-        hdmi_set_channel_count(codec, hinfo->nid,
-                               substream->runtime->channels);
-
-        hdmi_setup_audio_infoframe(codec, hinfo->nid, substream);
-
-        return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
-}
-
-static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        unsigned int stream_tag,
-                                        unsigned int format,
-                                        struct snd_pcm_substream *substream)
-{
-        int chs;
-        unsigned int dataDCC1, dataDCC2, chan, chanmask, channel_id;
-        int i;
-
-        mutex_lock(&codec->spdif_mutex);
-
-        chs = substream->runtime->channels;
-        chan = chs ? (chs - 1) : 1;
-
-        switch (chs) {
-        default:
-        case 0:
-        case 2:
-                chanmask = 0x00;
-                break;
-        case 4:
-                chanmask = 0x08;
-                break;
-        case 6:
-                chanmask = 0x0b;
-                break;
-        case 8:
-                chanmask = 0x13;
-                break;
-        }
-        dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;
-        dataDCC2 = 0x2;
-
-        /* set the Audio InforFrame Channel Allocation */
-        snd_hda_codec_write(codec, 0x1, 0,
-                        Nv_VERB_SET_Channel_Allocation, chanmask);
-
-        /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
-        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
-                snd_hda_codec_write(codec,
-                                nvhdmi_master_con_nid_7x,
-                                0,
-                                AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
-
-        /* set the stream id */
-        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
-                        AC_VERB_SET_CHANNEL_STREAMID, (stream_tag << 4) | 0x0);
-
-        /* set the stream format */
-        snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
-                        AC_VERB_SET_STREAM_FORMAT, format);
-
-        /* turn on again (if needed) */
-        /* enable and set the channel status audio/data flag */
-        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) {
-                snd_hda_codec_write(codec,
-                                nvhdmi_master_con_nid_7x,
-                                0,
-                                AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & 0xff);
-                snd_hda_codec_write(codec,
-                                nvhdmi_master_con_nid_7x,
-                                0,
-                                AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
-        }
-
-        for (i = 0; i < 4; i++) {
-                if (chs == 2)
-                        channel_id = 0;
-                else
-                        channel_id = i * 2;
-
-                /* turn off SPDIF once;
-                 *otherwise the IEC958 bits won't be updated
-                 */
-                if (codec->spdif_status_reset &&
-                (codec->spdif_ctls & AC_DIG1_ENABLE))
-                        snd_hda_codec_write(codec,
-                                nvhdmi_con_nids_7x[i],
-                                0,
-                                AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
-                /* set the stream id */
-                snd_hda_codec_write(codec,
-                                nvhdmi_con_nids_7x[i],
-                                0,
-                                AC_VERB_SET_CHANNEL_STREAMID,
-                                (stream_tag << 4) | channel_id);
-                /* set the stream format */
-                snd_hda_codec_write(codec,
-                                nvhdmi_con_nids_7x[i],
-                                0,
-                                AC_VERB_SET_STREAM_FORMAT,
-                                format);
-                /* turn on again (if needed) */
-                /* enable and set the channel status audio/data flag */
-                if (codec->spdif_status_reset &&
-                (codec->spdif_ctls & AC_DIG1_ENABLE)) {
-                        snd_hda_codec_write(codec,
-                                        nvhdmi_con_nids_7x[i],
-                                        0,
-                                        AC_VERB_SET_DIGI_CONVERT_1,
-                                        codec->spdif_ctls & 0xff);
-                        snd_hda_codec_write(codec,
-                                        nvhdmi_con_nids_7x[i],
-                                        0,
-                                        AC_VERB_SET_DIGI_CONVERT_2, dataDCC2);
-                }
-        }
-
-        /* set the Audio Info Frame Checksum */
-        snd_hda_codec_write(codec, 0x1, 0,
-                        Nv_VERB_SET_Info_Frame_Checksum,
-                        (0x71 - chan - chanmask));
-
-        mutex_unlock(&codec->spdif_mutex);
-        return 0;
-}
-
-static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        unsigned int stream_tag,
-                                        unsigned int format,
-                                        struct snd_pcm_substream *substream)
-{
-        struct hdmi_spec *spec = codec->spec;
-        return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
-                                        format, substream);
-}
-
-static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_89 = {
-        .substreams = 1,
-        .channels_min = 2,
-        .ops = {
-                .open = hdmi_pcm_open,
-                .prepare = nvhdmi_dig_playback_pcm_prepare_8ch_89,
-        },
-};
-
-static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_7x = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 8,
-        .nid = nvhdmi_master_con_nid_7x,
-        .rates = SUPPORTED_RATES,
-        .maxbps = SUPPORTED_MAXBPS,
-        .formats = SUPPORTED_FORMATS,
-        .ops = {
-                .open = nvhdmi_dig_playback_pcm_open,
-                .close = nvhdmi_dig_playback_pcm_close_8ch_7x,
-                .prepare = nvhdmi_dig_playback_pcm_prepare_8ch
-        },
-};
-
-static struct hda_pcm_stream nvhdmi_pcm_digital_playback_2ch = {
-        .substreams = 1,
-        .channels_min = 2,
-        .channels_max = 2,
-        .nid = nvhdmi_master_con_nid_7x,
-        .rates = SUPPORTED_RATES,
-        .maxbps = SUPPORTED_MAXBPS,
-        .formats = SUPPORTED_FORMATS,
-        .ops = {
-                .open = nvhdmi_dig_playback_pcm_open,
-                .close = nvhdmi_dig_playback_pcm_close_2ch,
-                .prepare = nvhdmi_dig_playback_pcm_prepare_2ch
-        },
-};
-
-static int nvhdmi_build_pcms_8ch_89(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-        int i;
-
-        codec->num_pcms = spec->num_cvts;
-        codec->pcm_info = info;
-
-        for (i = 0; i < codec->num_pcms; i++, info++) {
-                unsigned int chans;
-
-                chans = get_wcaps(codec, spec->cvt[i]);
-                chans = get_wcaps_channels(chans);
-
-                info->name = nvhdmi_pcm_names[i];
-                info->pcm_type = HDA_PCM_TYPE_HDMI;
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK]
-                                        = nvhdmi_pcm_digital_playback_8ch_89;
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->cvt[i];
-                info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
-        }
-
-        return 0;
-}
-
-static int nvhdmi_build_pcms_8ch_7x(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        info->name = "NVIDIA HDMI";
-        info->pcm_type = HDA_PCM_TYPE_HDMI;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK]
-                                        = nvhdmi_pcm_digital_playback_8ch_7x;
-
-        return 0;
-}
-
-static int nvhdmi_build_pcms_2ch(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
-
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        info->name = "NVIDIA HDMI";
-        info->pcm_type = HDA_PCM_TYPE_HDMI;
-        info->stream[SNDRV_PCM_STREAM_PLAYBACK]
-                                        = nvhdmi_pcm_digital_playback_2ch;
-
-        return 0;
-}
-
-static struct hda_codec_ops nvhdmi_patch_ops_8ch_89 = {
-        .build_controls = nvhdmi_build_controls,
-        .build_pcms = nvhdmi_build_pcms_8ch_89,
-        .init = nvhdmi_init,
-        .free = nvhdmi_free,
-        .unsol_event = hdmi_unsol_event,
-};
-
-static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
-        .build_controls = nvhdmi_build_controls,
-        .build_pcms = nvhdmi_build_pcms_8ch_7x,
-        .init = nvhdmi_init,
-        .free = nvhdmi_free,
-};
-
-static struct hda_codec_ops nvhdmi_patch_ops_2ch = {
-        .build_controls = nvhdmi_build_controls,
-        .build_pcms = nvhdmi_build_pcms_2ch,
-        .init = nvhdmi_init,
-        .free = nvhdmi_free,
-};
-
-static int patch_nvhdmi_8ch_89(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec;
-        int i;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-        spec->codec_type = HDA_CODEC_NVIDIA_MCP89;
-        spec->old_pin_detect = 1;
-
-        if (hdmi_parse_codec(codec) < 0) {
-                codec->spec = NULL;
-                kfree(spec);
-                return -EINVAL;
-        }
-        codec->patch_ops = nvhdmi_patch_ops_8ch_89;
-
-        for (i = 0; i < spec->num_pins; i++)
-                snd_hda_eld_proc_new(codec, &spec->sink_eld[i], i);
-
-        init_channel_allocations();
-
-        return 0;
-}
-
-static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        spec->multiout.num_dacs = 0;  /* no analog */
-        spec->multiout.max_channels = 8;
-        spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;
-        spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;
-        spec->old_pin_detect = 1;
-
-        codec->patch_ops = nvhdmi_patch_ops_8ch_7x;
-
-        return 0;
-}
-
-static int patch_nvhdmi_2ch(struct hda_codec *codec)
-{
-        struct hdmi_spec *spec;
-
-        spec = kzalloc(sizeof(*spec), GFP_KERNEL);
-        if (spec == NULL)
-                return -ENOMEM;
-
-        codec->spec = spec;
-
-        spec->multiout.num_dacs = 0;  /* no analog */
-        spec->multiout.max_channels = 2;
-        spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;
-        spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;
-        spec->old_pin_detect = 1;
-
-        codec->patch_ops = nvhdmi_patch_ops_2ch;
-
-        return 0;
-}
-
-/*
- * patch entries
- */
-static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
-        { .id = 0x10de0002, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de0003, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de0005, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de0006, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de0007, .name = "MCP79/7A HDMI",  .patch = patch_nvhdmi_8ch_7x },
-        { .id = 0x10de000a, .name = "GPU 0a HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de000b, .name = "GPU 0b HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de000c, .name = "MCP89 HDMI",     .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de000d, .name = "GPU 0d HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0010, .name = "GPU 10 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0011, .name = "GPU 11 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
-        { .id = 0x10de0067, .name = "MCP67 HDMI",     .patch = patch_nvhdmi_2ch },
-        { .id = 0x10de8001, .name = "MCP73 HDMI",     .patch = patch_nvhdmi_2ch },
-        {} /* terminator */
-};
-
-MODULE_ALIAS("snd-hda-codec-id:10de0002");
-MODULE_ALIAS("snd-hda-codec-id:10de0003");
-MODULE_ALIAS("snd-hda-codec-id:10de0005");
-MODULE_ALIAS("snd-hda-codec-id:10de0006");
-MODULE_ALIAS("snd-hda-codec-id:10de0007");
-MODULE_ALIAS("snd-hda-codec-id:10de000a");
-MODULE_ALIAS("snd-hda-codec-id:10de000b");
-MODULE_ALIAS("snd-hda-codec-id:10de000c");
-MODULE_ALIAS("snd-hda-codec-id:10de000d");
-MODULE_ALIAS("snd-hda-codec-id:10de0010");
-MODULE_ALIAS("snd-hda-codec-id:10de0011");
-MODULE_ALIAS("snd-hda-codec-id:10de0012");
-MODULE_ALIAS("snd-hda-codec-id:10de0013");
-MODULE_ALIAS("snd-hda-codec-id:10de0014");
-MODULE_ALIAS("snd-hda-codec-id:10de0018");
-MODULE_ALIAS("snd-hda-codec-id:10de0019");
-MODULE_ALIAS("snd-hda-codec-id:10de001a");
-MODULE_ALIAS("snd-hda-codec-id:10de001b");
-MODULE_ALIAS("snd-hda-codec-id:10de001c");
-MODULE_ALIAS("snd-hda-codec-id:10de0040");
-MODULE_ALIAS("snd-hda-codec-id:10de0041");
-MODULE_ALIAS("snd-hda-codec-id:10de0042");
-MODULE_ALIAS("snd-hda-codec-id:10de0043");
-MODULE_ALIAS("snd-hda-codec-id:10de0044");
-MODULE_ALIAS("snd-hda-codec-id:10de0067");
-MODULE_ALIAS("snd-hda-codec-id:10de8001");
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("NVIDIA HDMI HD-audio codec");
-
-static struct hda_codec_preset_list nvhdmi_list = {
-        .preset = snd_hda_preset_nvhdmi,
-        .owner = THIS_MODULE,
-};
-
-static int __init patch_nvhdmi_init(void)
-{
-        return snd_hda_add_codec_preset(&nvhdmi_list);
-}
-
-static void __exit patch_nvhdmi_exit(void)
-{
-        snd_hda_delete_codec_preset(&nvhdmi_list);
-}
-
-module_init(patch_nvhdmi_init)
-module_exit(patch_nvhdmi_exit)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a432e6efd19b..b48fb43b5448 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <sound/core.h>
+#include <sound/jack.h>
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_beep.h"
@@ -230,7 +231,6 @@ enum {
         ALC888_ACER_ASPIRE_8930G,
         ALC888_ACER_ASPIRE_7730G,
         ALC883_MEDION,
-        ALC883_MEDION_MD2,
         ALC883_MEDION_WIM2160,
         ALC883_LAPTOP_EAPD,
         ALC883_LENOVO_101E_2ch,
@@ -294,13 +294,28 @@ struct alc_customize_define {
         unsigned int  platform_type:1;
         unsigned int  swap:1;
         unsigned int  override:1;
+        unsigned int  fixup:1; /* Means that this sku is set by driver, not read from hw */
+};
+
+struct alc_fixup;
+
+struct alc_multi_io {
+        hda_nid_t pin;          /* multi-io widget pin NID */
+        hda_nid_t dac;          /* DAC to be connected */
+        unsigned int ctl_in;    /* cached input-pin control value */
+};
+
+enum {
+        ALC_AUTOMUTE_PIN,       /* change the pin control */
+        ALC_AUTOMUTE_AMP,       /* mute/unmute the pin AMP */
+        ALC_AUTOMUTE_MIXER,     /* mute/unmute mixer widget AMP */
 };
 
 struct alc_spec {
         /* codec parameterization */
-        struct snd_kcontrol_new *mixers[5];     /* mixer arrays */
+        const struct snd_kcontrol_new *mixers[5];       /* mixer arrays */
         unsigned int num_mixers;
-        struct snd_kcontrol_new *cap_mixer;     /* capture mixer */
+        const 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[10];  /* initialization verbs
@@ -310,14 +325,14 @@ struct alc_spec {
         unsigned int num_init_verbs;
 
         char stream_name_analog[32];    /* analog PCM stream */
-        struct hda_pcm_stream *stream_analog_playback;
-        struct hda_pcm_stream *stream_analog_capture;
-        struct hda_pcm_stream *stream_analog_alt_playback;
-        struct hda_pcm_stream *stream_analog_alt_capture;
+        const struct hda_pcm_stream *stream_analog_playback;
+        const struct hda_pcm_stream *stream_analog_capture;
+        const struct hda_pcm_stream *stream_analog_alt_playback;
+        const struct hda_pcm_stream *stream_analog_alt_capture;
 
         char stream_name_digital[32];   /* digital PCM stream */
-        struct hda_pcm_stream *stream_digital_playback;
-        struct hda_pcm_stream *stream_digital_capture;
+        const struct hda_pcm_stream *stream_digital_playback;
+        const struct hda_pcm_stream *stream_digital_capture;
 
         /* playback */
         struct hda_multi_out multiout;  /* playback set-up
@@ -330,8 +345,8 @@ struct alc_spec {
 
         /* capture */
         unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
-        hda_nid_t *capsrc_nids;
+        const hda_nid_t *adc_nids;
+        const hda_nid_t *capsrc_nids;
         hda_nid_t dig_in_nid;           /* digital-in NID; optional */
 
         /* capture setup for dynamic dual-adc switch */
@@ -345,6 +360,7 @@ struct alc_spec {
         const struct hda_input_mux *input_mux;
         unsigned int cur_mux[3];
         struct alc_mic_route ext_mic;
+        struct alc_mic_route dock_mic;
         struct alc_mic_route int_mic;
 
         /* channel model */
@@ -372,17 +388,29 @@ struct alc_spec {
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         void (*power_hook)(struct hda_codec *codec);
 #endif
+        void (*shutup)(struct hda_codec *codec);
 
         /* for pin sensing */
-        unsigned int sense_updated: 1;
         unsigned int jack_present: 1;
-        unsigned int master_sw: 1;
+        unsigned int line_jack_present:1;
+        unsigned int master_mute:1;
         unsigned int auto_mic:1;
+        unsigned int automute:1;        /* HP automute enabled */
+        unsigned int detect_line:1;     /* Line-out detection enabled */
+        unsigned int automute_lines:1;  /* automute line-out as well */
+        unsigned int automute_hp_lo:1;  /* both HP and LO available */
 
         /* other flags */
         unsigned int no_analog :1; /* digital I/O only */
         unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */
+        unsigned int single_input_src:1;
+
+        /* auto-mute control */
+        int automute_mode;
+        hda_nid_t automute_mixer_nid[AUTO_CFG_MAX_OUTS];
+
         int init_amp;
+        int codec_variant;      /* flag for other variants */
 
         /* for virtual master */
         hda_nid_t vmaster_nid;
@@ -393,25 +421,34 @@ struct alc_spec {
         /* for PLL fix */
         hda_nid_t pll_nid;
         unsigned int pll_coef_idx, pll_coef_bit;
+
+        /* fix-up list */
+        int fixup_id;
+        const struct alc_fixup *fixup_list;
+        const char *fixup_name;
+
+        /* multi-io */
+        int multi_ios;
+        struct alc_multi_io multi_io[4];
 };
 
 /*
  * configuration template - to be copied to the spec instance
  */
 struct alc_config_preset {
-        struct snd_kcontrol_new *mixers[5]; /* should be identical size
+        const struct snd_kcontrol_new *mixers[5]; /* should be identical size
                                              * with spec
                                              */
-        struct snd_kcontrol_new *cap_mixer; /* capture mixer */
+        const struct snd_kcontrol_new *cap_mixer; /* capture mixer */
         const struct hda_verb *init_verbs[5];
         unsigned int num_dacs;
-        hda_nid_t *dac_nids;
+        const hda_nid_t *dac_nids;
         hda_nid_t dig_out_nid;          /* optional */
         hda_nid_t hp_nid;               /* optional */
-        hda_nid_t *slave_dig_outs;
+        const hda_nid_t *slave_dig_outs;
         unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
-        hda_nid_t *capsrc_nids;
+        const hda_nid_t *adc_nids;
+        const hda_nid_t *capsrc_nids;
         hda_nid_t dig_in_nid;
         unsigned int num_channel_mode;
         const struct hda_channel_mode *channel_mode;
@@ -423,7 +460,7 @@ struct alc_config_preset {
         void (*setup)(struct hda_codec *);
         void (*init_hook)(struct hda_codec *);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-        struct hda_amp_list *loopbacks;
+        const struct hda_amp_list *loopbacks;
         void (*power_hook)(struct hda_codec *codec);
 #endif
 };
@@ -539,7 +576,7 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,
 
 /*
  * Control the mode of pin widget settings via the mixer.  "pc" is used
- * instead of "%" to avoid consequences of accidently treating the % as
+ * instead of "%" to avoid consequences of accidentally treating the % as
  * being part of a format specifier.  Maximum allowed length of a value is
  * 63 characters plus NULL terminator.
  *
@@ -550,11 +587,11 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,
  * NIDs 0x0f and 0x10 have been observed to have this behaviour as of
  * March 2006.
  */
-static char *alc_pin_mode_names[] = {
+static const char * const alc_pin_mode_names[] = {
         "Mic 50pc bias", "Mic 80pc bias",
         "Line in", "Line out", "Headphone out",
 };
-static unsigned char alc_pin_mode_values[] = {
+static const unsigned char alc_pin_mode_values[] = {
         PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP,
 };
 /* The control can present all 5 options, or it can limit the options based
@@ -573,7 +610,7 @@ static unsigned char alc_pin_mode_values[] = {
 /* Info about the pin modes supported by the different pin direction modes.
  * For each direction the minimum and maximum values are given.
  */
-static signed char alc_pin_mode_dir_info[5][2] = {
+static const signed char alc_pin_mode_dir_info[5][2] = {
         { 0, 2 },    /* ALC_PIN_DIR_IN */
         { 3, 4 },    /* ALC_PIN_DIR_OUT */
         { 0, 4 },    /* ALC_PIN_DIR_INOUT */
@@ -846,7 +883,7 @@ static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
 {
         unsigned int val = PIN_IN;
 
-        if (auto_pin_type <= AUTO_PIN_FRONT_MIC) {
+        if (auto_pin_type == AUTO_PIN_MIC) {
                 unsigned int pincap;
                 unsigned int oldval;
                 oldval = snd_hda_codec_read(codec, nid, 0,
@@ -866,9 +903,31 @@ static void alc_set_input_pin(struct hda_codec *codec, hda_nid_t nid,
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, val);
 }
 
+static void alc_fixup_autocfg_pin_nums(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+
+        if (!cfg->line_outs) {
+                while (cfg->line_outs < AUTO_CFG_MAX_OUTS &&
+                       cfg->line_out_pins[cfg->line_outs])
+                        cfg->line_outs++;
+        }
+        if (!cfg->speaker_outs) {
+                while (cfg->speaker_outs < AUTO_CFG_MAX_OUTS &&
+                       cfg->speaker_pins[cfg->speaker_outs])
+                        cfg->speaker_outs++;
+        }
+        if (!cfg->hp_outs) {
+                while (cfg->hp_outs < AUTO_CFG_MAX_OUTS &&
+                       cfg->hp_pins[cfg->hp_outs])
+                        cfg->hp_outs++;
+        }
+}
+
 /*
  */
-static void add_mixer(struct alc_spec *spec, struct snd_kcontrol_new *mix)
+static void add_mixer(struct alc_spec *spec, const struct snd_kcontrol_new *mix)
 {
         if (snd_BUG_ON(spec->num_mixers >= ARRAY_SIZE(spec->mixers)))
                 return;
@@ -934,24 +993,26 @@ static void setup_preset(struct hda_codec *codec,
 
         if (preset->setup)
                 preset->setup(codec);
+
+        alc_fixup_autocfg_pin_nums(codec);
 }
 
 /* Enable GPIO mask and set output */
-static struct hda_verb alc_gpio1_init_verbs[] = {
+static const struct hda_verb alc_gpio1_init_verbs[] = {
         {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
         {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
         {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
         { }
 };
 
-static struct hda_verb alc_gpio2_init_verbs[] = {
+static const struct hda_verb alc_gpio2_init_verbs[] = {
         {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
         {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
         {0x01, AC_VERB_SET_GPIO_DATA, 0x02},
         { }
 };
 
-static struct hda_verb alc_gpio3_init_verbs[] = {
+static const struct hda_verb alc_gpio3_init_verbs[] = {
         {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
         {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03},
         {0x01, AC_VERB_SET_GPIO_DATA, 0x03},
@@ -990,25 +1051,149 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
         alc_fix_pll(codec);
 }
 
-static void alc_automute_pin(struct hda_codec *codec)
+static int alc_init_jacks(struct hda_codec *codec)
+{
+#ifdef CONFIG_SND_HDA_INPUT_JACK
+        struct alc_spec *spec = codec->spec;
+        int err;
+        unsigned int hp_nid = spec->autocfg.hp_pins[0];
+        unsigned int mic_nid = spec->ext_mic.pin;
+        unsigned int dock_nid = spec->dock_mic.pin;
+
+        if (hp_nid) {
+                err = snd_hda_input_jack_add(codec, hp_nid,
+                                             SND_JACK_HEADPHONE, NULL);
+                if (err < 0)
+                        return err;
+                snd_hda_input_jack_report(codec, hp_nid);
+        }
+
+        if (mic_nid) {
+                err = snd_hda_input_jack_add(codec, mic_nid,
+                                             SND_JACK_MICROPHONE, NULL);
+                if (err < 0)
+                        return err;
+                snd_hda_input_jack_report(codec, mic_nid);
+        }
+        if (dock_nid) {
+                err = snd_hda_input_jack_add(codec, dock_nid,
+                                             SND_JACK_MICROPHONE, NULL);
+                if (err < 0)
+                        return err;
+                snd_hda_input_jack_report(codec, dock_nid);
+        }
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
+        return 0;
+}
+
+static int detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins)
+{
+        int i, present = 0;
+
+        for (i = 0; i < num_pins; i++) {
+                hda_nid_t nid = pins[i];
+                if (!nid)
+                        break;
+                snd_hda_input_jack_report(codec, nid);
+                present |= snd_hda_jack_detect(codec, nid);
+        }
+        return present;
+}
+
+static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
+                        bool mute, bool hp_out)
 {
         struct alc_spec *spec = codec->spec;
-        unsigned int nid = spec->autocfg.hp_pins[0];
+        unsigned int mute_bits = mute ? HDA_AMP_MUTE : 0;
+        unsigned int pin_bits = mute ? 0 : (hp_out ? PIN_HP : PIN_OUT);
         int i;
 
-        if (!nid)
-                return;
-        spec->jack_present = snd_hda_jack_detect(codec, nid);
-        for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
-                nid = spec->autocfg.speaker_pins[i];
+        for (i = 0; i < num_pins; i++) {
+                hda_nid_t nid = pins[i];
                 if (!nid)
                         break;
-                snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                    spec->jack_present ? 0 : PIN_OUT);
+                switch (spec->automute_mode) {
+                case ALC_AUTOMUTE_PIN:
+                        snd_hda_codec_write(codec, nid, 0,
+                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                            pin_bits);
+                        break;
+                case ALC_AUTOMUTE_AMP:
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, mute_bits);
+                        break;
+                case ALC_AUTOMUTE_MIXER:
+                        nid = spec->automute_mixer_nid[i];
+                        if (!nid)
+                                break;
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
+                                                 HDA_AMP_MUTE, mute_bits);
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 1,
+                                                 HDA_AMP_MUTE, mute_bits);
+                        break;
+                }
         }
 }
 
+/* Toggle internal speakers muting */
+static void update_speakers(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int on;
+
+        /* Control HP pins/amps depending on master_mute state;
+         * in general, HP pins/amps control should be enabled in all cases,
+         * but currently set only for master_mute, just to be safe
+         */
+        do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
+                    spec->autocfg.hp_pins, spec->master_mute, true);
+
+        if (!spec->automute)
+                on = 0;
+        else
+                on = spec->jack_present | spec->line_jack_present;
+        on |= spec->master_mute;
+        do_automute(codec, ARRAY_SIZE(spec->autocfg.speaker_pins),
+                    spec->autocfg.speaker_pins, on, false);
+
+        /* toggle line-out mutes if needed, too */
+        /* if LO is a copy of either HP or Speaker, don't need to handle it */
+        if (spec->autocfg.line_out_pins[0] == spec->autocfg.hp_pins[0] ||
+            spec->autocfg.line_out_pins[0] == spec->autocfg.speaker_pins[0])
+                return;
+        if (!spec->automute_lines || !spec->automute)
+                on = 0;
+        else
+                on = spec->jack_present;
+        on |= spec->master_mute;
+        do_automute(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
+                    spec->autocfg.line_out_pins, on, false);
+}
+
+static void alc_hp_automute(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (!spec->automute)
+                return;
+        spec->jack_present =
+                detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
+                             spec->autocfg.hp_pins);
+        update_speakers(codec);
+}
+
+static void alc_line_automute(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        if (!spec->automute || !spec->detect_line)
+                return;
+        spec->line_jack_present =
+                detect_jacks(codec, ARRAY_SIZE(spec->autocfg.line_out_pins),
+                             spec->autocfg.line_out_pins);
+        update_speakers(codec);
+}
+
 static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,
                                 hda_nid_t nid)
 {
@@ -1048,7 +1233,7 @@ static void alc_dual_mic_adc_auto_switch(struct hda_codec *codec)
 static void alc_mic_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        struct alc_mic_route *dead, *alive;
+        struct alc_mic_route *dead1, *dead2, *alive;
         unsigned int present, type;
         hda_nid_t cap_nid;
 
@@ -1066,13 +1251,24 @@ static void alc_mic_automute(struct hda_codec *codec)
 
         cap_nid = spec->capsrc_nids ? spec->capsrc_nids[0] : spec->adc_nids[0];
 
+        alive = &spec->int_mic;
+        dead1 = &spec->ext_mic;
+        dead2 = &spec->dock_mic;
+
         present = snd_hda_jack_detect(codec, spec->ext_mic.pin);
         if (present) {
                 alive = &spec->ext_mic;
-                dead = &spec->int_mic;
-        } else {
-                alive = &spec->int_mic;
-                dead = &spec->ext_mic;
+                dead1 = &spec->int_mic;
+                dead2 = &spec->dock_mic;
+        }
+        if (!present && spec->dock_mic.pin > 0) {
+                present = snd_hda_jack_detect(codec, spec->dock_mic.pin);
+                if (present) {
+                        alive = &spec->dock_mic;
+                        dead1 = &spec->int_mic;
+                        dead2 = &spec->ext_mic;
+                }
+                snd_hda_input_jack_report(codec, spec->dock_mic.pin);
         }
 
         type = get_wcaps_type(get_wcaps(codec, cap_nid));
@@ -1081,15 +1277,21 @@ static void alc_mic_automute(struct hda_codec *codec)
                 snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,
                                          alive->mux_idx,
                                          HDA_AMP_MUTE, 0);
-                snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,
-                                         dead->mux_idx,
-                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
+                if (dead1->pin > 0)
+                        snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,
+                                                 dead1->mux_idx,
+                                                 HDA_AMP_MUTE, HDA_AMP_MUTE);
+                if (dead2->pin > 0)
+                        snd_hda_codec_amp_stereo(codec, cap_nid, HDA_INPUT,
+                                                 dead2->mux_idx,
+                                                 HDA_AMP_MUTE, HDA_AMP_MUTE);
         } else {
                 /* MUX style (e.g. ALC880) */
                 snd_hda_codec_write_cache(codec, cap_nid, 0,
                                           AC_VERB_SET_CONNECT_SEL,
                                           alive->mux_idx);
         }
+        snd_hda_input_jack_report(codec, spec->ext_mic.pin);
 
         /* FIXME: analog mixer */
 }
@@ -1103,7 +1305,10 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
                 res >>= 26;
         switch (res) {
         case ALC880_HP_EVENT:
-                alc_automute_pin(codec);
+                alc_hp_automute(codec);
+                break;
+        case ALC880_FRONT_EVENT:
+                alc_line_automute(codec);
                 break;
         case ALC880_MIC_EVENT:
                 alc_mic_automute(codec);
@@ -1113,7 +1318,8 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
 
 static void alc_inithook(struct hda_codec *codec)
 {
-        alc_automute_pin(codec);
+        alc_hp_automute(codec);
+        alc_line_automute(codec);
         alc_mic_automute(codec);
 }
 
@@ -1155,6 +1361,43 @@ static void set_eapd(struct hda_codec *codec, hda_nid_t nid, int on)
                                     on ? 2 : 0);
 }
 
+/* turn on/off EAPD controls of the codec */
+static void alc_auto_setup_eapd(struct hda_codec *codec, bool on)
+{
+        /* We currently only handle front, HP */
+        switch (codec->vendor_id) {
+        case 0x10ec0260:
+                set_eapd(codec, 0x0f, on);
+                set_eapd(codec, 0x10, on);
+                break;
+        case 0x10ec0262:
+        case 0x10ec0267:
+        case 0x10ec0268:
+        case 0x10ec0269:
+        case 0x10ec0270:
+        case 0x10ec0272:
+        case 0x10ec0660:
+        case 0x10ec0662:
+        case 0x10ec0663:
+        case 0x10ec0665:
+        case 0x10ec0862:
+        case 0x10ec0889:
+        case 0x10ec0892:
+                set_eapd(codec, 0x14, on);
+                set_eapd(codec, 0x15, on);
+                break;
+        }
+}
+
+/* generic shutup callback;
+ * just turning off EPAD and a little pause for avoiding pop-noise
+ */
+static void alc_eapd_shutup(struct hda_codec *codec)
+{
+        alc_auto_setup_eapd(codec, false);
+        msleep(200);
+}
+
 static void alc_auto_init_amp(struct hda_codec *codec, int type)
 {
         unsigned int tmp;
@@ -1170,26 +1413,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
                 snd_hda_sequence_write(codec, alc_gpio3_init_verbs);
                 break;
         case ALC_INIT_DEFAULT:
-                switch (codec->vendor_id) {
-                case 0x10ec0260:
-                        set_eapd(codec, 0x0f, 1);
-                        set_eapd(codec, 0x10, 1);
-                        break;
-                case 0x10ec0262:
-                case 0x10ec0267:
-                case 0x10ec0268:
-                case 0x10ec0269:
-                case 0x10ec0270:
-                case 0x10ec0272:
-                case 0x10ec0660:
-                case 0x10ec0662:
-                case 0x10ec0663:
-                case 0x10ec0862:
-                case 0x10ec0889:
-                        set_eapd(codec, 0x14, 1);
-                        set_eapd(codec, 0x15, 1);
-                        break;
-                }
+                alc_auto_setup_eapd(codec, true);
                 switch (codec->vendor_id) {
                 case 0x10ec0260:
                         snd_hda_codec_write(codec, 0x1a, 0,
@@ -1208,7 +1432,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
                 case 0x10ec0883:
                 case 0x10ec0885:
                 case 0x10ec0887:
-                case 0x10ec0889:
+                /*case 0x10ec0889:*/ /* this causes an SPDIF problem */
                         alc889_coef_init(codec);
                         break;
                 case 0x10ec0888:
@@ -1233,73 +1457,230 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type)
         }
 }
 
+static int alc_automute_mode_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        static const char * const texts2[] = {
+                "Disabled", "Enabled"
+        };
+        static const char * const texts3[] = {
+                "Disabled", "Speaker Only", "Line-Out+Speaker"
+        };
+        const char * const *texts;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        if (spec->automute_hp_lo) {
+                uinfo->value.enumerated.items = 3;
+                texts = texts3;
+        } else {
+                uinfo->value.enumerated.items = 2;
+                texts = texts2;
+        }
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name,
+               texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int alc_automute_mode_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        unsigned int val;
+        if (!spec->automute)
+                val = 0;
+        else if (!spec->automute_lines)
+                val = 1;
+        else
+                val = 2;
+        ucontrol->value.enumerated.item[0] = val;
+        return 0;
+}
+
+static int alc_automute_mode_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+
+        switch (ucontrol->value.enumerated.item[0]) {
+        case 0:
+                if (!spec->automute)
+                        return 0;
+                spec->automute = 0;
+                break;
+        case 1:
+                if (spec->automute && !spec->automute_lines)
+                        return 0;
+                spec->automute = 1;
+                spec->automute_lines = 0;
+                break;
+        case 2:
+                if (!spec->automute_hp_lo)
+                        return -EINVAL;
+                if (spec->automute && spec->automute_lines)
+                        return 0;
+                spec->automute = 1;
+                spec->automute_lines = 1;
+                break;
+        default:
+                return -EINVAL;
+        }
+        update_speakers(codec);
+        return 1;
+}
+
+static const struct snd_kcontrol_new alc_automute_mode_enum = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Auto-Mute Mode",
+        .info = alc_automute_mode_info,
+        .get = alc_automute_mode_get,
+        .put = alc_automute_mode_put,
+};
+
+static struct snd_kcontrol_new *alc_kcontrol_new(struct alc_spec *spec);
+
+static int alc_add_automute_mode_enum(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        struct snd_kcontrol_new *knew;
+
+        knew = alc_kcontrol_new(spec);
+        if (!knew)
+                return -ENOMEM;
+        *knew = alc_automute_mode_enum;
+        knew->name = kstrdup("Auto-Mute Mode", GFP_KERNEL);
+        if (!knew->name)
+                return -ENOMEM;
+        return 0;
+}
+
 static void alc_init_auto_hp(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int present = 0;
+        int i;
 
-        if (!spec->autocfg.hp_pins[0])
+        if (cfg->hp_pins[0])
+                present++;
+        if (cfg->line_out_pins[0])
+                present++;
+        if (cfg->speaker_pins[0])
+                present++;
+        if (present < 2) /* need two different output types */
                 return;
+        if (present == 3)
+                spec->automute_hp_lo = 1; /* both HP and LO automute */
 
-        if (!spec->autocfg.speaker_pins[0]) {
-                if (spec->autocfg.line_out_pins[0] &&
-                    spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
-                        spec->autocfg.speaker_pins[0] =
-                                spec->autocfg.line_out_pins[0];
-                else
-                        return;
+        if (!cfg->speaker_pins[0]) {
+                memcpy(cfg->speaker_pins, cfg->line_out_pins,
+                       sizeof(cfg->speaker_pins));
+                cfg->speaker_outs = cfg->line_outs;
+        }
+
+        if (!cfg->hp_pins[0]) {
+                memcpy(cfg->hp_pins, cfg->line_out_pins,
+                       sizeof(cfg->hp_pins));
+                cfg->hp_outs = cfg->line_outs;
         }
 
-        snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",
-                    spec->autocfg.hp_pins[0]);
-        snd_hda_codec_write_cache(codec, spec->autocfg.hp_pins[0], 0,
+        for (i = 0; i < cfg->hp_outs; i++) {
+                hda_nid_t nid = cfg->hp_pins[i];
+                if (!is_jack_detectable(codec, nid))
+                        continue;
+                snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",
+                            nid);
+                snd_hda_codec_write_cache(codec, nid, 0,
                                   AC_VERB_SET_UNSOLICITED_ENABLE,
                                   AC_USRSP_EN | ALC880_HP_EVENT);
-        spec->unsol_event = alc_sku_unsol_event;
+                spec->automute = 1;
+                spec->automute_mode = ALC_AUTOMUTE_PIN;
+        }
+        if (spec->automute && cfg->line_out_pins[0] &&
+            cfg->line_out_pins[0] != cfg->hp_pins[0] &&
+            cfg->line_out_pins[0] != cfg->speaker_pins[0]) {
+                for (i = 0; i < cfg->line_outs; i++) {
+                        hda_nid_t nid = cfg->line_out_pins[i];
+                        if (!is_jack_detectable(codec, nid))
+                                continue;
+                        snd_printdd("realtek: Enable Line-Out auto-muting "
+                                    "on NID 0x%x\n", nid);
+                        snd_hda_codec_write_cache(codec, nid, 0,
+                                        AC_VERB_SET_UNSOLICITED_ENABLE,
+                                        AC_USRSP_EN | ALC880_FRONT_EVENT);
+                        spec->detect_line = 1;
+                }
+                spec->automute_lines = spec->detect_line;
+        }
+
+        if (spec->automute) {
+                /* create a control for automute mode */
+                alc_add_automute_mode_enum(codec);
+                spec->unsol_event = alc_sku_unsol_event;
+        }
 }
 
 static void alc_init_auto_mic(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t fixed, ext;
+        hda_nid_t fixed, ext, dock;
         int i;
 
-        /* there must be only two mic inputs exclusively */
-        for (i = AUTO_PIN_LINE; i < AUTO_PIN_LAST; i++)
-                if (cfg->input_pins[i])
-                        return;
-
-        fixed = ext = 0;
-        for (i = AUTO_PIN_MIC; i <= AUTO_PIN_FRONT_MIC; i++) {
-                hda_nid_t nid = cfg->input_pins[i];
+        fixed = ext = dock = 0;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 unsigned int defcfg;
-                if (!nid)
-                        return;
                 defcfg = snd_hda_codec_get_pincfg(codec, nid);
-                switch (get_defcfg_connect(defcfg)) {
-                case AC_JACK_PORT_FIXED:
+                switch (snd_hda_get_input_pin_attr(defcfg)) {
+                case INPUT_PIN_ATTR_INT:
                         if (fixed)
                                 return; /* already occupied */
+                        if (cfg->inputs[i].type != AUTO_PIN_MIC)
+                                return; /* invalid type */
                         fixed = nid;
                         break;
-                case AC_JACK_PORT_COMPLEX:
+                case INPUT_PIN_ATTR_UNUSED:
+                        return; /* invalid entry */
+                case INPUT_PIN_ATTR_DOCK:
+                        if (dock)
+                                return; /* already occupied */
+                        if (cfg->inputs[i].type > AUTO_PIN_LINE_IN)
+                                return; /* invalid type */
+                        dock = nid;
+                        break;
+                default:
                         if (ext)
                                 return; /* already occupied */
+                        if (cfg->inputs[i].type != AUTO_PIN_MIC)
+                                return; /* invalid type */
                         ext = nid;
                         break;
-                default:
-                        return; /* invalid entry */
                 }
         }
+        if (!ext && dock) {
+                ext = dock;
+                dock = 0;
+        }
         if (!ext || !fixed)
                 return;
-        if (!(get_wcaps(codec, ext) & AC_WCAP_UNSOL_CAP))
+        if (!is_jack_detectable(codec, ext))
+                return; /* no unsol support */
+        if (dock && !is_jack_detectable(codec, dock))
                 return; /* no unsol support */
-        snd_printdd("realtek: Enable auto-mic switch on NID 0x%x/0x%x\n",
-                    ext, fixed);
+        snd_printdd("realtek: Enable auto-mic switch on NID 0x%x/0x%x/0x%x\n",
+                    ext, fixed, dock);
         spec->ext_mic.pin = ext;
+        spec->dock_mic.pin = dock;
         spec->int_mic.pin = fixed;
         spec->ext_mic.mux_idx = MUX_IDX_UNDEF; /* set later */
+        spec->dock_mic.mux_idx = MUX_IDX_UNDEF; /* set later */
         spec->int_mic.mux_idx = MUX_IDX_UNDEF; /* set later */
         spec->auto_mic = 1;
         snd_hda_codec_write_cache(codec, spec->ext_mic.pin, 0,
@@ -1308,6 +1689,11 @@ static void alc_init_auto_mic(struct hda_codec *codec)
         spec->unsol_event = alc_sku_unsol_event;
 }
 
+/* Could be any non-zero and even value. When used as fixup, tells
+ * the driver to ignore any present sku defines.
+ */
+#define ALC_FIXUP_SKU_IGNORE (2)
+
 static int alc_auto_parse_customize_define(struct hda_codec *codec)
 {
         unsigned int ass, tmp, i;
@@ -1316,6 +1702,13 @@ static int alc_auto_parse_customize_define(struct hda_codec *codec)
 
         spec->cdefine.enable_pcbeep = 1; /* assume always enabled */
 
+        if (spec->cdefine.fixup) {
+                ass = spec->cdefine.sku_cfg;
+                if (ass == ALC_FIXUP_SKU_IGNORE)
+                        return -1;
+                goto do_sku;
+        }
+
         ass = codec->subsystem_id & 0xffff;
         if (ass != codec->bus->pci->subsystem_device && (ass & 1))
                 goto do_sku;
@@ -1383,6 +1776,13 @@ static int alc_subsystem_id(struct hda_codec *codec,
         unsigned nid;
         struct alc_spec *spec = codec->spec;
 
+        if (spec->cdefine.fixup) {
+                ass = spec->cdefine.sku_cfg;
+                if (ass == ALC_FIXUP_SKU_IGNORE)
+                        return 0;
+                goto do_sku;
+        }
+
         ass = codec->subsystem_id & 0xffff;
         if ((ass != codec->bus->pci->subsystem_device) && (ass & 1))
                 goto do_sku;
@@ -1438,6 +1838,7 @@ do_sku:
                 spec->init_amp = ALC_INIT_GPIO3;
                 break;
         case 5:
+        default:
                 spec->init_amp = ALC_INIT_DEFAULT;
                 break;
         }
@@ -1472,9 +1873,6 @@ do_sku:
                                 return 1;
                 spec->autocfg.hp_pins[0] = nid;
         }
-
-        alc_init_auto_hp(codec);
-        alc_init_auto_mic(codec);
         return 1;
 }
 
@@ -1487,9 +1885,10 @@ static void alc_ssid_check(struct hda_codec *codec,
                 snd_printd("realtek: "
                            "Enable default setup for auto mode as fallback\n");
                 spec->init_amp = ALC_INIT_DEFAULT;
-                alc_init_auto_hp(codec);
-                alc_init_auto_mic(codec);
         }
+
+        alc_init_auto_hp(codec);
+        alc_init_auto_mic(codec);
 }
 
 /*
@@ -1501,37 +1900,139 @@ struct alc_pincfg {
         u32 val;
 };
 
+struct alc_model_fixup {
+        const int id;
+        const char *name;
+};
+
 struct alc_fixup {
-        const struct alc_pincfg *pins;
-        const struct hda_verb *verbs;
+        int type;
+        bool chained;
+        int chain_id;
+        union {
+                unsigned int sku;
+                const struct alc_pincfg *pins;
+                const struct hda_verb *verbs;
+                void (*func)(struct hda_codec *codec,
+                             const struct alc_fixup *fix,
+                             int action);
+        } v;
 };
 
-static void alc_pick_fixup(struct hda_codec *codec,
-                           const struct snd_pci_quirk *quirk,
-                           const struct alc_fixup *fix,
-                           int pre_init)
-{
-        const struct alc_pincfg *cfg;
+enum {
+        ALC_FIXUP_INVALID,
+        ALC_FIXUP_SKU,
+        ALC_FIXUP_PINS,
+        ALC_FIXUP_VERBS,
+        ALC_FIXUP_FUNC,
+};
 
-        quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
-        if (!quirk)
-                return;
-        fix += quirk->value;
-        cfg = fix->pins;
-        if (pre_init && cfg) {
+enum {
+        ALC_FIXUP_ACT_PRE_PROBE,
+        ALC_FIXUP_ACT_PROBE,
+        ALC_FIXUP_ACT_INIT,
+};
+
+static void alc_apply_fixup(struct hda_codec *codec, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        int id = spec->fixup_id;
 #ifdef CONFIG_SND_DEBUG_VERBOSE
-                snd_printdd(KERN_INFO "hda_codec: %s: Apply pincfg for %s\n",
-                            codec->chip_name, quirk->name);
+        const char *modelname = spec->fixup_name;
 #endif
-                for (; cfg->nid; cfg++)
-                        snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val);
+        int depth = 0;
+
+        if (!spec->fixup_list)
+                return;
+
+        while (id >= 0) {
+                const struct alc_fixup *fix = spec->fixup_list + id;
+                const struct alc_pincfg *cfg;
+
+                switch (fix->type) {
+                case ALC_FIXUP_SKU:
+                        if (action != ALC_FIXUP_ACT_PRE_PROBE || !fix->v.sku)
+                                break;;
+                        snd_printdd(KERN_INFO "hda_codec: %s: "
+                                    "Apply sku override for %s\n",
+                                    codec->chip_name, modelname);
+                        spec->cdefine.sku_cfg = fix->v.sku;
+                        spec->cdefine.fixup = 1;
+                        break;
+                case ALC_FIXUP_PINS:
+                        cfg = fix->v.pins;
+                        if (action != ALC_FIXUP_ACT_PRE_PROBE || !cfg)
+                                break;
+                        snd_printdd(KERN_INFO "hda_codec: %s: "
+                                    "Apply pincfg for %s\n",
+                                    codec->chip_name, modelname);
+                        for (; cfg->nid; cfg++)
+                                snd_hda_codec_set_pincfg(codec, cfg->nid,
+                                                         cfg->val);
+                        break;
+                case ALC_FIXUP_VERBS:
+                        if (action != ALC_FIXUP_ACT_PROBE || !fix->v.verbs)
+                                break;
+                        snd_printdd(KERN_INFO "hda_codec: %s: "
+                                    "Apply fix-verbs for %s\n",
+                                    codec->chip_name, modelname);
+                        add_verb(codec->spec, fix->v.verbs);
+                        break;
+                case ALC_FIXUP_FUNC:
+                        if (!fix->v.func)
+                                break;
+                        snd_printdd(KERN_INFO "hda_codec: %s: "
+                                    "Apply fix-func for %s\n",
+                                    codec->chip_name, modelname);
+                        fix->v.func(codec, fix, action);
+                        break;
+                default:
+                        snd_printk(KERN_ERR "hda_codec: %s: "
+                                   "Invalid fixup type %d\n",
+                                   codec->chip_name, fix->type);
+                        break;
+                }
+                if (!fix->chained)
+                        break;
+                if (++depth > 10)
+                        break;
+                id = fix->chain_id;
+        }
+}
+
+static void alc_pick_fixup(struct hda_codec *codec,
+                           const struct alc_model_fixup *models,
+                           const struct snd_pci_quirk *quirk,
+                           const struct alc_fixup *fixlist)
+{
+        struct alc_spec *spec = codec->spec;
+        int id = -1;
+        const char *name = NULL;
+
+        if (codec->modelname && models) {
+                while (models->name) {
+                        if (!strcmp(codec->modelname, models->name)) {
+                                id = models->id;
+                                name = models->name;
+                                break;
+                        }
+                        models++;
+                }
         }
-        if (!pre_init && fix->verbs) {
+        if (id < 0) {
+                quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
+                if (quirk) {
+                        id = quirk->value;
 #ifdef CONFIG_SND_DEBUG_VERBOSE
-                snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-verbs for %s\n",
-                            codec->chip_name, quirk->name);
+                        name = quirk->name;
 #endif
-                add_verb(codec->spec, fix->verbs);
+                }
+        }
+
+        spec->fixup_id = id;
+        if (id >= 0) {
+                spec->fixup_list = fixlist;
+                spec->fixup_name = name;
         }
 }
 
@@ -1546,6 +2047,15 @@ static int alc_read_coef_idx(struct hda_codec *codec,
         return val;
 }
 
+static void alc_write_coef_idx(struct hda_codec *codec, unsigned int coef_idx,
+                                                        unsigned int coef_val)
+{
+        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_COEF_INDEX,
+                            coef_idx);
+        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF,
+                            coef_val);
+}
+
 /* set right pin controls for digital I/O */
 static void alc_auto_init_digital(struct hda_codec *codec)
 {
@@ -1620,7 +2130,7 @@ static void alc_auto_parse_digital(struct hda_codec *codec)
 /*
  * 2ch mode
  */
-static struct hda_verb alc888_4ST_ch2_intel_init[] = {
+static const struct hda_verb alc888_4ST_ch2_intel_init[] = {
 /* Mic-in jack as mic in */
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -1635,7 +2145,7 @@ static struct hda_verb alc888_4ST_ch2_intel_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc888_4ST_ch4_intel_init[] = {
+static const struct hda_verb alc888_4ST_ch4_intel_init[] = {
 /* Mic-in jack as mic in */
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -1650,7 +2160,7 @@ static struct hda_verb alc888_4ST_ch4_intel_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc888_4ST_ch6_intel_init[] = {
+static const struct hda_verb alc888_4ST_ch6_intel_init[] = {
 /* Mic-in jack as CLFE */
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -1665,7 +2175,7 @@ static struct hda_verb alc888_4ST_ch6_intel_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc888_4ST_ch8_intel_init[] = {
+static const struct hda_verb alc888_4ST_ch8_intel_init[] = {
 /* Mic-in jack as CLFE */
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -1677,7 +2187,7 @@ static struct hda_verb alc888_4ST_ch8_intel_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
+static const struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
         { 2, alc888_4ST_ch2_intel_init },
         { 4, alc888_4ST_ch4_intel_init },
         { 6, alc888_4ST_ch6_intel_init },
@@ -1688,7 +2198,7 @@ static struct hda_channel_mode alc888_4ST_8ch_intel_modes[4] = {
  * ALC888 Fujitsu Siemens Amillo xa3530
  */
 
-static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
+static const struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
 /* Front Mic: set to PIN_IN (empty by default) */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 /* Connect Internal HP to Front */
@@ -1721,46 +2231,6 @@ static struct hda_verb alc888_fujitsu_xa3530_verbs[] = {
         {}
 };
 
-static void alc_automute_amp(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        unsigned int mute;
-        hda_nid_t nid;
-        int i;
-
-        spec->jack_present = 0;
-        for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
-                nid = spec->autocfg.hp_pins[i];
-                if (!nid)
-                        break;
-                if (snd_hda_jack_detect(codec, nid)) {
-                        spec->jack_present = 1;
-                        break;
-                }
-        }
-
-        mute = spec->jack_present ? HDA_AMP_MUTE : 0;
-        /* Toggle internal speakers muting */
-        for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
-                nid = spec->autocfg.speaker_pins[i];
-                if (!nid)
-                        break;
-                snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, mute);
-        }
-}
-
-static void alc_automute_amp_unsol_event(struct hda_codec *codec,
-                                         unsigned int res)
-{
-        if (codec->vendor_id == 0x10ec0880)
-                res >>= 28;
-        else
-                res >>= 26;
-        if (res == ALC880_HP_EVENT)
-                alc_automute_amp(codec);
-}
-
 static void alc889_automute_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -1771,12 +2241,14 @@ static void alc889_automute_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[2] = 0x17;
         spec->autocfg.speaker_pins[3] = 0x19;
         spec->autocfg.speaker_pins[4] = 0x1a;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc889_intel_init_hook(struct hda_codec *codec)
 {
         alc889_coef_init(codec);
-        alc_automute_amp(codec);
+        alc_hp_automute(codec);
 }
 
 static void alc888_fujitsu_xa3530_setup(struct hda_codec *codec)
@@ -1787,13 +2259,15 @@ static void alc888_fujitsu_xa3530_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[1] = 0x1b; /* hp */
         spec->autocfg.speaker_pins[0] = 0x14; /* speaker */
         spec->autocfg.speaker_pins[1] = 0x15; /* bass */
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /*
  * ALC888 Acer Aspire 4930G model
  */
 
-static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
+static const struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
 /* Front Mic: set to PIN_IN (empty by default) */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 /* Unselect Front Mic by default in input mixer 3 */
@@ -1808,6 +2282,7 @@ static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
@@ -1815,7 +2290,7 @@ static struct hda_verb alc888_acer_aspire_4930g_verbs[] = {
  * ALC888 Acer Aspire 6530G model
  */
 
-static struct hda_verb alc888_acer_aspire_6530g_verbs[] = {
+static const struct hda_verb alc888_acer_aspire_6530g_verbs[] = {
 /* Route to built-in subwoofer as well as speakers */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -1842,10 +2317,40 @@ static struct hda_verb alc888_acer_aspire_6530g_verbs[] = {
 };
 
 /*
+ *ALC888 Acer Aspire 7730G model
+ */
+
+static const struct hda_verb alc888_acer_aspire_7730G_verbs[] = {
+/* Bias voltage on for external mic port */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN | PIN_VREF80},
+/* Front Mic: set to PIN_IN (empty by default) */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+/* Unselect Front Mic by default in input mixer 3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0xb)},
+/* Enable unsolicited event for HP jack */
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+/* Enable speaker output */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
+/* Enable headphone output */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT | PIN_HP},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
+/*Enable internal subwoofer */
+        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x17, AC_VERB_SET_CONNECT_SEL, 0x02},
+        {0x17, AC_VERB_SET_EAPD_BTLENABLE, 2},
+        { }
+};
+
+/*
  * ALC889 Acer Aspire 8930G model
  */
 
-static struct hda_verb alc889_acer_aspire_8930g_verbs[] = {
+static const struct hda_verb alc889_acer_aspire_8930g_verbs[] = {
 /* Front Mic: set to PIN_IN (empty by default) */
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
 /* Unselect Front Mic by default in input mixer 3 */
@@ -1891,7 +2396,7 @@ static struct hda_verb alc889_acer_aspire_8930g_verbs[] = {
         { }
 };
 
-static struct hda_input_mux alc888_2_capture_sources[2] = {
+static const struct hda_input_mux alc888_2_capture_sources[2] = {
         /* Front mic only available on one ADC */
         {
                 .num_items = 4,
@@ -1912,22 +2417,22 @@ static struct hda_input_mux alc888_2_capture_sources[2] = {
         }
 };
 
-static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
+static const struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
         /* Interal mic only available on one ADC */
         {
                 .num_items = 5,
                 .items = {
-                        { "Ext Mic", 0x0 },
+                        { "Mic", 0x0 },
                         { "Line In", 0x2 },
                         { "CD", 0x4 },
                         { "Input Mix", 0xa },
-                        { "Int Mic", 0xb },
+                        { "Internal Mic", 0xb },
                 },
         },
         {
                 .num_items = 4,
                 .items = {
-                        { "Ext Mic", 0x0 },
+                        { "Mic", 0x0 },
                         { "Line In", 0x2 },
                         { "CD", 0x4 },
                         { "Input Mix", 0xa },
@@ -1935,7 +2440,7 @@ static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
         }
 };
 
-static struct hda_input_mux alc889_capture_sources[3] = {
+static const struct hda_input_mux alc889_capture_sources[3] = {
         /* Digital mic only available on first "ADC" */
         {
                 .num_items = 5,
@@ -1967,7 +2472,7 @@ static struct hda_input_mux alc889_capture_sources[3] = {
         }
 };
 
-static struct snd_kcontrol_new alc888_base_mixer[] = {
+static const struct snd_kcontrol_new alc888_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -1984,12 +2489,34 @@ static struct snd_kcontrol_new alc888_base_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
+static const struct snd_kcontrol_new alc888_acer_aspire_4930g_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
+                HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME_MONO("Internal LFE Playback Volume", 0x0f, 1, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Internal LFE Playback Switch", 0x0f, 1, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        { } /* end */
+};
+
+static const struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2002,7 +2529,7 @@ static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
@@ -2016,6 +2543,8 @@ static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x16;
         spec->autocfg.speaker_pins[2] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc888_acer_aspire_6530g_setup(struct hda_codec *codec)
@@ -2026,6 +2555,20 @@ static void alc888_acer_aspire_6530g_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x16;
         spec->autocfg.speaker_pins[2] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
+}
+
+static void alc888_acer_aspire_7730g_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[1] = 0x16;
+        spec->autocfg.speaker_pins[2] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec)
@@ -2036,6 +2579,8 @@ static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x16;
         spec->autocfg.speaker_pins[2] = 0x1b;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /*
@@ -2046,12 +2591,12 @@ static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec)
  *                 F-Mic = 0x1b, HP = 0x19
  */
 
-static hda_nid_t alc880_dac_nids[4] = {
+static const hda_nid_t alc880_dac_nids[4] = {
         /* front, rear, clfe, rear_surr */
         0x02, 0x05, 0x04, 0x03
 };
 
-static hda_nid_t alc880_adc_nids[3] = {
+static const hda_nid_t alc880_adc_nids[3] = {
         /* ADC0-2 */
         0x07, 0x08, 0x09,
 };
@@ -2060,7 +2605,7 @@ static hda_nid_t alc880_adc_nids[3] = {
  * but it shows zero connection in the real implementation on some devices.
  * Note: this is a 915GAV bug, fixed on 915GLV
  */
-static hda_nid_t alc880_adc_nids_alt[2] = {
+static const hda_nid_t alc880_adc_nids_alt[2] = {
         /* ADC1-2 */
         0x08, 0x09,
 };
@@ -2068,7 +2613,7 @@ static hda_nid_t alc880_adc_nids_alt[2] = {
 #define ALC880_DIGOUT_NID       0x06
 #define ALC880_DIGIN_NID        0x0a
 
-static struct hda_input_mux alc880_capture_source = {
+static const struct hda_input_mux alc880_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -2080,7 +2625,7 @@ static struct hda_input_mux alc880_capture_source = {
 
 /* channel source setting (2/6 channel selection for 3-stack) */
 /* 2ch mode */
-static struct hda_verb alc880_threestack_ch2_init[] = {
+static const struct hda_verb alc880_threestack_ch2_init[] = {
         /* set line-in to input, mute it */
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -2091,7 +2636,7 @@ static struct hda_verb alc880_threestack_ch2_init[] = {
 };
 
 /* 6ch mode */
-static struct hda_verb alc880_threestack_ch6_init[] = {
+static const struct hda_verb alc880_threestack_ch6_init[] = {
         /* set line-in to output, unmute it */
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -2101,12 +2646,12 @@ static struct hda_verb alc880_threestack_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc880_threestack_modes[2] = {
+static const struct hda_channel_mode alc880_threestack_modes[2] = {
         { 2, alc880_threestack_ch2_init },
         { 6, alc880_threestack_ch6_init },
 };
 
-static struct snd_kcontrol_new alc880_three_stack_mixer[] = {
+static const struct snd_kcontrol_new alc880_three_stack_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
@@ -2170,17 +2715,30 @@ typedef int (*getput_call_t)(struct snd_kcontrol *kcontrol,
 
 static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol,
-                                 getput_call_t func)
+                                 getput_call_t func, bool check_adc_switch)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
-        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        int err;
+        int i, err = 0;
 
         mutex_lock(&codec->control_mutex);
-        kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx],
-                                                      3, 0, HDA_INPUT);
-        err = func(kcontrol, ucontrol);
+        if (check_adc_switch && spec->dual_adc_switch) {
+                for (i = 0; i < spec->num_adc_nids; i++) {
+                        kcontrol->private_value =
+                                HDA_COMPOSE_AMP_VAL(spec->adc_nids[i],
+                                                    3, 0, HDA_INPUT);
+                        err = func(kcontrol, ucontrol);
+                        if (err < 0)
+                                goto error;
+                }
+        } else {
+                i = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+                kcontrol->private_value =
+                        HDA_COMPOSE_AMP_VAL(spec->adc_nids[i],
+                                            3, 0, HDA_INPUT);
+                err = func(kcontrol, ucontrol);
+        }
+ error:
         mutex_unlock(&codec->control_mutex);
         return err;
 }
@@ -2189,14 +2747,14 @@ static int alc_cap_vol_get(struct snd_kcontrol *kcontrol,
                            struct snd_ctl_elem_value *ucontrol)
 {
         return alc_cap_getput_caller(kcontrol, ucontrol,
-                                     snd_hda_mixer_amp_volume_get);
+                                     snd_hda_mixer_amp_volume_get, false);
 }
 
 static int alc_cap_vol_put(struct snd_kcontrol *kcontrol,
                            struct snd_ctl_elem_value *ucontrol)
 {
         return alc_cap_getput_caller(kcontrol, ucontrol,
-                                     snd_hda_mixer_amp_volume_put);
+                                     snd_hda_mixer_amp_volume_put, true);
 }
 
 /* capture mixer elements */
@@ -2206,14 +2764,14 @@ static int alc_cap_sw_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         return alc_cap_getput_caller(kcontrol, ucontrol,
-                                     snd_hda_mixer_amp_switch_get);
+                                     snd_hda_mixer_amp_switch_get, false);
 }
 
 static int alc_cap_sw_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         return alc_cap_getput_caller(kcontrol, ucontrol,
-                                     snd_hda_mixer_amp_switch_put);
+                                     snd_hda_mixer_amp_switch_put, true);
 }
 
 #define _DEFINE_CAPMIX(num) \
@@ -2251,14 +2809,14 @@ static int alc_cap_sw_put(struct snd_kcontrol *kcontrol,
         }
 
 #define DEFINE_CAPMIX(num) \
-static struct snd_kcontrol_new alc_capture_mixer ## num[] = { \
+static const 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[] = { \
+static const struct snd_kcontrol_new alc_capture_mixer_nosrc ## num[] = { \
         _DEFINE_CAPMIX(num),                                        \
         { } /* end */                                               \
 }
@@ -2281,7 +2839,7 @@ DEFINE_CAPMIX_NOSRC(3);
  */
 
 /* additional mixers to alc880_three_stack_mixer */
-static struct snd_kcontrol_new alc880_five_stack_mixer[] = {
+static const struct snd_kcontrol_new alc880_five_stack_mixer[] = {
         HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT),
         { } /* end */
@@ -2289,7 +2847,7 @@ static struct snd_kcontrol_new alc880_five_stack_mixer[] = {
 
 /* channel source setting (6/8 channel selection for 5-stack) */
 /* 6ch mode */
-static struct hda_verb alc880_fivestack_ch6_init[] = {
+static const struct hda_verb alc880_fivestack_ch6_init[] = {
         /* set line-in to input, mute it */
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -2297,14 +2855,14 @@ static struct hda_verb alc880_fivestack_ch6_init[] = {
 };
 
 /* 8ch mode */
-static struct hda_verb alc880_fivestack_ch8_init[] = {
+static const struct hda_verb alc880_fivestack_ch8_init[] = {
         /* set line-in to output, unmute it */
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { } /* end */
 };
 
-static struct hda_channel_mode alc880_fivestack_modes[2] = {
+static const struct hda_channel_mode alc880_fivestack_modes[2] = {
         { 6, alc880_fivestack_ch6_init },
         { 8, alc880_fivestack_ch8_init },
 };
@@ -2319,12 +2877,12 @@ static struct hda_channel_mode alc880_fivestack_modes[2] = {
  *   Mic = 0x18, F-Mic = 0x19, Line = 0x1a, HP = 0x1b
  */
 
-static hda_nid_t alc880_6st_dac_nids[4] = {
+static const hda_nid_t alc880_6st_dac_nids[4] = {
         /* front, rear, clfe, rear_surr */
         0x02, 0x03, 0x04, 0x05
 };
 
-static struct hda_input_mux alc880_6stack_capture_source = {
+static const struct hda_input_mux alc880_6stack_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -2335,11 +2893,11 @@ static struct hda_input_mux alc880_6stack_capture_source = {
 };
 
 /* fixed 8-channels */
-static struct hda_channel_mode alc880_sixstack_modes[1] = {
+static const struct hda_channel_mode alc880_sixstack_modes[1] = {
         { 8, NULL },
 };
 
-static struct snd_kcontrol_new alc880_six_stack_mixer[] = {
+static const struct snd_kcontrol_new alc880_six_stack_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2394,18 +2952,18 @@ static struct snd_kcontrol_new alc880_six_stack_mixer[] = {
  * haven't setup any initialization verbs for these yet...
  */
 
-static hda_nid_t alc880_w810_dac_nids[3] = {
+static const hda_nid_t alc880_w810_dac_nids[3] = {
         /* front, rear/surround, clfe */
         0x02, 0x03, 0x04
 };
 
 /* fixed 6 channels */
-static struct hda_channel_mode alc880_w810_modes[1] = {
+static const struct hda_channel_mode alc880_w810_modes[1] = {
         { 6, NULL }
 };
 
 /* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */
-static struct snd_kcontrol_new alc880_w810_base_mixer[] = {
+static const struct snd_kcontrol_new alc880_w810_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2427,17 +2985,17 @@ static struct snd_kcontrol_new alc880_w810_base_mixer[] = {
  *                 Line = 0x1a
  */
 
-static hda_nid_t alc880_z71v_dac_nids[1] = {
+static const hda_nid_t alc880_z71v_dac_nids[1] = {
         0x02
 };
 #define ALC880_Z71V_HP_DAC      0x03
 
 /* fixed 2 channels */
-static struct hda_channel_mode alc880_2_jack_modes[1] = {
+static const struct hda_channel_mode alc880_2_jack_modes[1] = {
         { 2, NULL }
 };
 
-static struct snd_kcontrol_new alc880_z71v_mixer[] = {
+static const struct snd_kcontrol_new alc880_z71v_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2457,12 +3015,12 @@ static struct snd_kcontrol_new alc880_z71v_mixer[] = {
  * Pin assignment: HP = 0x14, Front = 0x15, Mic = 0x18
  */
 
-static hda_nid_t alc880_f1734_dac_nids[1] = {
+static const hda_nid_t alc880_f1734_dac_nids[1] = {
         0x03
 };
 #define ALC880_F1734_HP_DAC     0x02
 
-static struct snd_kcontrol_new alc880_f1734_mixer[] = {
+static const struct snd_kcontrol_new alc880_f1734_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2474,7 +3032,7 @@ static struct snd_kcontrol_new alc880_f1734_mixer[] = {
         { } /* end */
 };
 
-static struct hda_input_mux alc880_f1734_capture_source = {
+static const struct hda_input_mux alc880_f1734_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x1 },
@@ -2494,7 +3052,7 @@ static struct hda_input_mux alc880_f1734_capture_source = {
 #define alc880_asus_dac_nids    alc880_w810_dac_nids    /* identical with w810 */
 #define alc880_asus_modes       alc880_threestack_modes /* 2/6 channel mode */
 
-static struct snd_kcontrol_new alc880_asus_mixer[] = {
+static const struct snd_kcontrol_new alc880_asus_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2528,14 +3086,14 @@ static struct snd_kcontrol_new alc880_asus_mixer[] = {
  */
 
 /* additional mixers to alc880_asus_mixer */
-static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
+static const struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
         HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT),
         HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT),
         { } /* end */
 };
 
 /* TCL S700 */
-static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
+static const struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
@@ -2549,7 +3107,7 @@ static struct snd_kcontrol_new alc880_tcl_s700_mixer[] = {
 };
 
 /* Uniwill */
-static struct snd_kcontrol_new alc880_uniwill_mixer[] = {
+static const struct snd_kcontrol_new alc880_uniwill_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2576,21 +3134,21 @@ static struct snd_kcontrol_new alc880_uniwill_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc880_fujitsu_mixer[] = {
+static const struct snd_kcontrol_new alc880_fujitsu_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {
+static const struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -2607,7 +3165,7 @@ static struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {
 /*
  * slave controls for virtual master
  */
-static const char *alc_slave_vols[] = {
+static const char * const alc_slave_vols[] = {
         "Front Playback Volume",
         "Surround Playback Volume",
         "Center Playback Volume",
@@ -2617,11 +3175,10 @@ static const char *alc_slave_vols[] = {
         "Speaker Playback Volume",
         "Mono Playback Volume",
         "Line-Out Playback Volume",
-        "PCM Playback Volume",
         NULL,
 };
 
-static const char *alc_slave_sws[] = {
+static const char * const alc_slave_sws[] = {
         "Front Playback Switch",
         "Surround Playback Switch",
         "Center Playback Switch",
@@ -2632,7 +3189,6 @@ static const char *alc_slave_sws[] = {
         "Mono Playback Switch",
         "IEC958 Playback Switch",
         "Line-Out Playback Switch",
-        "PCM Playback Switch",
         NULL,
 };
 
@@ -2653,7 +3209,7 @@ static void alc_free_kctls(struct hda_codec *codec);
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
 /* additional beep mixers; the actual parameters are overwritten at build */
-static struct snd_kcontrol_new alc_beep_mixer[] = {
+static const struct snd_kcontrol_new alc_beep_mixer[] = {
         HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_INPUT),
         HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_INPUT),
         { } /* end */
@@ -2664,7 +3220,7 @@ static int alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         struct snd_kcontrol *kctl = NULL;
-        struct snd_kcontrol_new *knew;
+        const struct snd_kcontrol_new *knew;
         int i, j, err;
         unsigned int u;
         hda_nid_t nid;
@@ -2701,7 +3257,7 @@ static int alc_build_controls(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
         /* create beep controls if needed */
         if (spec->beep_amp) {
-                struct snd_kcontrol_new *knew;
+                const struct snd_kcontrol_new *knew;
                 for (knew = alc_beep_mixer; knew->name; knew++) {
                         struct snd_kcontrol *kctl;
                         kctl = snd_ctl_new1(knew, codec);
@@ -2740,7 +3296,7 @@ static int alc_build_controls(struct hda_codec *codec)
                 if (!kctl)
                         kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
                 for (i = 0; kctl && i < kctl->count; i++) {
-                        hda_nid_t *nids = spec->capsrc_nids;
+                        const hda_nid_t *nids = spec->capsrc_nids;
                         if (!nids)
                                 nids = spec->adc_nids;
                         err = snd_hda_add_nid(codec, kctl, i, nids[i]);
@@ -2818,7 +3374,7 @@ static int alc_build_controls(struct hda_codec *codec)
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc880_volume_init_verbs[] = {
+static const struct hda_verb alc880_volume_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -2869,7 +3425,7 @@ static struct hda_verb alc880_volume_init_verbs[] = {
  * 3-stack pin configuration:
  * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
  */
-static struct hda_verb alc880_pin_3stack_init_verbs[] = {
+static const struct hda_verb alc880_pin_3stack_init_verbs[] = {
         /*
          * preset connection lists of input pins
          * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
@@ -2907,7 +3463,7 @@ static struct hda_verb alc880_pin_3stack_init_verbs[] = {
  * front = 0x14, surround = 0x17, clfe = 0x16, mic = 0x18, HP = 0x19,
  * line-in/side = 0x1a, f-mic = 0x1b
  */
-static struct hda_verb alc880_pin_5stack_init_verbs[] = {
+static const struct hda_verb alc880_pin_5stack_init_verbs[] = {
         /*
          * preset connection lists of input pins
          * 0 = front, 1 = rear_surr, 2 = CLFE, 3 = surround
@@ -2951,7 +3507,7 @@ static struct hda_verb alc880_pin_5stack_init_verbs[] = {
  * W810 pin configuration:
  * front = 0x14, surround = 0x15, clfe = 0x16, HP = 0x1b
  */
-static struct hda_verb alc880_pin_w810_init_verbs[] = {
+static const struct hda_verb alc880_pin_w810_init_verbs[] = {
         /* hphone/speaker input selector: front DAC */
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x0},
 
@@ -2972,7 +3528,7 @@ static struct hda_verb alc880_pin_w810_init_verbs[] = {
  * Z71V pin configuration:
  * Speaker-out = 0x14, HP = 0x15, Mic = 0x18, Line-in = 0x1a, Mic2 = 0x1b (?)
  */
-static struct hda_verb alc880_pin_z71v_init_verbs[] = {
+static const struct hda_verb alc880_pin_z71v_init_verbs[] = {
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -2991,7 +3547,7 @@ static struct hda_verb alc880_pin_z71v_init_verbs[] = {
  * front = 0x14, surr = 0x15, clfe = 0x16, side = 0x17, mic = 0x18,
  * f-mic = 0x19, line = 0x1a, HP = 0x1b
  */
-static struct hda_verb alc880_pin_6stack_init_verbs[] = {
+static const struct hda_verb alc880_pin_6stack_init_verbs[] = {
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
 
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -3021,7 +3577,7 @@ static struct hda_verb alc880_pin_6stack_init_verbs[] = {
  * HP = 0x14, InternalSpeaker = 0x15, mic = 0x18, internal mic = 0x19,
  * line = 0x1a
  */
-static struct hda_verb alc880_uniwill_init_verbs[] = {
+static const struct hda_verb alc880_uniwill_init_verbs[] = {
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
 
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -3059,7 +3615,7 @@ static struct hda_verb alc880_uniwill_init_verbs[] = {
 * Uniwill P53
 * HP = 0x14, InternalSpeaker = 0x15, mic = 0x19,
  */
-static struct hda_verb alc880_uniwill_p53_init_verbs[] = {
+static const struct hda_verb alc880_uniwill_p53_init_verbs[] = {
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
 
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -3088,13 +3644,13 @@ static struct hda_verb alc880_uniwill_p53_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc880_beep_init_verbs[] = {
+static const struct hda_verb alc880_beep_init_verbs[] = {
         { 0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) },
         { }
 };
 
 /* auto-toggle front mic */
-static void alc880_uniwill_mic_automute(struct hda_codec *codec)
+static void alc88x_simple_mic_automute(struct hda_codec *codec)
 {
         unsigned int present;
         unsigned char bits;
@@ -3111,12 +3667,14 @@ static void alc880_uniwill_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x16;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc880_uniwill_init_hook(struct hda_codec *codec)
 {
-        alc_automute_amp(codec);
-        alc880_uniwill_mic_automute(codec);
+        alc_hp_automute(codec);
+        alc88x_simple_mic_automute(codec);
 }
 
 static void alc880_uniwill_unsol_event(struct hda_codec *codec,
@@ -3127,10 +3685,10 @@ static void alc880_uniwill_unsol_event(struct hda_codec *codec,
          */
         switch (res >> 28) {
         case ALC880_MIC_EVENT:
-                alc880_uniwill_mic_automute(codec);
+                alc88x_simple_mic_automute(codec);
                 break;
         default:
-                alc_automute_amp_unsol_event(codec, res);
+                alc_sku_unsol_event(codec, res);
                 break;
         }
 }
@@ -3141,6 +3699,8 @@ static void alc880_uniwill_p53_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)
@@ -3165,14 +3725,14 @@ static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
         if ((res >> 28) == ALC880_DCVOL_EVENT)
                 alc880_uniwill_p53_dcvol_automute(codec);
         else
-                alc_automute_amp_unsol_event(codec, res);
+                alc_sku_unsol_event(codec, res);
 }
 
 /*
  * F1734 pin configuration:
  * HP = 0x14, speaker-out = 0x15, mic = 0x18
  */
-static struct hda_verb alc880_pin_f1734_init_verbs[] = {
+static const struct hda_verb alc880_pin_f1734_init_verbs[] = {
         {0x07, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
         {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -3204,7 +3764,7 @@ static struct hda_verb alc880_pin_f1734_init_verbs[] = {
  * ASUS pin configuration:
  * HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
  */
-static struct hda_verb alc880_pin_asus_init_verbs[] = {
+static const struct hda_verb alc880_pin_asus_init_verbs[] = {
         {0x10, AC_VERB_SET_CONNECT_SEL, 0x02},
         {0x11, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x12, AC_VERB_SET_CONNECT_SEL, 0x01},
@@ -3238,7 +3798,7 @@ static struct hda_verb alc880_pin_asus_init_verbs[] = {
 #define alc880_gpio3_init_verbs alc_gpio3_init_verbs
 
 /* Clevo m520g init */
-static struct hda_verb alc880_pin_clevo_init_verbs[] = {
+static const struct hda_verb alc880_pin_clevo_init_verbs[] = {
         /* headphone output */
         {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
         /* line-out */
@@ -3266,7 +3826,7 @@ static struct hda_verb alc880_pin_clevo_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {
+static const struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {
         /* change to EAPD mode */
         {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
         {0x20, AC_VERB_SET_PROC_COEF,  0x3060},
@@ -3304,12 +3864,12 @@ static struct hda_verb alc880_pin_tcl_S700_init_verbs[] = {
  */
 
 /* To make 5.1 output working (green=Front, blue=Surr, red=CLFE) */
-static hda_nid_t alc880_lg_dac_nids[3] = {
+static const hda_nid_t alc880_lg_dac_nids[3] = {
         0x05, 0x02, 0x03
 };
 
 /* seems analog CD is not working */
-static struct hda_input_mux alc880_lg_capture_source = {
+static const struct hda_input_mux alc880_lg_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x1 },
@@ -3319,34 +3879,34 @@ static struct hda_input_mux alc880_lg_capture_source = {
 };
 
 /* 2,4,6 channel modes */
-static struct hda_verb alc880_lg_ch2_init[] = {
+static const struct hda_verb alc880_lg_ch2_init[] = {
         /* set line-in and mic-in to input */
         { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { }
 };
 
-static struct hda_verb alc880_lg_ch4_init[] = {
+static const struct hda_verb alc880_lg_ch4_init[] = {
         /* set line-in to out and mic-in to input */
         { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { }
 };
 
-static struct hda_verb alc880_lg_ch6_init[] = {
+static const struct hda_verb alc880_lg_ch6_init[] = {
         /* set line-in and mic-in to output */
         { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         { }
 };
 
-static struct hda_channel_mode alc880_lg_ch_modes[3] = {
+static const struct hda_channel_mode alc880_lg_ch_modes[3] = {
         { 2, alc880_lg_ch2_init },
         { 4, alc880_lg_ch4_init },
         { 6, alc880_lg_ch6_init },
 };
 
-static struct snd_kcontrol_new alc880_lg_mixer[] = {
+static const struct snd_kcontrol_new alc880_lg_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0f, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
@@ -3371,7 +3931,7 @@ static struct snd_kcontrol_new alc880_lg_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc880_lg_init_verbs[] = {
+static const struct hda_verb alc880_lg_init_verbs[] = {
         /* set capture source to mic-in */
         {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -3409,6 +3969,8 @@ static void alc880_lg_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /*
@@ -3423,7 +3985,7 @@ static void alc880_lg_setup(struct hda_codec *codec)
  *   SPDIF-Out: 0x1e
  */
 
-static struct hda_input_mux alc880_lg_lw_capture_source = {
+static const struct hda_input_mux alc880_lg_lw_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -3434,7 +3996,7 @@ static struct hda_input_mux alc880_lg_lw_capture_source = {
 
 #define alc880_lg_lw_modes alc880_threestack_modes
 
-static struct snd_kcontrol_new alc880_lg_lw_mixer[] = {
+static const struct snd_kcontrol_new alc880_lg_lw_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
@@ -3459,7 +4021,7 @@ static struct snd_kcontrol_new alc880_lg_lw_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc880_lg_lw_init_verbs[] = {
+static const struct hda_verb alc880_lg_lw_init_verbs[] = {
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
         {0x10, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
         {0x12, AC_VERB_SET_CONNECT_SEL, 0x03}, /* line/surround */
@@ -3493,9 +4055,11 @@ static void alc880_lg_lw_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct snd_kcontrol_new alc880_medion_rim_mixer[] = {
+static const struct snd_kcontrol_new alc880_medion_rim_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
@@ -3505,7 +4069,7 @@ static struct snd_kcontrol_new alc880_medion_rim_mixer[] = {
         { } /* end */
 };
 
-static struct hda_input_mux alc880_medion_rim_capture_source = {
+static const struct hda_input_mux alc880_medion_rim_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x0 },
@@ -3513,7 +4077,7 @@ static struct hda_input_mux alc880_medion_rim_capture_source = {
         },
 };
 
-static struct hda_verb alc880_medion_rim_init_verbs[] = {
+static const struct hda_verb alc880_medion_rim_init_verbs[] = {
         {0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
 
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -3540,7 +4104,7 @@ static struct hda_verb alc880_medion_rim_init_verbs[] = {
 static void alc880_medion_rim_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        alc_automute_amp(codec);
+        alc_hp_automute(codec);
         /* toggle EAPD */
         if (spec->jack_present)
                 snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);
@@ -3564,10 +4128,12 @@ static void alc880_medion_rim_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x1b;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list alc880_loopbacks[] = {
+static const struct hda_amp_list alc880_loopbacks[] = {
         { 0x0b, HDA_INPUT, 0 },
         { 0x0b, HDA_INPUT, 1 },
         { 0x0b, HDA_INPUT, 2 },
@@ -3576,7 +4142,7 @@ static struct hda_amp_list alc880_loopbacks[] = {
         { } /* end */
 };
 
-static struct hda_amp_list alc880_lg_loopbacks[] = {
+static const struct hda_amp_list alc880_lg_loopbacks[] = {
         { 0x0b, HDA_INPUT, 1 },
         { 0x0b, HDA_INPUT, 6 },
         { 0x0b, HDA_INPUT, 7 },
@@ -3588,6 +4154,8 @@ static struct hda_amp_list alc880_lg_loopbacks[] = {
  * Common callbacks
  */
 
+static void alc_init_special_input_src(struct hda_codec *codec);
+
 static int alc_init(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -3598,14 +4166,14 @@ static int alc_init(struct hda_codec *codec)
 
         for (i = 0; i < spec->num_init_verbs; i++)
                 snd_hda_sequence_write(codec, spec->init_verbs[i]);
+        alc_init_special_input_src(codec);
 
         if (spec->init_hook)
                 spec->init_hook(codec);
 
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-        if (codec->patch_ops.check_power_status)
-                codec->patch_ops.check_power_status(codec, 0x01);
-#endif
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
+
+        hda_call_check_power_status(codec, 0x01);
         return 0;
 }
 
@@ -3746,7 +4314,7 @@ static int dualmic_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream dualmic_pcm_analog_capture = {
+static const struct hda_pcm_stream dualmic_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3759,7 +4327,7 @@ static struct hda_pcm_stream dualmic_pcm_analog_capture = {
 
 /*
  */
-static struct hda_pcm_stream alc880_pcm_analog_playback = {
+static const struct hda_pcm_stream alc880_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
@@ -3771,21 +4339,21 @@ static struct hda_pcm_stream alc880_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream alc880_pcm_analog_capture = {
+static const struct hda_pcm_stream alc880_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
         /* NID is set in alc_build_pcms */
 };
 
-static struct hda_pcm_stream alc880_pcm_analog_alt_playback = {
+static const struct hda_pcm_stream alc880_pcm_analog_alt_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
         /* NID is set in alc_build_pcms */
 };
 
-static struct hda_pcm_stream alc880_pcm_analog_alt_capture = {
+static const struct hda_pcm_stream alc880_pcm_analog_alt_capture = {
         .substreams = 2, /* can be overridden */
         .channels_min = 2,
         .channels_max = 2,
@@ -3796,7 +4364,7 @@ static struct hda_pcm_stream alc880_pcm_analog_alt_capture = {
         },
 };
 
-static struct hda_pcm_stream alc880_pcm_digital_playback = {
+static const struct hda_pcm_stream alc880_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3809,7 +4377,7 @@ static struct hda_pcm_stream alc880_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream alc880_pcm_digital_capture = {
+static const struct hda_pcm_stream alc880_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3817,7 +4385,7 @@ static struct hda_pcm_stream alc880_pcm_digital_capture = {
 };
 
 /* Used by alc_build_pcms to flag that a PCM has no playback stream */
-static struct hda_pcm_stream alc_pcm_null_stream = {
+static const struct hda_pcm_stream alc_pcm_null_stream = {
         .substreams = 0,
         .channels_min = 0,
         .channels_max = 0,
@@ -3911,7 +4479,7 @@ static int alc_build_pcms(struct hda_codec *codec)
                                 alc_pcm_null_stream;
                         info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
                 }
-                if (spec->num_adc_nids > 1) {
+                if (spec->num_adc_nids > 1 && spec->stream_analog_alt_capture) {
                         info->stream[SNDRV_PCM_STREAM_CAPTURE] =
                                 *spec->stream_analog_alt_capture;
                         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid =
@@ -3930,6 +4498,10 @@ static int alc_build_pcms(struct hda_codec *codec)
 
 static inline void alc_shutup(struct hda_codec *codec)
 {
+        struct alc_spec *spec = codec->spec;
+
+        if (spec && spec->shutup)
+                spec->shutup(codec);
         snd_hda_shutup_pins(codec);
 }
 
@@ -3954,6 +4526,7 @@ static void alc_free(struct hda_codec *codec)
                 return;
 
         alc_shutup(codec);
+        snd_hda_input_jack_free(codec);
         alc_free_kctls(codec);
         kfree(spec);
         snd_hda_detach_beep_device(codec);
@@ -3962,27 +4535,7 @@ static void alc_free(struct hda_codec *codec)
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 static void alc_power_eapd(struct hda_codec *codec)
 {
-        /* We currently only handle front, HP */
-        switch (codec->vendor_id) {
-        case 0x10ec0260:
-                set_eapd(codec, 0x0f, 0);
-                set_eapd(codec, 0x10, 0);
-                break;
-        case 0x10ec0262:
-        case 0x10ec0267:
-        case 0x10ec0268:
-        case 0x10ec0269:
-        case 0x10ec0270:
-        case 0x10ec0272:
-        case 0x10ec0660:
-        case 0x10ec0662:
-        case 0x10ec0663:
-        case 0x10ec0862:
-        case 0x10ec0889:
-                set_eapd(codec, 0x14, 0);
-                set_eapd(codec, 0x15, 0);
-                break;
-        }
+        alc_auto_setup_eapd(codec, false);
 }
 
 static int alc_suspend(struct hda_codec *codec, pm_message_t state)
@@ -3998,20 +4551,18 @@ static int alc_suspend(struct hda_codec *codec, pm_message_t state)
 #ifdef SND_HDA_NEEDS_RESUME
 static int alc_resume(struct hda_codec *codec)
 {
+        msleep(150); /* to avoid pop noise */
         codec->patch_ops.init(codec);
         snd_hda_codec_resume_amp(codec);
         snd_hda_codec_resume_cache(codec);
-#ifdef CONFIG_SND_HDA_POWER_SAVE
-        if (codec->patch_ops.check_power_status)
-                codec->patch_ops.check_power_status(codec, 0x01);
-#endif
+        hda_call_check_power_status(codec, 0x01);
         return 0;
 }
 #endif
 
 /*
  */
-static struct hda_codec_ops alc_patch_ops = {
+static const struct hda_codec_ops alc_patch_ops = {
         .build_controls = alc_build_controls,
         .build_pcms = alc_build_pcms,
         .init = alc_init,
@@ -4046,11 +4597,11 @@ static int alc_codec_rename(struct hda_codec *codec, const char *name)
  * enum controls.
  */
 #ifdef CONFIG_SND_DEBUG
-static hda_nid_t alc880_test_dac_nids[4] = {
+static const hda_nid_t alc880_test_dac_nids[4] = {
         0x02, 0x03, 0x04, 0x05
 };
 
-static struct hda_input_mux alc880_test_capture_source = {
+static const struct hda_input_mux alc880_test_capture_source = {
         .num_items = 7,
         .items = {
                 { "In-1", 0x0 },
@@ -4063,7 +4614,7 @@ static struct hda_input_mux alc880_test_capture_source = {
         },
 };
 
-static struct hda_channel_mode alc880_test_modes[4] = {
+static const struct hda_channel_mode alc880_test_modes[4] = {
         { 2, NULL },
         { 4, NULL },
         { 6, NULL },
@@ -4073,7 +4624,7 @@ static struct hda_channel_mode alc880_test_modes[4] = {
 static int alc_test_pin_ctl_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {
+        static const char * const texts[] = {
                 "N/A", "Line Out", "HP Out",
                 "In Hi-Z", "In 50%", "In Grd", "In 80%", "In 100%"
         };
@@ -4118,7 +4669,7 @@ static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         hda_nid_t nid = (hda_nid_t)kcontrol->private_value;
-        static unsigned int ctls[] = {
+        static const unsigned int ctls[] = {
                 0, AC_PINCTL_OUT_EN, AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN,
                 AC_PINCTL_IN_EN | AC_PINCTL_VREF_HIZ,
                 AC_PINCTL_IN_EN | AC_PINCTL_VREF_50,
@@ -4148,7 +4699,7 @@ static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol,
 static int alc_test_pin_src_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = {
+        static const char * const texts[] = {
                 "Front", "Surround", "CLFE", "Side"
         };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -4209,7 +4760,7 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
                         .private_value = nid           \
                         }
 
-static struct snd_kcontrol_new alc880_test_mixer[] = {
+static const struct snd_kcontrol_new alc880_test_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
@@ -4250,7 +4801,7 @@ static struct snd_kcontrol_new alc880_test_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc880_test_init_verbs[] = {
+static const struct hda_verb alc880_test_init_verbs[] = {
         /* Unmute inputs of 0x0c - 0x0f */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -4306,7 +4857,7 @@ static struct hda_verb alc880_test_init_verbs[] = {
 /*
  */
 
-static const char *alc880_models[ALC880_MODEL_LAST] = {
+static const char * const alc880_models[ALC880_MODEL_LAST] = {
         [ALC880_3ST]            = "3stack",
         [ALC880_TCL_S700]       = "tcl",
         [ALC880_3ST_DIG]        = "3stack-digout",
@@ -4334,7 +4885,7 @@ static const char *alc880_models[ALC880_MODEL_LAST] = {
         [ALC880_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc880_cfg_tbl[] = {
+static const struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_W810),
         SND_PCI_QUIRK(0x1019, 0xa880, "ECS", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x1019, 0xa884, "Acer APFV", ALC880_6ST),
@@ -4345,7 +4896,6 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0xe309, "ULI", ALC880_3ST_DIG),
         SND_PCI_QUIRK(0x1025, 0xe310, "ULI", ALC880_3ST),
         SND_PCI_QUIRK(0x1039, 0x1234, NULL, ALC880_6ST_DIG),
-        SND_PCI_QUIRK(0x103c, 0x2a09, "HP", ALC880_5ST),
         SND_PCI_QUIRK(0x1043, 0x10b3, "ASUS W1V", ALC880_ASUS_W1V),
         SND_PCI_QUIRK(0x1043, 0x10c2, "ASUS W6A", ALC880_ASUS_DIG),
         SND_PCI_QUIRK(0x1043, 0x10c3, "ASUS Wxx", ALC880_ASUS_DIG),
@@ -4375,7 +4925,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
         SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
-        SND_PCI_QUIRK(0x1584, 0x9054, "Uniwlll", ALC880_F1734),
+        SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_F1734),
         SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
         SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_UNIWILL_P53),
         SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),
@@ -4388,6 +4938,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),
         SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
         SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
+        SND_PCI_QUIRK(0x1854, 0x005f, "LG P1 Express", ALC880_LG),
         SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),
         SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),
         SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),
@@ -4413,7 +4964,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
 /*
  * ALC880 codec presets
  */
-static struct alc_config_preset alc880_presets[] = {
+static const struct alc_config_preset alc880_presets[] = {
         [ALC880_3ST] = {
                 .mixers = { alc880_three_stack_mixer },
                 .init_verbs = { alc880_volume_init_verbs,
@@ -4531,7 +5082,7 @@ static struct alc_config_preset alc880_presets[] = {
                 .input_mux = &alc880_f1734_capture_source,
                 .unsol_event = alc880_uniwill_p53_unsol_event,
                 .setup = alc880_uniwill_p53_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC880_ASUS] = {
                 .mixers = { alc880_asus_mixer },
@@ -4622,7 +5173,7 @@ static struct alc_config_preset alc880_presets[] = {
                 .input_mux = &alc880_capture_source,
                 .unsol_event = alc880_uniwill_p53_unsol_event,
                 .setup = alc880_uniwill_p53_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC880_FUJITSU] = {
                 .mixers = { alc880_fujitsu_mixer },
@@ -4637,7 +5188,7 @@ static struct alc_config_preset alc880_presets[] = {
                 .input_mux = &alc880_capture_source,
                 .unsol_event = alc880_uniwill_p53_unsol_event,
                 .setup = alc880_uniwill_p53_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC880_CLEVO] = {
                 .mixers = { alc880_three_stack_mixer },
@@ -4662,9 +5213,9 @@ static struct alc_config_preset alc880_presets[] = {
                 .channel_mode = alc880_lg_ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc880_lg_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc880_lg_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
 #ifdef CONFIG_SND_HDA_POWER_SAVE
                 .loopbacks = alc880_lg_loopbacks,
 #endif
@@ -4679,9 +5230,9 @@ static struct alc_config_preset alc880_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc880_lg_lw_modes),
                 .channel_mode = alc880_lg_lw_modes,
                 .input_mux = &alc880_lg_lw_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc880_lg_lw_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC880_MEDION_RIM] = {
                 .mixers = { alc880_medion_rim_mixer },
@@ -4721,26 +5272,32 @@ enum {
         ALC_CTL_WIDGET_MUTE,
         ALC_CTL_BIND_MUTE,
 };
-static struct snd_kcontrol_new alc880_control_templates[] = {
+static const struct snd_kcontrol_new alc880_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
         HDA_BIND_MUTE(NULL, 0, 0, 0),
 };
 
+static struct snd_kcontrol_new *alc_kcontrol_new(struct alc_spec *spec)
+{
+        snd_array_init(&spec->kctls, sizeof(struct snd_kcontrol_new), 32);
+        return snd_array_new(&spec->kctls);
+}
+
 /* add dynamic controls */
 static int add_control(struct alc_spec *spec, int type, const char *name,
-                       unsigned long val)
+                       int cidx, unsigned long val)
 {
         struct snd_kcontrol_new *knew;
 
-        snd_array_init(&spec->kctls, sizeof(*knew), 32);
-        knew = snd_array_new(&spec->kctls);
+        knew = alc_kcontrol_new(spec);
         if (!knew)
                 return -ENOMEM;
         *knew = alc880_control_templates[type];
         knew->name = kstrdup(name, GFP_KERNEL);
         if (!knew->name)
                 return -ENOMEM;
+        knew->index = cidx;
         if (get_amp_nid_(val))
                 knew->subdevice = HDA_SUBDEV_AMP_FLAG;
         knew->private_value = val;
@@ -4749,17 +5306,21 @@ static int add_control(struct alc_spec *spec, int type, const char *name,
 
 static int add_control_with_pfx(struct alc_spec *spec, int type,
                                 const char *pfx, const char *dir,
-                                const char *sfx, unsigned long val)
+                                const char *sfx, int cidx, unsigned long val)
 {
         char name[32];
         snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
-        return add_control(spec, type, name, val);
+        return add_control(spec, type, name, cidx, val);
 }
 
-#define add_pb_vol_ctrl(spec, type, pfx, val) \
-        add_control_with_pfx(spec, type, pfx, "Playback", "Volume", val)
-#define add_pb_sw_ctrl(spec, type, pfx, val) \
-        add_control_with_pfx(spec, type, pfx, "Playback", "Switch", val)
+#define add_pb_vol_ctrl(spec, type, pfx, val)                   \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Volume", 0, val)
+#define add_pb_sw_ctrl(spec, type, pfx, val)                    \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Switch", 0, val)
+#define __add_pb_vol_ctrl(spec, type, pfx, cidx, val)                   \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Volume", cidx, val)
+#define __add_pb_sw_ctrl(spec, type, pfx, cidx, val)                    \
+        add_control_with_pfx(spec, type, pfx, "Playback", "Switch", cidx, val)
 
 #define alc880_is_fixed_pin(nid)        ((nid) >= 0x14 && (nid) <= 0x17)
 #define alc880_fixed_pin_idx(nid)       ((nid) - 0x14)
@@ -4787,7 +5348,7 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec,
                 nid = cfg->line_out_pins[i];
                 if (alc880_is_fixed_pin(nid)) {
                         int idx = alc880_fixed_pin_idx(nid);
-                        spec->multiout.dac_nids[i] = alc880_idx_to_dac(idx);
+                        spec->private_dac_nids[i] = alc880_idx_to_dac(idx);
                         assigned[idx] = 1;
                 }
         }
@@ -4799,7 +5360,7 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec,
                 /* search for an empty channel */
                 for (j = 0; j < cfg->line_outs; j++) {
                         if (!assigned[j]) {
-                                spec->multiout.dac_nids[i] =
+                                spec->private_dac_nids[i] =
                                         alc880_idx_to_dac(j);
                                 assigned[j] = 1;
                                 break;
@@ -4810,21 +5371,50 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec,
         return 0;
 }
 
+static const char *alc_get_line_out_pfx(struct alc_spec *spec,
+                                        bool can_be_master)
+{
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+
+        if (cfg->line_outs == 1 && !spec->multi_ios &&
+            !cfg->hp_outs && !cfg->speaker_outs && can_be_master)
+                return "Master";
+
+        switch (cfg->line_out_type) {
+        case AUTO_PIN_SPEAKER_OUT:
+                if (cfg->line_outs == 1)
+                        return "Speaker";
+                break;
+        case AUTO_PIN_HP_OUT:
+                return "Headphone";
+        default:
+                if (cfg->line_outs == 1 && !spec->multi_ios)
+                        return "PCM";
+                break;
+        }
+        return NULL;
+}
+
 /* add playback controls from the parsed DAC table */
 static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
-        static const char *chname[4] = {
+        static const char * const chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
         };
+        const char *pfx = alc_get_line_out_pfx(spec, false);
         hda_nid_t nid;
-        int i, err;
+        int i, err, noutputs;
 
-        for (i = 0; i < cfg->line_outs; i++) {
+        noutputs = cfg->line_outs;
+        if (spec->multi_ios > 0)
+                noutputs += spec->multi_ios;
+
+        for (i = 0; i < noutputs; i++) {
                 if (!spec->multiout.dac_nids[i])
                         continue;
                 nid = alc880_idx_to_mixer(alc880_dac_to_idx(spec->multiout.dac_nids[i]));
-                if (i == 2) {
+                if (!pfx && i == 2) {
                         /* Center/LFE */
                         err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
                                               "Center",
@@ -4851,18 +5441,20 @@ static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
                         if (err < 0)
                                 return err;
                 } else {
-                        const char *pfx;
-                        if (cfg->line_outs == 1 &&
-                            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                                pfx = "Speaker";
-                        else
-                                pfx = chname[i];
-                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
+                        const char *name = pfx;
+                        int index = i;
+                        if (!name) {
+                                name = chname[i];
+                                index = 0;
+                        }
+                        err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                                name, index,
                                           HDA_COMPOSE_AMP_VAL(nid, 3, 0,
                                                               HDA_OUTPUT));
                         if (err < 0)
                                 return err;
-                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
+                        err = __add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                               name, index,
                                           HDA_COMPOSE_AMP_VAL(nid, 3, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -4912,16 +5504,16 @@ static int alc880_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin,
 
 /* create input playback/capture controls for the given pin */
 static int new_analog_input(struct alc_spec *spec, hda_nid_t pin,
-                            const char *ctlname,
+                            const char *ctlname, int ctlidx,
                             int idx, hda_nid_t mix_nid)
 {
         int err;
 
-        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname,
+        err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname, ctlidx,
                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
-        err = add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname,
+        err = __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname, ctlidx,
                           HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
@@ -4942,20 +5534,29 @@ static int alc_auto_create_input_ctls(struct hda_codec *codec,
 {
         struct alc_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx;
+        int i, err, idx, type_idx = 0;
+        const char *prev_label = NULL;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
+        for (i = 0; i < cfg->num_inputs; i++) {
                 hda_nid_t pin;
+                const char *label;
 
-                pin = cfg->input_pins[i];
+                pin = cfg->inputs[i].pin;
                 if (!alc_is_input_pin(codec, pin))
                         continue;
 
+                label = hda_get_autocfg_input_label(codec, cfg, i);
+                if (prev_label && !strcmp(label, prev_label))
+                        type_idx++;
+                else
+                        type_idx = 0;
+                prev_label = label;
+
                 if (mixer) {
                         idx = get_connection_index(codec, mixer, pin);
                         if (idx >= 0) {
                                 err = new_analog_input(spec, pin,
-                                                       auto_pin_cfg_labels[i],
+                                                       label, type_idx,
                                                        idx, mixer);
                                 if (err < 0)
                                         return err;
@@ -4967,12 +5568,8 @@ static int alc_auto_create_input_ctls(struct hda_codec *codec,
                 idx = get_connection_index(codec, cap1, pin);
                 if (idx < 0 && cap2)
                         idx = get_connection_index(codec, cap2, pin);
-                if (idx >= 0) {
-                        imux->items[imux->num_items].label =
-                                auto_pin_cfg_labels[i];
-                        imux->items[imux->num_items].index = idx;
-                        imux->num_items++;
-                }
+                if (idx >= 0)
+                        snd_hda_add_imux_item(imux, label, idx, NULL);
         }
         return 0;
 }
@@ -5044,12 +5641,13 @@ static void alc880_auto_init_extra_out(struct hda_codec *codec)
 static void alc880_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (alc_is_input_pin(codec, nid)) {
-                        alc_set_input_pin(codec, nid, i);
+                        alc_set_input_pin(codec, nid, cfg->inputs[i].type);
                         if (nid != ALC880_PIN_CD_NID &&
                             (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
@@ -5078,6 +5676,8 @@ static void alc880_auto_init_input_src(struct hda_codec *codec)
         }
 }
 
+static int alc_auto_add_multi_channel_mode(struct hda_codec *codec);
+
 /* parse the BIOS configuration and set up the alc_spec */
 /* return 1 if successful, 0 if the proper config is not found,
  * or a negative error code
@@ -5086,7 +5686,7 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc880_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc880_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc880_ignore);
@@ -5098,6 +5698,9 @@ static int alc880_parse_auto_config(struct hda_codec *codec)
         err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
         if (err < 0)
                 return err;
+        err = alc_auto_add_multi_channel_mode(codec);
+        if (err < 0)
+                return err;
         err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -5169,6 +5772,12 @@ static void fixup_automic_adc(struct hda_codec *codec)
                         spec->capsrc_nids += i;
                 spec->adc_nids += i;
                 spec->num_adc_nids = 1;
+                /* optional dock-mic */
+                eidx = get_connection_index(codec, cap, spec->dock_mic.pin);
+                if (eidx < 0)
+                        spec->dock_mic.pin = 0;
+                else
+                        spec->dock_mic.mux_idx = eidx;
                 return;
         }
         snd_printd(KERN_INFO "hda_codec: %s: "
@@ -5196,6 +5805,8 @@ static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)
         struct alc_spec *spec = codec->spec;
         int i;
 
+        if (!pin)
+                return 0;
         for (i = 0; i < spec->num_adc_nids; i++) {
                 hda_nid_t cap = spec->capsrc_nids ?
                         spec->capsrc_nids[i] : spec->adc_nids[i];
@@ -5214,25 +5825,20 @@ static int init_capsrc_for_pin(struct hda_codec *codec, hda_nid_t pin)
 static void fixup_single_adc(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        hda_nid_t pin = 0;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
         /* search for the input pin; there must be only one */
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (spec->autocfg.input_pins[i]) {
-                        pin = spec->autocfg.input_pins[i];
-                        break;
-                }
-        }
-        if (!pin)
+        if (cfg->num_inputs != 1)
                 return;
-        i = init_capsrc_for_pin(codec, pin);
+        i = init_capsrc_for_pin(codec, cfg->inputs[0].pin);
         if (i >= 0) {
                 /* use only this ADC */
                 if (spec->capsrc_nids)
                         spec->capsrc_nids += i;
                 spec->adc_nids += i;
                 spec->num_adc_nids = 1;
+                spec->single_input_src = 1;
         }
 }
 
@@ -5241,13 +5847,24 @@ static void fixup_dual_adc_switch(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         init_capsrc_for_pin(codec, spec->ext_mic.pin);
+        init_capsrc_for_pin(codec, spec->dock_mic.pin);
         init_capsrc_for_pin(codec, spec->int_mic.pin);
 }
 
+/* initialize some special cases for input sources */
+static void alc_init_special_input_src(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        if (spec->dual_adc_switch)
+                fixup_dual_adc_switch(codec);
+        else if (spec->single_input_src)
+                init_capsrc_for_pin(codec, spec->autocfg.inputs[0].pin);
+}
+
 static void set_capture_mixer(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        static struct snd_kcontrol_new *caps[2][3] = {
+        static const struct snd_kcontrol_new *caps[2][3] = {
                 { alc_capture_mixer_nosrc1,
                   alc_capture_mixer_nosrc2,
                   alc_capture_mixer_nosrc3 },
@@ -5259,7 +5876,7 @@ static void set_capture_mixer(struct hda_codec *codec)
                 int mux = 0;
                 int num_adcs = spec->num_adc_nids;
                 if (spec->dual_adc_switch)
-                        fixup_dual_adc_switch(codec);
+                        num_adcs = 1;
                 else if (spec->auto_mic)
                         fixup_automic_adc(codec);
                 else if (spec->input_mux) {
@@ -5268,17 +5885,16 @@ static void set_capture_mixer(struct hda_codec *codec)
                         else if (spec->input_mux->num_items == 1)
                                 fixup_single_adc(codec);
                 }
-                if (spec->dual_adc_switch)
-                        num_adcs = 1;
                 spec->cap_mixer = caps[mux][num_adcs - 1];
         }
 }
 
 /* fill adc_nids (and capsrc_nids) containing all active input pins */
-static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,
+static void fillup_priv_adc_nids(struct hda_codec *codec, const hda_nid_t *nids,
                                  int num_nids)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int n;
         hda_nid_t fallback_adc = 0, fallback_cap = 0;
 
@@ -5304,10 +5920,8 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,
                         fallback_adc = adc;
                         fallback_cap = cap;
                 }
-                for (i = 0; i < AUTO_PIN_LAST; i++) {
-                        hda_nid_t nid = spec->autocfg.input_pins[i];
-                        if (!nid)
-                                continue;
+                for (i = 0; i < cfg->num_inputs; i++) {
+                        hda_nid_t nid = cfg->inputs[i].pin;
                         for (j = 0; j < nconns; j++) {
                                 if (conn[j] == nid)
                                         break;
@@ -5315,7 +5929,7 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,
                         if (j >= nconns)
                                 break;
                 }
-                if (i >= AUTO_PIN_LAST) {
+                if (i >= cfg->num_inputs) {
                         int num_adcs = spec->num_adc_nids;
                         spec->private_adc_nids[num_adcs] = adc;
                         spec->private_capsrc_nids[num_adcs] = cap;
@@ -5342,9 +5956,11 @@ static void fillup_priv_adc_nids(struct hda_codec *codec, hda_nid_t *nids,
 #define set_beep_amp(spec, nid, idx, dir) \
         ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 3, idx, dir))
 
-static struct snd_pci_quirk beep_white_list[] = {
+static const struct snd_pci_quirk beep_white_list[] = {
         SND_PCI_QUIRK(0x1043, 0x829f, "ASUS", 1),
         SND_PCI_QUIRK(0x1043, 0x83ce, "EeePC", 1),
+        SND_PCI_QUIRK(0x1043, 0x831a, "EeePC", 1),
+        SND_PCI_QUIRK(0x1043, 0x834a, "EeePC", 1),
         SND_PCI_QUIRK(0x8086, 0xd613, "Intel", 1),
         {}
 };
@@ -5452,17 +6068,17 @@ static int patch_alc880(struct hda_codec *codec)
  * ALC260 support
  */
 
-static hda_nid_t alc260_dac_nids[1] = {
+static const hda_nid_t alc260_dac_nids[1] = {
         /* front */
         0x02,
 };
 
-static hda_nid_t alc260_adc_nids[1] = {
+static const hda_nid_t alc260_adc_nids[1] = {
         /* ADC0 */
         0x04,
 };
 
-static hda_nid_t alc260_adc_nids_alt[1] = {
+static const hda_nid_t alc260_adc_nids_alt[1] = {
         /* ADC1 */
         0x05,
 };
@@ -5470,7 +6086,7 @@ static hda_nid_t alc260_adc_nids_alt[1] = {
 /* NIDs used when simultaneous access to both ADCs makes sense.  Note that
  * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC.
  */
-static hda_nid_t alc260_dual_adc_nids[2] = {
+static const hda_nid_t alc260_dual_adc_nids[2] = {
         /* ADC0, ADC1 */
         0x04, 0x05
 };
@@ -5478,7 +6094,7 @@ static hda_nid_t alc260_dual_adc_nids[2] = {
 #define ALC260_DIGOUT_NID       0x03
 #define ALC260_DIGIN_NID        0x06
 
-static struct hda_input_mux alc260_capture_source = {
+static const struct hda_input_mux alc260_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -5494,7 +6110,7 @@ static struct hda_input_mux alc260_capture_source = {
  * recording the mixer output on the second ADC (ADC0 doesn't have a
  * connection to the mixer output).
  */
-static struct hda_input_mux alc260_fujitsu_capture_sources[2] = {
+static const struct hda_input_mux alc260_fujitsu_capture_sources[2] = {
         {
                 .num_items = 3,
                 .items = {
@@ -5518,7 +6134,7 @@ static struct hda_input_mux alc260_fujitsu_capture_sources[2] = {
 /* Acer TravelMate(/Extensa/Aspire) notebooks have similar configuration to
  * the Fujitsu S702x, but jacks are marked differently.
  */
-static struct hda_input_mux alc260_acer_capture_sources[2] = {
+static const struct hda_input_mux alc260_acer_capture_sources[2] = {
         {
                 .num_items = 4,
                 .items = {
@@ -5541,7 +6157,7 @@ static struct hda_input_mux alc260_acer_capture_sources[2] = {
 };
 
 /* Maxdata Favorit 100XS */
-static struct hda_input_mux alc260_favorit100_capture_sources[2] = {
+static const struct hda_input_mux alc260_favorit100_capture_sources[2] = {
         {
                 .num_items = 2,
                 .items = {
@@ -5565,7 +6181,7 @@ static struct hda_input_mux alc260_favorit100_capture_sources[2] = {
  * element which allows changing the channel mode, so the verb list is
  * never used.
  */
-static struct hda_channel_mode alc260_modes[1] = {
+static const struct hda_channel_mode alc260_modes[1] = {
         { 2, NULL },
 };
 
@@ -5579,7 +6195,7 @@ static struct hda_channel_mode alc260_modes[1] = {
  * acer: acer + capture
  */
 
-static struct snd_kcontrol_new alc260_base_output_mixer[] = {
+static const struct snd_kcontrol_new alc260_base_output_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x09, 0x0, HDA_OUTPUT),
@@ -5589,7 +6205,7 @@ static struct snd_kcontrol_new alc260_base_output_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc260_input_mixer[] = {
+static const struct snd_kcontrol_new alc260_input_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
@@ -5602,21 +6218,9 @@ static struct snd_kcontrol_new alc260_input_mixer[] = {
 };
 
 /* update HP, line and mono out pins according to the master switch */
-static void alc260_hp_master_update(struct hda_codec *codec,
-                                    hda_nid_t hp, hda_nid_t line,
-                                    hda_nid_t mono)
+static void alc260_hp_master_update(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
-        unsigned int val = spec->master_sw ? PIN_HP : 0;
-        /* change HP and line-out pins */
-        snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            val);
-        snd_hda_codec_write(codec, line, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            val);
-        /* mono (speaker) depending on the HP jack sense */
-        val = (val && !spec->jack_present) ? PIN_OUT : 0;
-        snd_hda_codec_write(codec, mono, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            val);
+        update_speakers(codec);
 }
 
 static int alc260_hp_master_sw_get(struct snd_kcontrol *kcontrol,
@@ -5624,7 +6228,7 @@ static int alc260_hp_master_sw_get(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
-        *ucontrol->value.integer.value = spec->master_sw;
+        *ucontrol->value.integer.value = !spec->master_mute;
         return 0;
 }
 
@@ -5633,20 +6237,16 @@ static int alc260_hp_master_sw_put(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct alc_spec *spec = codec->spec;
-        int val = !!*ucontrol->value.integer.value;
-        hda_nid_t hp, line, mono;
+        int val = !*ucontrol->value.integer.value;
 
-        if (val == spec->master_sw)
+        if (val == spec->master_mute)
                 return 0;
-        spec->master_sw = val;
-        hp = (kcontrol->private_value >> 16) & 0xff;
-        line = (kcontrol->private_value >> 8) & 0xff;
-        mono = kcontrol->private_value & 0xff;
-        alc260_hp_master_update(codec, hp, line, mono);
+        spec->master_mute = val;
+        alc260_hp_master_update(codec);
         return 1;
 }
 
-static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
+static const struct snd_kcontrol_new alc260_hp_output_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -5654,7 +6254,6 @@ static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
-                .private_value = (0x0f << 16) | (0x10 << 8) | 0x11
         },
         HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),
@@ -5666,26 +6265,23 @@ static struct snd_kcontrol_new alc260_hp_output_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc260_hp_unsol_verbs[] = {
+static const struct hda_verb alc260_hp_unsol_verbs[] = {
         {0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
         {},
 };
 
-static void alc260_hp_automute(struct hda_codec *codec)
+static void alc260_hp_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        spec->jack_present = snd_hda_jack_detect(codec, 0x10);
-        alc260_hp_master_update(codec, 0x0f, 0x10, 0x11);
-}
-
-static void alc260_hp_unsol_event(struct hda_codec *codec, unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc260_hp_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x0f;
+        spec->autocfg.speaker_pins[0] = 0x10;
+        spec->autocfg.speaker_pins[1] = 0x11;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
-static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
+static const struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -5693,7 +6289,6 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
                 .info = snd_ctl_boolean_mono_info,
                 .get = alc260_hp_master_sw_get,
                 .put = alc260_hp_master_sw_put,
-                .private_value = (0x15 << 16) | (0x10 << 8) | 0x11
         },
         HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),
@@ -5706,7 +6301,18 @@ static struct snd_kcontrol_new alc260_hp_3013_mixer[] = {
         { } /* end */
 };
 
-static struct hda_bind_ctls alc260_dc7600_bind_master_vol = {
+static void alc260_hp_3013_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x10;
+        spec->autocfg.speaker_pins[1] = 0x11;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
+}
+
+static const struct hda_bind_ctls alc260_dc7600_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_OUTPUT),
@@ -5716,7 +6322,7 @@ static struct hda_bind_ctls alc260_dc7600_bind_master_vol = {
         },
 };
 
-static struct hda_bind_ctls alc260_dc7600_bind_switch = {
+static const struct hda_bind_ctls alc260_dc7600_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),
@@ -5725,7 +6331,7 @@ static struct hda_bind_ctls alc260_dc7600_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc260_hp_dc7600_mixer[] = {
+static const struct snd_kcontrol_new alc260_hp_dc7600_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc260_dc7600_bind_master_vol),
         HDA_BIND_SW("LineOut Playback Switch", &alc260_dc7600_bind_switch),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x0f, 0x0, HDA_OUTPUT),
@@ -5733,49 +6339,27 @@ static struct snd_kcontrol_new alc260_hp_dc7600_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc260_hp_3013_unsol_verbs[] = {
+static const struct hda_verb alc260_hp_3013_unsol_verbs[] = {
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
         {},
 };
 
-static void alc260_hp_3013_automute(struct hda_codec *codec)
+static void alc260_hp_3012_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        spec->jack_present = snd_hda_jack_detect(codec, 0x15);
-        alc260_hp_master_update(codec, 0x15, 0x10, 0x11);
-}
-
-static void alc260_hp_3013_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc260_hp_3013_automute(codec);
-}
-
-static void alc260_hp_3012_automute(struct hda_codec *codec)
-{
-        unsigned int bits = snd_hda_jack_detect(codec, 0x10) ? 0 : PIN_OUT;
-
-        snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            bits);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            bits);
-        snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                            bits);
-}
-
-static void alc260_hp_3012_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc260_hp_3012_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x10;
+        spec->autocfg.speaker_pins[0] = 0x0f;
+        spec->autocfg.speaker_pins[1] = 0x11;
+        spec->autocfg.speaker_pins[2] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
 /* Fujitsu S702x series laptops.  ALC260 pin usage: Mic/Line jack = 0x12,
  * HP jack = 0x14, CD audio =  0x16, internal speaker = 0x10.
  */
-static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
+static const struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),
         ALC_PIN_MODE("Headphone Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
@@ -5812,7 +6396,7 @@ static struct snd_kcontrol_new alc260_fujitsu_mixer[] = {
  * controls for such models.  On models without a "mono speaker" the control
  * won't do anything.
  */
-static struct snd_kcontrol_new alc260_acer_mixer[] = {
+static const struct snd_kcontrol_new alc260_acer_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
         ALC_PIN_MODE("Headphone Jack Mode", 0x0f, ALC_PIN_DIR_INOUT),
@@ -5833,7 +6417,7 @@ static struct snd_kcontrol_new alc260_acer_mixer[] = {
 
 /* Maxdata Favorit 100XS: one output and one input (0x12) jack
  */
-static struct snd_kcontrol_new alc260_favorit100_mixer[] = {
+static const 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),
@@ -5846,7 +6430,7 @@ static struct snd_kcontrol_new alc260_favorit100_mixer[] = {
 /* Packard bell V7900  ALC260 pin usage: HP = 0x0f, Mic jack = 0x12,
  * Line In jack = 0x14, CD audio =  0x16, pc beep = 0x17.
  */
-static struct snd_kcontrol_new alc260_will_mixer[] = {
+static const struct snd_kcontrol_new alc260_will_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
@@ -5863,7 +6447,7 @@ static struct snd_kcontrol_new alc260_will_mixer[] = {
 /* Replacer 672V ALC260 pin usage: Mic jack = 0x12,
  * Line In jack = 0x14, ATAPI Mic = 0x13, speaker = 0x0f.
  */
-static struct snd_kcontrol_new alc260_replacer_672v_mixer[] = {
+static const struct snd_kcontrol_new alc260_replacer_672v_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Master Playback Switch", 0x08, 0x2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
@@ -5880,7 +6464,7 @@ static struct snd_kcontrol_new alc260_replacer_672v_mixer[] = {
 /*
  * initialization verbs
  */
-static struct hda_verb alc260_init_verbs[] = {
+static const struct hda_verb alc260_init_verbs[] = {
         /* Line In pin widget for input */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         /* CD pin widget for input */
@@ -5944,7 +6528,7 @@ static struct hda_verb alc260_init_verbs[] = {
 };
 
 #if 0 /* should be identical with alc260_init_verbs? */
-static struct hda_verb alc260_hp_init_verbs[] = {
+static const struct hda_verb alc260_hp_init_verbs[] = {
         /* Headphone and output */
         {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
         /* mono output */
@@ -5994,7 +6578,7 @@ static struct hda_verb alc260_hp_init_verbs[] = {
 };
 #endif
 
-static struct hda_verb alc260_hp_3013_init_verbs[] = {
+static const struct hda_verb alc260_hp_3013_init_verbs[] = {
         /* Line out and output */
         {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
         /* mono output */
@@ -6047,7 +6631,7 @@ static struct hda_verb alc260_hp_3013_init_verbs[] = {
  * laptops.  ALC260 pin usage: Mic/Line jack = 0x12, HP jack = 0x14, CD
  * audio = 0x16, internal speaker = 0x10.
  */
-static struct hda_verb alc260_fujitsu_init_verbs[] = {
+static const struct hda_verb alc260_fujitsu_init_verbs[] = {
         /* Disable all GPIOs */
         {0x01, AC_VERB_SET_GPIO_MASK, 0},
         /* Internal speaker is connected to headphone pin */
@@ -6129,7 +6713,7 @@ static struct hda_verb alc260_fujitsu_init_verbs[] = {
 /* Initialisation sequence for ALC260 as configured in Acer TravelMate and
  * similar laptops (adapted from Fujitsu init verbs).
  */
-static struct hda_verb alc260_acer_init_verbs[] = {
+static const struct hda_verb alc260_acer_init_verbs[] = {
         /* On TravelMate laptops, GPIO 0 enables the internal speaker and
          * the headphone jack.  Turn this on and rely on the standard mute
          * methods whenever the user wants to turn these outputs off.
@@ -6217,7 +6801,7 @@ 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[] = {
+static const 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.
@@ -6297,7 +6881,7 @@ static struct hda_verb alc260_favorit100_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc260_will_verbs[] = {
+static const struct hda_verb alc260_will_verbs[] = {
         {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x0b, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x0d, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -6307,7 +6891,7 @@ static struct hda_verb alc260_will_verbs[] = {
         {}
 };
 
-static struct hda_verb alc260_replacer_672v_verbs[] = {
+static const struct hda_verb alc260_replacer_672v_verbs[] = {
         {0x0f, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
         {0x1a, AC_VERB_SET_COEF_INDEX, 0x07},
         {0x1a, AC_VERB_SET_PROC_COEF, 0x3050},
@@ -6349,7 +6933,7 @@ static void alc260_replacer_672v_unsol_event(struct hda_codec *codec,
                 alc260_replacer_672v_automute(codec);
 }
 
-static struct hda_verb alc260_hp_dc7600_verbs[] = {
+static const struct hda_verb alc260_hp_dc7600_verbs[] = {
         {0x05, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -6367,17 +6951,17 @@ static struct hda_verb alc260_hp_dc7600_verbs[] = {
  * configuration.
  */
 #ifdef CONFIG_SND_DEBUG
-static hda_nid_t alc260_test_dac_nids[1] = {
+static const hda_nid_t alc260_test_dac_nids[1] = {
         0x02,
 };
-static hda_nid_t alc260_test_adc_nids[2] = {
+static const hda_nid_t alc260_test_adc_nids[2] = {
         0x04, 0x05,
 };
 /* For testing the ALC260, each input MUX needs its own definition since
  * the signal assignments are different.  This assumes that the first ADC
  * is NID 0x04.
  */
-static struct hda_input_mux alc260_test_capture_sources[2] = {
+static const struct hda_input_mux alc260_test_capture_sources[2] = {
         {
                 .num_items = 7,
                 .items = {
@@ -6404,7 +6988,7 @@ static struct hda_input_mux alc260_test_capture_sources[2] = {
                 },
         },
 };
-static struct snd_kcontrol_new alc260_test_mixer[] = {
+static const struct snd_kcontrol_new alc260_test_mixer[] = {
         /* Output driver widgets */
         HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
@@ -6468,7 +7052,7 @@ static struct snd_kcontrol_new alc260_test_mixer[] = {
 
         { } /* end */
 };
-static struct hda_verb alc260_test_init_verbs[] = {
+static const struct hda_verb alc260_test_init_verbs[] = {
         /* Enable all GPIOs as outputs with an initial value of 0 */
         {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
         {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
@@ -6606,7 +7190,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec,
 
         spec->multiout.num_dacs = 1;
         spec->multiout.dac_nids = spec->private_dac_nids;
-        spec->multiout.dac_nids[0] = 0x02;
+        spec->private_dac_nids[0] = 0x02;
 
         nid = cfg->line_out_pins[0];
         if (nid) {
@@ -6683,12 +7267,13 @@ static void alc260_auto_init_multi_out(struct hda_codec *codec)
 static void alc260_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (nid >= 0x12) {
-                        alc_set_input_pin(codec, nid, i);
+                        alc_set_input_pin(codec, nid, cfg->inputs[i].type);
                         if (nid != ALC260_PIN_CD_NID &&
                             (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
@@ -6703,7 +7288,7 @@ static void alc260_auto_init_analog_input(struct hda_codec *codec)
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc260_volume_init_verbs[] = {
+static const struct hda_verb alc260_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -6748,7 +7333,7 @@ static int alc260_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc260_ignore[] = { 0x17, 0 };
+        static const hda_nid_t alc260_ignore[] = { 0x17, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc260_ignore);
@@ -6793,7 +7378,7 @@ static void alc260_auto_init(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list alc260_loopbacks[] = {
+static const struct hda_amp_list alc260_loopbacks[] = {
         { 0x07, HDA_INPUT, 0 },
         { 0x07, HDA_INPUT, 1 },
         { 0x07, HDA_INPUT, 2 },
@@ -6810,18 +7395,17 @@ enum {
         PINFIX_HP_DC5750,
 };
 
-static struct alc_pincfg alc260_hp_dc5750_pinfix[] = {
-        { 0x11, 0x90130110 }, /* speaker */
-        { }
-};
-
 static const struct alc_fixup alc260_fixups[] = {
         [PINFIX_HP_DC5750] = {
-                .pins = alc260_hp_dc5750_pinfix
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x11, 0x90130110 }, /* speaker */
+                        { }
+                }
         },
 };
 
-static struct snd_pci_quirk alc260_fixup_tbl[] = {
+static const struct snd_pci_quirk alc260_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", PINFIX_HP_DC5750),
         {}
 };
@@ -6829,7 +7413,7 @@ static struct snd_pci_quirk alc260_fixup_tbl[] = {
 /*
  * ALC260 configurations
  */
-static const char *alc260_models[ALC260_MODEL_LAST] = {
+static const char * const alc260_models[ALC260_MODEL_LAST] = {
         [ALC260_BASIC]          = "basic",
         [ALC260_HP]             = "hp",
         [ALC260_HP_3013]        = "hp-3013",
@@ -6845,7 +7429,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {
         [ALC260_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc260_cfg_tbl[] = {
+static const struct snd_pci_quirk alc260_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
         SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
         SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
@@ -6869,7 +7453,7 @@ static struct snd_pci_quirk alc260_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc260_presets[] = {
+static const struct alc_config_preset alc260_presets[] = {
         [ALC260_BASIC] = {
                 .mixers = { alc260_base_output_mixer,
                             alc260_input_mixer },
@@ -6894,8 +7478,9 @@ static struct alc_config_preset alc260_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc260_modes),
                 .channel_mode = alc260_modes,
                 .input_mux = &alc260_capture_source,
-                .unsol_event = alc260_hp_unsol_event,
-                .init_hook = alc260_hp_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc260_hp_setup,
+                .init_hook = alc_inithook,
         },
         [ALC260_HP_DC7600] = {
                 .mixers = { alc260_hp_dc7600_mixer,
@@ -6909,8 +7494,9 @@ static struct alc_config_preset alc260_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc260_modes),
                 .channel_mode = alc260_modes,
                 .input_mux = &alc260_capture_source,
-                .unsol_event = alc260_hp_3012_unsol_event,
-                .init_hook = alc260_hp_3012_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc260_hp_3012_setup,
+                .init_hook = alc_inithook,
         },
         [ALC260_HP_3013] = {
                 .mixers = { alc260_hp_3013_mixer,
@@ -6924,8 +7510,9 @@ static struct alc_config_preset alc260_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc260_modes),
                 .channel_mode = alc260_modes,
                 .input_mux = &alc260_capture_source,
-                .unsol_event = alc260_hp_3013_unsol_event,
-                .init_hook = alc260_hp_3013_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc260_hp_3013_setup,
+                .init_hook = alc_inithook,
         },
         [ALC260_FUJITSU_S702X] = {
                 .mixers = { alc260_fujitsu_mixer },
@@ -7025,8 +7612,10 @@ static int patch_alc260(struct hda_codec *codec)
                 board_config = ALC260_AUTO;
         }
 
-        if (board_config == ALC260_AUTO)
-                alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 1);
+        if (board_config == ALC260_AUTO) {
+                alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
 
         if (board_config == ALC260_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -7074,14 +7663,14 @@ static int patch_alc260(struct hda_codec *codec)
         set_capture_mixer(codec);
         set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
 
-        if (board_config == ALC260_AUTO)
-                alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 0);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         spec->vmaster_nid = 0x08;
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC260_AUTO)
                 spec->init_hook = alc260_auto_init;
+        spec->shutup = alc_eapd_shutup;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc260_loopbacks;
@@ -7109,12 +7698,12 @@ static int patch_alc260(struct hda_codec *codec)
 #define ALC1200_DIGOUT_NID      0x10
 
 
-static struct hda_channel_mode alc882_ch_modes[1] = {
+static const struct hda_channel_mode alc882_ch_modes[1] = {
         { 8, NULL }
 };
 
 /* DACs */
-static hda_nid_t alc882_dac_nids[4] = {
+static const hda_nid_t alc882_dac_nids[4] = {
         /* front, rear, clfe, rear_surr */
         0x02, 0x03, 0x04, 0x05
 };
@@ -7124,20 +7713,20 @@ static hda_nid_t alc882_dac_nids[4] = {
 #define alc882_adc_nids         alc880_adc_nids
 #define alc882_adc_nids_alt     alc880_adc_nids_alt
 #define alc883_adc_nids         alc882_adc_nids_alt
-static hda_nid_t alc883_adc_nids_alt[1] = { 0x08 };
-static hda_nid_t alc883_adc_nids_rev[2] = { 0x09, 0x08 };
+static const hda_nid_t alc883_adc_nids_alt[1] = { 0x08 };
+static const hda_nid_t alc883_adc_nids_rev[2] = { 0x09, 0x08 };
 #define alc889_adc_nids         alc880_adc_nids
 
-static hda_nid_t alc882_capsrc_nids[3] = { 0x24, 0x23, 0x22 };
-static hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 };
+static const hda_nid_t alc882_capsrc_nids[3] = { 0x24, 0x23, 0x22 };
+static const hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 };
 #define alc883_capsrc_nids      alc882_capsrc_nids_alt
-static hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 };
+static const 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 */
 
-static struct hda_input_mux alc882_capture_source = {
+static const struct hda_input_mux alc882_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -7149,7 +7738,7 @@ static struct hda_input_mux alc882_capture_source = {
 
 #define alc883_capture_source   alc882_capture_source
 
-static struct hda_input_mux alc889_capture_source = {
+static const struct hda_input_mux alc889_capture_source = {
         .num_items = 3,
         .items = {
                 { "Front Mic", 0x0 },
@@ -7158,7 +7747,7 @@ static struct hda_input_mux alc889_capture_source = {
         },
 };
 
-static struct hda_input_mux mb5_capture_source = {
+static const struct hda_input_mux mb5_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x1 },
@@ -7167,7 +7756,7 @@ static struct hda_input_mux mb5_capture_source = {
         },
 };
 
-static struct hda_input_mux macmini3_capture_source = {
+static const struct hda_input_mux macmini3_capture_source = {
         .num_items = 2,
         .items = {
                 { "Line", 0x2 },
@@ -7175,7 +7764,7 @@ static struct hda_input_mux macmini3_capture_source = {
         },
 };
 
-static struct hda_input_mux alc883_3stack_6ch_intel = {
+static const struct hda_input_mux alc883_3stack_6ch_intel = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x1 },
@@ -7185,7 +7774,7 @@ static struct hda_input_mux alc883_3stack_6ch_intel = {
         },
 };
 
-static struct hda_input_mux alc883_lenovo_101e_capture_source = {
+static const struct hda_input_mux alc883_lenovo_101e_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x1 },
@@ -7193,25 +7782,25 @@ static struct hda_input_mux alc883_lenovo_101e_capture_source = {
         },
 };
 
-static struct hda_input_mux alc883_lenovo_nb0763_capture_source = {
+static const struct hda_input_mux alc883_lenovo_nb0763_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
-                { "Int Mic", 0x1 },
+                { "Internal Mic", 0x1 },
                 { "Line", 0x2 },
                 { "CD", 0x4 },
         },
 };
 
-static struct hda_input_mux alc883_fujitsu_pi2515_capture_source = {
+static const struct hda_input_mux alc883_fujitsu_pi2515_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x0 },
-                { "Int Mic", 0x1 },
+                { "Internal Mic", 0x1 },
         },
 };
 
-static struct hda_input_mux alc883_lenovo_sky_capture_source = {
+static const struct hda_input_mux alc883_lenovo_sky_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -7220,7 +7809,7 @@ static struct hda_input_mux alc883_lenovo_sky_capture_source = {
         },
 };
 
-static struct hda_input_mux alc883_asus_eee1601_capture_source = {
+static const struct hda_input_mux alc883_asus_eee1601_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x0 },
@@ -7228,7 +7817,7 @@ static struct hda_input_mux alc883_asus_eee1601_capture_source = {
         },
 };
 
-static struct hda_input_mux alc889A_mb31_capture_source = {
+static const struct hda_input_mux alc889A_mb31_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x0 },
@@ -7239,7 +7828,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = {
         },
 };
 
-static struct hda_input_mux alc889A_imac91_capture_source = {
+static const struct hda_input_mux alc889A_imac91_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x01 },
@@ -7250,14 +7839,14 @@ static struct hda_input_mux alc889A_imac91_capture_source = {
 /*
  * 2ch mode
  */
-static struct hda_channel_mode alc883_3ST_2ch_modes[1] = {
+static const struct hda_channel_mode alc883_3ST_2ch_modes[1] = {
         { 2, NULL }
 };
 
 /*
  * 2ch mode
  */
-static struct hda_verb alc882_3ST_ch2_init[] = {
+static const struct hda_verb alc882_3ST_ch2_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
@@ -7268,7 +7857,7 @@ static struct hda_verb alc882_3ST_ch2_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc882_3ST_ch4_init[] = {
+static const struct hda_verb alc882_3ST_ch4_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7280,7 +7869,7 @@ static struct hda_verb alc882_3ST_ch4_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc882_3ST_ch6_init[] = {
+static const struct hda_verb alc882_3ST_ch6_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },
@@ -7290,7 +7879,7 @@ static struct hda_verb alc882_3ST_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc882_3ST_6ch_modes[3] = {
+static const struct hda_channel_mode alc882_3ST_6ch_modes[3] = {
         { 2, alc882_3ST_ch2_init },
         { 4, alc882_3ST_ch4_init },
         { 6, alc882_3ST_ch6_init },
@@ -7301,7 +7890,7 @@ static struct hda_channel_mode alc882_3ST_6ch_modes[3] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc883_3ST_ch2_clevo_init[] = {
+static const struct hda_verb alc883_3ST_ch2_clevo_init[] = {
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -7313,7 +7902,7 @@ static struct hda_verb alc883_3ST_ch2_clevo_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc883_3ST_ch4_clevo_init[] = {
+static const struct hda_verb alc883_3ST_ch4_clevo_init[] = {
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
@@ -7326,7 +7915,7 @@ static struct hda_verb alc883_3ST_ch4_clevo_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc883_3ST_ch6_clevo_init[] = {
+static const struct hda_verb alc883_3ST_ch6_clevo_init[] = {
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -7337,7 +7926,7 @@ static struct hda_verb alc883_3ST_ch6_clevo_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc883_3ST_6ch_clevo_modes[3] = {
+static const struct hda_channel_mode alc883_3ST_6ch_clevo_modes[3] = {
         { 2, alc883_3ST_ch2_clevo_init },
         { 4, alc883_3ST_ch4_clevo_init },
         { 6, alc883_3ST_ch6_clevo_init },
@@ -7347,7 +7936,7 @@ static struct hda_channel_mode alc883_3ST_6ch_clevo_modes[3] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc882_sixstack_ch6_init[] = {
+static const struct hda_verb alc882_sixstack_ch6_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7358,7 +7947,7 @@ static struct hda_verb alc882_sixstack_ch6_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc882_sixstack_ch8_init[] = {
+static const struct hda_verb alc882_sixstack_ch8_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7366,7 +7955,7 @@ static struct hda_verb alc882_sixstack_ch8_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc882_sixstack_modes[2] = {
+static const struct hda_channel_mode alc882_sixstack_modes[2] = {
         { 6, alc882_sixstack_ch6_init },
         { 8, alc882_sixstack_ch8_init },
 };
@@ -7374,7 +7963,7 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = {
 
 /* Macbook Air 2,1 */
 
-static struct hda_channel_mode alc885_mba21_ch_modes[1] = {
+static const struct hda_channel_mode alc885_mba21_ch_modes[1] = {
       { 2, NULL },
 };
 
@@ -7385,7 +7974,7 @@ static struct hda_channel_mode alc885_mba21_ch_modes[1] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc885_mbp_ch2_init[] = {
+static const struct hda_verb alc885_mbp_ch2_init[] = {
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -7395,7 +7984,7 @@ static struct hda_verb alc885_mbp_ch2_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc885_mbp_ch4_init[] = {
+static const struct hda_verb alc885_mbp_ch4_init[] = {
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
@@ -7404,7 +7993,7 @@ static struct hda_verb alc885_mbp_ch4_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc885_mbp_4ch_modes[2] = {
+static const struct hda_channel_mode alc885_mbp_4ch_modes[2] = {
         { 2, alc885_mbp_ch2_init },
         { 4, alc885_mbp_ch4_init },
 };
@@ -7414,7 +8003,7 @@ static struct hda_channel_mode alc885_mbp_4ch_modes[2] = {
  * Speakers/Woofer/HP = Front
  * LineIn = Input
  */
-static struct hda_verb alc885_mb5_ch2_init[] = {
+static const struct hda_verb alc885_mb5_ch2_init[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         { } /* end */
@@ -7426,14 +8015,14 @@ static struct hda_verb alc885_mb5_ch2_init[] = {
  * Woofer = LFE
  * LineIn = Surround
  */
-static struct hda_verb alc885_mb5_ch6_init[] = {
+static const struct hda_verb alc885_mb5_ch6_init[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         { } /* end */
 };
 
-static struct hda_channel_mode alc885_mb5_6ch_modes[2] = {
+static const struct hda_channel_mode alc885_mb5_6ch_modes[2] = {
         { 2, alc885_mb5_ch2_init },
         { 6, alc885_mb5_ch6_init },
 };
@@ -7443,7 +8032,7 @@ static struct hda_channel_mode alc885_mb5_6ch_modes[2] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc883_4ST_ch2_init[] = {
+static const struct hda_verb alc883_4ST_ch2_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
@@ -7456,7 +8045,7 @@ static struct hda_verb alc883_4ST_ch2_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc883_4ST_ch4_init[] = {
+static const struct hda_verb alc883_4ST_ch4_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
@@ -7470,7 +8059,7 @@ static struct hda_verb alc883_4ST_ch4_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc883_4ST_ch6_init[] = {
+static const struct hda_verb alc883_4ST_ch6_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7485,7 +8074,7 @@ static struct hda_verb alc883_4ST_ch6_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc883_4ST_ch8_init[] = {
+static const struct hda_verb alc883_4ST_ch8_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x17, AC_VERB_SET_CONNECT_SEL, 0x03 },
@@ -7498,7 +8087,7 @@ static struct hda_verb alc883_4ST_ch8_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc883_4ST_8ch_modes[4] = {
+static const struct hda_channel_mode alc883_4ST_8ch_modes[4] = {
         { 2, alc883_4ST_ch2_init },
         { 4, alc883_4ST_ch4_init },
         { 6, alc883_4ST_ch6_init },
@@ -7509,7 +8098,7 @@ static struct hda_channel_mode alc883_4ST_8ch_modes[4] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc883_3ST_ch2_intel_init[] = {
+static const struct hda_verb alc883_3ST_ch2_intel_init[] = {
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
@@ -7520,7 +8109,7 @@ static struct hda_verb alc883_3ST_ch2_intel_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc883_3ST_ch4_intel_init[] = {
+static const struct hda_verb alc883_3ST_ch4_intel_init[] = {
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7532,7 +8121,7 @@ static struct hda_verb alc883_3ST_ch4_intel_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc883_3ST_ch6_intel_init[] = {
+static const struct hda_verb alc883_3ST_ch6_intel_init[] = {
         { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x19, AC_VERB_SET_CONNECT_SEL, 0x02 },
@@ -7542,7 +8131,7 @@ static struct hda_verb alc883_3ST_ch6_intel_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {
+static const struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {
         { 2, alc883_3ST_ch2_intel_init },
         { 4, alc883_3ST_ch4_intel_init },
         { 6, alc883_3ST_ch6_intel_init },
@@ -7551,7 +8140,7 @@ static struct hda_channel_mode alc883_3ST_6ch_intel_modes[3] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc889_ch2_intel_init[] = {
+static const struct hda_verb alc889_ch2_intel_init[] = {
         { 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
         { 0x19, AC_VERB_SET_CONNECT_SEL, 0x00 },
         { 0x16, AC_VERB_SET_CONNECT_SEL, 0x00 },
@@ -7564,7 +8153,7 @@ static struct hda_verb alc889_ch2_intel_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc889_ch6_intel_init[] = {
+static const struct hda_verb alc889_ch6_intel_init[] = {
         { 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
         { 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },
         { 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },
@@ -7577,7 +8166,7 @@ static struct hda_verb alc889_ch6_intel_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc889_ch8_intel_init[] = {
+static const struct hda_verb alc889_ch8_intel_init[] = {
         { 0x14, AC_VERB_SET_CONNECT_SEL, 0x00 },
         { 0x19, AC_VERB_SET_CONNECT_SEL, 0x01 },
         { 0x16, AC_VERB_SET_CONNECT_SEL, 0x02 },
@@ -7588,7 +8177,7 @@ static struct hda_verb alc889_ch8_intel_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc889_8ch_intel_modes[3] = {
+static const struct hda_channel_mode alc889_8ch_intel_modes[3] = {
         { 2, alc889_ch2_intel_init },
         { 6, alc889_ch6_intel_init },
         { 8, alc889_ch8_intel_init },
@@ -7597,7 +8186,7 @@ static struct hda_channel_mode alc889_8ch_intel_modes[3] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc883_sixstack_ch6_init[] = {
+static const struct hda_verb alc883_sixstack_ch6_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7608,7 +8197,7 @@ static struct hda_verb alc883_sixstack_ch6_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc883_sixstack_ch8_init[] = {
+static const struct hda_verb alc883_sixstack_ch8_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -7616,7 +8205,7 @@ static struct hda_verb alc883_sixstack_ch8_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc883_sixstack_modes[2] = {
+static const struct hda_channel_mode alc883_sixstack_modes[2] = {
         { 6, alc883_sixstack_ch6_init },
         { 8, alc883_sixstack_ch8_init },
 };
@@ -7625,7 +8214,7 @@ static struct hda_channel_mode alc883_sixstack_modes[2] = {
 /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
  */
-static struct snd_kcontrol_new alc882_base_mixer[] = {
+static const struct snd_kcontrol_new alc882_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -7642,24 +8231,24 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
 /* Macbook Air 2,1 same control for HP and internal Speaker */
 
-static struct snd_kcontrol_new alc885_mba21_mixer[] = {
+static const struct snd_kcontrol_new alc885_mba21_mixer[] = {
       HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
       HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_OUTPUT),
      { }
 };
 
 
-static struct snd_kcontrol_new alc885_mbp3_mixer[] = {
+static const struct snd_kcontrol_new alc885_mbp3_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE   ("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0e, 0x00, HDA_OUTPUT),
@@ -7669,12 +8258,12 @@ static struct snd_kcontrol_new alc885_mbp3_mixer[] = {
         HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost Volume", 0x1a, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0x00, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc885_mb5_mixer[] = {
+static const struct snd_kcontrol_new alc885_mb5_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),
@@ -7687,12 +8276,12 @@ static struct snd_kcontrol_new alc885_mb5_mixer[] = {
         HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE  ("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x19, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost Volume", 0x15, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x19, 0x00, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc885_macmini3_mixer[] = {
+static const struct snd_kcontrol_new alc885_macmini3_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE   ("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x00, HDA_OUTPUT),
@@ -7703,18 +8292,18 @@ static struct snd_kcontrol_new alc885_macmini3_mixer[] = {
         HDA_BIND_MUTE   ("Headphone Playback Switch", 0x0f, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x07, HDA_INPUT),
         HDA_CODEC_MUTE  ("Line Playback Switch", 0x0b, 0x07, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Boost", 0x15, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost Volume", 0x15, 0x00, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc885_imac91_mixer[] = {
+static const struct snd_kcontrol_new alc885_imac91_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 0x02, HDA_INPUT),
         { } /* end */
 };
 
 
-static struct snd_kcontrol_new alc882_w2jc_mixer[] = {
+static const struct snd_kcontrol_new alc882_w2jc_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -7722,12 +8311,12 @@ static struct snd_kcontrol_new alc882_w2jc_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc882_targa_mixer[] = {
+static const struct snd_kcontrol_new alc882_targa_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -7737,17 +8326,17 @@ static struct snd_kcontrol_new alc882_targa_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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
 /* Pin assignment: Front=0x14, HP = 0x15, Front = 0x16, ???
  *                 Front Mic=0x18, Line In = 0x1a, Line In = 0x1b, CD = 0x1c
  */
-static struct snd_kcontrol_new alc882_asus_a7j_mixer[] = {
+static const struct snd_kcontrol_new alc882_asus_a7j_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -7760,11 +8349,11 @@ static struct snd_kcontrol_new alc882_asus_a7j_mixer[] = {
         HDA_CODEC_MUTE("Mobile Line Playback Switch", 0x0b, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
+static const struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -7773,12 +8362,12 @@ static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc882_chmode_mixer[] = {
+static const struct snd_kcontrol_new alc882_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -7789,7 +8378,7 @@ static struct snd_kcontrol_new alc882_chmode_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc882_base_init_verbs[] = {
+static const struct hda_verb alc882_base_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -7851,7 +8440,7 @@ static struct hda_verb alc882_base_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc882_adc1_init_verbs[] = {
+static const struct hda_verb alc882_adc1_init_verbs[] = {
         /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
@@ -7863,26 +8452,26 @@ static struct hda_verb alc882_adc1_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc882_eapd_verbs[] = {
+static const struct hda_verb alc882_eapd_verbs[] = {
         /* change to EAPD mode */
         {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
         {0x20, AC_VERB_SET_PROC_COEF, 0x3060},
         { }
 };
 
-static struct hda_verb alc889_eapd_verbs[] = {
+static const struct hda_verb alc889_eapd_verbs[] = {
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
         {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
-static struct hda_verb alc_hp15_unsol_verbs[] = {
+static const struct hda_verb alc_hp15_unsol_verbs[] = {
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {}
 };
 
-static struct hda_verb alc885_init_verbs[] = {
+static const struct hda_verb alc885_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -7941,7 +8530,7 @@ static struct hda_verb alc885_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc885_init_input_verbs[] = {
+static const struct hda_verb alc885_init_input_verbs[] = {
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
@@ -7950,7 +8539,7 @@ static struct hda_verb alc885_init_input_verbs[] = {
 
 
 /* Unmute Selector 24h and set the default input to front mic */
-static struct hda_verb alc889_init_input_verbs[] = {
+static const struct hda_verb alc889_init_input_verbs[] = {
         {0x24, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         { }
@@ -7960,7 +8549,7 @@ static struct hda_verb alc889_init_input_verbs[] = {
 #define alc883_init_verbs       alc882_base_init_verbs
 
 /* Mac Pro test */
-static struct snd_kcontrol_new alc882_macpro_mixer[] = {
+static const struct snd_kcontrol_new alc882_macpro_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x18, 0x0, HDA_OUTPUT),
@@ -7973,7 +8562,7 @@ static struct snd_kcontrol_new alc882_macpro_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc882_macpro_init_verbs[] = {
+static const struct hda_verb alc882_macpro_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@@ -8025,7 +8614,7 @@ static struct hda_verb alc882_macpro_init_verbs[] = {
 };
 
 /* Macbook 5,1 */
-static struct hda_verb alc885_mb5_init_verbs[] = {
+static const struct hda_verb alc885_mb5_init_verbs[] = {
         /* DACs */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -8074,7 +8663,7 @@ static struct hda_verb alc885_mb5_init_verbs[] = {
 };
 
 /* Macmini 3,1 */
-static struct hda_verb alc885_macmini3_init_verbs[] = {
+static const struct hda_verb alc885_macmini3_init_verbs[] = {
         /* DACs */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -8121,7 +8710,7 @@ static struct hda_verb alc885_macmini3_init_verbs[] = {
 };
 
 
-static struct hda_verb alc885_mba21_init_verbs[] = {
+static const struct hda_verb alc885_mba21_init_verbs[] = {
         /*Internal and HP Speaker Mixer*/
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -8144,7 +8733,7 @@ static struct hda_verb alc885_mba21_init_verbs[] = {
 
 
 /* Macbook Pro rev3 */
-static struct hda_verb alc885_mbp3_init_verbs[] = {
+static const struct hda_verb alc885_mbp3_init_verbs[] = {
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@@ -8208,7 +8797,7 @@ static struct hda_verb alc885_mbp3_init_verbs[] = {
 };
 
 /* iMac 9,1 */
-static struct hda_verb alc885_imac91_init_verbs[] = {
+static const struct hda_verb alc885_imac91_init_verbs[] = {
         /* Internal Speaker Pin (0x0c) */
         {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, (PIN_OUT | AC_PINCTL_VREF_50) },
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -8263,14 +8852,14 @@ static struct hda_verb alc885_imac91_init_verbs[] = {
 };
 
 /* iMac 24 mixer. */
-static struct snd_kcontrol_new alc885_imac24_mixer[] = {
+static const struct snd_kcontrol_new alc885_imac24_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x0c, 0x00, HDA_INPUT),
         { } /* end */
 };
 
 /* iMac 24 init verbs. */
-static struct hda_verb alc885_imac24_init_verbs[] = {
+static const struct hda_verb alc885_imac24_init_verbs[] = {
         /* Internal speakers: output 0 (0x0c) */
         {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -8298,6 +8887,8 @@ static void alc885_imac24_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x18;
         spec->autocfg.speaker_pins[1] = 0x1a;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 #define alc885_mb5_setup        alc885_imac24_setup
@@ -8310,6 +8901,8 @@ static void alc885_mba21_setup(struct hda_codec *codec)
 
        spec->autocfg.hp_pins[0] = 0x14;
        spec->autocfg.speaker_pins[0] = 0x18;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 
@@ -8320,6 +8913,8 @@ static void alc885_mbp3_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc885_imac91_setup(struct hda_codec *codec)
@@ -8329,9 +8924,11 @@ static void alc885_imac91_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x18;
         spec->autocfg.speaker_pins[1] = 0x1a;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc882_targa_verbs[] = {
+static const struct hda_verb alc882_targa_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
@@ -8350,7 +8947,7 @@ static struct hda_verb alc882_targa_verbs[] = {
 static void alc882_targa_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        alc_automute_amp(codec);
+        alc_hp_automute(codec);
         snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
                                   spec->jack_present ? 1 : 3);
 }
@@ -8361,6 +8958,8 @@ static void alc882_targa_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x1b;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -8369,7 +8968,7 @@ static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc882_targa_automute(codec);
 }
 
-static struct hda_verb alc882_asus_a7j_verbs[] = {
+static const struct hda_verb alc882_asus_a7j_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
@@ -8387,7 +8986,7 @@ static struct hda_verb alc882_asus_a7j_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc882_asus_a7m_verbs[] = {
+static const struct hda_verb alc882_asus_a7m_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
@@ -8448,13 +9047,13 @@ static void alc885_macpro_init_hook(struct hda_codec *codec)
 static void alc885_imac24_init_hook(struct hda_codec *codec)
 {
         alc885_macpro_init_hook(codec);
-        alc_automute_amp(codec);
+        alc_hp_automute(codec);
 }
 
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc883_auto_init_verbs[] = {
+static const struct hda_verb alc883_auto_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -8494,7 +9093,7 @@ static struct hda_verb alc883_auto_init_verbs[] = {
 };
 
 /* 2ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:front) */
-static struct hda_verb alc889A_mb31_ch2_init[] = {
+static const struct hda_verb alc889A_mb31_ch2_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},             /* HP as front */
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},    /* Line as input */
@@ -8503,7 +9102,7 @@ static struct hda_verb alc889A_mb31_ch2_init[] = {
 };
 
 /* 4ch mode (Speaker:front, Subwoofer:CLFE, Line:CLFE, Headphones:front) */
-static struct hda_verb alc889A_mb31_ch4_init[] = {
+static const struct hda_verb alc889A_mb31_ch4_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},             /* HP as front */
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},   /* Line as output */
@@ -8512,7 +9111,7 @@ static struct hda_verb alc889A_mb31_ch4_init[] = {
 };
 
 /* 5ch mode (Speaker:front, Subwoofer:CLFE, Line:input, Headphones:rear) */
-static struct hda_verb alc889A_mb31_ch5_init[] = {
+static const struct hda_verb alc889A_mb31_ch5_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},             /* HP as rear */
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Subwoofer on */
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},    /* Line as input */
@@ -8521,7 +9120,7 @@ static struct hda_verb alc889A_mb31_ch5_init[] = {
 };
 
 /* 6ch mode (Speaker:front, Subwoofer:off, Line:CLFE, Headphones:Rear) */
-static struct hda_verb alc889A_mb31_ch6_init[] = {
+static const struct hda_verb alc889A_mb31_ch6_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},             /* HP as front */
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},   /* Subwoofer off */
         {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},   /* Line as output */
@@ -8529,14 +9128,14 @@ static struct hda_verb alc889A_mb31_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc889A_mb31_6ch_modes[4] = {
+static const struct hda_channel_mode alc889A_mb31_6ch_modes[4] = {
         { 2, alc889A_mb31_ch2_init },
         { 4, alc889A_mb31_ch4_init },
         { 5, alc889A_mb31_ch5_init },
         { 6, alc889A_mb31_ch6_init },
 };
 
-static struct hda_verb alc883_medion_eapd_verbs[] = {
+static const struct hda_verb alc883_medion_eapd_verbs[] = {
         /* eanable EAPD on medion laptop */
         {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
         {0x20, AC_VERB_SET_PROC_COEF, 0x3070},
@@ -8545,7 +9144,7 @@ static struct hda_verb alc883_medion_eapd_verbs[] = {
 
 #define alc883_base_mixer       alc882_base_mixer
 
-static struct snd_kcontrol_new alc883_mitac_mixer[] = {
+static const struct snd_kcontrol_new alc883_mitac_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
@@ -8554,43 +9153,43 @@ static struct snd_kcontrol_new alc883_mitac_mixer[] = {
         HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_clevo_m720_mixer[] = {
+static const struct snd_kcontrol_new alc883_clevo_m720_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = {
+static const struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
+static const struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -8599,15 +9198,15 @@ static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
+static const struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -8622,15 +9221,15 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = {
+static const struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -8646,15 +9245,15 @@ static struct snd_kcontrol_new alc883_3ST_6ch_intel_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc885_8ch_intel_mixer[] = {
+static const struct snd_kcontrol_new alc885_8ch_intel_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -8670,15 +9269,15 @@ static struct snd_kcontrol_new alc885_8ch_intel_mixer[] = {
         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, 0x3, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x1b, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x1b, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x3, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
+static const struct snd_kcontrol_new alc883_fivestack_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
@@ -8693,15 +9292,15 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_targa_mixer[] = {
+static const struct snd_kcontrol_new alc883_targa_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
@@ -8717,12 +9316,12 @@ static struct snd_kcontrol_new alc883_targa_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {
+static const struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
@@ -8730,36 +9329,36 @@ static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_targa_8ch_mixer[] = {
+static const struct snd_kcontrol_new alc883_targa_8ch_mixer[] = {
         HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {
+static const struct snd_kcontrol_new alc883_lenovo_101e_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = {
+static const struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
@@ -8767,25 +9366,12 @@ static struct snd_kcontrol_new alc883_lenovo_nb0763_mixer[] = {
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-        { } /* end */
-};
-
-static struct snd_kcontrol_new alc883_medion_md2_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_medion_wim2160_mixer[] = {
+static const struct snd_kcontrol_new alc883_medion_wim2160_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -8795,7 +9381,7 @@ static struct snd_kcontrol_new alc883_medion_wim2160_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_medion_wim2160_verbs[] = {
+static const struct hda_verb alc883_medion_wim2160_verbs[] = {
         /* Unmute front mixer */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -8819,21 +9405,23 @@ static void alc883_medion_wim2160_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1a;
         spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
+static const struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
+static const struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
@@ -8841,12 +9429,12 @@ static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = {
+static const struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
@@ -8863,15 +9451,15 @@ static struct snd_kcontrol_new alc888_lenovo_sky_mixer[] = {
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc889A_mb31_mixer[] = {
+static const struct snd_kcontrol_new alc889A_mb31_mixer[] = {
         /* Output mixers */
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 0x02, HDA_INPUT),
@@ -8887,8 +9475,8 @@ static struct snd_kcontrol_new alc889A_mb31_mixer[] = {
         HDA_CODEC_MUTE("Enable Headphones", 0x15, 0x00, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Enable LFE", 0x16, 2, 0x00, HDA_OUTPUT),
         /* Boost mixers */
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line Boost", 0x1a, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Boost Volume", 0x1a, 0x00, HDA_INPUT),
         /* Input mixers */
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x00, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x00, HDA_INPUT),
@@ -8897,17 +9485,17 @@ static struct snd_kcontrol_new alc889A_mb31_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_vaiott_mixer[] = {
+static const struct snd_kcontrol_new alc883_vaiott_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct hda_bind_ctls alc883_bind_cap_vol = {
+static const struct hda_bind_ctls alc883_bind_cap_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),
@@ -8916,7 +9504,7 @@ static struct hda_bind_ctls alc883_bind_cap_vol = {
         },
 };
 
-static struct hda_bind_ctls alc883_bind_cap_switch = {
+static const struct hda_bind_ctls alc883_bind_cap_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x08, 3, 0, HDA_INPUT),
@@ -8925,19 +9513,19 @@ static struct hda_bind_ctls alc883_bind_cap_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc883_asus_eee1601_mixer[] = {
+static const struct snd_kcontrol_new alc883_asus_eee1601_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_asus_eee1601_cap_mixer[] = {
+static const struct snd_kcontrol_new alc883_asus_eee1601_cap_mixer[] = {
         HDA_BIND_VOL("Capture Volume", &alc883_bind_cap_vol),
         HDA_BIND_SW("Capture Switch", &alc883_bind_cap_switch),
         {
@@ -8952,7 +9540,7 @@ static struct snd_kcontrol_new alc883_asus_eee1601_cap_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc883_chmode_mixer[] = {
+static const struct snd_kcontrol_new alc883_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -8971,19 +9559,11 @@ static void alc883_mitac_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-/* auto-toggle front mic */
-/*
-static void alc883_mitac_mic_automute(struct hda_codec *codec)
-{
-        unsigned char bits = snd_hda_jack_detect(codec, 0x18) ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
-}
-*/
-
-static struct hda_verb alc883_mitac_verbs[] = {
+static const struct hda_verb alc883_mitac_verbs[] = {
         /* HP */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -8998,7 +9578,7 @@ static struct hda_verb alc883_mitac_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_clevo_m540r_verbs[] = {
+static const struct hda_verb alc883_clevo_m540r_verbs[] = {
         /* HP */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -9014,7 +9594,7 @@ static struct hda_verb alc883_clevo_m540r_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_clevo_m720_verbs[] = {
+static const struct hda_verb alc883_clevo_m720_verbs[] = {
         /* HP */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -9029,7 +9609,7 @@ static struct hda_verb alc883_clevo_m720_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {
+static const struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {
         /* HP */
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -9043,7 +9623,7 @@ static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_targa_verbs[] = {
+static const struct hda_verb alc883_targa_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
@@ -9072,14 +9652,14 @@ static struct hda_verb alc883_targa_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_lenovo_101e_verbs[] = {
+static const struct hda_verb alc883_lenovo_101e_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_FRONT_EVENT|AC_USRSP_EN},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT|AC_USRSP_EN},
         { } /* end */
 };
 
-static struct hda_verb alc883_lenovo_nb0763_verbs[] = {
+static const struct hda_verb alc883_lenovo_nb0763_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
@@ -9087,7 +9667,7 @@ static struct hda_verb alc883_lenovo_nb0763_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc888_lenovo_ms7195_verbs[] = {
+static const struct hda_verb alc888_lenovo_ms7195_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -9096,7 +9676,7 @@ static struct hda_verb alc888_lenovo_ms7195_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc883_haier_w66_verbs[] = {
+static const struct hda_verb alc883_haier_w66_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
@@ -9109,7 +9689,7 @@ static struct hda_verb alc883_haier_w66_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc888_lenovo_sky_verbs[] = {
+static const struct hda_verb alc888_lenovo_sky_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -9121,12 +9701,12 @@ static struct hda_verb alc888_lenovo_sky_verbs[] = {
         { } /* end */
 };
 
-static struct hda_verb alc888_6st_dell_verbs[] = {
+static const struct hda_verb alc888_6st_dell_verbs[] = {
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
         { }
 };
 
-static struct hda_verb alc883_vaiott_verbs[] = {
+static const struct hda_verb alc883_vaiott_verbs[] = {
         /* HP */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -9145,9 +9725,11 @@ static void alc888_3st_hp_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x16;
         spec->autocfg.speaker_pins[2] = 0x18;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc888_3st_hp_verbs[] = {
+static const 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) */
@@ -9158,7 +9740,7 @@ static struct hda_verb alc888_3st_hp_verbs[] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc888_3st_hp_2ch_init[] = {
+static const 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 },
@@ -9169,7 +9751,7 @@ static struct hda_verb alc888_3st_hp_2ch_init[] = {
 /*
  * 4ch mode
  */
-static struct hda_verb alc888_3st_hp_4ch_init[] = {
+static const 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 },
@@ -9181,7 +9763,7 @@ static struct hda_verb alc888_3st_hp_4ch_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc888_3st_hp_6ch_init[] = {
+static const 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 },
@@ -9191,85 +9773,52 @@ static struct hda_verb alc888_3st_hp_6ch_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc888_3st_hp_modes[3] = {
+static const 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 },
 };
 
-/* toggle front-jack and RCA according to the hp-jack state */
-static void alc888_lenovo_ms7195_front_automute(struct hda_codec *codec)
-{
-        unsigned int present = snd_hda_jack_detect(codec, 0x1b);
-
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
-}
-
-/* toggle RCA according to the front-jack state */
-static void alc888_lenovo_ms7195_rca_automute(struct hda_codec *codec)
+static void alc888_lenovo_ms7195_setup(struct hda_codec *codec)
 {
-        unsigned int present = snd_hda_jack_detect(codec, 0x14);
-
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
-}
+        struct alc_spec *spec = codec->spec;
 
-static void alc883_lenovo_ms7195_unsol_event(struct hda_codec *codec,
-                                             unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc888_lenovo_ms7195_front_automute(codec);
-        if ((res >> 26) == ALC880_FRONT_EVENT)
-                alc888_lenovo_ms7195_rca_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.line_out_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc883_medion_md2_verbs[] = {
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-
-        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
-
-        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-        { } /* end */
-};
-
 /* toggle speaker-output according to the hp-jack state */
-static void alc883_medion_md2_setup(struct hda_codec *codec)
+static void alc883_lenovo_nb0763_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /* toggle speaker-output according to the hp-jack state */
 #define alc883_targa_init_hook          alc882_targa_init_hook
 #define alc883_targa_unsol_event        alc882_targa_unsol_event
 
-static void alc883_clevo_m720_mic_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-
-        present = snd_hda_jack_detect(codec, 0x18);
-        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
-}
-
 static void alc883_clevo_m720_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc883_clevo_m720_init_hook(struct hda_codec *codec)
 {
-        alc_automute_amp(codec);
-        alc883_clevo_m720_mic_automute(codec);
+        alc_hp_automute(codec);
+        alc88x_simple_mic_automute(codec);
 }
 
 static void alc883_clevo_m720_unsol_event(struct hda_codec *codec,
@@ -9277,10 +9826,10 @@ static void alc883_clevo_m720_unsol_event(struct hda_codec *codec,
 {
         switch (res >> 26) {
         case ALC880_MIC_EVENT:
-                alc883_clevo_m720_mic_automute(codec);
+                alc88x_simple_mic_automute(codec);
                 break;
         default:
-                alc_automute_amp_unsol_event(codec, res);
+                alc_sku_unsol_event(codec, res);
                 break;
         }
 }
@@ -9292,6 +9841,8 @@ static void alc883_2ch_fujitsu_pi2515_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc883_haier_w66_setup(struct hda_codec *codec)
@@ -9300,33 +9851,21 @@ static void alc883_haier_w66_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
+static void alc883_lenovo_101e_setup(struct hda_codec *codec)
 {
-        int bits = snd_hda_jack_detect(codec, 0x14) ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc883_lenovo_101e_all_automute(struct hda_codec *codec)
-{
-        int bits = snd_hda_jack_detect(codec, 0x1b) ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
+        struct alc_spec *spec = codec->spec;
 
-static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc883_lenovo_101e_all_automute(codec);
-        if ((res >> 26) == ALC880_FRONT_EVENT)
-                alc883_lenovo_101e_ispeaker_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.line_out_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->detect_line = 1;
+        spec->automute_lines = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /* toggle speaker-output according to the hp-jack state */
@@ -9337,9 +9876,11 @@ static void alc883_acer_aspire_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x15;
         spec->autocfg.speaker_pins[1] = 0x16;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc883_acer_eapd_verbs[] = {
+static const struct hda_verb alc883_acer_eapd_verbs[] = {
         /* HP Pin: output 0 (0x0c) */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -9357,13 +9898,6 @@ static struct hda_verb alc883_acer_eapd_verbs[] = {
         { }
 };
 
-static struct hda_verb alc888_acer_aspire_7730G_verbs[] = {
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
-        {0x17, AC_VERB_SET_CONNECT_SEL, 0x02},
-        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
-        { } /* end */
-};
-
 static void alc888_6st_dell_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -9373,6 +9907,8 @@ static void alc888_6st_dell_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[1] = 0x15;
         spec->autocfg.speaker_pins[2] = 0x16;
         spec->autocfg.speaker_pins[3] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc888_lenovo_sky_setup(struct hda_codec *codec)
@@ -9385,6 +9921,8 @@ static void alc888_lenovo_sky_setup(struct hda_codec *codec)
         spec->autocfg.speaker_pins[2] = 0x16;
         spec->autocfg.speaker_pins[3] = 0x17;
         spec->autocfg.speaker_pins[4] = 0x1a;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc883_vaiott_setup(struct hda_codec *codec)
@@ -9394,9 +9932,11 @@ static void alc883_vaiott_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc888_asus_m90v_verbs[] = {
+static const struct hda_verb alc888_asus_m90v_verbs[] = {
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -9419,9 +9959,11 @@ static void alc883_mode2_setup(struct hda_codec *codec)
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.mux_idx = 1;
         spec->auto_mic = 1;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct hda_verb alc888_asus_eee1601_verbs[] = {
+static const struct hda_verb alc888_asus_eee1601_verbs[] = {
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@@ -9440,10 +9982,10 @@ static void alc883_eee1601_inithook(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x1b;
-        alc_automute_pin(codec);
+        alc_hp_automute(codec);
 }
 
-static struct hda_verb alc889A_mb31_verbs[] = {
+static const struct hda_verb alc889A_mb31_verbs[] = {
         /* Init rear pin (used as headphone output) */
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},    /* Apple Headphones */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},           /* Connect to front */
@@ -9489,18 +10031,18 @@ static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res)
 #define alc882_pcm_digital_playback     alc880_pcm_digital_playback
 #define alc882_pcm_digital_capture      alc880_pcm_digital_capture
 
-static hda_nid_t alc883_slave_dig_outs[] = {
+static const hda_nid_t alc883_slave_dig_outs[] = {
         ALC1200_DIGOUT_NID, 0,
 };
 
-static hda_nid_t alc1200_slave_dig_outs[] = {
+static const hda_nid_t alc1200_slave_dig_outs[] = {
         ALC883_DIGOUT_NID, 0,
 };
 
 /*
  * configuration and preset
  */
-static const char *alc882_models[ALC882_MODEL_LAST] = {
+static const char * const alc882_models[ALC882_MODEL_LAST] = {
         [ALC882_3ST_DIG]        = "3stack-dig",
         [ALC882_6ST_DIG]        = "6stack-dig",
         [ALC882_ARIMA]          = "arima",
@@ -9529,7 +10071,6 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
         [ALC888_ACER_ASPIRE_8930G]      = "acer-aspire-8930g",
         [ALC888_ACER_ASPIRE_7730G]      = "acer-aspire-7730g",
         [ALC883_MEDION]         = "medion",
-        [ALC883_MEDION_MD2]     = "medion-md2",
         [ALC883_MEDION_WIM2160] = "medion-wim2160",
         [ALC883_LAPTOP_EAPD]    = "laptop-eapd",
         [ALC883_LENOVO_101E_2ch] = "lenovo-101e",
@@ -9553,7 +10094,7 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
         [ALC882_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc882_cfg_tbl[] = {
+static const struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x6668, "ECS", ALC882_6ST_DIG),
 
         SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
@@ -9585,7 +10126,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
 
         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, 0x2a3d, "HP Pavilion", 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),
@@ -9664,7 +10205,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
         SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),
         SND_PCI_QUIRK(0x17aa, 0x101d, "Lenovo Sky", ALC888_LENOVO_SKY),
-        SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),
         SND_PCI_QUIRK(0x17c0, 0x4085, "MEDION MD96630", ALC888_LENOVO_MS7195_DIG),
         SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),
         SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
@@ -9681,7 +10221,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
 };
 
 /* codec SSID table for Intel Mac */
-static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
+static const struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
         SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC885_MBP3),
         SND_PCI_QUIRK(0x106b, 0x00a1, "Macbook", ALC885_MBP3),
         SND_PCI_QUIRK(0x106b, 0x00a4, "MacbookPro 4,1", ALC885_MBP3),
@@ -9708,7 +10248,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static struct alc_config_preset alc882_presets[] = {
+static const struct alc_config_preset alc882_presets[] = {
         [ALC882_3ST_DIG] = {
                 .mixers = { alc882_base_mixer },
                 .init_verbs = { alc882_base_init_verbs,
@@ -9764,9 +10304,9 @@ static struct alc_config_preset alc882_presets[] = {
                         .channel_mode = alc885_mba21_ch_modes,
                         .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),
                         .input_mux = &alc882_capture_source,
-                        .unsol_event = alc_automute_amp_unsol_event,
+                        .unsol_event = alc_sku_unsol_event,
                         .setup = alc885_mba21_setup,
-                        .init_hook = alc_automute_amp,
+                        .init_hook = alc_hp_automute,
        },
         [ALC885_MBP3] = {
                 .mixers = { alc885_mbp3_mixer, alc882_chmode_mixer },
@@ -9780,9 +10320,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc882_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc885_mbp3_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC885_MB5] = {
                 .mixers = { alc885_mb5_mixer, alc882_chmode_mixer },
@@ -9795,9 +10335,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &mb5_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc885_mb5_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC885_MACMINI3] = {
                 .mixers = { alc885_macmini3_mixer, alc882_chmode_mixer },
@@ -9810,9 +10350,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &macmini3_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc885_macmini3_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC885_MACPRO] = {
                 .mixers = { alc882_macpro_mixer },
@@ -9836,7 +10376,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
                 .channel_mode = alc882_ch_modes,
                 .input_mux = &alc882_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc885_imac24_setup,
                 .init_hook = alc885_imac24_init_hook,
         },
@@ -9851,9 +10391,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc889A_imac91_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc885_imac91_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC882_TARGA] = {
                 .mixers = { alc882_targa_mixer, alc882_chmode_mixer },
@@ -9869,7 +10409,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc882_3ST_6ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc882_capture_source,
-                .unsol_event = alc882_targa_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc882_targa_setup,
                 .init_hook = alc882_targa_automute,
         },
@@ -9963,8 +10503,8 @@ static struct alc_config_preset alc882_presets[] = {
                 .capsrc_nids = alc889_capsrc_nids,
                 .input_mux = &alc889_capture_source,
                 .setup = alc889_automute_setup,
-                .init_hook = alc_automute_amp,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .init_hook = alc_hp_automute,
+                .unsol_event = alc_sku_unsol_event,
                 .need_dac_fix = 1,
         },
         [ALC889_INTEL] = {
@@ -9984,7 +10524,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc889_capture_source,
                 .setup = alc889_automute_setup,
                 .init_hook = alc889_intel_init_hook,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .need_dac_fix = 1,
         },
         [ALC883_6ST_DIG] = {
@@ -10073,12 +10613,12 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_acer_aspire_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_ACER_ASPIRE_4930G] = {
-                .mixers = { alc888_base_mixer,
+                .mixers = { alc888_acer_aspire_4930g_mixer,
                                 alc883_chmode_mixer },
                 .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
                                 alc888_acer_aspire_4930g_verbs },
@@ -10095,9 +10635,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_mux_defs =
                         ARRAY_SIZE(alc888_2_capture_sources),
                 .input_mux = alc888_2_capture_sources,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_acer_aspire_4930g_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_ACER_ASPIRE_6530G] = {
                 .mixers = { alc888_acer_aspire_6530_mixer },
@@ -10114,9 +10654,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_mux_defs =
                         ARRAY_SIZE(alc888_2_capture_sources),
                 .input_mux = alc888_acer_aspire_6530_sources,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_acer_aspire_6530g_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_ACER_ASPIRE_8930G] = {
                 .mixers = { alc889_acer_aspire_8930g_mixer,
@@ -10137,9 +10677,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_mux_defs =
                         ARRAY_SIZE(alc889_capture_sources),
                 .input_mux = alc889_capture_sources,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc889_acer_aspire_8930g_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
 #ifdef CONFIG_SND_HDA_POWER_SAVE
                 .power_hook = alc_power_eapd,
 #endif
@@ -10160,9 +10700,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .need_dac_fix = 1,
                 .const_channel_count = 6,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
-                .setup = alc888_acer_aspire_6530g_setup,
-                .init_hook = alc_automute_amp,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc888_acer_aspire_7730g_setup,
+                .init_hook = alc_hp_automute,
         },
         [ALC883_MEDION] = {
                 .mixers = { alc883_fivestack_mixer,
@@ -10178,19 +10718,6 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc883_sixstack_modes,
                 .input_mux = &alc883_capture_source,
         },
-        [ALC883_MEDION_MD2] = {
-                .mixers = { alc883_medion_md2_mixer},
-                .init_verbs = { alc883_init_verbs, alc883_medion_md2_verbs},
-                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
-                .dac_nids = alc883_dac_nids,
-                .dig_out_nid = ALC883_DIGOUT_NID,
-                .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
-                .channel_mode = alc883_3ST_2ch_modes,
-                .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
-                .setup = alc883_medion_md2_setup,
-                .init_hook = alc_automute_amp,
-        },
         [ALC883_MEDION_WIM2160] = {
                 .mixers = { alc883_medion_wim2160_mixer },
                 .init_verbs = { alc883_init_verbs, alc883_medion_wim2160_verbs },
@@ -10202,9 +10729,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_medion_wim2160_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC883_LAPTOP_EAPD] = {
                 .mixers = { alc883_base_mixer },
@@ -10254,8 +10781,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_lenovo_101e_capture_source,
-                .unsol_event = alc883_lenovo_101e_unsol_event,
-                .init_hook = alc883_lenovo_101e_all_automute,
+                .setup = alc883_lenovo_101e_setup,
+                .unsol_event = alc_sku_unsol_event,
+                .init_hook = alc_inithook,
         },
         [ALC883_LENOVO_NB0763] = {
                 .mixers = { alc883_lenovo_nb0763_mixer },
@@ -10266,9 +10794,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc883_3ST_2ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc883_lenovo_nb0763_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
-                .setup = alc883_medion_md2_setup,
-                .init_hook = alc_automute_amp,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc883_lenovo_nb0763_setup,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_LENOVO_MS7195_DIG] = {
                 .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
@@ -10280,8 +10808,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc883_3ST_6ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc883_lenovo_ms7195_unsol_event,
-                .init_hook = alc888_lenovo_ms7195_front_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc888_lenovo_ms7195_setup,
+                .init_hook = alc_inithook,
         },
         [ALC883_HAIER_W66] = {
                 .mixers = { alc883_targa_2ch_mixer},
@@ -10292,9 +10821,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_haier_w66_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_3ST_HP] = {
                 .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
@@ -10305,9 +10834,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc888_3st_hp_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_3st_hp_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_6ST_DELL] = {
                 .mixers = { alc883_base_mixer, alc883_chmode_mixer },
@@ -10319,9 +10848,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
                 .channel_mode = alc883_sixstack_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_6st_dell_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC883_MITAC] = {
                 .mixers = { alc883_mitac_mixer },
@@ -10331,9 +10860,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_mitac_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC883_FUJITSU_PI2515] = {
                 .mixers = { alc883_2ch_fujitsu_pi2515_mixer },
@@ -10345,9 +10874,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_fujitsu_pi2515_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_2ch_fujitsu_pi2515_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_FUJITSU_XA3530] = {
                 .mixers = { alc888_base_mixer, alc883_chmode_mixer },
@@ -10364,9 +10893,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_mux_defs =
                         ARRAY_SIZE(alc888_2_capture_sources),
                 .input_mux = alc888_2_capture_sources,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_fujitsu_xa3530_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_LENOVO_SKY] = {
                 .mixers = { alc888_lenovo_sky_mixer, alc883_chmode_mixer },
@@ -10378,9 +10907,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc883_sixstack_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc883_lenovo_sky_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc888_lenovo_sky_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC888_ASUS_M90V] = {
                 .mixers = { alc883_3ST_6ch_mixer, alc883_chmode_mixer },
@@ -10448,9 +10977,9 @@ static struct alc_config_preset alc882_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc883_vaiott_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
 };
 
@@ -10460,33 +10989,47 @@ static struct alc_config_preset alc882_presets[] = {
  */
 enum {
         PINFIX_ABIT_AW9D_MAX,
+        PINFIX_LENOVO_Y530,
         PINFIX_PB_M5210,
-};
-
-static struct alc_pincfg alc882_abit_aw9d_pinfix[] = {
-        { 0x15, 0x01080104 }, /* side */
-        { 0x16, 0x01011012 }, /* rear */
-        { 0x17, 0x01016011 }, /* clfe */
-        { }
-};
-
-static const struct hda_verb pb_m5210_verbs[] = {
-        { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
-        {}
+        PINFIX_ACER_ASPIRE_7736,
 };
 
 static const struct alc_fixup alc882_fixups[] = {
         [PINFIX_ABIT_AW9D_MAX] = {
-                .pins = alc882_abit_aw9d_pinfix
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x15, 0x01080104 }, /* side */
+                        { 0x16, 0x01011012 }, /* rear */
+                        { 0x17, 0x01016011 }, /* clfe */
+                        { }
+                }
+        },
+        [PINFIX_LENOVO_Y530] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x15, 0x99130112 }, /* rear int speakers */
+                        { 0x16, 0x99130111 }, /* subwoofer */
+                        { }
+                }
         },
         [PINFIX_PB_M5210] = {
-                .verbs = pb_m5210_verbs
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+                        {}
+                }
+        },
+        [PINFIX_ACER_ASPIRE_7736] = {
+                .type = ALC_FIXUP_SKU,
+                .v.sku = ALC_FIXUP_SKU_IGNORE,
         },
 };
 
-static struct snd_pci_quirk alc882_fixup_tbl[] = {
+static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", PINFIX_PB_M5210),
+        SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", PINFIX_LENOVO_Y530),
         SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", PINFIX_ABIT_AW9D_MAX),
+        SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", PINFIX_ACER_ASPIRE_7736),
         {}
 };
 
@@ -10535,33 +11078,42 @@ static void alc882_auto_init_hp_out(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         hda_nid_t pin, dac;
+        int i;
 
-        pin = spec->autocfg.hp_pins[0];
-        if (pin) {
-                dac = spec->multiout.hp_nid;
-                if (!dac)
-                        dac = spec->multiout.dac_nids[0]; /* to front */
-                alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
+        if (spec->autocfg.line_out_type != AUTO_PIN_HP_OUT) {
+                for (i = 0; i < ARRAY_SIZE(spec->autocfg.hp_pins); i++) {
+                        pin = spec->autocfg.hp_pins[i];
+                        if (!pin)
+                                break;
+                        dac = spec->multiout.hp_nid;
+                        if (!dac)
+                                dac = spec->multiout.dac_nids[0]; /* to front */
+                        alc882_auto_set_output_and_unmute(codec, pin, PIN_HP, dac);
+                }
         }
-        pin = spec->autocfg.speaker_pins[0];
-        if (pin) {
-                dac = spec->multiout.extra_out_nid[0];
-                if (!dac)
-                        dac = spec->multiout.dac_nids[0]; /* to front */
-                alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
+
+        if (spec->autocfg.line_out_type != AUTO_PIN_SPEAKER_OUT) {
+                for (i = 0; i < ARRAY_SIZE(spec->autocfg.speaker_pins); i++) {
+                        pin = spec->autocfg.speaker_pins[i];
+                        if (!pin)
+                                break;
+                        dac = spec->multiout.extra_out_nid[0];
+                        if (!dac)
+                                dac = spec->multiout.dac_nids[0]; /* to front */
+                        alc882_auto_set_output_and_unmute(codec, pin, PIN_OUT, dac);
+                }
         }
 }
 
 static void alc882_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (!nid)
-                        continue;
-                alc_set_input_pin(codec, nid, i);
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                alc_set_input_pin(codec, nid, cfg->inputs[i].type);
                 if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_AMP_GAIN_MUTE,
@@ -10581,6 +11133,11 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
                 const struct hda_input_mux *imux;
                 int conns, mute, idx, item;
 
+                /* mute ADC */
+                snd_hda_codec_write(codec, spec->adc_nids[c], 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_IN_MUTE(0));
+
                 conns = snd_hda_get_connections(codec, nid, conn_list,
                                                 ARRAY_SIZE(conn_list));
                 if (conns < 0)
@@ -10623,24 +11180,35 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
 static int alc_auto_add_mic_boost(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        int err;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int i, err;
+        int type_idx = 0;
         hda_nid_t nid;
+        const char *prev_label = NULL;
 
-        nid = spec->autocfg.input_pins[AUTO_PIN_MIC];
-        if (nid && (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)) {
-                err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                  "Mic Boost",
-                                  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
-                if (err < 0)
-                        return err;
-        }
-        nid = spec->autocfg.input_pins[AUTO_PIN_FRONT_MIC];
-        if (nid && (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)) {
-                err = add_control(spec, ALC_CTL_WIDGET_VOL,
-                                  "Front Mic Boost",
+        for (i = 0; i < cfg->num_inputs; i++) {
+                if (cfg->inputs[i].type > AUTO_PIN_MIC)
+                        break;
+                nid = cfg->inputs[i].pin;
+                if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP) {
+                        const char *label;
+                        char boost_label[32];
+
+                        label = hda_get_autocfg_input_label(codec, cfg, i);
+                        if (prev_label && !strcmp(label, prev_label))
+                                type_idx++;
+                        else
+                                type_idx = 0;
+                        prev_label = label;
+
+                        snprintf(boost_label, sizeof(boost_label),
+                                 "%s Boost Volume", label);
+                        err = add_control(spec, ALC_CTL_WIDGET_VOL,
+                                          boost_label, type_idx,
                                   HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
-                if (err < 0)
-                        return err;
+                        if (err < 0)
+                                return err;
+                }
         }
         return 0;
 }
@@ -10649,7 +11217,7 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
 static int alc882_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        static hda_nid_t alc882_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc882_ignore[] = { 0x1d, 0 };
         int err;
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
@@ -10662,6 +11230,9 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
         err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
         if (err < 0)
                 return err;
+        err = alc_auto_add_multi_channel_mode(codec);
+        if (err < 0)
+                return err;
         err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -10726,8 +11297,6 @@ static int patch_alc882(struct hda_codec *codec)
 
         codec->spec = spec;
 
-        alc_auto_parse_customize_define(codec);
-
         switch (codec->vendor_id) {
         case 0x10ec0882:
         case 0x10ec0885:
@@ -10752,8 +11321,12 @@ static int patch_alc882(struct hda_codec *codec)
                 board_config = ALC882_AUTO;
         }
 
-        if (board_config == ALC882_AUTO)
-                alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 1);
+        if (board_config == ALC882_AUTO) {
+                alc_pick_fixup(codec, NULL, alc882_fixup_tbl, alc882_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
+
+        alc_auto_parse_customize_define(codec);
 
         if (board_config == ALC882_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -10827,14 +11400,15 @@ static int patch_alc882(struct hda_codec *codec)
         if (has_cdefine_beep(codec))
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
-        if (board_config == ALC882_AUTO)
-                alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 0);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         spec->vmaster_nid = 0x0c;
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC882_AUTO)
                 spec->init_hook = alc882_auto_init;
+
+        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc882_loopbacks;
@@ -10860,14 +11434,14 @@ static int patch_alc882(struct hda_codec *codec)
 #define alc262_modes            alc260_modes
 #define alc262_capture_source   alc882_capture_source
 
-static hda_nid_t alc262_dmic_adc_nids[1] = {
+static const hda_nid_t alc262_dmic_adc_nids[1] = {
         /* ADC0 */
         0x09
 };
 
-static hda_nid_t alc262_dmic_capsrc_nids[1] = { 0x22 };
+static const hda_nid_t alc262_dmic_capsrc_nids[1] = { 0x22 };
 
-static struct snd_kcontrol_new alc262_base_mixer[] = {
+static const struct snd_kcontrol_new alc262_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -10876,10 +11450,10 @@ static struct snd_kcontrol_new alc262_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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, 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),
@@ -10888,71 +11462,30 @@ static struct snd_kcontrol_new alc262_base_mixer[] = {
 };
 
 /* update HP, line and mono-out pins according to the master switch */
-static void alc262_hp_master_update(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        int val = spec->master_sw;
+#define alc262_hp_master_update         alc260_hp_master_update
 
-        /* HP & line-out */
-        snd_hda_codec_write_cache(codec, 0x1b, 0,
-                                  AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                  val ? PIN_HP : 0);
-        snd_hda_codec_write_cache(codec, 0x15, 0,
-                                  AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                  val ? PIN_HP : 0);
-        /* mono (speaker) depending on the HP jack sense */
-        val = val && !spec->jack_present;
-        snd_hda_codec_write_cache(codec, 0x16, 0,
-                                  AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                  val ? PIN_OUT : 0);
-}
-
-static void alc262_hp_bpc_automute(struct hda_codec *codec)
+static void alc262_hp_bpc_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        spec->jack_present = snd_hda_jack_detect(codec, 0x1b);
-        alc262_hp_master_update(codec);
-}
-
-static void alc262_hp_bpc_unsol_event(struct hda_codec *codec, unsigned int res)
-{
-        if ((res >> 26) != ALC880_HP_EVENT)
-                return;
-        alc262_hp_bpc_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.speaker_pins[0] = 0x16;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
-static void alc262_hp_wildwest_automute(struct hda_codec *codec)
+static void alc262_hp_wildwest_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        spec->jack_present = snd_hda_jack_detect(codec, 0x15);
-        alc262_hp_master_update(codec);
-}
-
-static void alc262_hp_wildwest_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
-{
-        if ((res >> 26) != ALC880_HP_EVENT)
-                return;
-        alc262_hp_wildwest_automute(codec);
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x16;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
 #define alc262_hp_master_sw_get         alc260_hp_master_sw_get
-
-static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol,
-                                   struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        int val = !!*ucontrol->value.integer.value;
-
-        if (val == spec->master_sw)
-                return 0;
-        spec->master_sw = val;
-        alc262_hp_master_update(codec);
-        return 1;
-}
+#define alc262_hp_master_sw_put         alc260_hp_master_sw_put
 
 #define ALC262_HP_MASTER_SWITCH                                 \
         {                                                       \
@@ -10969,7 +11502,7 @@ static int alc262_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         }
 
 
-static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
+static const struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
         ALC262_HP_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -10980,10 +11513,10 @@ static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
                             HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -10993,7 +11526,7 @@ static struct snd_kcontrol_new alc262_HP_BPC_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
+static const struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
         ALC262_HP_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -11005,7 +11538,7 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
                             HDA_OUTPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x02, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x1a, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x1a, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -11013,10 +11546,10 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {
+static const struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {
         HDA_CODEC_VOLUME("Rear Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Rear Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Rear Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Rear Mic Boost Volume", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
@@ -11027,20 +11560,22 @@ static void alc262_hp_t5735_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
-static struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {
+static const struct snd_kcontrol_new alc262_hp_t5735_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct hda_verb alc262_hp_t5735_verbs[] = {
+static const struct hda_verb alc262_hp_t5735_verbs[] = {
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
 
@@ -11048,7 +11583,7 @@ static struct hda_verb alc262_hp_t5735_verbs[] = {
         { }
 };
 
-static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
+static const struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0e, 0x0, HDA_OUTPUT),
@@ -11058,7 +11593,7 @@ static struct snd_kcontrol_new alc262_hp_rp5700_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc262_hp_rp5700_verbs[] = {
+static const struct hda_verb alc262_hp_rp5700_verbs[] = {
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -11072,7 +11607,7 @@ static struct hda_verb alc262_hp_rp5700_verbs[] = {
         {}
 };
 
-static struct hda_input_mux alc262_hp_rp5700_capture_source = {
+static const struct hda_input_mux alc262_hp_rp5700_capture_source = {
         .num_items = 1,
         .items = {
                 { "Line", 0x1 },
@@ -11080,44 +11615,9 @@ static struct hda_input_mux alc262_hp_rp5700_capture_source = {
 };
 
 /* bind hp and internal speaker mute (with plug check) as master switch */
-static void alc262_hippo_master_update(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t hp_nid = spec->autocfg.hp_pins[0];
-        hda_nid_t line_nid = spec->autocfg.line_out_pins[0];
-        hda_nid_t speaker_nid = spec->autocfg.speaker_pins[0];
-        unsigned int mute;
-
-        /* HP */
-        mute = spec->master_sw ? 0 : HDA_AMP_MUTE;
-        snd_hda_codec_amp_stereo(codec, hp_nid, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, mute);
-        /* mute internal speaker per jack sense */
-        if (spec->jack_present)
-                mute = HDA_AMP_MUTE;
-        if (line_nid)
-                snd_hda_codec_amp_stereo(codec, line_nid, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, mute);
-        if (speaker_nid && speaker_nid != line_nid)
-                snd_hda_codec_amp_stereo(codec, speaker_nid, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, mute);
-}
-
+#define alc262_hippo_master_update      alc262_hp_master_update
 #define alc262_hippo_master_sw_get      alc262_hp_master_sw_get
-
-static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol,
-                                      struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct alc_spec *spec = codec->spec;
-        int val = !!*ucontrol->value.integer.value;
-
-        if (val == spec->master_sw)
-                return 0;
-        spec->master_sw = val;
-        alc262_hippo_master_update(codec);
-        return 1;
-}
+#define alc262_hippo_master_sw_put      alc262_hp_master_sw_put
 
 #define ALC262_HIPPO_MASTER_SWITCH                              \
         {                                                       \
@@ -11134,7 +11634,7 @@ static int alc262_hippo_master_sw_put(struct snd_kcontrol *kcontrol,
                              (SUBDEV_SPEAKER(0) << 16), \
         }
 
-static struct snd_kcontrol_new alc262_hippo_mixer[] = {
+static const struct snd_kcontrol_new alc262_hippo_mixer[] = {
         ALC262_HIPPO_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -11143,15 +11643,15 @@ static struct snd_kcontrol_new alc262_hippo_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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_hippo1_mixer[] = {
+static const struct snd_kcontrol_new alc262_hippo1_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
@@ -11160,36 +11660,22 @@ static struct snd_kcontrol_new alc262_hippo1_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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
 /* mute/unmute internal speaker according to the hp jack and mute state */
-static void alc262_hippo_automute(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        hda_nid_t hp_nid = spec->autocfg.hp_pins[0];
-
-        spec->jack_present = snd_hda_jack_detect(codec, hp_nid);
-        alc262_hippo_master_update(codec);
-}
-
-static void alc262_hippo_unsol_event(struct hda_codec *codec, unsigned int res)
-{
-        if ((res >> 26) != ALC880_HP_EVENT)
-                return;
-        alc262_hippo_automute(codec);
-}
-
 static void alc262_hippo_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc262_hippo1_setup(struct hda_codec *codec)
@@ -11198,10 +11684,12 @@ static void alc262_hippo1_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 
-static struct snd_kcontrol_new alc262_sony_mixer[] = {
+static const struct snd_kcontrol_new alc262_sony_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
@@ -11211,7 +11699,7 @@ static struct snd_kcontrol_new alc262_sony_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_benq_t31_mixer[] = {
+static const struct snd_kcontrol_new alc262_benq_t31_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -11222,7 +11710,7 @@ static struct snd_kcontrol_new alc262_benq_t31_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_tyan_mixer[] = {
+static const 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),
@@ -11231,14 +11719,14 @@ static struct snd_kcontrol_new alc262_tyan_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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct hda_verb alc262_tyan_verbs[] = {
+static const 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},
@@ -11260,6 +11748,8 @@ static void alc262_tyan_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 
@@ -11269,7 +11759,7 @@ static void alc262_tyan_setup(struct hda_codec *codec)
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc262_init_verbs[] = {
+static const struct hda_verb alc262_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -11345,13 +11835,13 @@ static struct hda_verb alc262_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc262_eapd_verbs[] = {
+static const struct hda_verb alc262_eapd_verbs[] = {
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
         {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
-static struct hda_verb alc262_hippo1_unsol_verbs[] = {
+static const struct hda_verb alc262_hippo1_unsol_verbs[] = {
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
         {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
@@ -11361,7 +11851,7 @@ static struct hda_verb alc262_hippo1_unsol_verbs[] = {
         {}
 };
 
-static struct hda_verb alc262_sony_unsol_verbs[] = {
+static const struct hda_verb alc262_sony_unsol_verbs[] = {
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},   // Front Mic
@@ -11371,7 +11861,7 @@ static struct hda_verb alc262_sony_unsol_verbs[] = {
         {}
 };
 
-static struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = {
+static const struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -11380,7 +11870,7 @@ static struct snd_kcontrol_new alc262_toshiba_s06_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc262_toshiba_s06_verbs[] = {
+static const struct hda_verb alc262_toshiba_s06_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -11403,6 +11893,8 @@ static void alc262_toshiba_s06_setup(struct hda_codec *codec)
         spec->int_mic.pin = 0x12;
         spec->int_mic.mux_idx = 9;
         spec->auto_mic = 1;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
 /*
@@ -11412,20 +11904,20 @@ static void alc262_toshiba_s06_setup(struct hda_codec *codec)
  *  0x18 = external mic
  */
 
-static struct snd_kcontrol_new alc262_nec_mixer[] = {
+static const struct snd_kcontrol_new alc262_nec_mixer[] = {
         HDA_CODEC_VOLUME_MONO("Speaker Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Speaker Playback Switch", 0x16, 0, 0x0, HDA_OUTPUT),
 
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
 
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct hda_verb alc262_nec_verbs[] = {
+static const struct hda_verb alc262_nec_verbs[] = {
         /* Unmute Speaker */
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
 
@@ -11446,9 +11938,9 @@ static struct hda_verb alc262_nec_verbs[] = {
  *  0x1b = port replicator headphone out
  */
 
-#define ALC_HP_EVENT    0x37
+#define ALC_HP_EVENT    ALC880_HP_EVENT
 
-static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
+static const struct hda_verb alc262_fujitsu_unsol_verbs[] = {
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
@@ -11456,29 +11948,29 @@ static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
         {}
 };
 
-static struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {
+static const struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {}
 };
 
-static struct hda_verb alc262_lenovo_3000_init_verbs[] = {
+static const struct hda_verb alc262_lenovo_3000_init_verbs[] = {
         /* Front Mic pin: input vref at 50% */
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
         {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {}
 };
 
-static struct hda_input_mux alc262_fujitsu_capture_source = {
+static const struct hda_input_mux alc262_fujitsu_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
-                { "Int Mic", 0x1 },
+                { "Internal Mic", 0x1 },
                 { "CD", 0x4 },
         },
 };
 
-static struct hda_input_mux alc262_HP_capture_source = {
+static const struct hda_input_mux alc262_HP_capture_source = {
         .num_items = 5,
         .items = {
                 { "Mic", 0x0 },
@@ -11489,7 +11981,7 @@ static struct hda_input_mux alc262_HP_capture_source = {
         },
 };
 
-static struct hda_input_mux alc262_HP_D7000_capture_source = {
+static const struct hda_input_mux alc262_HP_D7000_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -11499,44 +11991,19 @@ static struct hda_input_mux alc262_HP_D7000_capture_source = {
         },
 };
 
-/* mute/unmute internal speaker according to the hp jacks and mute state */
-static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
+static void alc262_fujitsu_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        unsigned int mute;
-
-        if (force || !spec->sense_updated) {
-                spec->jack_present = snd_hda_jack_detect(codec, 0x14) ||
-                                     snd_hda_jack_detect(codec, 0x1b);
-                spec->sense_updated = 1;
-        }
-        /* unmute internal speaker only if both HPs are unplugged and
-         * master switch is on
-         */
-        if (spec->jack_present)
-                mute = HDA_AMP_MUTE;
-        else
-                mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, mute);
-}
-
-/* unsolicited event for HP jack sensing */
-static void alc262_fujitsu_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) != ALC_HP_EVENT)
-                return;
-        alc262_fujitsu_automute(codec, 1);
-}
 
-static void alc262_fujitsu_init_hook(struct hda_codec *codec)
-{
-        alc262_fujitsu_automute(codec, 1);
+        spec->autocfg.hp_pins[0] = 0x14;
+        spec->autocfg.hp_pins[1] = 0x1b;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 /* bind volumes of both NID 0x0c and 0x0d */
-static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {
+static const struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
@@ -11545,78 +12012,15 @@ static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {
         },
 };
 
-/* mute/unmute internal speaker according to the hp jack and mute state */
-static void alc262_lenovo_3000_automute(struct hda_codec *codec, int force)
-{
-        struct alc_spec *spec = codec->spec;
-        unsigned int mute;
-
-        if (force || !spec->sense_updated) {
-                spec->jack_present = snd_hda_jack_detect(codec, 0x1b);
-                spec->sense_updated = 1;
-        }
-        if (spec->jack_present) {
-                /* mute internal speaker */
-                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
-                snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
-        } else {
-                /* unmute internal speaker if necessary */
-                mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, mute);
-                snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
-                                         HDA_AMP_MUTE, mute);
-        }
-}
-
-/* unsolicited event for HP jack sensing */
-static void alc262_lenovo_3000_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) != ALC_HP_EVENT)
-                return;
-        alc262_lenovo_3000_automute(codec, 1);
-}
-
-static int amp_stereo_mute_update(struct hda_codec *codec, hda_nid_t nid,
-                                  int dir, int idx, long *valp)
-{
-        int i, change = 0;
-
-        for (i = 0; i < 2; i++, valp++)
-                change |= snd_hda_codec_amp_update(codec, nid, i, dir, idx,
-                                                   HDA_AMP_MUTE,
-                                                   *valp ? 0 : HDA_AMP_MUTE);
-        return change;
-}
-
-/* bind hp and internal speaker mute (with plug check) */
-static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = amp_stereo_mute_update(codec, 0x14, HDA_OUTPUT, 0, valp);
-        change |= amp_stereo_mute_update(codec, 0x1b, HDA_OUTPUT, 0, valp);
-        if (change)
-                alc262_fujitsu_automute(codec, 0);
-        return change;
-}
-
-static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
+static const struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
-                .put = alc262_fujitsu_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x14,
+                .info = snd_ctl_boolean_mono_info,
+                .get = alc262_hp_master_sw_get,
+                .put = alc262_hp_master_sw_put,
         },
         {
                 .iface = NID_MAPPING,
@@ -11625,71 +12029,67 @@ 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("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-/* bind hp and internal speaker mute (with plug check) */
-static int alc262_lenovo_3000_master_sw_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
+static void alc262_lenovo_3000_setup(struct hda_codec *codec)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
+        struct alc_spec *spec = codec->spec;
 
-        change = amp_stereo_mute_update(codec, 0x1b, HDA_OUTPUT, 0, valp);
-        if (change)
-                alc262_lenovo_3000_automute(codec, 0);
-        return change;
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[1] = 0x16;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
-static struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {
+static const struct snd_kcontrol_new alc262_lenovo_3000_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
-                .put = alc262_lenovo_3000_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x1b,
+                .info = snd_ctl_boolean_mono_info,
+                .get = alc262_hp_master_sw_get,
+                .put = alc262_hp_master_sw_put,
         },
         HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = {
+static const struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
         ALC262_HIPPO_MASTER_SWITCH,
         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("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
 /* additional init verbs for Benq laptops */
-static struct hda_verb alc262_EAPD_verbs[] = {
+static const struct hda_verb alc262_EAPD_verbs[] = {
         {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
         {0x20, AC_VERB_SET_PROC_COEF,  0x3070},
         {}
 };
 
-static struct hda_verb alc262_benq_t31_EAPD_verbs[] = {
+static const struct hda_verb alc262_benq_t31_EAPD_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24},
 
@@ -11699,17 +12099,17 @@ static struct hda_verb alc262_benq_t31_EAPD_verbs[] = {
 };
 
 /* Samsung Q1 Ultra Vista model setup */
-static struct snd_kcontrol_new alc262_ultra_mixer[] = {
+static const struct snd_kcontrol_new alc262_ultra_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Headphone Mic Boost", 0x15, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Mic Boost Volume", 0x15, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct hda_verb alc262_ultra_verbs[] = {
+static const struct hda_verb alc262_ultra_verbs[] = {
         /* output mixer */
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -11772,7 +12172,7 @@ static void alc262_ultra_unsol_event(struct hda_codec *codec,
         alc262_ultra_automute(codec);
 }
 
-static struct hda_input_mux alc262_ultra_capture_source = {
+static const struct hda_input_mux alc262_ultra_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x1 },
@@ -11798,7 +12198,7 @@ static int alc262_ultra_mux_enum_put(struct snd_kcontrol *kcontrol,
         return ret;
 }
 
-static struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {
+static const struct snd_kcontrol_new alc262_ultra_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT),
         {
@@ -11831,7 +12231,7 @@ static int alc262_check_volbit(hda_nid_t nid)
 }
 
 static int alc262_add_out_vol_ctl(struct alc_spec *spec, hda_nid_t nid,
-                                  const char *pfx, int *vbits)
+                                  const char *pfx, int *vbits, int idx)
 {
         unsigned long val;
         int vbit;
@@ -11846,11 +12246,11 @@ static int alc262_add_out_vol_ctl(struct alc_spec *spec, hda_nid_t nid,
                 val = HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT);
         else
                 val = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT);
-        return add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, val);
+        return __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, idx, val);
 }
 
 static int alc262_add_out_sw_ctl(struct alc_spec *spec, hda_nid_t nid,
-                                 const char *pfx)
+                                 const char *pfx, int idx)
 {
         unsigned long val;
 
@@ -11860,7 +12260,7 @@ static int alc262_add_out_sw_ctl(struct alc_spec *spec, hda_nid_t nid,
                 val = HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT);
         else
                 val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-        return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, val);
+        return __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, idx, val);
 }
 
 /* add playback controls from the parsed DAC table */
@@ -11869,49 +12269,57 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec,
 {
         const char *pfx;
         int vbits;
-        int err;
+        int i, err;
 
         spec->multiout.num_dacs = 1;    /* only use one dac */
         spec->multiout.dac_nids = spec->private_dac_nids;
-        spec->multiout.dac_nids[0] = 2;
+        spec->private_dac_nids[0] = 2;
 
-        if (!cfg->speaker_pins[0] && !cfg->hp_pins[0])
-                pfx = "Master";
-        else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                pfx = "Speaker";
-        else
+        pfx = alc_get_line_out_pfx(spec, true);
+        if (!pfx)
                 pfx = "Front";
-        err = alc262_add_out_sw_ctl(spec, cfg->line_out_pins[0], pfx);
-        if (err < 0)
-                return err;
-        err = alc262_add_out_sw_ctl(spec, cfg->speaker_pins[0], "Speaker");
-        if (err < 0)
-                return err;
-        err = alc262_add_out_sw_ctl(spec, cfg->hp_pins[0], "Headphone");
-        if (err < 0)
-                return err;
+        for (i = 0; i < 2; i++) {
+                err = alc262_add_out_sw_ctl(spec, cfg->line_out_pins[i], pfx, i);
+                if (err < 0)
+                        return err;
+                if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
+                        err = alc262_add_out_sw_ctl(spec, cfg->speaker_pins[i],
+                                                    "Speaker", i);
+                        if (err < 0)
+                                return err;
+                }
+                if (cfg->line_out_type != AUTO_PIN_HP_OUT) {
+                        err = alc262_add_out_sw_ctl(spec, cfg->hp_pins[i],
+                                                    "Headphone", i);
+                        if (err < 0)
+                                return err;
+                }
+        }
 
         vbits = alc262_check_volbit(cfg->line_out_pins[0]) |
                 alc262_check_volbit(cfg->speaker_pins[0]) |
                 alc262_check_volbit(cfg->hp_pins[0]);
         if (vbits == 1 || vbits == 2)
                 pfx = "Master"; /* only one mixer is used */
-        else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                pfx = "Speaker";
-        else
-                pfx = "Front";
         vbits = 0;
-        err = alc262_add_out_vol_ctl(spec, cfg->line_out_pins[0], pfx, &vbits);
-        if (err < 0)
-                return err;
-        err = alc262_add_out_vol_ctl(spec, cfg->speaker_pins[0], "Speaker",
-                                     &vbits);
-        if (err < 0)
-                return err;
-        err = alc262_add_out_vol_ctl(spec, cfg->hp_pins[0], "Headphone",
-                                     &vbits);
-        if (err < 0)
-                return err;
+        for (i = 0; i < 2; i++) {
+                err = alc262_add_out_vol_ctl(spec, cfg->line_out_pins[i], pfx,
+                                             &vbits, i);
+                if (err < 0)
+                        return err;
+                if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
+                        err = alc262_add_out_vol_ctl(spec, cfg->speaker_pins[i],
+                                                     "Speaker", &vbits, i);
+                        if (err < 0)
+                                return err;
+                }
+                if (cfg->line_out_type != AUTO_PIN_HP_OUT) {
+                        err = alc262_add_out_vol_ctl(spec, cfg->hp_pins[i],
+                                                     "Headphone", &vbits, i);
+                        if (err < 0)
+                                return err;
+                }
+        }
         return 0;
 }
 
@@ -11921,7 +12329,7 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec,
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc262_volume_init_verbs[] = {
+static const struct hda_verb alc262_volume_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -11982,7 +12390,7 @@ static struct hda_verb alc262_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc262_HP_BPC_init_verbs[] = {
+static const struct hda_verb alc262_HP_BPC_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -12086,7 +12494,7 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
+static const struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -12182,7 +12590,7 @@ static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = {
+static const struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = {
 
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },       /* Front Speaker */
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
@@ -12199,6 +12607,39 @@ static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = {
         {}
 };
 
+/*
+ * Pin config fixes
+ */
+enum {
+        PINFIX_FSC_H270,
+        PINFIX_HP_Z200,
+};
+
+static const struct alc_fixup alc262_fixups[] = {
+        [PINFIX_FSC_H270] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x14, 0x99130110 }, /* speaker */
+                        { 0x15, 0x0221142f }, /* front HP */
+                        { 0x1b, 0x0121141f }, /* rear HP */
+                        { }
+                }
+        },
+        [PINFIX_HP_Z200] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x16, 0x99130120 }, /* internal speaker */
+                        { }
+                }
+        },
+};
+
+static const struct snd_pci_quirk alc262_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200", PINFIX_HP_Z200),
+        SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", PINFIX_FSC_H270),
+        {}
+};
+
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
 #define alc262_loopbacks        alc880_loopbacks
@@ -12217,7 +12658,7 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc262_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc262_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc262_ignore);
@@ -12281,7 +12722,7 @@ static void alc262_auto_init(struct hda_codec *codec)
 /*
  * configuration and preset
  */
-static const char *alc262_models[ALC262_MODEL_LAST] = {
+static const char * const alc262_models[ALC262_MODEL_LAST] = {
         [ALC262_BASIC]          = "basic",
         [ALC262_HIPPO]          = "hippo",
         [ALC262_HIPPO_1]        = "hippo_1",
@@ -12302,13 +12743,17 @@ static const char *alc262_models[ALC262_MODEL_LAST] = {
         [ALC262_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc262_cfg_tbl[] = {
+static const 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_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, 0x1500, "HP z series",
+                           ALC262_HP_BPC),
+        SND_PCI_QUIRK(0x103c, 0x170b, "HP Z200",
+                           ALC262_AUTO),
         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),
@@ -12352,7 +12797,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc262_presets[] = {
+static const struct alc_config_preset alc262_presets[] = {
         [ALC262_BASIC] = {
                 .mixers = { alc262_base_mixer },
                 .init_verbs = { alc262_init_verbs },
@@ -12373,9 +12818,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc262_hippo_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hippo_setup,
-                .init_hook = alc262_hippo_automute,
+                .init_hook = alc_inithook,
         },
         [ALC262_HIPPO_1] = {
                 .mixers = { alc262_hippo1_mixer },
@@ -12387,9 +12832,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc262_hippo_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hippo1_setup,
-                .init_hook = alc262_hippo_automute,
+                .init_hook = alc_inithook,
         },
         [ALC262_FUJITSU] = {
                 .mixers = { alc262_fujitsu_mixer },
@@ -12402,8 +12847,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_fujitsu_capture_source,
-                .unsol_event = alc262_fujitsu_unsol_event,
-                .init_hook = alc262_fujitsu_init_hook,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc262_fujitsu_setup,
+                .init_hook = alc_inithook,
         },
         [ALC262_HP_BPC] = {
                 .mixers = { alc262_HP_BPC_mixer },
@@ -12414,8 +12860,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_HP_capture_source,
-                .unsol_event = alc262_hp_bpc_unsol_event,
-                .init_hook = alc262_hp_bpc_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc262_hp_bpc_setup,
+                .init_hook = alc_inithook,
         },
         [ALC262_HP_BPC_D7000_WF] = {
                 .mixers = { alc262_HP_BPC_WildWest_mixer },
@@ -12426,8 +12873,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_HP_D7000_capture_source,
-                .unsol_event = alc262_hp_wildwest_unsol_event,
-                .init_hook = alc262_hp_wildwest_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc262_hp_wildwest_setup,
+                .init_hook = alc_inithook,
         },
         [ALC262_HP_BPC_D7000_WL] = {
                 .mixers = { alc262_HP_BPC_WildWest_mixer,
@@ -12439,8 +12887,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_HP_D7000_capture_source,
-                .unsol_event = alc262_hp_wildwest_unsol_event,
-                .init_hook = alc262_hp_wildwest_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc262_hp_wildwest_setup,
+                .init_hook = alc_inithook,
         },
         [ALC262_HP_TC_T5735] = {
                 .mixers = { alc262_hp_t5735_mixer },
@@ -12483,9 +12932,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc262_hippo_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hippo_setup,
-                .init_hook = alc262_hippo_automute,
+                .init_hook = alc_inithook,
         },
         [ALC262_BENQ_T31] = {
                 .mixers = { alc262_benq_t31_mixer },
@@ -12497,9 +12946,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc262_hippo_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hippo_setup,
-                .init_hook = alc262_hippo_automute,
+                .init_hook = alc_inithook,
         },
         [ALC262_ULTRA] = {
                 .mixers = { alc262_ultra_mixer },
@@ -12528,7 +12977,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_fujitsu_capture_source,
-                .unsol_event = alc262_lenovo_3000_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc262_lenovo_3000_setup,
+                .init_hook = alc_inithook,
         },
         [ALC262_NEC] = {
                 .mixers = { alc262_nec_mixer },
@@ -12565,9 +13016,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc262_hippo_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_hippo_setup,
-                .init_hook = alc262_hippo_automute,
+                .init_hook = alc_inithook,
         },
         [ALC262_TYAN] = {
                 .mixers = { alc262_tyan_mixer },
@@ -12579,9 +13030,9 @@ static struct alc_config_preset alc262_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc262_tyan_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
 };
 
@@ -12623,6 +13074,11 @@ static int patch_alc262(struct hda_codec *codec)
         }
 
         if (board_config == ALC262_AUTO) {
+                alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
+
+        if (board_config == ALC262_AUTO) {
                 /* automatic parse from the BIOS config */
                 err = alc262_parse_auto_config(codec);
                 if (err < 0) {
@@ -12690,11 +13146,16 @@ static int patch_alc262(struct hda_codec *codec)
         if (!spec->no_analog && has_cdefine_beep(codec))
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+
         spec->vmaster_nid = 0x0c;
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC262_AUTO)
                 spec->init_hook = alc262_auto_init;
+        spec->shutup = alc_eapd_shutup;
+
+        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc262_loopbacks;
@@ -12709,48 +13170,48 @@ static int patch_alc262(struct hda_codec *codec)
 #define ALC268_DIGOUT_NID       ALC880_DIGOUT_NID
 #define alc268_modes            alc260_modes
 
-static hda_nid_t alc268_dac_nids[2] = {
+static const hda_nid_t alc268_dac_nids[2] = {
         /* front, hp */
         0x02, 0x03
 };
 
-static hda_nid_t alc268_adc_nids[2] = {
+static const hda_nid_t alc268_adc_nids[2] = {
         /* ADC0-1 */
         0x08, 0x07
 };
 
-static hda_nid_t alc268_adc_nids_alt[1] = {
+static const hda_nid_t alc268_adc_nids_alt[1] = {
         /* ADC0 */
         0x08
 };
 
-static hda_nid_t alc268_capsrc_nids[2] = { 0x23, 0x24 };
+static const hda_nid_t alc268_capsrc_nids[2] = { 0x23, 0x24 };
 
-static struct snd_kcontrol_new alc268_base_mixer[] = {
+static const struct snd_kcontrol_new alc268_base_mixer[] = {
         /* output mixer control */
         HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost Volume", 0x1a, 0, HDA_INPUT),
         { }
 };
 
-static struct snd_kcontrol_new alc268_toshiba_mixer[] = {
+static const struct snd_kcontrol_new alc268_toshiba_mixer[] = {
         /* output mixer control */
         HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost Volume", 0x1a, 0, HDA_INPUT),
         { }
 };
 
 /* bind Beep switches of both NID 0x0f and 0x10 */
-static struct hda_bind_ctls alc268_bind_beep_sw = {
+static const struct hda_bind_ctls alc268_bind_beep_sw = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT),
@@ -12759,27 +13220,27 @@ static struct hda_bind_ctls alc268_bind_beep_sw = {
         },
 };
 
-static struct snd_kcontrol_new alc268_beep_mixer[] = {
+static const struct snd_kcontrol_new alc268_beep_mixer[] = {
         HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT),
         HDA_BIND_SW("Beep Playback Switch", &alc268_bind_beep_sw),
         { }
 };
 
-static struct hda_verb alc268_eapd_verbs[] = {
+static const struct hda_verb alc268_eapd_verbs[] = {
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
         {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
 /* Toshiba specific */
-static struct hda_verb alc268_toshiba_verbs[] = {
+static const struct hda_verb alc268_toshiba_verbs[] = {
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
         { } /* end */
 };
 
 /* Acer specific */
 /* bind volumes of both NID 0x02 and 0x03 */
-static struct hda_bind_ctls alc268_acer_bind_master_vol = {
+static const struct hda_bind_ctls alc268_acer_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
@@ -12788,91 +13249,68 @@ static struct hda_bind_ctls alc268_acer_bind_master_vol = {
         },
 };
 
-/* mute/unmute internal speaker according to the hp jack and mute state */
-static void alc268_acer_automute(struct hda_codec *codec, int force)
+static void alc268_acer_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        unsigned int mute;
 
-        if (force || !spec->sense_updated) {
-                spec->jack_present = snd_hda_jack_detect(codec, 0x14);
-                spec->sense_updated = 1;
-        }
-        if (spec->jack_present)
-                mute = HDA_AMP_MUTE; /* mute internal speaker */
-        else /* unmute internal speaker if necessary */
-                mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, mute);
+        spec->autocfg.hp_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
+#define alc268_acer_master_sw_get       alc262_hp_master_sw_get
+#define alc268_acer_master_sw_put       alc262_hp_master_sw_put
 
-/* bind hp and internal speaker mute (with plug check) */
-static int alc268_acer_master_sw_put(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = amp_stereo_mute_update(codec, 0x14, HDA_OUTPUT, 0, valp);
-        if (change)
-                alc268_acer_automute(codec, 0);
-        return change;
-}
-
-static struct snd_kcontrol_new alc268_acer_aspire_one_mixer[] = {
+static const struct snd_kcontrol_new alc268_acer_aspire_one_mixer[] = {
         /* output mixer control */
         HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x15,
+                .info = snd_ctl_boolean_mono_info,
+                .get = alc268_acer_master_sw_get,
                 .put = alc268_acer_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
         },
         HDA_CODEC_VOLUME("Mic Boost Capture Volume", 0x18, 0, HDA_INPUT),
         { }
 };
 
-static struct snd_kcontrol_new alc268_acer_mixer[] = {
+static const struct snd_kcontrol_new alc268_acer_mixer[] = {
         /* output mixer control */
         HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x14,
+                .info = snd_ctl_boolean_mono_info,
+                .get = alc268_acer_master_sw_get,
                 .put = alc268_acer_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
         },
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost Volume", 0x1a, 0, HDA_INPUT),
         { }
 };
 
-static struct snd_kcontrol_new alc268_acer_dmic_mixer[] = {
+static const struct snd_kcontrol_new alc268_acer_dmic_mixer[] = {
         /* output mixer control */
         HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
-                .subdevice = HDA_SUBDEV_AMP_FLAG,
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
+                .subdevice = HDA_SUBDEV_NID_FLAG | 0x14,
+                .info = snd_ctl_boolean_mono_info,
+                .get = alc268_acer_master_sw_get,
                 .put = alc268_acer_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
         },
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost Volume", 0x1a, 0, HDA_INPUT),
         { }
 };
 
-static struct hda_verb alc268_acer_aspire_one_verbs[] = {
+static const struct hda_verb alc268_acer_aspire_one_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
@@ -12882,7 +13320,7 @@ static struct hda_verb alc268_acer_aspire_one_verbs[] = {
         { }
 };
 
-static struct hda_verb alc268_acer_verbs[] = {
+static const struct hda_verb alc268_acer_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* internal dmic? */
         {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -12894,53 +13332,15 @@ static struct hda_verb alc268_acer_verbs[] = {
 };
 
 /* unsolicited event for HP jack sensing */
-#define alc268_toshiba_unsol_event      alc262_hippo_unsol_event
 #define alc268_toshiba_setup            alc262_hippo_setup
-#define alc268_toshiba_automute         alc262_hippo_automute
-
-static void alc268_acer_unsol_event(struct hda_codec *codec,
-                                       unsigned int res)
-{
-        if ((res >> 26) != ALC880_HP_EVENT)
-                return;
-        alc268_acer_automute(codec, 1);
-}
-
-static void alc268_acer_init_hook(struct hda_codec *codec)
-{
-        alc268_acer_automute(codec, 1);
-}
-
-/* toggle speaker-output according to the hp-jack state */
-static void alc268_aspire_one_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x15);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0f, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc268_acer_lc_unsol_event(struct hda_codec *codec,
-                                    unsigned int res)
-{
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc268_aspire_one_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
 
 static void alc268_acer_lc_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
@@ -12948,24 +13348,18 @@ static void alc268_acer_lc_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc268_acer_lc_init_hook(struct hda_codec *codec)
-{
-        alc268_aspire_one_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
-
-static struct snd_kcontrol_new alc268_dell_mixer[] = {
+static const struct snd_kcontrol_new alc268_dell_mixer[] = {
         /* output mixer control */
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { }
 };
 
-static struct hda_verb alc268_dell_verbs[] = {
+static const struct hda_verb alc268_dell_verbs[] = {
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
@@ -12985,21 +13379,23 @@ static void alc268_dell_setup(struct hda_codec *codec)
         spec->int_mic.pin = 0x19;
         spec->int_mic.mux_idx = 1;
         spec->auto_mic = 1;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
-static struct snd_kcontrol_new alc267_quanta_il1_mixer[] = {
+static const struct snd_kcontrol_new alc267_quanta_il1_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x2, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Capture Volume", 0x23, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Mic Capture Switch", 0x23, 2, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { }
 };
 
-static struct hda_verb alc267_quanta_il1_verbs[] = {
+static const struct hda_verb alc267_quanta_il1_verbs[] = {
         {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
         {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT | AC_USRSP_EN},
         { }
@@ -13015,12 +13411,14 @@ static void alc267_quanta_il1_setup(struct hda_codec *codec)
         spec->int_mic.pin = 0x19;
         spec->int_mic.mux_idx = 1;
         spec->auto_mic = 1;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
 }
 
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc268_base_init_verbs[] = {
+static const struct hda_verb alc268_base_init_verbs[] = {
         /* Unmute DAC0-1 and set vol = 0 */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -13068,7 +13466,7 @@ static struct hda_verb alc268_base_init_verbs[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc268_volume_init_verbs[] = {
+static const struct hda_verb alc268_volume_init_verbs[] = {
         /* set output DAC */
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -13094,20 +13492,20 @@ static struct hda_verb alc268_volume_init_verbs[] = {
         { }
 };
 
-static struct snd_kcontrol_new alc268_capture_nosrc_mixer[] = {
+static const struct snd_kcontrol_new alc268_capture_nosrc_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc268_capture_alt_mixer[] = {
+static const struct snd_kcontrol_new alc268_capture_alt_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),
         _DEFINE_CAPSRC(1),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc268_capture_mixer[] = {
+static const struct snd_kcontrol_new alc268_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x23, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x23, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x24, 0x0, HDA_OUTPUT),
@@ -13116,7 +13514,7 @@ static struct snd_kcontrol_new alc268_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_input_mux alc268_capture_source = {
+static const struct hda_input_mux alc268_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -13126,7 +13524,7 @@ static struct hda_input_mux alc268_capture_source = {
         },
 };
 
-static struct hda_input_mux alc268_acer_capture_source = {
+static const struct hda_input_mux alc268_acer_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -13135,7 +13533,7 @@ static struct hda_input_mux alc268_acer_capture_source = {
         },
 };
 
-static struct hda_input_mux alc268_acer_dmic_capture_source = {
+static const struct hda_input_mux alc268_acer_dmic_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -13145,7 +13543,7 @@ static struct hda_input_mux alc268_acer_dmic_capture_source = {
 };
 
 #ifdef CONFIG_SND_DEBUG
-static struct snd_kcontrol_new alc268_test_mixer[] = {
+static const struct snd_kcontrol_new alc268_test_mixer[] = {
         /* Volume widgets */
         HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -13224,7 +13622,7 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
                                                       HDA_OUTPUT));
                 if (err < 0)
                         return err;
-                spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
+                spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
 
         if (nid != 0x16)
@@ -13310,8 +13708,10 @@ static void alc268_auto_set_output_and_unmute(struct hda_codec *codec,
 static void alc268_auto_init_multi_out(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        hda_nid_t nid = spec->autocfg.line_out_pins[0];
-        if (nid) {
+        int i;
+
+        for (i = 0; i < spec->autocfg.line_outs; i++) {
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
                 int pin_type = get_pin_type(spec->autocfg.line_out_type);
                 alc268_auto_set_output_and_unmute(codec, nid, pin_type);
         }
@@ -13321,13 +13721,19 @@ static void alc268_auto_init_hp_out(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         hda_nid_t pin;
+        int i;
 
-        pin = spec->autocfg.hp_pins[0];
-        if (pin)
+        for (i = 0; i < spec->autocfg.hp_outs; i++) {
+                pin = spec->autocfg.hp_pins[i];
                 alc268_auto_set_output_and_unmute(codec, pin, PIN_HP);
-        pin = spec->autocfg.speaker_pins[0];
-        if (pin)
+        }
+        for (i = 0; i < spec->autocfg.speaker_outs; i++) {
+                pin = spec->autocfg.speaker_pins[i];
                 alc268_auto_set_output_and_unmute(codec, pin, PIN_OUT);
+        }
+        if (spec->autocfg.mono_out_pin)
+                snd_hda_codec_write(codec, spec->autocfg.mono_out_pin, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
 }
 
 static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec)
@@ -13389,7 +13795,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc268_ignore[] = { 0 };
+        static const hda_nid_t alc268_ignore[] = { 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc268_ignore);
@@ -13435,6 +13841,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
 }
 
 #define alc268_auto_init_analog_input   alc882_auto_init_analog_input
+#define alc268_auto_init_input_src      alc882_auto_init_input_src
 
 /* init callback for auto-configuration model -- overriding the default init */
 static void alc268_auto_init(struct hda_codec *codec)
@@ -13444,6 +13851,7 @@ static void alc268_auto_init(struct hda_codec *codec)
         alc268_auto_init_hp_out(codec);
         alc268_auto_init_mono_speaker_out(codec);
         alc268_auto_init_analog_input(codec);
+        alc268_auto_init_input_src(codec);
         alc_auto_init_digital(codec);
         if (spec->unsol_event)
                 alc_inithook(codec);
@@ -13452,7 +13860,7 @@ static void alc268_auto_init(struct hda_codec *codec)
 /*
  * configuration and preset
  */
-static const char *alc268_models[ALC268_MODEL_LAST] = {
+static const char * const alc268_models[ALC268_MODEL_LAST] = {
         [ALC267_QUANTA_IL1]     = "quanta-il1",
         [ALC268_3ST]            = "3stack",
         [ALC268_TOSHIBA]        = "toshiba",
@@ -13467,7 +13875,7 @@ static const char *alc268_models[ALC268_MODEL_LAST] = {
         [ALC268_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc268_cfg_tbl[] = {
+static const struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x011e, "Acer Aspire 5720z", ALC268_ACER),
         SND_PCI_QUIRK(0x1025, 0x0126, "Acer", ALC268_ACER),
         SND_PCI_QUIRK(0x1025, 0x012e, "Acer Aspire 5310", ALC268_ACER),
@@ -13476,6 +13884,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
                                                 ALC268_ACER_ASPIRE_ONE),
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
+        SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron 910", ALC268_AUTO),
         SND_PCI_QUIRK_MASK(0x1028, 0xfff0, 0x02b0,
                         "Dell Inspiron Mini9/Vostro A90", ALC268_DELL),
         /* almost compatible with toshiba but with optional digital outs;
@@ -13486,13 +13895,12 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
         SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),
         SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),
-        SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
         SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),
         {}
 };
 
 /* Toshiba laptops have no unique PCI SSID but only codec SSID */
-static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
+static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1179, 0xff0a, "TOSHIBA X-200", ALC268_AUTO),
         SND_PCI_QUIRK(0x1179, 0xff0e, "TOSHIBA X-200 HDMI", ALC268_AUTO),
         SND_PCI_QUIRK_MASK(0x1179, 0xff00, 0xff00, "TOSHIBA A/Lx05",
@@ -13500,7 +13908,7 @@ static struct snd_pci_quirk alc268_ssid_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc268_presets[] = {
+static const struct alc_config_preset alc268_presets[] = {
         [ALC267_QUANTA_IL1] = {
                 .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,
                             alc268_capture_nosrc_mixer },
@@ -13546,9 +13954,9 @@ static struct alc_config_preset alc268_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc268_modes),
                 .channel_mode = alc268_modes,
                 .input_mux = &alc268_capture_source,
-                .unsol_event = alc268_toshiba_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc268_toshiba_setup,
-                .init_hook = alc268_toshiba_automute,
+                .init_hook = alc_inithook,
         },
         [ALC268_ACER] = {
                 .mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,
@@ -13564,8 +13972,9 @@ static struct alc_config_preset alc268_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc268_modes),
                 .channel_mode = alc268_modes,
                 .input_mux = &alc268_acer_capture_source,
-                .unsol_event = alc268_acer_unsol_event,
-                .init_hook = alc268_acer_init_hook,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc268_acer_setup,
+                .init_hook = alc_inithook,
         },
         [ALC268_ACER_DMIC] = {
                 .mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,
@@ -13581,8 +13990,9 @@ static struct alc_config_preset alc268_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc268_modes),
                 .channel_mode = alc268_modes,
                 .input_mux = &alc268_acer_dmic_capture_source,
-                .unsol_event = alc268_acer_unsol_event,
-                .init_hook = alc268_acer_init_hook,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc268_acer_setup,
+                .init_hook = alc_inithook,
         },
         [ALC268_ACER_ASPIRE_ONE] = {
                 .mixers = { alc268_acer_aspire_one_mixer,
@@ -13598,9 +14008,9 @@ static struct alc_config_preset alc268_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc268_modes),
                 .channel_mode = alc268_modes,
-                .unsol_event = alc268_acer_lc_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc268_acer_lc_setup,
-                .init_hook = alc268_acer_lc_init_hook,
+                .init_hook = alc_inithook,
         },
         [ALC268_DELL] = {
                 .mixers = { alc268_dell_mixer, alc268_beep_mixer,
@@ -13634,8 +14044,9 @@ static struct alc_config_preset alc268_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc268_modes),
                 .channel_mode = alc268_modes,
                 .input_mux = &alc268_capture_source,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc268_toshiba_setup,
-                .init_hook = alc268_toshiba_automute,
+                .init_hook = alc_inithook,
         },
 #ifdef CONFIG_SND_DEBUG
         [ALC268_TEST] = {
@@ -13731,7 +14142,6 @@ static int patch_alc268(struct hda_codec *codec)
         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;
 
                 spec->capsrc_nids = alc268_capsrc_nids;
                 /* get type */
@@ -13751,13 +14161,6 @@ static int patch_alc268(struct hda_codec *codec)
                         spec->num_adc_nids = ARRAY_SIZE(alc268_adc_nids);
                         add_mixer(spec, alc268_capture_mixer);
                 }
-                /* set default input source */
-                for (i = 0; i < spec->num_adc_nids; i++)
-                        snd_hda_codec_write_cache(codec, alc268_capsrc_nids[i],
-                                0, AC_VERB_SET_CONNECT_SEL,
-                                i < spec->num_mux_defs ?
-                                spec->input_mux[i].items[0].index :
-                                spec->input_mux->items[0].index);
         }
 
         spec->vmaster_nid = 0x02;
@@ -13765,6 +14168,9 @@ static int patch_alc268(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC268_AUTO)
                 spec->init_hook = alc268_auto_init;
+        spec->shutup = alc_eapd_shutup;
+
+        alc_init_jacks(codec);
 
         return 0;
 }
@@ -13776,48 +14182,48 @@ static int patch_alc268(struct hda_codec *codec)
 
 #define alc269_dac_nids         alc260_dac_nids
 
-static hda_nid_t alc269_adc_nids[1] = {
+static const hda_nid_t alc269_adc_nids[1] = {
         /* ADC1 */
         0x08,
 };
 
-static hda_nid_t alc269_capsrc_nids[1] = {
+static const hda_nid_t alc269_capsrc_nids[1] = {
         0x23,
 };
 
-static hda_nid_t alc269vb_adc_nids[1] = {
+static const hda_nid_t alc269vb_adc_nids[1] = {
         /* ADC1 */
         0x09,
 };
 
-static hda_nid_t alc269vb_capsrc_nids[1] = {
+static const hda_nid_t alc269vb_capsrc_nids[1] = {
         0x22,
 };
 
-static hda_nid_t alc269_adc_candidates[] = {
-        0x08, 0x09, 0x07,
+static const hda_nid_t alc269_adc_candidates[] = {
+        0x08, 0x09, 0x07, 0x11,
 };
 
 #define alc269_modes            alc260_modes
 #define alc269_capture_source   alc880_lg_lw_capture_source
 
-static struct snd_kcontrol_new alc269_base_mixer[] = {
+static const struct snd_kcontrol_new alc269_base_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
+static const struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
         /* output mixer control */
         HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
         {
@@ -13831,14 +14237,14 @@ static struct snd_kcontrol_new alc269_quanta_fl1_mixer[] = {
         },
         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("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         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("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { }
 };
 
-static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
+static const struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         /* output mixer control */
         HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
         {
@@ -13852,17 +14258,17 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
         },
         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("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         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("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         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("Dock Mic Boost Volume", 0x1b, 0, HDA_INPUT),
         { }
 };
 
-static struct snd_kcontrol_new alc269_laptop_mixer[] = {
+static const struct snd_kcontrol_new alc269_laptop_mixer[] = {
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
@@ -13870,7 +14276,7 @@ static struct snd_kcontrol_new alc269_laptop_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269vb_laptop_mixer[] = {
+static const struct snd_kcontrol_new alc269vb_laptop_mixer[] = {
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
@@ -13878,47 +14284,47 @@ static struct snd_kcontrol_new alc269vb_laptop_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269_asus_mixer[] = {
+static const struct snd_kcontrol_new alc269_asus_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x0c, 0x0, HDA_INPUT),
         { } /* end */
 };
 
 /* capture mixer elements */
-static struct snd_kcontrol_new alc269_laptop_analog_capture_mixer[] = {
+static const struct snd_kcontrol_new alc269_laptop_analog_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269_laptop_digital_capture_mixer[] = {
+static const struct snd_kcontrol_new alc269_laptop_digital_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269vb_laptop_analog_capture_mixer[] = {
+static const struct snd_kcontrol_new alc269vb_laptop_analog_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {
+static const struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         { } /* end */
 };
 
 /* FSC amilo */
 #define alc269_fujitsu_mixer    alc269_laptop_mixer
 
-static struct hda_verb alc269_quanta_fl1_verbs[] = {
+static const struct hda_verb alc269_quanta_fl1_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -13928,7 +14334,7 @@ static struct hda_verb alc269_quanta_fl1_verbs[] = {
         { }
 };
 
-static struct hda_verb alc269_lifebook_verbs[] = {
+static const struct hda_verb alc269_lifebook_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -13945,15 +14351,7 @@ static struct hda_verb alc269_lifebook_verbs[] = {
 /* toggle speaker-output according to the hp-jack state */
 static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec)
 {
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x15);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
+        alc_hp_automute(codec);
 
         snd_hda_codec_write(codec, 0x20, 0,
                         AC_VERB_SET_COEF_INDEX, 0x0c);
@@ -13966,34 +14364,8 @@ static void alc269_quanta_fl1_speaker_automute(struct hda_codec *codec)
                         AC_VERB_SET_PROC_COEF, 0x480);
 }
 
-/* toggle speaker-output according to the hp-jacks state */
-static void alc269_lifebook_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        /* Check laptop headphone socket */
-        present = snd_hda_jack_detect(codec, 0x15);
-
-        /* Check port replicator headphone socket */
-        present |= snd_hda_jack_detect(codec, 0x1a);
-
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-
-        snd_hda_codec_write(codec, 0x20, 0,
-                        AC_VERB_SET_COEF_INDEX, 0x0c);
-        snd_hda_codec_write(codec, 0x20, 0,
-                        AC_VERB_SET_PROC_COEF, 0x680);
-
-        snd_hda_codec_write(codec, 0x20, 0,
-                        AC_VERB_SET_COEF_INDEX, 0x0c);
-        snd_hda_codec_write(codec, 0x20, 0,
-                        AC_VERB_SET_PROC_COEF, 0x480);
-}
+#define alc269_lifebook_speaker_automute \
+        alc269_quanta_fl1_speaker_automute
 
 static void alc269_lifebook_mic_autoswitch(struct hda_codec *codec)
 {
@@ -14042,6 +14414,9 @@ static void alc269_quanta_fl1_setup(struct hda_codec *codec)
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -14055,13 +14430,24 @@ static void alc269_quanta_fl1_init_hook(struct hda_codec *codec)
         alc_mic_automute(codec);
 }
 
+static void alc269_lifebook_setup(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.hp_pins[1] = 0x1a;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
+}
+
 static void alc269_lifebook_init_hook(struct hda_codec *codec)
 {
         alc269_lifebook_speaker_automute(codec);
         alc269_lifebook_mic_autoswitch(codec);
 }
 
-static struct hda_verb alc269_laptop_dmic_init_verbs[] = {
+static const struct hda_verb alc269_laptop_dmic_init_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x23, AC_VERB_SET_CONNECT_SEL, 0x05},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -14072,7 +14458,7 @@ static struct hda_verb alc269_laptop_dmic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc269_laptop_amic_init_verbs[] = {
+static const struct hda_verb alc269_laptop_amic_init_verbs[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x23, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -14082,7 +14468,7 @@ static struct hda_verb alc269_laptop_amic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {
+static const struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {
         {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x22, AC_VERB_SET_CONNECT_SEL, 0x06},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -14093,7 +14479,7 @@ static struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc269vb_laptop_amic_init_verbs[] = {
+static const struct hda_verb alc269vb_laptop_amic_init_verbs[] = {
         {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x22, AC_VERB_SET_CONNECT_SEL, 0x01},
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
@@ -14104,7 +14490,7 @@ static struct hda_verb alc269vb_laptop_amic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc271_acer_dmic_verbs[] = {
+static const struct hda_verb alc271_acer_dmic_verbs[] = {
         {0x20, AC_VERB_SET_COEF_INDEX, 0x0d},
         {0x20, AC_VERB_SET_PROC_COEF, 0x4000},
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -14118,41 +14504,14 @@ static struct hda_verb alc271_acer_dmic_verbs[] = {
         { }
 };
 
-/* toggle speaker-output according to the hp-jack state */
-static void alc269_speaker_automute(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        unsigned int nid = spec->autocfg.hp_pins[0];
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, nid);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
-/* unsolicited event for HP jack sensing */
-static void alc269_laptop_unsol_event(struct hda_codec *codec,
-                                     unsigned int res)
-{
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc269_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
-
 static void alc269_laptop_amic_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -14165,6 +14524,9 @@ static void alc269_laptop_dmic_setup(struct hda_codec *codec)
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
@@ -14177,6 +14539,9 @@ static void alc269vb_laptop_amic_setup(struct hda_codec *codec)
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x21;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -14189,6 +14554,9 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x21;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
@@ -14196,16 +14564,10 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc269_laptop_inithook(struct hda_codec *codec)
-{
-        alc269_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
-
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc269_init_verbs[] = {
+static const struct hda_verb alc269_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -14248,7 +14610,7 @@ static struct hda_verb alc269_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc269vb_init_verbs[] = {
+static const struct hda_verb alc269vb_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -14306,7 +14668,7 @@ static struct hda_verb alc269vb_init_verbs[] = {
 #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 = {
+static const struct hda_pcm_stream alc269_44k_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
@@ -14319,7 +14681,7 @@ static struct hda_pcm_stream alc269_44k_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream alc269_44k_pcm_analog_capture = {
+static const struct hda_pcm_stream alc269_44k_pcm_analog_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -14386,6 +14748,16 @@ static int alc275_setup_dual_adc(struct hda_codec *codec)
         return 0;
 }
 
+/* different alc269-variants */
+enum {
+        ALC269_TYPE_NORMAL,
+        ALC269_TYPE_ALC258,
+        ALC269_TYPE_ALC259,
+        ALC269_TYPE_ALC269VB,
+        ALC269_TYPE_ALC270,
+        ALC269_TYPE_ALC271X,
+};
+
 /*
  * BIOS auto configuration
  */
@@ -14393,7 +14765,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc269_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc269_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc269_ignore);
@@ -14403,7 +14775,11 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         err = alc269_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
-        err = alc269_auto_create_input_ctls(codec, &spec->autocfg);
+        if (spec->codec_variant == ALC269_TYPE_NORMAL)
+                err = alc269_auto_create_input_ctls(codec, &spec->autocfg);
+        else
+                err = alc_auto_create_input_ctls(codec, &spec->autocfg, 0,
+                                                 0x22, 0);
         if (err < 0)
                 return err;
 
@@ -14414,7 +14790,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         if (spec->kctls.list)
                 add_mixer(spec, spec->kctls.list);
 
-        if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010) {
+        if (spec->codec_variant != ALC269_TYPE_NORMAL) {
                 add_verb(spec, alc269vb_init_verbs);
                 alc_ssid_check(codec, 0, 0x1b, 0x14, 0x21);
         } else {
@@ -14429,11 +14805,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
                 fillup_priv_adc_nids(codec, alc269_adc_candidates,
                                      sizeof(alc269_adc_candidates));
 
-        /* set default input source */
-        if (!spec->dual_adc_switch)
-                select_or_unmute_capsrc(codec, spec->capsrc_nids[0],
-                                        spec->input_mux->items[0].index);
-
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
@@ -14447,6 +14818,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
 #define alc269_auto_init_multi_out      alc268_auto_init_multi_out
 #define alc269_auto_init_hp_out         alc268_auto_init_hp_out
 #define alc269_auto_init_analog_input   alc882_auto_init_analog_input
+#define alc269_auto_init_input_src      alc882_auto_init_input_src
 
 
 /* init callback for auto-configuration model -- overriding the default init */
@@ -14456,39 +14828,169 @@ static void alc269_auto_init(struct hda_codec *codec)
         alc269_auto_init_multi_out(codec);
         alc269_auto_init_hp_out(codec);
         alc269_auto_init_analog_input(codec);
+        if (!spec->dual_adc_switch)
+                alc269_auto_init_input_src(codec);
         alc_auto_init_digital(codec);
         if (spec->unsol_event)
                 alc_inithook(codec);
 }
 
+static void alc269_toggle_power_output(struct hda_codec *codec, int power_up)
+{
+        int val = alc_read_coef_idx(codec, 0x04);
+        if (power_up)
+                val |= 1 << 11;
+        else
+                val &= ~(1 << 11);
+        alc_write_coef_idx(codec, 0x04, val);
+}
+
+static void alc269_shutup(struct hda_codec *codec)
+{
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x017)
+                alc269_toggle_power_output(codec, 0);
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
+                alc269_toggle_power_output(codec, 0);
+                msleep(150);
+        }
+}
+
+#ifdef SND_HDA_NEEDS_RESUME
+static int alc269_resume(struct hda_codec *codec)
+{
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
+                alc269_toggle_power_output(codec, 0);
+                msleep(150);
+        }
+
+        codec->patch_ops.init(codec);
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x017) {
+                alc269_toggle_power_output(codec, 1);
+                msleep(200);
+        }
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018)
+                alc269_toggle_power_output(codec, 1);
+
+        snd_hda_codec_resume_amp(codec);
+        snd_hda_codec_resume_cache(codec);
+        hda_call_check_power_status(codec, 0x01);
+        return 0;
+}
+#endif /* SND_HDA_NEEDS_RESUME */
+
+static void alc269_fixup_hweq(struct hda_codec *codec,
+                               const struct alc_fixup *fix, int action)
+{
+        int coef;
+
+        if (action != ALC_FIXUP_ACT_INIT)
+                return;
+        coef = alc_read_coef_idx(codec, 0x1e);
+        alc_write_coef_idx(codec, 0x1e, coef | 0x80);
+}
+
+static void alc271_fixup_dmic(struct hda_codec *codec,
+                              const struct alc_fixup *fix, int action)
+{
+        static const struct hda_verb verbs[] = {
+                {0x20, AC_VERB_SET_COEF_INDEX, 0x0d},
+                {0x20, AC_VERB_SET_PROC_COEF, 0x4000},
+                {}
+        };
+        unsigned int cfg;
+
+        if (strcmp(codec->chip_name, "ALC271X"))
+                return;
+        cfg = snd_hda_codec_get_pincfg(codec, 0x12);
+        if (get_defcfg_connect(cfg) == AC_JACK_PORT_FIXED)
+                snd_hda_sequence_write(codec, verbs);
+}
+
 enum {
         ALC269_FIXUP_SONY_VAIO,
+        ALC275_FIXUP_SONY_VAIO_GPIO2,
         ALC269_FIXUP_DELL_M101Z,
-};
-
-static const struct hda_verb alc269_sony_vaio_fixup_verbs[] = {
-        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
-        {}
+        ALC269_FIXUP_SKU_IGNORE,
+        ALC269_FIXUP_ASUS_G73JW,
+        ALC269_FIXUP_LENOVO_EAPD,
+        ALC275_FIXUP_SONY_HWEQ,
+        ALC271_FIXUP_DMIC,
 };
 
 static const struct alc_fixup alc269_fixups[] = {
         [ALC269_FIXUP_SONY_VAIO] = {
-                .verbs = alc269_sony_vaio_fixup_verbs
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
+                        {}
+                }
+        },
+        [ALC275_FIXUP_SONY_VAIO_GPIO2] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x01, AC_VERB_SET_GPIO_MASK, 0x04},
+                        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04},
+                        {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_SONY_VAIO
         },
         [ALC269_FIXUP_DELL_M101Z] = {
-                .verbs = (const struct hda_verb[]) {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
                         /* Enables internal speaker */
                         {0x20, AC_VERB_SET_COEF_INDEX, 13},
                         {0x20, AC_VERB_SET_PROC_COEF, 0x4040},
                         {}
                 }
         },
+        [ALC269_FIXUP_SKU_IGNORE] = {
+                .type = ALC_FIXUP_SKU,
+                .v.sku = ALC_FIXUP_SKU_IGNORE,
+        },
+        [ALC269_FIXUP_ASUS_G73JW] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x17, 0x99130111 }, /* subwoofer */
+                        { }
+                }
+        },
+        [ALC269_FIXUP_LENOVO_EAPD] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
+                        {}
+                }
+        },
+        [ALC275_FIXUP_SONY_HWEQ] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc269_fixup_hweq,
+                .chained = true,
+                .chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2
+        },
+        [ALC271_FIXUP_DMIC] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc271_fixup_dmic,
+        },
 };
 
-static struct snd_pci_quirk alc269_fixup_tbl[] = {
-        SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
-        SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
+static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
+        SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
+        SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
+        SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
+        SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
+        SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
+        SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
         {}
 };
 
@@ -14496,7 +14998,7 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = {
 /*
  * configuration and preset
  */
-static const char *alc269_models[ALC269_MODEL_LAST] = {
+static const char * const alc269_models[ALC269_MODEL_LAST] = {
         [ALC269_BASIC]                  = "basic",
         [ALC269_QUANTA_FL1]             = "quanta",
         [ALC269_AMIC]                   = "laptop-amic",
@@ -14506,7 +15008,7 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
         [ALC269_AUTO]                   = "auto",
 };
 
-static struct snd_pci_quirk alc269_cfg_tbl[] = {
+static const struct snd_pci_quirk alc269_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),
         SND_PCI_QUIRK(0x1025, 0x047c, "ACER ZGA", ALC271_ACER),
         SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
@@ -14520,7 +15022,7 @@ static struct snd_pci_quirk alc269_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269VB_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269VB_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_AMIC),
-        SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_AMIC),
+        SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82JV", ALC269VB_AMIC),
         SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_AMIC),
         SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_AMIC),
@@ -14564,7 +15066,7 @@ static struct snd_pci_quirk alc269_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc269_presets[] = {
+static const struct alc_config_preset alc269_presets[] = {
         [ALC269_BASIC] = {
                 .mixers = { alc269_base_mixer },
                 .init_verbs = { alc269_init_verbs },
@@ -14598,9 +15100,9 @@ static struct alc_config_preset alc269_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc269_modes),
                 .channel_mode = alc269_modes,
-                .unsol_event = alc269_laptop_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc269_laptop_amic_setup,
-                .init_hook = alc269_laptop_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC269_DMIC] = {
                 .mixers = { alc269_laptop_mixer },
@@ -14612,9 +15114,9 @@ static struct alc_config_preset alc269_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc269_modes),
                 .channel_mode = alc269_modes,
-                .unsol_event = alc269_laptop_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc269_laptop_dmic_setup,
-                .init_hook = alc269_laptop_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC269VB_AMIC] = {
                 .mixers = { alc269vb_laptop_mixer },
@@ -14626,9 +15128,9 @@ static struct alc_config_preset alc269_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc269_modes),
                 .channel_mode = alc269_modes,
-                .unsol_event = alc269_laptop_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc269vb_laptop_amic_setup,
-                .init_hook = alc269_laptop_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC269VB_DMIC] = {
                 .mixers = { alc269vb_laptop_mixer },
@@ -14640,9 +15142,9 @@ static struct alc_config_preset alc269_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc269_modes),
                 .channel_mode = alc269_modes,
-                .unsol_event = alc269_laptop_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc269vb_laptop_dmic_setup,
-                .init_hook = alc269_laptop_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC269_FUJITSU] = {
                 .mixers = { alc269_fujitsu_mixer },
@@ -14654,9 +15156,9 @@ static struct alc_config_preset alc269_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc269_modes),
                 .channel_mode = alc269_modes,
-                .unsol_event = alc269_laptop_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc269_laptop_dmic_setup,
-                .init_hook = alc269_laptop_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC269_LIFEBOOK] = {
                 .mixers = { alc269_lifebook_mixer },
@@ -14668,6 +15170,7 @@ static struct alc_config_preset alc269_presets[] = {
                 .channel_mode = alc269_modes,
                 .input_mux = &alc269_capture_source,
                 .unsol_event = alc269_lifebook_unsol_event,
+                .setup = alc269_lifebook_setup,
                 .init_hook = alc269_lifebook_init_hook,
         },
         [ALC271_ACER] = {
@@ -14689,12 +15192,53 @@ static struct alc_config_preset alc269_presets[] = {
         },
 };
 
+static int alc269_fill_coef(struct hda_codec *codec)
+{
+        int val;
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) < 0x015) {
+                alc_write_coef_idx(codec, 0xf, 0x960b);
+                alc_write_coef_idx(codec, 0xe, 0x8817);
+        }
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x016) {
+                alc_write_coef_idx(codec, 0xf, 0x960b);
+                alc_write_coef_idx(codec, 0xe, 0x8814);
+        }
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x017) {
+                val = alc_read_coef_idx(codec, 0x04);
+                /* Power up output pin */
+                alc_write_coef_idx(codec, 0x04, val | (1<<11));
+        }
+
+        if ((alc_read_coef_idx(codec, 0) & 0x00ff) == 0x018) {
+                val = alc_read_coef_idx(codec, 0xd);
+                if ((val & 0x0c00) >> 10 != 0x1) {
+                        /* Capless ramp up clock control */
+                        alc_write_coef_idx(codec, 0xd, val | (1<<10));
+                }
+                val = alc_read_coef_idx(codec, 0x17);
+                if ((val & 0x01c0) >> 6 != 0x4) {
+                        /* Class D power on reset */
+                        alc_write_coef_idx(codec, 0x17, val | (1<<7));
+                }
+        }
+
+        val = alc_read_coef_idx(codec, 0xd); /* Class D */
+        alc_write_coef_idx(codec, 0xd, val | (1<<14));
+
+        val = alc_read_coef_idx(codec, 0x4); /* HP */
+        alc_write_coef_idx(codec, 0x4, val | (1<<11));
+
+        return 0;
+}
+
 static int patch_alc269(struct hda_codec *codec)
 {
         struct alc_spec *spec;
-        int board_config;
+        int board_config, coef;
         int err;
-        int is_alc269vb = 0;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -14704,15 +15248,29 @@ static int patch_alc269(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
-        if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010){
-                if (codec->bus->pci->subsystem_vendor == 0x1025 &&
-                    spec->cdefine.platform_type == 1)
-                        alc_codec_rename(codec, "ALC271X");
-                else
-                        alc_codec_rename(codec, "ALC259");
-                is_alc269vb = 1;
-        } else
-                alc_fix_pll_init(codec, 0x20, 0x04, 15);
+        if (codec->vendor_id == 0x10ec0269) {
+                coef = alc_read_coef_idx(codec, 0);
+                if ((coef & 0x00f0) == 0x0010) {
+                        if (codec->bus->pci->subsystem_vendor == 0x1025 &&
+                            spec->cdefine.platform_type == 1) {
+                                alc_codec_rename(codec, "ALC271X");
+                                spec->codec_variant = ALC269_TYPE_ALC271X;
+                        } else if ((coef & 0xf000) == 0x1000) {
+                                spec->codec_variant = ALC269_TYPE_ALC270;
+                        } else if ((coef & 0xf000) == 0x2000) {
+                                alc_codec_rename(codec, "ALC259");
+                                spec->codec_variant = ALC269_TYPE_ALC259;
+                        } else if ((coef & 0xf000) == 0x3000) {
+                                alc_codec_rename(codec, "ALC258");
+                                spec->codec_variant = ALC269_TYPE_ALC258;
+                        } else {
+                                alc_codec_rename(codec, "ALC269VB");
+                                spec->codec_variant = ALC269_TYPE_ALC269VB;
+                        }
+                } else
+                        alc_fix_pll_init(codec, 0x20, 0x04, 15);
+                alc269_fill_coef(codec);
+        }
 
         board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
                                                   alc269_models,
@@ -14724,8 +15282,10 @@ static int patch_alc269(struct hda_codec *codec)
                 board_config = ALC269_AUTO;
         }
 
-        if (board_config == ALC269_AUTO)
-                alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 1);
+        if (board_config == ALC269_AUTO) {
+                alc_pick_fixup(codec, NULL, alc269_fixup_tbl, alc269_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
 
         if (board_config == ALC269_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -14770,7 +15330,7 @@ static int patch_alc269(struct hda_codec *codec)
         spec->stream_digital_capture = &alc269_pcm_digital_capture;
 
         if (!spec->adc_nids) { /* wasn't filled automatically? use default */
-                if (!is_alc269vb) {
+                if (spec->codec_variant == ALC269_TYPE_NORMAL) {
                         spec->adc_nids = alc269_adc_nids;
                         spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
                         spec->capsrc_nids = alc269_capsrc_nids;
@@ -14786,14 +15346,19 @@ static int patch_alc269(struct hda_codec *codec)
         if (has_cdefine_beep(codec))
                 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
 
-        if (board_config == ALC269_AUTO)
-                alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 0);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         spec->vmaster_nid = 0x02;
 
         codec->patch_ops = alc_patch_ops;
+#ifdef SND_HDA_NEEDS_RESUME
+        codec->patch_ops.resume = alc269_resume;
+#endif
         if (board_config == ALC269_AUTO)
                 spec->init_hook = alc269_auto_init;
+        spec->shutup = alc269_shutup;
+
+        alc_init_jacks(codec);
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc269_loopbacks;
@@ -14812,7 +15377,7 @@ static int patch_alc269(struct hda_codec *codec)
  * set the path ways for 2 channel output
  * need to set the codec line out and mic 1 pin widgets to inputs
  */
-static struct hda_verb alc861_threestack_ch2_init[] = {
+static const struct hda_verb alc861_threestack_ch2_init[] = {
         /* set pin widget 1Ah (line in) for input */
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
         /* set pin widget 18h (mic1/2) for input, for mic also enable
@@ -14831,7 +15396,7 @@ static struct hda_verb alc861_threestack_ch2_init[] = {
  * 6ch mode
  * need to set the codec line out and mic 1 pin widgets to outputs
  */
-static struct hda_verb alc861_threestack_ch6_init[] = {
+static const struct hda_verb alc861_threestack_ch6_init[] = {
         /* set pin widget 1Ah (line in) for output (Back Surround)*/
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
         /* set pin widget 18h (mic1) for output (CLFE)*/
@@ -14848,30 +15413,30 @@ static struct hda_verb alc861_threestack_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc861_threestack_modes[2] = {
+static const struct hda_channel_mode alc861_threestack_modes[2] = {
         { 2, alc861_threestack_ch2_init },
         { 6, alc861_threestack_ch6_init },
 };
 /* Set mic1 as input and unmute the mixer */
-static struct hda_verb alc861_uniwill_m31_ch2_init[] = {
+static const struct hda_verb alc861_uniwill_m31_ch2_init[] = {
         { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
         { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x01 << 8)) }, /*mic*/
         { } /* end */
 };
 /* Set mic1 as output and mute mixer */
-static struct hda_verb alc861_uniwill_m31_ch4_init[] = {
+static const struct hda_verb alc861_uniwill_m31_ch4_init[] = {
         { 0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
         { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8)) }, /*mic*/
         { } /* end */
 };
 
-static struct hda_channel_mode alc861_uniwill_m31_modes[2] = {
+static const struct hda_channel_mode alc861_uniwill_m31_modes[2] = {
         { 2, alc861_uniwill_m31_ch2_init },
         { 4, alc861_uniwill_m31_ch4_init },
 };
 
 /* Set mic1 and line-in as input and unmute the mixer */
-static struct hda_verb alc861_asus_ch2_init[] = {
+static const struct hda_verb alc861_asus_ch2_init[] = {
         /* set pin widget 1Ah (line in) for input */
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 },
         /* set pin widget 18h (mic1/2) for input, for mic also enable
@@ -14887,7 +15452,7 @@ static struct hda_verb alc861_asus_ch2_init[] = {
         { } /* end */
 };
 /* Set mic1 nad line-in as output and mute mixer */
-static struct hda_verb alc861_asus_ch6_init[] = {
+static const struct hda_verb alc861_asus_ch6_init[] = {
         /* set pin widget 1Ah (line in) for output (Back Surround)*/
         { 0x0c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
         /* { 0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, */
@@ -14905,14 +15470,14 @@ static struct hda_verb alc861_asus_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc861_asus_modes[2] = {
+static const struct hda_channel_mode alc861_asus_modes[2] = {
         { 2, alc861_asus_ch2_init },
         { 6, alc861_asus_ch6_init },
 };
 
 /* patch-ALC861 */
 
-static struct snd_kcontrol_new alc861_base_mixer[] = {
+static const struct snd_kcontrol_new alc861_base_mixer[] = {
         /* output mixer control */
         HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
@@ -14935,7 +15500,7 @@ static struct snd_kcontrol_new alc861_base_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861_3ST_mixer[] = {
+static const struct snd_kcontrol_new alc861_3ST_mixer[] = {
         /* output mixer control */
         HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
@@ -14966,7 +15531,7 @@ static struct snd_kcontrol_new alc861_3ST_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861_toshiba_mixer[] = {
+static const struct snd_kcontrol_new alc861_toshiba_mixer[] = {
         /* output mixer control */
         HDA_CODEC_MUTE("Master Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x15, 0x01, HDA_INPUT),
@@ -14975,7 +15540,7 @@ static struct snd_kcontrol_new alc861_toshiba_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
+static const struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
         /* output mixer control */
         HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
@@ -15006,7 +15571,7 @@ static struct snd_kcontrol_new alc861_uniwill_m31_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861_asus_mixer[] = {
+static const struct snd_kcontrol_new alc861_asus_mixer[] = {
         /* output mixer control */
         HDA_CODEC_MUTE("Front Playback Switch", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Surround Playback Switch", 0x06, 0x0, HDA_OUTPUT),
@@ -15038,7 +15603,7 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = {
 };
 
 /* additional mixer */
-static struct snd_kcontrol_new alc861_asus_laptop_mixer[] = {
+static const 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),
         { }
@@ -15047,7 +15612,7 @@ static struct snd_kcontrol_new alc861_asus_laptop_mixer[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc861_base_init_verbs[] = {
+static const struct hda_verb alc861_base_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -15113,7 +15678,7 @@ static struct hda_verb alc861_base_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc861_threestack_init_verbs[] = {
+static const struct hda_verb alc861_threestack_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -15174,7 +15739,7 @@ static struct hda_verb alc861_threestack_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc861_uniwill_m31_init_verbs[] = {
+static const struct hda_verb alc861_uniwill_m31_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -15236,7 +15801,7 @@ static struct hda_verb alc861_uniwill_m31_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc861_asus_init_verbs[] = {
+static const struct hda_verb alc861_asus_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -15302,7 +15867,7 @@ static struct hda_verb alc861_asus_init_verbs[] = {
 };
 
 /* additional init verbs for ASUS laptops */
-static struct hda_verb alc861_asus_laptop_init_verbs[] = {
+static const struct hda_verb alc861_asus_laptop_init_verbs[] = {
         { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x45 }, /* HP-out */
         { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2) }, /* mute line-in */
         { }
@@ -15311,7 +15876,7 @@ static struct hda_verb alc861_asus_laptop_init_verbs[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc861_auto_init_verbs[] = {
+static const struct hda_verb alc861_auto_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -15360,7 +15925,7 @@ static struct hda_verb alc861_auto_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc861_toshiba_init_verbs[] = {
+static const struct hda_verb alc861_toshiba_init_verbs[] = {
         {0x0f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
 
         { }
@@ -15393,26 +15958,26 @@ static void alc861_toshiba_unsol_event(struct hda_codec *codec,
 
 #define ALC861_DIGOUT_NID       0x07
 
-static struct hda_channel_mode alc861_8ch_modes[1] = {
+static const struct hda_channel_mode alc861_8ch_modes[1] = {
         { 8, NULL }
 };
 
-static hda_nid_t alc861_dac_nids[4] = {
+static const hda_nid_t alc861_dac_nids[4] = {
         /* front, surround, clfe, side */
         0x03, 0x06, 0x05, 0x04
 };
 
-static hda_nid_t alc660_dac_nids[3] = {
+static const hda_nid_t alc660_dac_nids[3] = {
         /* front, clfe, surround */
         0x03, 0x05, 0x06
 };
 
-static hda_nid_t alc861_adc_nids[1] = {
+static const hda_nid_t alc861_adc_nids[1] = {
         /* ADC0-2 */
         0x08,
 };
 
-static struct hda_input_mux alc861_capture_source = {
+static const struct hda_input_mux alc861_capture_source = {
         .num_items = 5,
         .items = {
                 { "Mic", 0x0 },
@@ -15462,46 +16027,42 @@ static int alc861_auto_fill_dac_nids(struct hda_codec *codec,
                 dac = alc861_look_for_dac(codec, nid);
                 if (!dac)
                         continue;
-                spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
+                spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
         return 0;
 }
 
-static int alc861_create_out_sw(struct hda_codec *codec, const char *pfx,
-                                hda_nid_t nid, unsigned int chs)
+static int __alc861_create_out_sw(struct hda_codec *codec, const char *pfx,
+                                  hda_nid_t nid, int idx, unsigned int chs)
 {
-        return add_pb_sw_ctrl(codec->spec, ALC_CTL_WIDGET_MUTE, pfx,
+        return __add_pb_sw_ctrl(codec->spec, ALC_CTL_WIDGET_MUTE, pfx, idx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
 }
 
+#define alc861_create_out_sw(codec, pfx, nid, chs) \
+        __alc861_create_out_sw(codec, pfx, nid, 0, chs)
+
 /* add playback controls from the parsed DAC table */
 static int alc861_auto_create_multi_out_ctls(struct hda_codec *codec,
                                              const struct auto_pin_cfg *cfg)
 {
         struct alc_spec *spec = codec->spec;
-        static const char *chname[4] = {
+        static const char * const chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
         };
+        const char *pfx = alc_get_line_out_pfx(spec, true);
         hda_nid_t nid;
-        int i, err;
+        int i, err, noutputs;
 
-        if (cfg->line_outs == 1) {
-                const char *pfx = NULL;
-                if (!cfg->hp_outs)
-                        pfx = "Master";
-                else if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                        pfx = "Speaker";
-                if (pfx) {
-                        nid = spec->multiout.dac_nids[0];
-                        return alc861_create_out_sw(codec, pfx, nid, 3);
-                }
-        }
+        noutputs = cfg->line_outs;
+        if (spec->multi_ios > 0)
+                noutputs += spec->multi_ios;
 
-        for (i = 0; i < cfg->line_outs; i++) {
+        for (i = 0; i < noutputs; i++) {
                 nid = spec->multiout.dac_nids[i];
                 if (!nid)
                         continue;
-                if (i == 2) {
+                if (!pfx && i == 2) {
                         /* Center/LFE */
                         err = alc861_create_out_sw(codec, "Center", nid, 1);
                         if (err < 0)
@@ -15510,7 +16071,13 @@ static int alc861_auto_create_multi_out_ctls(struct hda_codec *codec,
                         if (err < 0)
                                 return err;
                 } else {
-                        err = alc861_create_out_sw(codec, chname[i], nid, 3);
+                        const char *name = pfx;
+                        int index = i;
+                        if (!name) {
+                                name = chname[i];
+                                index = 0;
+                        }
+                        err = __alc861_create_out_sw(codec, name, nid, index, 3);
                         if (err < 0)
                                 return err;
                 }
@@ -15606,12 +16173,13 @@ static void alc861_auto_init_hp_out(struct hda_codec *codec)
 static void alc861_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (nid >= 0x0c && nid <= 0x11)
-                        alc_set_input_pin(codec, nid, i);
+                        alc_set_input_pin(codec, nid, cfg->inputs[i].type);
         }
 }
 
@@ -15623,7 +16191,7 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc861_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc861_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc861_ignore);
@@ -15635,6 +16203,9 @@ static int alc861_parse_auto_config(struct hda_codec *codec)
         err = alc861_auto_fill_dac_nids(codec, &spec->autocfg);
         if (err < 0)
                 return err;
+        err = alc_auto_add_multi_channel_mode(codec);
+        if (err < 0)
+                return err;
         err = alc861_auto_create_multi_out_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -15679,7 +16250,7 @@ static void alc861_auto_init(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list alc861_loopbacks[] = {
+static const struct hda_amp_list alc861_loopbacks[] = {
         { 0x15, HDA_INPUT, 0 },
         { 0x15, HDA_INPUT, 1 },
         { 0x15, HDA_INPUT, 2 },
@@ -15692,7 +16263,7 @@ static struct hda_amp_list alc861_loopbacks[] = {
 /*
  * configuration and preset
  */
-static const char *alc861_models[ALC861_MODEL_LAST] = {
+static const char * const alc861_models[ALC861_MODEL_LAST] = {
         [ALC861_3ST]            = "3stack",
         [ALC660_3ST]            = "3stack-660",
         [ALC861_3ST_DIG]        = "3stack-dig",
@@ -15704,7 +16275,7 @@ static const char *alc861_models[ALC861_MODEL_LAST] = {
         [ALC861_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc861_cfg_tbl[] = {
+static const struct snd_pci_quirk alc861_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC861_3ST),
         SND_PCI_QUIRK(0x1043, 0x1335, "ASUS F2/3", ALC861_ASUS_LAPTOP),
         SND_PCI_QUIRK(0x1043, 0x1338, "ASUS F2/3", ALC861_ASUS_LAPTOP),
@@ -15728,7 +16299,7 @@ static struct snd_pci_quirk alc861_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc861_presets[] = {
+static const struct alc_config_preset alc861_presets[] = {
         [ALC861_3ST] = {
                 .mixers = { alc861_3ST_mixer },
                 .init_verbs = { alc861_threestack_init_verbs },
@@ -15840,19 +16411,18 @@ enum {
         PINFIX_FSC_AMILO_PI1505,
 };
 
-static struct alc_pincfg alc861_fsc_amilo_pi1505_pinfix[] = {
-        { 0x0b, 0x0221101f }, /* HP */
-        { 0x0f, 0x90170310 }, /* speaker */
-        { }
-};
-
 static const struct alc_fixup alc861_fixups[] = {
         [PINFIX_FSC_AMILO_PI1505] = {
-                .pins = alc861_fsc_amilo_pi1505_pinfix
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x0b, 0x0221101f }, /* HP */
+                        { 0x0f, 0x90170310 }, /* speaker */
+                        { }
+                }
         },
 };
 
-static struct snd_pci_quirk alc861_fixup_tbl[] = {
+static const struct snd_pci_quirk alc861_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}
 };
@@ -15879,8 +16449,10 @@ static int patch_alc861(struct hda_codec *codec)
                 board_config = ALC861_AUTO;
         }
 
-        if (board_config == ALC861_AUTO)
-                alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 1);
+        if (board_config == ALC861_AUTO) {
+                alc_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
 
         if (board_config == ALC861_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -15917,8 +16489,7 @@ static int patch_alc861(struct hda_codec *codec)
 
         spec->vmaster_nid = 0x03;
 
-        if (board_config == ALC861_AUTO)
-                alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 0);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC861_AUTO) {
@@ -15944,7 +16515,7 @@ static int patch_alc861(struct hda_codec *codec)
  */
 #define ALC861VD_DIGOUT_NID     0x06
 
-static hda_nid_t alc861vd_dac_nids[4] = {
+static const hda_nid_t alc861vd_dac_nids[4] = {
         /* front, surr, clfe, side surr */
         0x02, 0x03, 0x04, 0x05
 };
@@ -15956,21 +16527,21 @@ static hda_nid_t alc861vd_dac_nids[4] = {
  * - and it is the same as in 861vd.
  * adc_nids in ALC660vd are (is) the same as in 861vd
  */
-static hda_nid_t alc660vd_dac_nids[3] = {
+static const hda_nid_t alc660vd_dac_nids[3] = {
         /* front, rear, clfe, rear_surr */
         0x02, 0x04, 0x03
 };
 
-static hda_nid_t alc861vd_adc_nids[1] = {
+static const hda_nid_t alc861vd_adc_nids[1] = {
         /* ADC0 */
         0x09,
 };
 
-static hda_nid_t alc861vd_capsrc_nids[1] = { 0x22 };
+static const hda_nid_t alc861vd_capsrc_nids[1] = { 0x22 };
 
 /* input MUX */
 /* FIXME: should be a matrix-type input source selection */
-static struct hda_input_mux alc861vd_capture_source = {
+static const struct hda_input_mux alc861vd_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -15980,15 +16551,15 @@ static struct hda_input_mux alc861vd_capture_source = {
         },
 };
 
-static struct hda_input_mux alc861vd_dallas_capture_source = {
+static const struct hda_input_mux alc861vd_dallas_capture_source = {
         .num_items = 2,
         .items = {
-                { "Ext Mic", 0x0 },
-                { "Int Mic", 0x1 },
+                { "Mic", 0x0 },
+                { "Internal Mic", 0x1 },
         },
 };
 
-static struct hda_input_mux alc861vd_hp_capture_source = {
+static const struct hda_input_mux alc861vd_hp_capture_source = {
         .num_items = 2,
         .items = {
                 { "Front Mic", 0x0 },
@@ -15999,14 +16570,14 @@ static struct hda_input_mux alc861vd_hp_capture_source = {
 /*
  * 2ch mode
  */
-static struct hda_channel_mode alc861vd_3stack_2ch_modes[1] = {
+static const struct hda_channel_mode alc861vd_3stack_2ch_modes[1] = {
         { 2, NULL }
 };
 
 /*
  * 6ch mode
  */
-static struct hda_verb alc861vd_6stack_ch6_init[] = {
+static const struct hda_verb alc861vd_6stack_ch6_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -16017,7 +16588,7 @@ static struct hda_verb alc861vd_6stack_ch6_init[] = {
 /*
  * 8ch mode
  */
-static struct hda_verb alc861vd_6stack_ch8_init[] = {
+static const struct hda_verb alc861vd_6stack_ch8_init[] = {
         { 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -16025,12 +16596,12 @@ static struct hda_verb alc861vd_6stack_ch8_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc861vd_6stack_modes[2] = {
+static const struct hda_channel_mode alc861vd_6stack_modes[2] = {
         { 6, alc861vd_6stack_ch6_init },
         { 8, alc861vd_6stack_ch8_init },
 };
 
-static struct snd_kcontrol_new alc861vd_chmode_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -16044,7 +16615,7 @@ static struct snd_kcontrol_new alc861vd_chmode_mixer[] = {
 /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
  */
-static struct snd_kcontrol_new alc861vd_6st_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_6st_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
 
@@ -16063,11 +16634,11 @@ static struct snd_kcontrol_new alc861vd_6st_mixer[] = {
 
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
 
@@ -16080,17 +16651,17 @@ static struct snd_kcontrol_new alc861vd_6st_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861vd_3st_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_3st_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
 
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
 
@@ -16103,18 +16674,18 @@ static struct snd_kcontrol_new alc861vd_3st_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         /*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
 
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
 
@@ -16125,26 +16696,26 @@ static struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
 };
 
 /* Pin assignment: Speaker=0x14, HP = 0x15,
- *                 Ext Mic=0x18, Int Mic = 0x19, CD = 0x1c, PC Beep = 0x1d
+ *                 Mic=0x18, Internal Mic = 0x19, CD = 0x1c, PC Beep = 0x1d
  */
-static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_dallas_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Speaker Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
 /* Pin assignment: Speaker=0x14, Line-out = 0x15,
  *                 Front Mic=0x18, ATAPI Mic = 0x19,
  */
-static struct snd_kcontrol_new alc861vd_hp_mixer[] = {
+static const struct snd_kcontrol_new alc861vd_hp_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -16160,7 +16731,7 @@ static struct snd_kcontrol_new alc861vd_hp_mixer[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc861vd_volume_init_verbs[] = {
+static const struct hda_verb alc861vd_volume_init_verbs[] = {
         /*
          * Unmute ADC0 and set the default input to mic-in
          */
@@ -16210,7 +16781,7 @@ static struct hda_verb alc861vd_volume_init_verbs[] = {
  * 3-stack pin configuration:
  * front = 0x14, mic/clfe = 0x18, HP = 0x19, line/surr = 0x1a, f-mic = 0x1b
  */
-static struct hda_verb alc861vd_3stack_init_verbs[] = {
+static const struct hda_verb alc861vd_3stack_init_verbs[] = {
         /*
          * Set pin mode and muting
          */
@@ -16241,7 +16812,7 @@ static struct hda_verb alc861vd_3stack_init_verbs[] = {
 /*
  * 6-stack pin configuration:
  */
-static struct hda_verb alc861vd_6stack_init_verbs[] = {
+static const struct hda_verb alc861vd_6stack_init_verbs[] = {
         /*
          * Set pin mode and muting
          */
@@ -16282,18 +16853,18 @@ static struct hda_verb alc861vd_6stack_init_verbs[] = {
         { }
 };
 
-static struct hda_verb alc861vd_eapd_verbs[] = {
+static const struct hda_verb alc861vd_eapd_verbs[] = {
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
-static struct hda_verb alc660vd_eapd_verbs[] = {
+static const struct hda_verb alc660vd_eapd_verbs[] = {
         {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
         {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
-static struct hda_verb alc861vd_lenovo_unsol_verbs[] = {
+static const struct hda_verb alc861vd_lenovo_unsol_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
@@ -16302,29 +16873,19 @@ static struct hda_verb alc861vd_lenovo_unsol_verbs[] = {
         {}
 };
 
-static void alc861vd_lenovo_mic_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x18);
-        bits = present ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
 static void alc861vd_lenovo_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         spec->autocfg.hp_pins[0] = 0x1b;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc861vd_lenovo_init_hook(struct hda_codec *codec)
 {
-        alc_automute_amp(codec);
-        alc861vd_lenovo_mic_automute(codec);
+        alc_hp_automute(codec);
+        alc88x_simple_mic_automute(codec);
 }
 
 static void alc861vd_lenovo_unsol_event(struct hda_codec *codec,
@@ -16332,15 +16893,15 @@ static void alc861vd_lenovo_unsol_event(struct hda_codec *codec,
 {
         switch (res >> 26) {
         case ALC880_MIC_EVENT:
-                alc861vd_lenovo_mic_automute(codec);
+                alc88x_simple_mic_automute(codec);
                 break;
         default:
-                alc_automute_amp_unsol_event(codec, res);
+                alc_sku_unsol_event(codec, res);
                 break;
         }
 }
 
-static struct hda_verb alc861vd_dallas_verbs[] = {
+static const struct hda_verb alc861vd_dallas_verbs[] = {
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
@@ -16392,6 +16953,8 @@ static void alc861vd_dallas_setup(struct hda_codec *codec)
 
         spec->autocfg.hp_pins[0] = 0x15;
         spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
@@ -16407,7 +16970,7 @@ static void alc861vd_dallas_setup(struct hda_codec *codec)
 /*
  * configuration and preset
  */
-static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {
+static const char * const alc861vd_models[ALC861VD_MODEL_LAST] = {
         [ALC660VD_3ST]          = "3stack-660",
         [ALC660VD_3ST_DIG]      = "3stack-660-digout",
         [ALC660VD_ASUS_V1S]     = "asus-v1s",
@@ -16420,7 +16983,7 @@ static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {
         [ALC861VD_AUTO]         = "auto",
 };
 
-static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
+static const struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
         SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),
         SND_PCI_QUIRK(0x1043, 0x12e2, "Asus z35m", ALC660VD_3ST),
@@ -16439,7 +17002,7 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         {}
 };
 
-static struct alc_config_preset alc861vd_presets[] = {
+static const struct alc_config_preset alc861vd_presets[] = {
         [ALC660VD_3ST] = {
                 .mixers = { alc861vd_3st_mixer },
                 .init_verbs = { alc861vd_volume_init_verbs,
@@ -16516,9 +17079,9 @@ static struct alc_config_preset alc861vd_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
                 .channel_mode = alc861vd_3stack_2ch_modes,
                 .input_mux = &alc861vd_dallas_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc861vd_dallas_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC861VD_HP] = {
                 .mixers = { alc861vd_hp_mixer },
@@ -16529,9 +17092,9 @@ static struct alc_config_preset alc861vd_presets[] = {
                 .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
                 .channel_mode = alc861vd_3stack_2ch_modes,
                 .input_mux = &alc861vd_hp_capture_source,
-                .unsol_event = alc_automute_amp_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc861vd_dallas_setup,
-                .init_hook = alc_automute_amp,
+                .init_hook = alc_hp_automute,
         },
         [ALC660VD_ASUS_V1S] = {
                 .mixers = { alc861vd_lenovo_mixer },
@@ -16557,7 +17120,7 @@ static struct alc_config_preset alc861vd_presets[] = {
 static int alc861vd_auto_create_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        return alc_auto_create_input_ctls(codec, cfg, 0x15, 0x09, 0);
+        return alc_auto_create_input_ctls(codec, cfg, 0x0b, 0x22, 0);
 }
 
 
@@ -16600,12 +17163,13 @@ static void alc861vd_auto_init_hp_out(struct hda_codec *codec)
 static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (alc_is_input_pin(codec, nid)) {
-                        alc_set_input_pin(codec, nid, i);
+                        alc_set_input_pin(codec, nid, cfg->inputs[i].type);
                         if (nid != ALC861VD_PIN_CD_NID &&
                             (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
@@ -16626,11 +17190,18 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
 static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
-        static const char *chname[4] = {"Front", "Surround", "CLFE", "Side"};
+        static const char * const chname[4] = {
+                "Front", "Surround", "CLFE", "Side"
+        };
+        const char *pfx = alc_get_line_out_pfx(spec, true);
         hda_nid_t nid_v, nid_s;
-        int i, err;
+        int i, err, noutputs;
 
-        for (i = 0; i < cfg->line_outs; i++) {
+        noutputs = cfg->line_outs;
+        if (spec->multi_ios > 0)
+                noutputs += spec->multi_ios;
+
+        for (i = 0; i < noutputs; i++) {
                 if (!spec->multiout.dac_nids[i])
                         continue;
                 nid_v = alc861vd_idx_to_mixer_vol(
@@ -16640,7 +17211,7 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                                 alc880_dac_to_idx(
                                         spec->multiout.dac_nids[i]));
 
-                if (i == 2) {
+                if (!pfx && i == 2) {
                         /* Center/LFE */
                         err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
                                               "Center",
@@ -16667,24 +17238,20 @@ static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                         if (err < 0)
                                 return err;
                 } else {
-                        const char *pfx;
-                        if (cfg->line_outs == 1 &&
-                            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) {
-                                if (!cfg->hp_pins)
-                                        pfx = "Speaker";
-                                else
-                                        pfx = "PCM";
-                        } else
-                                pfx = chname[i];
-                        err = add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
+                        const char *name = pfx;
+                        int index = i;
+                        if (!name) {
+                                name = chname[i];
+                                index = 0;
+                        }
+                        err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL,
+                                                name, index,
                                           HDA_COMPOSE_AMP_VAL(nid_v, 3, 0,
                                                               HDA_OUTPUT));
                         if (err < 0)
                                 return err;
-                        if (cfg->line_outs == 1 &&
-                            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                                pfx = "Speaker";
-                        err = add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE, pfx,
+                        err = __add_pb_sw_ctrl(spec, ALC_CTL_BIND_MUTE,
+                                               name, index,
                                           HDA_COMPOSE_AMP_VAL(nid_s, 3, 2,
                                                               HDA_INPUT));
                         if (err < 0)
@@ -16747,7 +17314,7 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc861vd_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc861vd_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc861vd_ignore);
@@ -16759,6 +17326,9 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
         err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
         if (err < 0)
                 return err;
+        err = alc_auto_add_multi_channel_mode(codec);
+        if (err < 0)
+                return err;
         err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -16815,20 +17385,19 @@ enum {
 };
 
 /* reset GPIO1 */
-static const struct hda_verb alc660vd_fix_asus_gpio1_verbs[] = {
-        {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
-        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
-        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
-        { }
-};
-
 static const struct alc_fixup alc861vd_fixups[] = {
         [ALC660VD_FIX_ASUS_GPIO1] = {
-                .verbs = alc660vd_fix_asus_gpio1_verbs,
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
+                        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+                        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+                        { }
+                }
         },
 };
 
-static struct snd_pci_quirk alc861vd_fixup_tbl[] = {
+static const struct snd_pci_quirk alc861vd_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1339, "ASUS A7-K", ALC660VD_FIX_ASUS_GPIO1),
         {}
 };
@@ -16854,8 +17423,10 @@ static int patch_alc861vd(struct hda_codec *codec)
                 board_config = ALC861VD_AUTO;
         }
 
-        if (board_config == ALC861VD_AUTO)
-                alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 1);
+        if (board_config == ALC861VD_AUTO) {
+                alc_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
+        }
 
         if (board_config == ALC861VD_AUTO) {
                 /* automatic parse from the BIOS config */
@@ -16903,13 +17474,13 @@ static int patch_alc861vd(struct hda_codec *codec)
 
         spec->vmaster_nid = 0x02;
 
-        if (board_config == ALC861VD_AUTO)
-                alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 0);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         codec->patch_ops = alc_patch_ops;
 
         if (board_config == ALC861VD_AUTO)
                 spec->init_hook = alc861vd_auto_init;
+        spec->shutup = alc_eapd_shutup;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc861vd_loopbacks;
@@ -16932,32 +17503,32 @@ static int patch_alc861vd(struct hda_codec *codec)
 #define ALC662_DIGOUT_NID       0x06
 #define ALC662_DIGIN_NID        0x0a
 
-static hda_nid_t alc662_dac_nids[4] = {
-        /* front, rear, clfe, rear_surr */
+static const hda_nid_t alc662_dac_nids[3] = {
+        /* front, rear, clfe */
         0x02, 0x03, 0x04
 };
 
-static hda_nid_t alc272_dac_nids[2] = {
+static const hda_nid_t alc272_dac_nids[2] = {
         0x02, 0x03
 };
 
-static hda_nid_t alc662_adc_nids[2] = {
+static const hda_nid_t alc662_adc_nids[2] = {
         /* ADC1-2 */
         0x09, 0x08
 };
 
-static hda_nid_t alc272_adc_nids[1] = {
+static const hda_nid_t alc272_adc_nids[1] = {
         /* ADC1-2 */
         0x08,
 };
 
-static hda_nid_t alc662_capsrc_nids[2] = { 0x22, 0x23 };
-static hda_nid_t alc272_capsrc_nids[1] = { 0x23 };
+static const hda_nid_t alc662_capsrc_nids[2] = { 0x22, 0x23 };
+static const hda_nid_t alc272_capsrc_nids[1] = { 0x23 };
 
 
 /* input MUX */
 /* FIXME: should be a matrix-type input source selection */
-static struct hda_input_mux alc662_capture_source = {
+static const struct hda_input_mux alc662_capture_source = {
         .num_items = 4,
         .items = {
                 { "Mic", 0x0 },
@@ -16967,7 +17538,7 @@ static struct hda_input_mux alc662_capture_source = {
         },
 };
 
-static struct hda_input_mux alc662_lenovo_101e_capture_source = {
+static const struct hda_input_mux alc662_lenovo_101e_capture_source = {
         .num_items = 2,
         .items = {
                 { "Mic", 0x1 },
@@ -16975,7 +17546,7 @@ static struct hda_input_mux alc662_lenovo_101e_capture_source = {
         },
 };
 
-static struct hda_input_mux alc663_capture_source = {
+static const struct hda_input_mux alc663_capture_source = {
         .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
@@ -16985,7 +17556,7 @@ static struct hda_input_mux alc663_capture_source = {
 };
 
 #if 0 /* set to 1 for testing other input sources below */
-static struct hda_input_mux alc272_nc10_capture_source = {
+static const struct hda_input_mux alc272_nc10_capture_source = {
         .num_items = 16,
         .items = {
                 { "Autoselect Mic", 0x0 },
@@ -17011,14 +17582,14 @@ static struct hda_input_mux alc272_nc10_capture_source = {
 /*
  * 2ch mode
  */
-static struct hda_channel_mode alc662_3ST_2ch_modes[1] = {
+static const struct hda_channel_mode alc662_3ST_2ch_modes[1] = {
         { 2, NULL }
 };
 
 /*
  * 2ch mode
  */
-static struct hda_verb alc662_3ST_ch2_init[] = {
+static const struct hda_verb alc662_3ST_ch2_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
         { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
@@ -17029,7 +17600,7 @@ static struct hda_verb alc662_3ST_ch2_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc662_3ST_ch6_init[] = {
+static const struct hda_verb alc662_3ST_ch6_init[] = {
         { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
         { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 },
@@ -17039,7 +17610,7 @@ static struct hda_verb alc662_3ST_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc662_3ST_6ch_modes[2] = {
+static const struct hda_channel_mode alc662_3ST_6ch_modes[2] = {
         { 2, alc662_3ST_ch2_init },
         { 6, alc662_3ST_ch6_init },
 };
@@ -17047,7 +17618,7 @@ static struct hda_channel_mode alc662_3ST_6ch_modes[2] = {
 /*
  * 2ch mode
  */
-static struct hda_verb alc662_sixstack_ch6_init[] = {
+static const struct hda_verb alc662_sixstack_ch6_init[] = {
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x00 },
         { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -17057,14 +17628,14 @@ static struct hda_verb alc662_sixstack_ch6_init[] = {
 /*
  * 6ch mode
  */
-static struct hda_verb alc662_sixstack_ch8_init[] = {
+static const struct hda_verb alc662_sixstack_ch8_init[] = {
         { 0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
         { } /* end */
 };
 
-static struct hda_channel_mode alc662_5stack_modes[2] = {
+static const struct hda_channel_mode alc662_5stack_modes[2] = {
         { 2, alc662_sixstack_ch6_init },
         { 6, alc662_sixstack_ch8_init },
 };
@@ -17073,7 +17644,7 @@ static struct hda_channel_mode alc662_5stack_modes[2] = {
  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
  */
 
-static struct snd_kcontrol_new alc662_base_mixer[] = {
+static const struct snd_kcontrol_new alc662_base_mixer[] = {
         /* output mixer control */
         HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),
@@ -17097,7 +17668,7 @@ static struct snd_kcontrol_new alc662_base_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {
+static const struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -17112,7 +17683,7 @@ static struct snd_kcontrol_new alc662_3ST_2ch_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
+static const struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x0c, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -17133,7 +17704,7 @@ static struct snd_kcontrol_new alc662_3ST_6ch_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
+static const struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x02, 2, HDA_INPUT),
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -17146,21 +17717,21 @@ static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = {
+static const struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
 
-        HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("e-Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
+static const struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
         ALC262_HIPPO_MASTER_SWITCH,
         HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -17174,7 +17745,7 @@ static struct snd_kcontrol_new alc662_eeepc_ep20_mixer[] = {
         { } /* end */
 };
 
-static struct hda_bind_ctls alc663_asus_bind_master_vol = {
+static const struct hda_bind_ctls alc663_asus_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
@@ -17183,7 +17754,7 @@ static struct hda_bind_ctls alc663_asus_bind_master_vol = {
         },
 };
 
-static struct hda_bind_ctls alc663_asus_one_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_one_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17192,7 +17763,7 @@ static struct hda_bind_ctls alc663_asus_one_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc663_m51va_mixer[] = {
+static const struct snd_kcontrol_new alc663_m51va_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_one_bind_switch),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
@@ -17200,7 +17771,7 @@ static struct snd_kcontrol_new alc663_m51va_mixer[] = {
         { } /* end */
 };
 
-static struct hda_bind_ctls alc663_asus_tree_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_tree_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17210,7 +17781,7 @@ static struct hda_bind_ctls alc663_asus_tree_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc663_two_hp_m1_mixer[] = {
+static const struct snd_kcontrol_new alc663_two_hp_m1_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_tree_bind_switch),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
@@ -17221,7 +17792,7 @@ static struct snd_kcontrol_new alc663_two_hp_m1_mixer[] = {
         { } /* end */
 };
 
-static struct hda_bind_ctls alc663_asus_four_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_four_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17231,7 +17802,7 @@ static struct hda_bind_ctls alc663_asus_four_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc663_two_hp_m2_mixer[] = {
+static const struct snd_kcontrol_new alc663_two_hp_m2_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_four_bind_switch),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
@@ -17241,7 +17812,7 @@ static struct snd_kcontrol_new alc663_two_hp_m2_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc662_1bjd_mixer[] = {
+static const struct snd_kcontrol_new alc662_1bjd_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -17252,7 +17823,7 @@ static struct snd_kcontrol_new alc662_1bjd_mixer[] = {
         { } /* end */
 };
 
-static struct hda_bind_ctls alc663_asus_two_bind_master_vol = {
+static const struct hda_bind_ctls alc663_asus_two_bind_master_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
@@ -17261,7 +17832,7 @@ static struct hda_bind_ctls alc663_asus_two_bind_master_vol = {
         },
 };
 
-static struct hda_bind_ctls alc663_asus_two_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_two_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17270,7 +17841,7 @@ static struct hda_bind_ctls alc663_asus_two_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc663_asus_21jd_clfe_mixer[] = {
+static const struct snd_kcontrol_new alc663_asus_21jd_clfe_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume",
                                 &alc663_asus_two_bind_master_vol),
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_two_bind_switch),
@@ -17281,7 +17852,7 @@ static struct snd_kcontrol_new alc663_asus_21jd_clfe_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc663_asus_15jd_clfe_mixer[] = {
+static const struct snd_kcontrol_new alc663_asus_15jd_clfe_mixer[] = {
         HDA_BIND_VOL("Master Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_two_bind_switch),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -17291,7 +17862,7 @@ static struct snd_kcontrol_new alc663_asus_15jd_clfe_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc663_g71v_mixer[] = {
+static const struct snd_kcontrol_new alc663_g71v_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Front Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -17300,26 +17871,26 @@ static struct snd_kcontrol_new alc663_g71v_mixer[] = {
 
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc663_g50v_mixer[] = {
+static const struct snd_kcontrol_new alc663_g50v_mixer[] = {
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
         { } /* end */
 };
 
-static struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17331,7 +17902,7 @@ static struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {
         },
 };
 
-static struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {
+static const struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
@@ -17340,7 +17911,7 @@ static struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc663_mode7_mixer[] = {
+static const struct snd_kcontrol_new alc663_mode7_mixer[] = {
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
         HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
@@ -17353,7 +17924,7 @@ static struct snd_kcontrol_new alc663_mode7_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc663_mode8_mixer[] = {
+static const struct snd_kcontrol_new alc663_mode8_mixer[] = {
         HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
         HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
         HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
@@ -17365,7 +17936,7 @@ static struct snd_kcontrol_new alc663_mode8_mixer[] = {
 };
 
 
-static struct snd_kcontrol_new alc662_chmode_mixer[] = {
+static const struct snd_kcontrol_new alc662_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Channel Mode",
@@ -17376,7 +17947,7 @@ static struct snd_kcontrol_new alc662_chmode_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb alc662_init_verbs[] = {
+static const struct hda_verb alc662_init_verbs[] = {
         /* ADC: mute amp left and right */
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -17422,55 +17993,36 @@ static struct hda_verb alc662_init_verbs[] = {
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* always trun on EAPD */
-        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
-        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
-
         { }
 };
 
-static struct hda_verb alc663_init_verbs[] = {
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        { }
-};
-
-static struct hda_verb alc272_init_verbs[] = {
-        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+static const struct hda_verb alc662_eapd_init_verbs[] = {
+        /* always trun on EAPD */
+        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
+        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
         { }
 };
 
-static struct hda_verb alc662_sue_init_verbs[] = {
+static const struct hda_verb alc662_sue_init_verbs[] = {
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},
         {}
 };
 
-static struct hda_verb alc662_eeepc_sue_init_verbs[] = {
+static const struct hda_verb alc662_eeepc_sue_init_verbs[] = {
         {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
         {}
 };
 
 /* Set Unsolicited Event*/
-static struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
+static const struct hda_verb alc662_eeepc_ep20_sue_init_verbs[] = {
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
         {}
 };
 
-static struct hda_verb alc663_m51va_init_verbs[] = {
+static const struct hda_verb alc663_m51va_init_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
@@ -17483,7 +18035,7 @@ static struct hda_verb alc663_m51va_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_21jd_amic_init_verbs[] = {
+static const struct hda_verb alc663_21jd_amic_init_verbs[] = {
         {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x21, AC_VERB_SET_CONNECT_SEL, 0x01},  /* Headphone */
@@ -17494,7 +18046,7 @@ static struct hda_verb alc663_21jd_amic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc662_1bjd_amic_init_verbs[] = {
+static const struct hda_verb alc662_1bjd_amic_init_verbs[] = {
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -17506,7 +18058,7 @@ static struct hda_verb alc662_1bjd_amic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_15jd_amic_init_verbs[] = {
+static const struct hda_verb alc663_15jd_amic_init_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},  /* Headphone */
@@ -17517,7 +18069,7 @@ static struct hda_verb alc663_15jd_amic_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_two_hp_amic_m1_init_verbs[] = {
+static const struct hda_verb alc663_two_hp_amic_m1_init_verbs[] = {
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -17533,7 +18085,7 @@ static struct hda_verb alc663_two_hp_amic_m1_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_two_hp_amic_m2_init_verbs[] = {
+static const struct hda_verb alc663_two_hp_amic_m2_init_verbs[] = {
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -17549,7 +18101,7 @@ static struct hda_verb alc663_two_hp_amic_m2_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_g71v_init_verbs[] = {
+static const struct hda_verb alc663_g71v_init_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         /* {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
         /* {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, */ /* Headphone */
@@ -17564,7 +18116,7 @@ static struct hda_verb alc663_g71v_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_g50v_init_verbs[] = {
+static const struct hda_verb alc663_g50v_init_verbs[] = {
         {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x21, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Headphone */
@@ -17574,7 +18126,7 @@ static struct hda_verb alc663_g50v_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc662_ecs_init_verbs[] = {
+static const struct hda_verb alc662_ecs_init_verbs[] = {
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0x701f},
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
@@ -17582,7 +18134,7 @@ static struct hda_verb alc662_ecs_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc272_dell_zm1_init_verbs[] = {
+static const struct hda_verb alc272_dell_zm1_init_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -17597,7 +18149,7 @@ static struct hda_verb alc272_dell_zm1_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc272_dell_init_verbs[] = {
+static const struct hda_verb alc272_dell_init_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
@@ -17612,7 +18164,7 @@ static struct hda_verb alc272_dell_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_mode7_init_verbs[] = {
+static const struct hda_verb alc663_mode7_init_verbs[] = {
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -17631,7 +18183,7 @@ static struct hda_verb alc663_mode7_init_verbs[] = {
         {}
 };
 
-static struct hda_verb alc663_mode8_init_verbs[] = {
+static const struct hda_verb alc663_mode8_init_verbs[] = {
         {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -17651,61 +18203,29 @@ static struct hda_verb alc663_mode8_init_verbs[] = {
         {}
 };
 
-static struct snd_kcontrol_new alc662_auto_capture_mixer[] = {
+static const struct snd_kcontrol_new alc662_auto_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc272_auto_capture_mixer[] = {
+static const struct snd_kcontrol_new alc272_auto_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
         { } /* end */
 };
 
-static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x14);
-        bits = present ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc662_lenovo_101e_all_automute(struct hda_codec *codec)
+static void alc662_lenovo_101e_setup(struct hda_codec *codec)
 {
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x1b);
-        bits = present ? HDA_AMP_MUTE : 0;
-
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc662_lenovo_101e_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
-{
-        if ((res >> 26) == ALC880_HP_EVENT)
-                alc662_lenovo_101e_all_automute(codec);
-        if ((res >> 26) == ALC880_FRONT_EVENT)
-                alc662_lenovo_101e_ispeaker_automute(codec);
-}
+        struct alc_spec *spec = codec->spec;
 
-/* unsolicited event for HP jack sensing */
-static void alc662_eeepc_unsol_event(struct hda_codec *codec,
-                                     unsigned int res)
-{
-        if ((res >> 26) == ALC880_MIC_EVENT)
-                alc_mic_automute(codec);
-        else
-                alc262_hippo_unsol_event(codec, res);
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.line_out_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x15;
+        spec->automute = 1;
+        spec->detect_line = 1;
+        spec->automute_lines = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc662_eeepc_setup(struct hda_codec *codec)
@@ -17720,180 +18240,24 @@ static void alc662_eeepc_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc662_eeepc_inithook(struct hda_codec *codec)
-{
-        alc262_hippo_automute(codec);
-        alc_mic_automute(codec);
-}
-
 static void alc662_eeepc_ep20_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
         spec->autocfg.hp_pins[0] = 0x14;
         spec->autocfg.speaker_pins[0] = 0x1b;
-}
-
-#define alc662_eeepc_ep20_inithook      alc262_hippo_master_update
-
-static void alc663_m51va_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x21);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc663_21jd_two_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x21);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc663_15jd_two_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x15);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x0e, HDA_INPUT, 1,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc662_f5z_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x1b);
-        bits = present ? 0 : PIN_OUT;
-        snd_hda_codec_write(codec, 0x14, 0,
-                         AC_VERB_SET_PIN_WIDGET_CONTROL, bits);
-}
-
-static void alc663_two_hp_m1_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present1, present2;
-
-        present1 = snd_hda_jack_detect(codec, 0x21);
-        present2 = snd_hda_jack_detect(codec, 0x15);
-
-        if (present1 || present2) {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-        } else {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-        }
-}
-
-static void alc663_two_hp_m2_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present1, present2;
-
-        present1 = snd_hda_jack_detect(codec, 0x1b);
-        present2 = snd_hda_jack_detect(codec, 0x15);
-
-        if (present1 || present2) {
-                snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
-                snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
-        } else {
-                snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
-                                         HDA_AMP_MUTE, 0);
-                snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
-                                         HDA_AMP_MUTE, 0);
-        }
-}
-
-static void alc663_two_hp_m7_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present1, present2;
-
-        present1 = snd_hda_codec_read(codec, 0x1b, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
-        present2 = snd_hda_codec_read(codec, 0x21, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
-
-        if (present1 || present2) {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-                snd_hda_codec_write_cache(codec, 0x17, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-        } else {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-                snd_hda_codec_write_cache(codec, 0x17, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-        }
-}
-
-static void alc663_two_hp_m8_speaker_automute(struct hda_codec *codec)
-{
-        unsigned int present1, present2;
-
-        present1 = snd_hda_codec_read(codec, 0x21, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
-        present2 = snd_hda_codec_read(codec, 0x15, 0,
-                        AC_VERB_GET_PIN_SENSE, 0)
-                        & AC_PINSENSE_PRESENCE;
-
-        if (present1 || present2) {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-                snd_hda_codec_write_cache(codec, 0x17, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-        } else {
-                snd_hda_codec_write_cache(codec, 0x14, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-                snd_hda_codec_write_cache(codec, 0x17, 0,
-                        AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
-        }
-}
-
-static void alc663_m51va_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
-{
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_m51va_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc663_m51va_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x12;
@@ -17901,18 +18265,15 @@ static void alc663_m51va_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-static void alc663_m51va_inithook(struct hda_codec *codec)
-{
-        alc663_m51va_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
-
 /* ***************** Mode1 ******************************/
-#define alc663_mode1_unsol_event        alc663_m51va_unsol_event
-
 static void alc663_mode1_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
         spec->ext_mic.pin = 0x18;
         spec->ext_mic.mux_idx = 0;
         spec->int_mic.pin = 0x19;
@@ -17920,256 +18281,171 @@ static void alc663_mode1_setup(struct hda_codec *codec)
         spec->auto_mic = 1;
 }
 
-#define alc663_mode1_inithook           alc663_m51va_inithook
-
 /* ***************** Mode2 ******************************/
-static void alc662_mode2_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc662_mode2_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc662_f5z_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
-#define alc662_mode2_setup      alc663_mode1_setup
-
-static void alc662_mode2_inithook(struct hda_codec *codec)
-{
-        alc662_f5z_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
 /* ***************** Mode3 ******************************/
-static void alc663_mode3_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode3_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_two_hp_m1_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
-#define alc663_mode3_setup      alc663_mode1_setup
-
-static void alc663_mode3_inithook(struct hda_codec *codec)
-{
-        alc663_two_hp_m1_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
 /* ***************** Mode4 ******************************/
-static void alc663_mode4_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode4_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_21jd_two_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[1] = 0x16;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute_mixer_nid[1] = 0x0e;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
-#define alc663_mode4_setup      alc663_mode1_setup
-
-static void alc663_mode4_inithook(struct hda_codec *codec)
-{
-        alc663_21jd_two_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
 /* ***************** Mode5 ******************************/
-static void alc663_mode5_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode5_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_15jd_two_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[1] = 0x16;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute_mixer_nid[1] = 0x0e;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
-#define alc663_mode5_setup      alc663_mode1_setup
-
-static void alc663_mode5_inithook(struct hda_codec *codec)
-{
-        alc663_15jd_two_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
 /* ***************** Mode6 ******************************/
-static void alc663_mode6_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode6_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_two_hp_m2_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
-
-#define alc663_mode6_setup      alc663_mode1_setup
-
-static void alc663_mode6_inithook(struct hda_codec *codec)
-{
-        alc663_two_hp_m2_speaker_automute(codec);
-        alc_mic_automute(codec);
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.hp_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute_mixer_nid[0] = 0x0c;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_MIXER;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
 /* ***************** Mode7 ******************************/
-static void alc663_mode7_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode7_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_two_hp_m7_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
-
-#define alc663_mode7_setup      alc663_mode1_setup
-
-static void alc663_mode7_inithook(struct hda_codec *codec)
-{
-        alc663_two_hp_m7_speaker_automute(codec);
-        alc_mic_automute(codec);
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x1b;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x19;
+        spec->int_mic.mux_idx = 1;
+        spec->auto_mic = 1;
 }
 
 /* ***************** Mode8 ******************************/
-static void alc663_mode8_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
-{
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_two_hp_m8_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
-
-#define alc663_mode8_setup      alc663_m51va_setup
-
-static void alc663_mode8_inithook(struct hda_codec *codec)
-{
-        alc663_two_hp_m8_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
-
-static void alc663_g71v_hp_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x21);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc663_g71v_front_automute(struct hda_codec *codec)
-{
-        unsigned int present;
-        unsigned char bits;
-
-        present = snd_hda_jack_detect(codec, 0x15);
-        bits = present ? HDA_AMP_MUTE : 0;
-        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
-                                 HDA_AMP_MUTE, bits);
-}
-
-static void alc663_g71v_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_mode8_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_g71v_hp_automute(codec);
-                break;
-        case ALC880_FRONT_EVENT:
-                alc663_g71v_front_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
-}
-
-#define alc663_g71v_setup       alc663_m51va_setup
-
-static void alc663_g71v_inithook(struct hda_codec *codec)
-{
-        alc663_g71v_front_automute(codec);
-        alc663_g71v_hp_automute(codec);
-        alc_mic_automute(codec);
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.hp_pins[1] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->autocfg.speaker_pins[0] = 0x17;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_PIN;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x12;
+        spec->int_mic.mux_idx = 9;
+        spec->auto_mic = 1;
 }
 
-static void alc663_g50v_unsol_event(struct hda_codec *codec,
-                                           unsigned int res)
+static void alc663_g71v_setup(struct hda_codec *codec)
 {
-        switch (res >> 26) {
-        case ALC880_HP_EVENT:
-                alc663_m51va_speaker_automute(codec);
-                break;
-        case ALC880_MIC_EVENT:
-                alc_mic_automute(codec);
-                break;
-        }
+        struct alc_spec *spec = codec->spec;
+        spec->autocfg.hp_pins[0] = 0x21;
+        spec->autocfg.line_out_pins[0] = 0x15;
+        spec->autocfg.speaker_pins[0] = 0x14;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
+        spec->detect_line = 1;
+        spec->automute_lines = 1;
+        spec->ext_mic.pin = 0x18;
+        spec->ext_mic.mux_idx = 0;
+        spec->int_mic.pin = 0x12;
+        spec->int_mic.mux_idx = 9;
+        spec->auto_mic = 1;
 }
 
 #define alc663_g50v_setup       alc663_m51va_setup
 
-static void alc663_g50v_inithook(struct hda_codec *codec)
-{
-        alc663_m51va_speaker_automute(codec);
-        alc_mic_automute(codec);
-}
-
-static struct snd_kcontrol_new alc662_ecs_mixer[] = {
+static const struct snd_kcontrol_new alc662_ecs_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         ALC262_HIPPO_MASTER_SWITCH,
 
-        HDA_CODEC_VOLUME("e-Mic/LineIn Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("e-Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("e-Mic/LineIn Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic/LineIn Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic/LineIn Playback Switch", 0x0b, 0x0, HDA_INPUT),
 
-        HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-        HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new alc272_nc10_mixer[] = {
+static const struct snd_kcontrol_new alc272_nc10_mixer[] = {
         /* Master Playback automatically created from Speaker and Headphone */
         HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
 
-        HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Ext Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 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("Int Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
@@ -18187,11 +18463,11 @@ static struct snd_kcontrol_new alc272_nc10_mixer[] = {
 /*
  * configuration and preset
  */
-static const char *alc662_models[ALC662_MODEL_LAST] = {
+static const char * const alc662_models[ALC662_MODEL_LAST] = {
         [ALC662_3ST_2ch_DIG]    = "3stack-dig",
         [ALC662_3ST_6ch_DIG]    = "3stack-6ch-dig",
         [ALC662_3ST_6ch]        = "3stack-6ch",
-        [ALC662_5ST_DIG]        = "6stack-dig",
+        [ALC662_5ST_DIG]        = "5stack-dig",
         [ALC662_LENOVO_101E]    = "lenovo-101e",
         [ALC662_ASUS_EEEPC_P701] = "eeepc-p701",
         [ALC662_ASUS_EEEPC_EP20] = "eeepc-ep20",
@@ -18214,7 +18490,7 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
         [ALC662_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc662_cfg_tbl[] = {
+static const struct snd_pci_quirk alc662_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS),
         SND_PCI_QUIRK(0x1028, 0x02d6, "DELL", ALC272_DELL),
         SND_PCI_QUIRK(0x1028, 0x02f4, "DELL ZM1", ALC272_DELL_ZM1),
@@ -18292,13 +18568,14 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
                                         ALC662_3ST_6ch_DIG),
         SND_PCI_QUIRK_MASK(0x1854, 0xf000, 0x2000, "ASUS H13-200x",
                            ALC663_ASUS_H13),
+        SND_PCI_QUIRK(0x1991, 0x5628, "Ordissimo EVE", ALC662_LENOVO_101E),
         {}
 };
 
-static struct alc_config_preset alc662_presets[] = {
+static const struct alc_config_preset alc662_presets[] = {
         [ALC662_3ST_2ch_DIG] = {
                 .mixers = { alc662_3ST_2ch_mixer },
-                .init_verbs = { alc662_init_verbs },
+                .init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
@@ -18309,7 +18586,7 @@ static struct alc_config_preset alc662_presets[] = {
         },
         [ALC662_3ST_6ch_DIG] = {
                 .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },
-                .init_verbs = { alc662_init_verbs },
+                .init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
@@ -18321,7 +18598,7 @@ static struct alc_config_preset alc662_presets[] = {
         },
         [ALC662_3ST_6ch] = {
                 .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },
-                .init_verbs = { alc662_init_verbs },
+                .init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
@@ -18331,7 +18608,7 @@ static struct alc_config_preset alc662_presets[] = {
         },
         [ALC662_5ST_DIG] = {
                 .mixers = { alc662_base_mixer, alc662_chmode_mixer },
-                .init_verbs = { alc662_init_verbs },
+                .init_verbs = { alc662_init_verbs, alc662_eapd_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
@@ -18342,104 +18619,120 @@ static struct alc_config_preset alc662_presets[] = {
         },
         [ALC662_LENOVO_101E] = {
                 .mixers = { alc662_lenovo_101e_mixer },
-                .init_verbs = { alc662_init_verbs, alc662_sue_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc662_sue_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
                 .input_mux = &alc662_lenovo_101e_capture_source,
-                .unsol_event = alc662_lenovo_101e_unsol_event,
-                .init_hook = alc662_lenovo_101e_all_automute,
+                .unsol_event = alc_sku_unsol_event,
+                .setup = alc662_lenovo_101e_setup,
+                .init_hook = alc_inithook,
         },
         [ALC662_ASUS_EEEPC_P701] = {
                 .mixers = { alc662_eeepc_p701_mixer },
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc662_eeepc_sue_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc662_eeepc_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc662_eeepc_setup,
-                .init_hook = alc662_eeepc_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC662_ASUS_EEEPC_EP20] = {
                 .mixers = { alc662_eeepc_ep20_mixer,
                             alc662_chmode_mixer },
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc662_eeepc_ep20_sue_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
                 .channel_mode = alc662_3ST_6ch_modes,
                 .input_mux = &alc662_lenovo_101e_capture_source,
-                .unsol_event = alc662_eeepc_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc662_eeepc_ep20_setup,
-                .init_hook = alc662_eeepc_ep20_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC662_ECS] = {
                 .mixers = { alc662_ecs_mixer },
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc662_ecs_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc662_eeepc_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc662_eeepc_setup,
-                .init_hook = alc662_eeepc_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_M51VA] = {
                 .mixers = { alc663_m51va_mixer },
-                .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc663_m51va_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_m51va_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_m51va_setup,
-                .init_hook = alc663_m51va_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_G71V] = {
                 .mixers = { alc663_g71v_mixer },
-                .init_verbs = { alc662_init_verbs, alc663_g71v_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc663_g71v_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_g71v_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_g71v_setup,
-                .init_hook = alc663_g71v_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_H13] = {
                 .mixers = { alc663_m51va_mixer },
-                .init_verbs = { alc662_init_verbs, alc663_m51va_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc663_m51va_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_m51va_unsol_event,
-                .init_hook = alc663_m51va_inithook,
+                .setup = alc663_m51va_setup,
+                .unsol_event = alc_sku_unsol_event,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_G50V] = {
                 .mixers = { alc663_g50v_mixer },
-                .init_verbs = { alc662_init_verbs, alc663_g50v_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc663_g50v_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_6ch_modes),
                 .channel_mode = alc662_3ST_6ch_modes,
                 .input_mux = &alc663_capture_source,
-                .unsol_event = alc663_g50v_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_g50v_setup,
-                .init_hook = alc663_g50v_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE1] = {
                 .mixers = { alc663_m51va_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_21jd_amic_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18447,28 +18740,30 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode1_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode1_setup,
-                .init_hook = alc663_mode1_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC662_ASUS_MODE2] = {
                 .mixers = { alc662_1bjd_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc662_1bjd_amic_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc662_mode2_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc662_mode2_setup,
-                .init_hook = alc662_mode2_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE3] = {
                 .mixers = { alc663_two_hp_m1_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_two_hp_amic_m1_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18476,14 +18771,15 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode3_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode3_setup,
-                .init_hook = alc663_mode3_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE4] = {
                 .mixers = { alc663_asus_21jd_clfe_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_21jd_amic_init_verbs},
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18491,14 +18787,15 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode4_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode4_setup,
-                .init_hook = alc663_mode4_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE5] = {
                 .mixers = { alc663_asus_15jd_clfe_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_15jd_amic_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18506,14 +18803,15 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode5_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode5_setup,
-                .init_hook = alc663_mode5_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE6] = {
                 .mixers = { alc663_two_hp_m2_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_two_hp_amic_m2_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18521,14 +18819,15 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode6_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode6_setup,
-                .init_hook = alc663_mode6_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE7] = {
                 .mixers = { alc663_mode7_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_mode7_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18536,14 +18835,15 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode7_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode7_setup,
-                .init_hook = alc663_mode7_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC663_ASUS_MODE8] = {
                 .mixers = { alc663_mode8_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_mode8_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .hp_nid = 0x03,
@@ -18551,52 +18851,57 @@ static struct alc_config_preset alc662_presets[] = {
                 .dig_out_nid = ALC662_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_mode8_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode8_setup,
-                .init_hook = alc663_mode8_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC272_DELL] = {
                 .mixers = { alc663_m51va_mixer },
                 .cap_mixer = alc272_auto_capture_mixer,
-                .init_verbs = { alc662_init_verbs, alc272_dell_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc272_dell_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc272_dac_nids),
-                .dac_nids = alc662_dac_nids,
+                .dac_nids = alc272_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .adc_nids = alc272_adc_nids,
                 .num_adc_nids = ARRAY_SIZE(alc272_adc_nids),
                 .capsrc_nids = alc272_capsrc_nids,
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_m51va_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_m51va_setup,
-                .init_hook = alc663_m51va_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC272_DELL_ZM1] = {
                 .mixers = { alc663_m51va_mixer },
                 .cap_mixer = alc662_auto_capture_mixer,
-                .init_verbs = { alc662_init_verbs, alc272_dell_zm1_init_verbs },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
+                                alc272_dell_zm1_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc272_dac_nids),
-                .dac_nids = alc662_dac_nids,
+                .dac_nids = alc272_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .adc_nids = alc662_adc_nids,
                 .num_adc_nids = 1,
                 .capsrc_nids = alc662_capsrc_nids,
                 .channel_mode = alc662_3ST_2ch_modes,
-                .unsol_event = alc663_m51va_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_m51va_setup,
-                .init_hook = alc663_m51va_inithook,
+                .init_hook = alc_inithook,
         },
         [ALC272_SAMSUNG_NC10] = {
                 .mixers = { alc272_nc10_mixer },
                 .init_verbs = { alc662_init_verbs,
+                                alc662_eapd_init_verbs,
                                 alc663_21jd_amic_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc272_dac_nids),
                 .dac_nids = alc272_dac_nids,
                 .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
                 .channel_mode = alc662_3ST_2ch_modes,
                 /*.input_mux = &alc272_nc10_capture_source,*/
-                .unsol_event = alc663_mode4_unsol_event,
+                .unsol_event = alc_sku_unsol_event,
                 .setup = alc663_mode4_setup,
-                .init_hook = alc663_mode4_inithook,
+                .init_hook = alc_inithook,
         },
 };
 
@@ -18606,43 +18911,79 @@ static struct alc_config_preset alc662_presets[] = {
  */
 
 /* convert from MIX nid to DAC */
-static inline hda_nid_t alc662_mix_to_dac(hda_nid_t nid)
+static hda_nid_t alc_auto_mix_to_dac(struct hda_codec *codec, hda_nid_t nid)
 {
-        if (nid == 0x0f)
-                return 0x02;
-        else if (nid >= 0x0c && nid <= 0x0e)
-                return nid - 0x0c + 0x02;
-        else
-                return 0;
+        hda_nid_t list[5];
+        int i, num;
+
+        num = snd_hda_get_connections(codec, nid, list, ARRAY_SIZE(list));
+        for (i = 0; i < num; i++) {
+                if (get_wcaps_type(get_wcaps(codec, list[i])) == AC_WID_AUD_OUT)
+                        return list[i];
+        }
+        return 0;
+}
+
+/* go down to the selector widget before the mixer */
+static hda_nid_t alc_go_down_to_selector(struct hda_codec *codec, hda_nid_t pin)
+{
+        hda_nid_t srcs[5];
+        int num = snd_hda_get_connections(codec, pin, srcs,
+                                          ARRAY_SIZE(srcs));
+        if (num != 1 ||
+            get_wcaps_type(get_wcaps(codec, srcs[0])) != AC_WID_AUD_SEL)
+                return pin;
+        return srcs[0];
 }
 
 /* get MIX nid connected to the given pin targeted to DAC */
-static hda_nid_t alc662_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,
+static hda_nid_t alc_auto_dac_to_mix(struct hda_codec *codec, hda_nid_t pin,
                                    hda_nid_t dac)
 {
-        hda_nid_t mix[4];
+        hda_nid_t mix[5];
         int i, num;
 
+        pin = alc_go_down_to_selector(codec, pin);
         num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));
         for (i = 0; i < num; i++) {
-                if (alc662_mix_to_dac(mix[i]) == dac)
+                if (alc_auto_mix_to_dac(codec, mix[i]) == dac)
                         return mix[i];
         }
         return 0;
 }
 
+/* select the connection from pin to DAC if needed */
+static int alc_auto_select_dac(struct hda_codec *codec, hda_nid_t pin,
+                               hda_nid_t dac)
+{
+        hda_nid_t mix[5];
+        int i, num;
+
+        pin = alc_go_down_to_selector(codec, pin);
+        num = snd_hda_get_connections(codec, pin, mix, ARRAY_SIZE(mix));
+        if (num < 2)
+                return 0;
+        for (i = 0; i < num; i++) {
+                if (alc_auto_mix_to_dac(codec, mix[i]) == dac) {
+                        snd_hda_codec_update_cache(codec, pin, 0,
+                                                   AC_VERB_SET_CONNECT_SEL, i);
+                        return 0;
+                }
+        }
+        return 0;
+}
+
 /* look for an empty DAC slot */
-static hda_nid_t alc662_look_for_dac(struct hda_codec *codec, hda_nid_t pin)
+static hda_nid_t alc_auto_look_for_dac(struct hda_codec *codec, hda_nid_t pin)
 {
         struct alc_spec *spec = codec->spec;
         hda_nid_t srcs[5];
         int i, j, num;
 
+        pin = alc_go_down_to_selector(codec, pin);
         num = snd_hda_get_connections(codec, pin, srcs, ARRAY_SIZE(srcs));
-        if (num < 0)
-                return 0;
         for (i = 0; i < num; i++) {
-                hda_nid_t nid = alc662_mix_to_dac(srcs[i]);
+                hda_nid_t nid = alc_auto_mix_to_dac(codec, srcs[i]);
                 if (!nid)
                         continue;
                 for (j = 0; j < spec->multiout.num_dacs; j++)
@@ -18664,28 +19005,32 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec,
 
         spec->multiout.dac_nids = spec->private_dac_nids;
         for (i = 0; i < cfg->line_outs; i++) {
-                dac = alc662_look_for_dac(codec, cfg->line_out_pins[i]);
+                dac = alc_auto_look_for_dac(codec, cfg->line_out_pins[i]);
                 if (!dac)
                         continue;
-                spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
+                spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
         return 0;
 }
 
-static inline int alc662_add_vol_ctl(struct alc_spec *spec, const char *pfx,
-                              hda_nid_t nid, unsigned int chs)
+static inline int __alc662_add_vol_ctl(struct alc_spec *spec, const char *pfx,
+                                       hda_nid_t nid, int idx, unsigned int chs)
 {
-        return add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx,
+        return __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, pfx, idx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_OUTPUT));
 }
 
-static inline int alc662_add_sw_ctl(struct alc_spec *spec, const char *pfx,
-                             hda_nid_t nid, unsigned int chs)
+static inline int __alc662_add_sw_ctl(struct alc_spec *spec, const char *pfx,
+                                      hda_nid_t nid, int idx, unsigned int chs)
 {
-        return add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx,
+        return __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, pfx, idx,
                            HDA_COMPOSE_AMP_VAL(nid, chs, 0, HDA_INPUT));
 }
 
+#define alc662_add_vol_ctl(spec, pfx, nid, chs) \
+        __alc662_add_vol_ctl(spec, pfx, nid, 0, chs)
+#define alc662_add_sw_ctl(spec, pfx, nid, chs) \
+        __alc662_add_sw_ctl(spec, pfx, nid, 0, chs)
 #define alc662_add_stereo_vol(spec, pfx, nid) \
         alc662_add_vol_ctl(spec, pfx, nid, 3)
 #define alc662_add_stereo_sw(spec, pfx, nid) \
@@ -18696,20 +19041,29 @@ static int alc662_auto_create_multi_out_ctls(struct hda_codec *codec,
                                              const struct auto_pin_cfg *cfg)
 {
         struct alc_spec *spec = codec->spec;
-        static const char *chname[4] = {
+        static const char * const chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
         };
-        hda_nid_t nid, mix;
-        int i, err;
+        const char *pfx = alc_get_line_out_pfx(spec, true);
+        hda_nid_t nid, mix, pin;
+        int i, err, noutputs;
 
-        for (i = 0; i < cfg->line_outs; i++) {
+        noutputs = cfg->line_outs;
+        if (spec->multi_ios > 0)
+                noutputs += spec->multi_ios;
+
+        for (i = 0; i < noutputs; i++) {
                 nid = spec->multiout.dac_nids[i];
                 if (!nid)
                         continue;
-                mix = alc662_dac_to_mix(codec, cfg->line_out_pins[i], nid);
+                if (i >= cfg->line_outs)
+                        pin = spec->multi_io[i - 1].pin;
+                else
+                        pin = cfg->line_out_pins[i];
+                mix = alc_auto_dac_to_mix(codec, pin, nid);
                 if (!mix)
                         continue;
-                if (i == 2) {
+                if (!pfx && i == 2) {
                         /* Center/LFE */
                         err = alc662_add_vol_ctl(spec, "Center", nid, 1);
                         if (err < 0)
@@ -18724,22 +19078,16 @@ static int alc662_auto_create_multi_out_ctls(struct hda_codec *codec,
                         if (err < 0)
                                 return err;
                 } else {
-                        const char *pfx;
-                        if (cfg->line_outs == 1 &&
-                            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) {
-                                if (cfg->hp_outs)
-                                        pfx = "Speaker";
-                                else
-                                        pfx = "PCM";
-                        } else
-                                pfx = chname[i];
-                        err = alc662_add_vol_ctl(spec, pfx, nid, 3);
+                        const char *name = pfx;
+                        int index = i;
+                        if (!name) {
+                                name = chname[i];
+                                index = 0;
+                        }
+                        err = __alc662_add_vol_ctl(spec, name, nid, index, 3);
                         if (err < 0)
                                 return err;
-                        if (cfg->line_outs == 1 &&
-                            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                                pfx = "Speaker";
-                        err = alc662_add_sw_ctl(spec, pfx, mix, 3);
+                        err = __alc662_add_sw_ctl(spec, name, mix, index, 3);
                         if (err < 0)
                                 return err;
                 }
@@ -18758,7 +19106,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
 
         if (!pin)
                 return 0;
-        nid = alc662_look_for_dac(codec, pin);
+        nid = alc_auto_look_for_dac(codec, pin);
         if (!nid) {
                 /* the corresponding DAC is already occupied */
                 if (!(get_wcaps(codec, pin) & AC_WCAP_OUT_AMP))
@@ -18768,7 +19116,7 @@ static int alc662_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
                                    HDA_COMPOSE_AMP_VAL(pin, 3, 0, HDA_OUTPUT));
         }
 
-        mix = alc662_dac_to_mix(codec, pin, nid);
+        mix = alc_auto_dac_to_mix(codec, pin, nid);
         if (!mix)
                 return 0;
         err = alc662_add_vol_ctl(spec, pfx, nid, 3);
@@ -18792,14 +19140,21 @@ static void alc662_auto_set_output_and_unmute(struct hda_codec *codec,
         hda_nid_t srcs[HDA_MAX_CONNECTIONS];
 
         alc_set_pin_output(codec, nid, pin_type);
-        /* need the manual connection? */
         num = snd_hda_get_connections(codec, nid, srcs, ARRAY_SIZE(srcs));
-        if (num <= 1)
-                return;
         for (i = 0; i < num; i++) {
-                if (alc662_mix_to_dac(srcs[i]) != dac)
+                if (alc_auto_mix_to_dac(codec, srcs[i]) != dac)
                         continue;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, i);
+                /* need the manual connection? */
+                if (num > 1)
+                        snd_hda_codec_write(codec, nid, 0,
+                                            AC_VERB_SET_CONNECT_SEL, i);
+                /* unmute mixer widget inputs */
+                snd_hda_codec_write(codec, srcs[i], 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_IN_UNMUTE(0));
+                snd_hda_codec_write(codec, srcs[i], 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE,
+                                    AMP_IN_UNMUTE(1));
                 return;
         }
 }
@@ -18838,12 +19193,13 @@ static void alc662_auto_init_hp_out(struct hda_codec *codec)
 static void alc662_auto_init_analog_input(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (alc_is_input_pin(codec, nid)) {
-                        alc_set_input_pin(codec, nid, i);
+                        alc_set_input_pin(codec, nid, cfg->inputs[i].type);
                         if (nid != ALC662_PIN_CD_NID &&
                             (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP))
                                 snd_hda_codec_write(codec, nid, 0,
@@ -18855,11 +19211,164 @@ static void alc662_auto_init_analog_input(struct hda_codec *codec)
 
 #define alc662_auto_init_input_src      alc882_auto_init_input_src
 
+/*
+ * multi-io helper
+ */
+static int alc_auto_fill_multi_ios(struct hda_codec *codec,
+                                   unsigned int location)
+{
+        struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int type, i, num_pins = 0;
+
+        for (type = AUTO_PIN_LINE_IN; type >= AUTO_PIN_MIC; type--) {
+                for (i = 0; i < cfg->num_inputs; i++) {
+                        hda_nid_t nid = cfg->inputs[i].pin;
+                        hda_nid_t dac;
+                        unsigned int defcfg, caps;
+                        if (cfg->inputs[i].type != type)
+                                continue;
+                        defcfg = snd_hda_codec_get_pincfg(codec, nid);
+                        if (get_defcfg_connect(defcfg) != AC_JACK_PORT_COMPLEX)
+                                continue;
+                        if (location && get_defcfg_location(defcfg) != location)
+                                continue;
+                        caps = snd_hda_query_pin_caps(codec, nid);
+                        if (!(caps & AC_PINCAP_OUT))
+                                continue;
+                        dac = alc_auto_look_for_dac(codec, nid);
+                        if (!dac)
+                                continue;
+                        spec->multi_io[num_pins].pin = nid;
+                        spec->multi_io[num_pins].dac = dac;
+                        num_pins++;
+                        spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
+                }
+        }
+        spec->multiout.num_dacs = 1;
+        if (num_pins < 2)
+                return 0;
+        return num_pins;
+}
+
+static int alc_auto_ch_mode_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = spec->multi_ios + 1;
+        if (uinfo->value.enumerated.item > spec->multi_ios)
+                uinfo->value.enumerated.item = spec->multi_ios;
+        sprintf(uinfo->value.enumerated.name, "%dch",
+                (uinfo->value.enumerated.item + 1) * 2);
+        return 0;
+}
+
+static int alc_auto_ch_mode_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        ucontrol->value.enumerated.item[0] = (spec->ext_channel_count - 1) / 2;
+        return 0;
+}
+
+static int alc_set_multi_io(struct hda_codec *codec, int idx, bool output)
+{
+        struct alc_spec *spec = codec->spec;
+        hda_nid_t nid = spec->multi_io[idx].pin;
+
+        if (!spec->multi_io[idx].ctl_in)
+                spec->multi_io[idx].ctl_in =
+                        snd_hda_codec_read(codec, nid, 0,
+                                           AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (output) {
+                snd_hda_codec_update_cache(codec, nid, 0,
+                                           AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                           PIN_OUT);
+                if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, 0);
+                alc_auto_select_dac(codec, nid, spec->multi_io[idx].dac);
+        } else {
+                if (get_wcaps(codec, nid) & AC_WCAP_OUT_AMP)
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, HDA_AMP_MUTE);
+                snd_hda_codec_update_cache(codec, nid, 0,
+                                           AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                           spec->multi_io[idx].ctl_in);
+        }
+        return 0;
+}
+
+static int alc_auto_ch_mode_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct alc_spec *spec = codec->spec;
+        int i, ch;
+
+        ch = ucontrol->value.enumerated.item[0];
+        if (ch < 0 || ch > spec->multi_ios)
+                return -EINVAL;
+        if (ch == (spec->ext_channel_count - 1) / 2)
+                return 0;
+        spec->ext_channel_count = (ch + 1) * 2;
+        for (i = 0; i < spec->multi_ios; i++)
+                alc_set_multi_io(codec, i, i < ch);
+        spec->multiout.max_channels = spec->ext_channel_count;
+        return 1;
+}
+
+static const struct snd_kcontrol_new alc_auto_channel_mode_enum = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_auto_ch_mode_info,
+        .get = alc_auto_ch_mode_get,
+        .put = alc_auto_ch_mode_put,
+};
+
+static int alc_auto_add_multi_channel_mode(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        unsigned int location, defcfg;
+        int num_pins;
+
+        if (cfg->line_outs != 1 ||
+            cfg->line_out_type != AUTO_PIN_LINE_OUT)
+                return 0;
+
+        defcfg = snd_hda_codec_get_pincfg(codec, cfg->line_out_pins[0]);
+        location = get_defcfg_location(defcfg);
+
+        num_pins = alc_auto_fill_multi_ios(codec, location);
+        if (num_pins > 0) {
+                struct snd_kcontrol_new *knew;
+
+                knew = alc_kcontrol_new(spec);
+                if (!knew)
+                        return -ENOMEM;
+                *knew = alc_auto_channel_mode_enum;
+                knew->name = kstrdup("Channel Mode", GFP_KERNEL);
+                if (!knew->name)
+                        return -ENOMEM;
+
+                spec->multi_ios = num_pins;
+                spec->ext_channel_count = 2;
+                spec->multiout.num_dacs = num_pins + 1;
+        }
+        return 0;
+}
+
 static int alc662_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc662_ignore[] = { 0x1d, 0 };
+        static const hda_nid_t alc662_ignore[] = { 0x1d, 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc662_ignore);
@@ -18871,6 +19380,9 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
         err = alc662_auto_fill_dac_nids(codec, &spec->autocfg);
         if (err < 0)
                 return err;
+        err = alc_auto_add_multi_channel_mode(codec);
+        if (err < 0)
+                return err;
         err = alc662_auto_create_multi_out_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -18901,14 +19413,6 @@ static int alc662_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux[0];
 
-        add_verb(spec, alc662_init_verbs);
-        if (codec->vendor_id == 0x10ec0272 || codec->vendor_id == 0x10ec0663 ||
-            codec->vendor_id == 0x10ec0665 || codec->vendor_id == 0x10ec0670)
-                add_verb(spec, alc663_init_verbs);
-
-        if (codec->vendor_id == 0x10ec0272)
-                add_verb(spec, alc272_init_verbs);
-
         err = alc_auto_add_mic_boost(codec);
         if (err < 0)
                 return err;
@@ -18935,10 +19439,82 @@ static void alc662_auto_init(struct hda_codec *codec)
                 alc_inithook(codec);
 }
 
+static void alc272_fixup_mario(struct hda_codec *codec,
+                               const struct alc_fixup *fix, int action)
+{
+        if (action != ALC_FIXUP_ACT_PROBE)
+                return;
+        if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,
+                                      (0x3b << AC_AMPCAP_OFFSET_SHIFT) |
+                                      (0x3b << AC_AMPCAP_NUM_STEPS_SHIFT) |
+                                      (0x03 << AC_AMPCAP_STEP_SIZE_SHIFT) |
+                                      (0 << AC_AMPCAP_MUTE_SHIFT)))
+                printk(KERN_WARNING
+                       "hda_codec: failed to override amp caps for NID 0x2\n");
+}
+
+enum {
+        ALC662_FIXUP_ASPIRE,
+        ALC662_FIXUP_IDEAPAD,
+        ALC272_FIXUP_MARIO,
+        ALC662_FIXUP_CZC_P10T,
+        ALC662_FIXUP_SKU_IGNORE,
+};
+
+static const struct alc_fixup alc662_fixups[] = {
+        [ALC662_FIXUP_ASPIRE] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x15, 0x99130112 }, /* subwoofer */
+                        { }
+                }
+        },
+        [ALC662_FIXUP_IDEAPAD] = {
+                .type = ALC_FIXUP_PINS,
+                .v.pins = (const struct alc_pincfg[]) {
+                        { 0x17, 0x99130112 }, /* subwoofer */
+                        { }
+                }
+        },
+        [ALC272_FIXUP_MARIO] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc272_fixup_mario,
+        },
+        [ALC662_FIXUP_CZC_P10T] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
+                        {}
+                }
+        },
+        [ALC662_FIXUP_SKU_IGNORE] = {
+                .type = ALC_FIXUP_SKU,
+                .v.sku = ALC_FIXUP_SKU_IGNORE,
+        },
+};
+
+static const struct snd_pci_quirk alc662_fixup_tbl[] = {
+        SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),
+        SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
+        SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
+        SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
+        SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
+        {}
+};
+
+static const struct alc_model_fixup alc662_fixup_models[] = {
+        {.id = ALC272_FIXUP_MARIO, .name = "mario"},
+        {}
+};
+
+
 static int patch_alc662(struct hda_codec *codec)
 {
         struct alc_spec *spec;
         int err, board_config;
+        int coef;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
@@ -18950,12 +19526,15 @@ static int patch_alc662(struct hda_codec *codec)
 
         alc_fix_pll_init(codec, 0x20, 0x04, 15);
 
-        if (alc_read_coef_idx(codec, 0) == 0x8020)
+        coef = alc_read_coef_idx(codec, 0);
+        if (coef == 0x8020 || coef == 0x8011)
                 alc_codec_rename(codec, "ALC661");
-        else if ((alc_read_coef_idx(codec, 0) & (1 << 14)) &&
-                 codec->bus->pci->subsystem_vendor == 0x1025 &&
-                 spec->cdefine.platform_type == 1)
+        else if (coef & (1 << 14) &&
+                codec->bus->pci->subsystem_vendor == 0x1025 &&
+                spec->cdefine.platform_type == 1)
                 alc_codec_rename(codec, "ALC272X");
+        else if (coef == 0x4011)
+                alc_codec_rename(codec, "ALC656");
 
         board_config = snd_hda_check_board_config(codec, ALC662_MODEL_LAST,
                                                   alc662_models,
@@ -18967,6 +19546,9 @@ static int patch_alc662(struct hda_codec *codec)
         }
 
         if (board_config == ALC662_AUTO) {
+                alc_pick_fixup(codec, alc662_fixup_models,
+                               alc662_fixup_tbl, alc662_fixups);
+                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
                 /* automatic parse from the BIOS config */
                 err = alc662_parse_auto_config(codec);
                 if (err < 0) {
@@ -19024,9 +19606,15 @@ static int patch_alc662(struct hda_codec *codec)
         }
         spec->vmaster_nid = 0x02;
 
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
+
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC662_AUTO)
                 spec->init_hook = alc662_auto_init;
+        spec->shutup = alc_eapd_shutup;
+
+        alc_init_jacks(codec);
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc662_loopbacks;
@@ -19039,7 +19627,10 @@ static int patch_alc888(struct hda_codec *codec)
 {
         if ((alc_read_coef_idx(codec, 0) & 0x00f0)==0x0030){
                 kfree(codec->chip_name);
-                codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
+                if (codec->vendor_id == 0x10ec0887)
+                        codec->chip_name = kstrdup("ALC887-VD", GFP_KERNEL);
+                else
+                        codec->chip_name = kstrdup("ALC888-VD", GFP_KERNEL);
                 if (!codec->chip_name) {
                         alc_free(codec);
                         return -ENOMEM;
@@ -19049,6 +19640,15 @@ static int patch_alc888(struct hda_codec *codec)
         return patch_alc882(codec);
 }
 
+static int patch_alc899(struct hda_codec *codec)
+{
+        if ((alc_read_coef_idx(codec, 0) & 0x2000) != 0x2000) {
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("ALC898", GFP_KERNEL);
+        }
+        return patch_alc882(codec);
+}
+
 /*
  * ALC680 support
  */
@@ -19056,12 +19656,12 @@ static int patch_alc888(struct hda_codec *codec)
 #define ALC680_DIGOUT_NID       ALC880_DIGOUT_NID
 #define alc680_modes            alc260_modes
 
-static hda_nid_t alc680_dac_nids[3] = {
+static const hda_nid_t alc680_dac_nids[3] = {
         /* Lout1, Lout2, hp */
         0x02, 0x03, 0x04
 };
 
-static hda_nid_t alc680_adc_nids[3] = {
+static const hda_nid_t alc680_adc_nids[3] = {
         /* ADC0-2 */
         /* DMIC, MIC, Line-in*/
         0x07, 0x08, 0x09
@@ -19070,6 +19670,38 @@ static hda_nid_t alc680_adc_nids[3] = {
 /*
  * Analog capture ADC cgange
  */
+static void alc680_rec_autoswitch(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->autocfg;
+        int pin_found = 0;
+        int type_found = AUTO_PIN_LAST;
+        hda_nid_t nid;
+        int i;
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                nid = cfg->inputs[i].pin;
+                if (!is_jack_detectable(codec, nid))
+                        continue;
+                if (snd_hda_jack_detect(codec, nid)) {
+                        if (cfg->inputs[i].type < type_found) {
+                                type_found = cfg->inputs[i].type;
+                                pin_found = nid;
+                        }
+                }
+        }
+
+        nid = 0x07;
+        if (pin_found)
+                snd_hda_get_connections(codec, pin_found, &nid, 1);
+
+        if (nid != spec->cur_adc)
+                __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
+        spec->cur_adc = nid;
+        snd_hda_codec_setup_stream(codec, nid, spec->cur_adc_stream_tag, 0,
+                                   spec->cur_adc_format);
+}
+
 static int alc680_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
                                       struct hda_codec *codec,
                                       unsigned int stream_tag,
@@ -19077,24 +19709,12 @@ static int alc680_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
                                       struct snd_pcm_substream *substream)
 {
         struct alc_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int pre_mic, pre_line;
-
-        pre_mic  = snd_hda_jack_detect(codec, cfg->input_pins[AUTO_PIN_MIC]);
-        pre_line = snd_hda_jack_detect(codec, cfg->input_pins[AUTO_PIN_LINE]);
 
+        spec->cur_adc = 0x07;
         spec->cur_adc_stream_tag = stream_tag;
         spec->cur_adc_format = format;
 
-        if (pre_mic || pre_line) {
-                if (pre_mic)
-                        snd_hda_codec_setup_stream(codec, 0x08, stream_tag, 0,
-                                                                        format);
-                else
-                        snd_hda_codec_setup_stream(codec, 0x09, stream_tag, 0,
-                                                                        format);
-        } else
-                snd_hda_codec_setup_stream(codec, 0x07, stream_tag, 0, format);
+        alc680_rec_autoswitch(codec);
         return 0;
 }
 
@@ -19108,7 +19728,7 @@ static int alc680_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream alc680_pcm_analog_auto_capture = {
+static const struct hda_pcm_stream alc680_pcm_analog_auto_capture = {
         .substreams = 1, /* can be overridden */
         .channels_min = 2,
         .channels_max = 2,
@@ -19119,19 +19739,19 @@ static struct hda_pcm_stream alc680_pcm_analog_auto_capture = {
         },
 };
 
-static struct snd_kcontrol_new alc680_base_mixer[] = {
+static const struct snd_kcontrol_new alc680_base_mixer[] = {
         /* output mixer control */
         HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x4, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x16, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Int Mic Boost", 0x12, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Line In Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost Volume", 0x12, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost Volume", 0x19, 0, HDA_INPUT),
         { }
 };
 
-static struct hda_bind_ctls alc680_bind_cap_vol = {
+static const struct hda_bind_ctls alc680_bind_cap_vol = {
         .ops = &snd_hda_bind_vol,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x07, 3, 0, HDA_INPUT),
@@ -19141,7 +19761,7 @@ static struct hda_bind_ctls alc680_bind_cap_vol = {
         },
 };
 
-static struct hda_bind_ctls alc680_bind_cap_switch = {
+static const struct hda_bind_ctls alc680_bind_cap_switch = {
         .ops = &snd_hda_bind_sw,
         .values = {
                 HDA_COMPOSE_AMP_VAL(0x07, 3, 0, HDA_INPUT),
@@ -19151,7 +19771,7 @@ static struct hda_bind_ctls alc680_bind_cap_switch = {
         },
 };
 
-static struct snd_kcontrol_new alc680_master_capture_mixer[] = {
+static const struct snd_kcontrol_new alc680_master_capture_mixer[] = {
         HDA_BIND_VOL("Capture Volume", &alc680_bind_cap_vol),
         HDA_BIND_SW("Capture Switch", &alc680_bind_cap_switch),
         { } /* end */
@@ -19160,7 +19780,7 @@ static struct snd_kcontrol_new alc680_master_capture_mixer[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb alc680_init_verbs[] = {
+static const struct hda_verb alc680_init_verbs[] = {
         {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -19180,6 +19800,7 @@ static struct hda_verb alc680_init_verbs[] = {
 
         {0x16, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT   | AC_USRSP_EN},
         {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT  | AC_USRSP_EN},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_MIC_EVENT  | AC_USRSP_EN},
 
         { }
 };
@@ -19192,39 +19813,27 @@ static void alc680_base_setup(struct hda_codec *codec)
         spec->autocfg.hp_pins[0] = 0x16;
         spec->autocfg.speaker_pins[0] = 0x14;
         spec->autocfg.speaker_pins[1] = 0x15;
-        spec->autocfg.input_pins[AUTO_PIN_MIC] = 0x18;
-        spec->autocfg.input_pins[AUTO_PIN_LINE] = 0x19;
-}
-
-static void alc680_rec_autoswitch(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-        struct auto_pin_cfg *cfg = &spec->autocfg;
-        unsigned int present;
-        hda_nid_t new_adc;
-
-        present = snd_hda_jack_detect(codec, cfg->input_pins[AUTO_PIN_MIC]);
-
-        new_adc = present ? 0x8 : 0x7;
-        __snd_hda_codec_cleanup_stream(codec, !present ? 0x8 : 0x7, 1);
-        snd_hda_codec_setup_stream(codec, new_adc,
-                                   spec->cur_adc_stream_tag, 0,
-                                   spec->cur_adc_format);
-
+        spec->autocfg.num_inputs = 2;
+        spec->autocfg.inputs[0].pin = 0x18;
+        spec->autocfg.inputs[0].type = AUTO_PIN_MIC;
+        spec->autocfg.inputs[1].pin = 0x19;
+        spec->autocfg.inputs[1].type = AUTO_PIN_LINE_IN;
+        spec->automute = 1;
+        spec->automute_mode = ALC_AUTOMUTE_AMP;
 }
 
 static void alc680_unsol_event(struct hda_codec *codec,
                                            unsigned int res)
 {
         if ((res >> 26) == ALC880_HP_EVENT)
-                alc_automute_amp(codec);
+                alc_hp_automute(codec);
         if ((res >> 26) == ALC880_MIC_EVENT)
                 alc680_rec_autoswitch(codec);
 }
 
 static void alc680_inithook(struct hda_codec *codec)
 {
-        alc_automute_amp(codec);
+        alc_hp_automute(codec);
         alc680_rec_autoswitch(codec);
 }
 
@@ -19261,7 +19870,7 @@ static int alc680_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
 
                 if (err < 0)
                         return err;
-                spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
+                spec->private_dac_nids[spec->multiout.num_dacs++] = dac;
         }
 
         return 0;
@@ -19347,7 +19956,7 @@ static int alc680_parse_auto_config(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         int err;
-        static hda_nid_t alc680_ignore[] = { 0 };
+        static const hda_nid_t alc680_ignore[] = { 0 };
 
         err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                            alc680_ignore);
@@ -19400,17 +20009,17 @@ static void alc680_auto_init(struct hda_codec *codec)
 /*
  * configuration and preset
  */
-static const char *alc680_models[ALC680_MODEL_LAST] = {
+static const char * const alc680_models[ALC680_MODEL_LAST] = {
         [ALC680_BASE]           = "base",
         [ALC680_AUTO]           = "auto",
 };
 
-static struct snd_pci_quirk alc680_cfg_tbl[] = {
+static const struct snd_pci_quirk alc680_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x12f3, "ASUS NX90", ALC680_BASE),
         {}
 };
 
-static struct alc_config_preset alc680_presets[] = {
+static const struct alc_config_preset alc680_presets[] = {
         [ALC680_BASE] = {
                 .mixers = { alc680_base_mixer },
                 .cap_mixer =  alc680_master_capture_mixer,
@@ -19491,7 +20100,8 @@ static int patch_alc680(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_realtek[] = {
+static const struct hda_codec_preset snd_hda_preset_realtek[] = {
+        { .id = 0x10ec0221, .name = "ALC221", .patch = patch_alc269 },
         { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
         { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
         { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
@@ -19500,6 +20110,7 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0270, .name = "ALC270", .patch = patch_alc269 },
         { .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },
         { .id = 0x10ec0275, .name = "ALC275", .patch = patch_alc269 },
+        { .id = 0x10ec0276, .name = "ALC276", .patch = patch_alc269 },
         { .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
           .patch = patch_alc861 },
         { .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },
@@ -19521,12 +20132,13 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",
           .patch = patch_alc882 },
         { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },
-        { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 },
+        { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc888 },
         { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200",
           .patch = patch_alc882 },
         { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },
         { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc882 },
         { .id = 0x10ec0892, .name = "ALC892", .patch = patch_alc662 },
+        { .id = 0x10ec0899, .name = "ALC899", .patch = patch_alc899 },
         {} /* terminator */
 };
 
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index f419ee8d75f0..2f55f32876fa 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -130,7 +130,7 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
 }
                 
 
-static struct snd_kcontrol_new si3054_modem_mixer[] = {
+static const struct snd_kcontrol_new si3054_modem_mixer[] = {
         SI3054_KCONTROL("Off-hook Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_OH),
         SI3054_KCONTROL("Caller ID Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_CID),
         {}
@@ -181,7 +181,7 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo,
 }
 
 
-static struct hda_pcm_stream si3054_pcm = {
+static const struct hda_pcm_stream si3054_pcm = {
         .substreams = 1,
         .channels_min = 1,
         .channels_max = 1,
@@ -200,12 +200,13 @@ static int si3054_build_pcms(struct hda_codec *codec)
 {
         struct si3054_spec *spec = codec->spec;
         struct hda_pcm *info = &spec->pcm;
-        si3054_pcm.nid = codec->mfg;
         codec->num_pcms = 1;
         codec->pcm_info = info;
         info->name = "Si3054 Modem";
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = si3054_pcm;
         info->stream[SNDRV_PCM_STREAM_CAPTURE]  = si3054_pcm;
+        info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = codec->mfg;
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = codec->mfg;
         info->pcm_type = HDA_PCM_TYPE_MODEM;
         return 0;
 }
@@ -263,7 +264,7 @@ static void si3054_free(struct hda_codec *codec)
 /*
  */
 
-static struct hda_codec_ops si3054_patch_ops = {
+static const struct hda_codec_ops si3054_patch_ops = {
         .build_controls = si3054_build_controls,
         .build_pcms = si3054_build_pcms,
         .init = si3054_init,
@@ -283,7 +284,7 @@ static int patch_si3054(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_si3054[] = {
+static const struct hda_codec_preset snd_hda_preset_si3054[] = {
         { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
         { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
         { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index c16c5ba0fda0..7f81cc2274f3 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -32,6 +32,7 @@
 #include <sound/core.h>
 #include <sound/asoundef.h>
 #include <sound/jack.h>
+#include <sound/tlv.h>
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_beep.h"
@@ -179,18 +180,16 @@ struct sigmatel_event {
         int data;
 };
 
-struct sigmatel_jack {
-        hda_nid_t nid;
-        int type;
-        struct snd_jack *jack;
-};
-
 struct sigmatel_mic_route {
         hda_nid_t pin;
         signed char mux_idx;
         signed char dmux_idx;
 };
 
+#define MAX_PINS_NUM 16
+#define MAX_ADCS_NUM 4
+#define MAX_DMICS_NUM 4
+
 struct sigmatel_spec {
         struct snd_kcontrol_new *mixers[4];
         unsigned int num_mixers;
@@ -218,18 +217,15 @@ struct sigmatel_spec {
         unsigned int stream_delay;
 
         /* analog loopback */
-        struct snd_kcontrol_new *aloopback_ctl;
+        const struct snd_kcontrol_new *aloopback_ctl;
         unsigned char aloopback_mask;
         unsigned char aloopback_shift;
 
         /* power management */
         unsigned int num_pwrs;
-        unsigned int *pwr_mapping;
-        hda_nid_t *pwr_nids;
-        hda_nid_t *dac_list;
-
-        /* jack detection */
-        struct snd_array jacks;
+        const unsigned int *pwr_mapping;
+        const hda_nid_t *pwr_nids;
+        const hda_nid_t *dac_list;
 
         /* events */
         struct snd_array events;
@@ -245,26 +241,27 @@ struct sigmatel_spec {
         int volume_offset;
 
         /* capture */
-        hda_nid_t *adc_nids;
+        const hda_nid_t *adc_nids;
         unsigned int num_adcs;
-        hda_nid_t *mux_nids;
+        const hda_nid_t *mux_nids;
         unsigned int num_muxes;
-        hda_nid_t *dmic_nids;
+        const hda_nid_t *dmic_nids;
         unsigned int num_dmics;
-        hda_nid_t *dmux_nids;
+        const hda_nid_t *dmux_nids;
         unsigned int num_dmuxes;
-        hda_nid_t *smux_nids;
+        const hda_nid_t *smux_nids;
         unsigned int num_smuxes;
         unsigned int num_analog_muxes;
 
-        unsigned long *capvols; /* amp-volume attr: HDA_COMPOSE_AMP_VAL() */
-        unsigned long *capsws; /* amp-mute attr: HDA_COMPOSE_AMP_VAL() */
+        const unsigned long *capvols; /* amp-volume attr: HDA_COMPOSE_AMP_VAL() */
+        const unsigned long *capsws; /* amp-mute attr: HDA_COMPOSE_AMP_VAL() */
         unsigned int num_caps; /* number of capture volume/switch elements */
 
         struct sigmatel_mic_route ext_mic;
         struct sigmatel_mic_route int_mic;
+        struct sigmatel_mic_route dock_mic;
 
-        const char **spdif_labels;
+        const char * const *spdif_labels;
 
         hda_nid_t dig_in_nid;
         hda_nid_t mono_nid;
@@ -272,12 +269,12 @@ struct sigmatel_spec {
         hda_nid_t digbeep_nid;
 
         /* pin widgets */
-        hda_nid_t *pin_nids;
+        const hda_nid_t *pin_nids;
         unsigned int num_pins;
 
         /* codec specific stuff */
-        struct hda_verb *init;
-        struct snd_kcontrol_new *mixer;
+        const struct hda_verb *init;
+        const struct snd_kcontrol_new *mixer;
 
         /* capture source */
         struct hda_input_mux *dinput_mux;
@@ -307,54 +304,65 @@ struct sigmatel_spec {
         struct hda_input_mux private_imux;
         struct hda_input_mux private_smux;
         struct hda_input_mux private_mono_mux;
+
+        /* auto spec */
+        unsigned auto_pin_cnt;
+        hda_nid_t auto_pin_nids[MAX_PINS_NUM];
+        unsigned auto_adc_cnt;
+        hda_nid_t auto_adc_nids[MAX_ADCS_NUM];
+        hda_nid_t auto_mux_nids[MAX_ADCS_NUM];
+        hda_nid_t auto_dmux_nids[MAX_ADCS_NUM];
+        unsigned long auto_capvols[MAX_ADCS_NUM];
+        unsigned auto_dmic_cnt;
+        hda_nid_t auto_dmic_nids[MAX_DMICS_NUM];
 };
 
-static hda_nid_t stac9200_adc_nids[1] = {
+static const hda_nid_t stac9200_adc_nids[1] = {
         0x03,
 };
 
-static hda_nid_t stac9200_mux_nids[1] = {
+static const hda_nid_t stac9200_mux_nids[1] = {
         0x0c,
 };
 
-static hda_nid_t stac9200_dac_nids[1] = {
+static const hda_nid_t stac9200_dac_nids[1] = {
         0x02,
 };
 
-static hda_nid_t stac92hd73xx_pwr_nids[8] = {
+static const hda_nid_t stac92hd73xx_pwr_nids[8] = {
         0x0a, 0x0b, 0x0c, 0xd, 0x0e,
         0x0f, 0x10, 0x11
 };
 
-static hda_nid_t stac92hd73xx_slave_dig_outs[2] = {
+static const hda_nid_t stac92hd73xx_slave_dig_outs[2] = {
         0x26, 0,
 };
 
-static hda_nid_t stac92hd73xx_adc_nids[2] = {
+static const hda_nid_t stac92hd73xx_adc_nids[2] = {
         0x1a, 0x1b
 };
 
 #define STAC92HD73XX_NUM_DMICS  2
-static hda_nid_t stac92hd73xx_dmic_nids[STAC92HD73XX_NUM_DMICS + 1] = {
+static const hda_nid_t stac92hd73xx_dmic_nids[STAC92HD73XX_NUM_DMICS + 1] = {
         0x13, 0x14, 0
 };
 
 #define STAC92HD73_DAC_COUNT 5
 
-static hda_nid_t stac92hd73xx_mux_nids[2] = {
+static const hda_nid_t stac92hd73xx_mux_nids[2] = {
         0x20, 0x21,
 };
 
-static hda_nid_t stac92hd73xx_dmux_nids[2] = {
+static const hda_nid_t stac92hd73xx_dmux_nids[2] = {
         0x20, 0x21,
 };
 
-static hda_nid_t stac92hd73xx_smux_nids[2] = {
+static const hda_nid_t stac92hd73xx_smux_nids[2] = {
         0x22, 0x23,
 };
 
 #define STAC92HD73XX_NUM_CAPS   2
-static unsigned long stac92hd73xx_capvols[] = {
+static const unsigned long stac92hd73xx_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x20, 3, 0, HDA_OUTPUT),
         HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),
 };
@@ -362,239 +370,222 @@ static unsigned long stac92hd73xx_capvols[] = {
 
 #define STAC92HD83_DAC_COUNT 3
 
-static hda_nid_t stac92hd83xxx_mux_nids[2] = {
-        0x17, 0x18,
-};
-
-static hda_nid_t stac92hd83xxx_adc_nids[2] = {
-        0x15, 0x16,
-};
-
-static hda_nid_t stac92hd83xxx_pwr_nids[4] = {
+static const hda_nid_t stac92hd83xxx_pwr_nids[4] = {
         0xa, 0xb, 0xd, 0xe,
 };
 
-static hda_nid_t stac92hd83xxx_slave_dig_outs[2] = {
+static const hda_nid_t stac92hd83xxx_slave_dig_outs[2] = {
         0x1e, 0,
 };
 
-static unsigned int stac92hd83xxx_pwr_mapping[4] = {
+static const unsigned int stac92hd83xxx_pwr_mapping[4] = {
         0x03, 0x0c, 0x20, 0x40,
 };
 
-#define STAC92HD83XXX_NUM_CAPS  2
-static unsigned long stac92hd83xxx_capvols[] = {
-        HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),
-        HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_OUTPUT),
+static const hda_nid_t stac92hd83xxx_dmic_nids[] = {
+                0x11, 0x20,
 };
-#define stac92hd83xxx_capsws    stac92hd83xxx_capvols
 
-static hda_nid_t stac92hd71bxx_pwr_nids[3] = {
+static const hda_nid_t stac92hd71bxx_pwr_nids[3] = {
         0x0a, 0x0d, 0x0f
 };
 
-static hda_nid_t stac92hd71bxx_adc_nids[2] = {
+static const hda_nid_t stac92hd71bxx_adc_nids[2] = {
         0x12, 0x13,
 };
 
-static hda_nid_t stac92hd71bxx_mux_nids[2] = {
+static const hda_nid_t stac92hd71bxx_mux_nids[2] = {
         0x1a, 0x1b
 };
 
-static hda_nid_t stac92hd71bxx_dmux_nids[2] = {
+static const hda_nid_t stac92hd71bxx_dmux_nids[2] = {
         0x1c, 0x1d,
 };
 
-static hda_nid_t stac92hd71bxx_smux_nids[2] = {
+static const hda_nid_t stac92hd71bxx_smux_nids[2] = {
         0x24, 0x25,
 };
 
 #define STAC92HD71BXX_NUM_DMICS 2
-static hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {
+static const hda_nid_t stac92hd71bxx_dmic_nids[STAC92HD71BXX_NUM_DMICS + 1] = {
         0x18, 0x19, 0
 };
 
-static hda_nid_t stac92hd71bxx_slave_dig_outs[2] = {
+static const hda_nid_t stac92hd71bxx_dmic_5port_nids[STAC92HD71BXX_NUM_DMICS] = {
+        0x18, 0
+};
+
+static const hda_nid_t stac92hd71bxx_slave_dig_outs[2] = {
         0x22, 0
 };
 
 #define STAC92HD71BXX_NUM_CAPS          2
-static unsigned long stac92hd71bxx_capvols[] = {
+static const unsigned long stac92hd71bxx_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_OUTPUT),
         HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
 };
 #define stac92hd71bxx_capsws    stac92hd71bxx_capvols
 
-static hda_nid_t stac925x_adc_nids[1] = {
+static const hda_nid_t stac925x_adc_nids[1] = {
         0x03,
 };
 
-static hda_nid_t stac925x_mux_nids[1] = {
+static const hda_nid_t stac925x_mux_nids[1] = {
         0x0f,
 };
 
-static hda_nid_t stac925x_dac_nids[1] = {
+static const hda_nid_t stac925x_dac_nids[1] = {
         0x02,
 };
 
 #define STAC925X_NUM_DMICS      1
-static hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS + 1] = {
+static const hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS + 1] = {
         0x15, 0
 };
 
-static hda_nid_t stac925x_dmux_nids[1] = {
+static const hda_nid_t stac925x_dmux_nids[1] = {
         0x14,
 };
 
-static unsigned long stac925x_capvols[] = {
+static const unsigned long stac925x_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_OUTPUT),
 };
-static unsigned long stac925x_capsws[] = {
+static const unsigned long stac925x_capsws[] = {
         HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
 };
 
-static hda_nid_t stac922x_adc_nids[2] = {
+static const hda_nid_t stac922x_adc_nids[2] = {
         0x06, 0x07,
 };
 
-static hda_nid_t stac922x_mux_nids[2] = {
+static const hda_nid_t stac922x_mux_nids[2] = {
         0x12, 0x13,
 };
 
 #define STAC922X_NUM_CAPS       2
-static unsigned long stac922x_capvols[] = {
+static const unsigned long stac922x_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_INPUT),
         HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT),
 };
 #define stac922x_capsws         stac922x_capvols
 
-static hda_nid_t stac927x_slave_dig_outs[2] = {
+static const hda_nid_t stac927x_slave_dig_outs[2] = {
         0x1f, 0,
 };
 
-static hda_nid_t stac927x_adc_nids[3] = {
+static const hda_nid_t stac927x_adc_nids[3] = {
         0x07, 0x08, 0x09
 };
 
-static hda_nid_t stac927x_mux_nids[3] = {
+static const hda_nid_t stac927x_mux_nids[3] = {
         0x15, 0x16, 0x17
 };
 
-static hda_nid_t stac927x_smux_nids[1] = {
+static const hda_nid_t stac927x_smux_nids[1] = {
         0x21,
 };
 
-static hda_nid_t stac927x_dac_nids[6] = {
+static const hda_nid_t stac927x_dac_nids[6] = {
         0x02, 0x03, 0x04, 0x05, 0x06, 0
 };
 
-static hda_nid_t stac927x_dmux_nids[1] = {
+static const hda_nid_t stac927x_dmux_nids[1] = {
         0x1b,
 };
 
 #define STAC927X_NUM_DMICS 2
-static hda_nid_t stac927x_dmic_nids[STAC927X_NUM_DMICS + 1] = {
+static const hda_nid_t stac927x_dmic_nids[STAC927X_NUM_DMICS + 1] = {
         0x13, 0x14, 0
 };
 
 #define STAC927X_NUM_CAPS       3
-static unsigned long stac927x_capvols[] = {
+static const unsigned long stac927x_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x18, 3, 0, HDA_INPUT),
         HDA_COMPOSE_AMP_VAL(0x19, 3, 0, HDA_INPUT),
         HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_INPUT),
 };
-static unsigned long stac927x_capsws[] = {
+static const unsigned long stac927x_capsws[] = {
         HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
         HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_OUTPUT),
         HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
 };
 
-static const char *stac927x_spdif_labels[5] = {
+static const char * const stac927x_spdif_labels[5] = {
         "Digital Playback", "ADAT", "Analog Mux 1",
         "Analog Mux 2", "Analog Mux 3"
 };
 
-static hda_nid_t stac9205_adc_nids[2] = {
+static const hda_nid_t stac9205_adc_nids[2] = {
         0x12, 0x13
 };
 
-static hda_nid_t stac9205_mux_nids[2] = {
+static const hda_nid_t stac9205_mux_nids[2] = {
         0x19, 0x1a
 };
 
-static hda_nid_t stac9205_dmux_nids[1] = {
+static const hda_nid_t stac9205_dmux_nids[1] = {
         0x1d,
 };
 
-static hda_nid_t stac9205_smux_nids[1] = {
+static const hda_nid_t stac9205_smux_nids[1] = {
         0x21,
 };
 
 #define STAC9205_NUM_DMICS      2
-static hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS + 1] = {
+static const hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS + 1] = {
         0x17, 0x18, 0
 };
 
 #define STAC9205_NUM_CAPS       2
-static unsigned long stac9205_capvols[] = {
+static const unsigned long stac9205_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_INPUT),
         HDA_COMPOSE_AMP_VAL(0x1c, 3, 0, HDA_INPUT),
 };
-static unsigned long stac9205_capsws[] = {
+static const unsigned long stac9205_capsws[] = {
         HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
         HDA_COMPOSE_AMP_VAL(0x1e, 3, 0, HDA_OUTPUT),
 };
 
-static hda_nid_t stac9200_pin_nids[8] = {
+static const hda_nid_t stac9200_pin_nids[8] = {
         0x08, 0x09, 0x0d, 0x0e, 
         0x0f, 0x10, 0x11, 0x12,
 };
 
-static hda_nid_t stac925x_pin_nids[8] = {
+static const hda_nid_t stac925x_pin_nids[8] = {
         0x07, 0x08, 0x0a, 0x0b, 
         0x0c, 0x0d, 0x10, 0x11,
 };
 
-static hda_nid_t stac922x_pin_nids[10] = {
+static const hda_nid_t stac922x_pin_nids[10] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x10, 0x11, 0x15, 0x1b,
 };
 
-static hda_nid_t stac92hd73xx_pin_nids[13] = {
+static const hda_nid_t stac92hd73xx_pin_nids[13] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x10, 0x11, 0x12, 0x13,
         0x14, 0x22, 0x23
 };
 
-static hda_nid_t stac92hd83xxx_pin_nids[10] = {
-        0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-        0x0f, 0x10, 0x11, 0x1f, 0x20,
-};
-
-static hda_nid_t stac92hd88xxx_pin_nids[10] = {
-        0x0a, 0x0b, 0x0c, 0x0d,
-        0x0f, 0x11, 0x1f, 0x20,
-};
-
 #define STAC92HD71BXX_NUM_PINS 13
-static hda_nid_t stac92hd71bxx_pin_nids_4port[STAC92HD71BXX_NUM_PINS] = {
+static const 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_6port[STAC92HD71BXX_NUM_PINS] = {
+static const hda_nid_t stac92hd71bxx_pin_nids_6port[STAC92HD71BXX_NUM_PINS] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x14, 0x18, 0x19, 0x1e,
         0x1f, 0x20, 0x27
 };
 
-static hda_nid_t stac927x_pin_nids[14] = {
+static const hda_nid_t stac927x_pin_nids[14] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x10, 0x11, 0x12, 0x13,
         0x14, 0x21, 0x22, 0x23,
 };
 
-static hda_nid_t stac9205_pin_nids[12] = {
+static const hda_nid_t stac9205_pin_nids[12] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x14, 0x16, 0x17, 0x18,
         0x21, 0x22,
@@ -737,7 +728,7 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         struct sigmatel_spec *spec = codec->spec;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         const struct hda_input_mux *imux = spec->input_mux;
-        unsigned int idx, prev_idx;
+        unsigned int idx, prev_idx, didx;
 
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
@@ -749,7 +740,8 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                 snd_hda_codec_write_cache(codec, spec->mux_nids[adc_idx], 0,
                                           AC_VERB_SET_CONNECT_SEL,
                                           imux->items[idx].index);
-                if (prev_idx >= spec->num_analog_muxes) {
+                if (prev_idx >= spec->num_analog_muxes &&
+                    spec->mux_nids[adc_idx] != spec->dmux_nids[adc_idx]) {
                         imux = spec->dinput_mux;
                         /* 0 = analog */
                         snd_hda_codec_write_cache(codec,
@@ -759,9 +751,13 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                 }
         } else {
                 imux = spec->dinput_mux;
+                /* first dimux item is hardcoded to select analog imux,
+                 * so lets skip it
+                 */
+                didx = idx - spec->num_analog_muxes + 1;
                 snd_hda_codec_write_cache(codec, spec->dmux_nids[adc_idx], 0,
                                           AC_VERB_SET_CONNECT_SEL,
-                                          imux->items[idx - 1].index);
+                                          imux->items[didx].index);
         }
         spec->cur_mux[adc_idx] = idx;
         return 1;
@@ -849,45 +845,45 @@ static int stac92xx_aloopback_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
-static struct hda_verb stac9200_core_init[] = {
+static const struct hda_verb stac9200_core_init[] = {
         /* set dac0mux for dac converter */
         { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
         {}
 };
 
-static struct hda_verb stac9200_eapd_init[] = {
+static const struct hda_verb stac9200_eapd_init[] = {
         /* set dac0mux for dac converter */
         {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
         {}
 };
 
-static struct hda_verb dell_eq_core_init[] = {
+static const struct hda_verb dell_eq_core_init[] = {
         /* set master volume to max value without distortion
          * and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec},
         {}
 };
 
-static struct hda_verb stac92hd73xx_core_init[] = {
+static const struct hda_verb stac92hd73xx_core_init[] = {
         /* set master volume and direct control */
         { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         {}
 };
 
-static struct hda_verb stac92hd83xxx_core_init[] = {
+static const struct hda_verb stac92hd83xxx_core_init[] = {
         /* power state controls amps */
         { 0x01, AC_VERB_SET_EAPD, 1 << 2},
         {}
 };
 
-static struct hda_verb stac92hd71bxx_core_init[] = {
+static const struct hda_verb stac92hd71bxx_core_init[] = {
         /* set master volume and direct control */
         { 0x28, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         {}
 };
 
-static struct hda_verb stac92hd71bxx_unmute_core_init[] = {
+static const 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)},
@@ -895,7 +891,7 @@ static struct hda_verb stac92hd71bxx_unmute_core_init[] = {
         {}
 };
 
-static struct hda_verb stac925x_core_init[] = {
+static const struct hda_verb stac925x_core_init[] = {
         /* set dac0mux for dac converter */
         { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* mute the master volume */
@@ -903,13 +899,13 @@ static struct hda_verb stac925x_core_init[] = {
         {}
 };
 
-static struct hda_verb stac922x_core_init[] = {
+static const struct hda_verb stac922x_core_init[] = {
         /* set master volume and direct control */      
         { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         {}
 };
 
-static struct hda_verb d965_core_init[] = {
+static const struct hda_verb d965_core_init[] = {
         /* set master volume and direct control */      
         { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         /* unmute node 0x1b */
@@ -919,7 +915,7 @@ static struct hda_verb d965_core_init[] = {
         {}
 };
 
-static struct hda_verb dell_3st_core_init[] = {
+static const struct hda_verb dell_3st_core_init[] = {
         /* don't set delta bit */
         {0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},
         /* unmute node 0x1b */
@@ -929,7 +925,7 @@ static struct hda_verb dell_3st_core_init[] = {
         {}
 };
 
-static struct hda_verb stac927x_core_init[] = {
+static const struct hda_verb stac927x_core_init[] = {
         /* set master volume and direct control */      
         { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         /* enable analog pc beep path */
@@ -937,7 +933,7 @@ static struct hda_verb stac927x_core_init[] = {
         {}
 };
 
-static struct hda_verb stac927x_volknob_core_init[] = {
+static const struct hda_verb stac927x_volknob_core_init[] = {
         /* don't set delta bit */
         {0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f},
         /* enable analog pc beep path */
@@ -945,7 +941,7 @@ static struct hda_verb stac927x_volknob_core_init[] = {
         {}
 };
 
-static struct hda_verb stac9205_core_init[] = {
+static const struct hda_verb stac9205_core_init[] = {
         /* set master volume and direct control */      
         { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         /* enable analog pc beep path */
@@ -985,46 +981,46 @@ static struct hda_verb stac9205_core_init[] = {
                 .private_value = nid, \
         }
 
-static struct snd_kcontrol_new stac9200_mixer[] = {
-        HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
+static const struct snd_kcontrol_new stac9200_mixer[] = {
+        HDA_CODEC_VOLUME_MIN_MUTE("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new stac92hd73xx_6ch_loopback[] = {
+static const struct snd_kcontrol_new stac92hd73xx_6ch_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 3),
         {}
 };
 
-static struct snd_kcontrol_new stac92hd73xx_8ch_loopback[] = {
+static const struct snd_kcontrol_new stac92hd73xx_8ch_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 4),
         {}
 };
 
-static struct snd_kcontrol_new stac92hd73xx_10ch_loopback[] = {
+static const struct snd_kcontrol_new stac92hd73xx_10ch_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFA0, 0x7A1, 5),
         {}
 };
 
 
-static struct snd_kcontrol_new stac92hd71bxx_loopback[] = {
+static const struct snd_kcontrol_new stac92hd71bxx_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2)
 };
 
-static struct snd_kcontrol_new stac925x_mixer[] = {
-        HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
+static const struct snd_kcontrol_new stac925x_mixer[] = {
+        HDA_CODEC_VOLUME_MIN_MUTE("Master Playback Volume", 0xe, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct snd_kcontrol_new stac9205_loopback[] = {
+static const struct snd_kcontrol_new stac9205_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0, 1),
         {}
 };
 
-static struct snd_kcontrol_new stac927x_loopback[] = {
+static const struct snd_kcontrol_new stac927x_loopback[] = {
         STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB, 1),
         {}
 };
@@ -1047,7 +1043,7 @@ static struct snd_kcontrol_new stac_smux_mixer = {
         .put = stac92xx_smux_enum_put,
 };
 
-static const char *slave_vols[] = {
+static const char * const slave_vols[] = {
         "Front Playback Volume",
         "Surround Playback Volume",
         "Center Playback Volume",
@@ -1058,7 +1054,7 @@ static const char *slave_vols[] = {
         NULL
 };
 
-static const char *slave_sws[] = {
+static const char * const slave_sws[] = {
         "Front Playback Switch",
         "Surround Playback Switch",
         "Center Playback Switch",
@@ -1105,9 +1101,7 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                 struct hda_input_mux *smux = &spec->private_smux;
                 /* check for mute support on SPDIF out */
                 if (wcaps & AC_WCAP_OUT_AMP) {
-                        smux->items[smux->num_items].label = "Off";
-                        smux->items[smux->num_items].index = 0;
-                        smux->num_items++;
+                        snd_hda_add_imux_item(smux, "Off", 0, NULL);
                         spec->spdif_mute = 1;
                 }
                 stac_smux_mixer.count = spec->num_smuxes;
@@ -1140,6 +1134,8 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                                         HDA_OUTPUT, vmaster_tlv);
                 /* correct volume offset */
                 vmaster_tlv[2] += vmaster_tlv[3] * spec->volume_offset;
+                /* minimum value is actually mute */
+                vmaster_tlv[3] |= TLV_DB_SCALE_MUTE;
                 err = snd_hda_add_vmaster(codec, "Master Playback Volume",
                                           vmaster_tlv, slave_vols);
                 if (err < 0)
@@ -1180,29 +1176,26 @@ static int stac92xx_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
         }
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                nid = cfg->input_pins[i];
-                if (nid) {
-                        err = stac92xx_add_jack(codec, nid,
-                                                SND_JACK_MICROPHONE);
-                        if (err < 0)
-                                return err;
-                }
+        for (i = 0; i < cfg->num_inputs; i++) {
+                nid = cfg->inputs[i].pin;
+                err = stac92xx_add_jack(codec, nid, SND_JACK_MICROPHONE);
+                if (err < 0)
+                        return err;
         }
 
         return 0;       
 }
 
-static unsigned int ref9200_pin_configs[8] = {
+static const unsigned int ref9200_pin_configs[8] = {
         0x01c47010, 0x01447010, 0x0221401f, 0x01114010,
         0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
 };
 
-static unsigned int gateway9200_m4_pin_configs[8] = {
+static const unsigned int gateway9200_m4_pin_configs[8] = {
         0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,
         0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,
 };
-static unsigned int gateway9200_m4_2_pin_configs[8] = {
+static const unsigned int gateway9200_m4_2_pin_configs[8] = {
         0x400000fe, 0x404500f4, 0x400100f0, 0x90110010,
         0x400100f1, 0x02a1902e, 0x500000f2, 0x500000f3,
 };
@@ -1213,7 +1206,7 @@ static unsigned int gateway9200_m4_2_pin_configs[8] = {
     102801DE
     102801E8
 */
-static unsigned int dell9200_d21_pin_configs[8] = {
+static const unsigned int dell9200_d21_pin_configs[8] = {
         0x400001f0, 0x400001f1, 0x02214030, 0x01014010, 
         0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
 };
@@ -1223,7 +1216,7 @@ static unsigned int dell9200_d21_pin_configs[8] = {
     102801C0
     102801C1
 */
-static unsigned int dell9200_d22_pin_configs[8] = {
+static const unsigned int dell9200_d22_pin_configs[8] = {
         0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
         0x01813020, 0x02a19021, 0x90100140, 0x400001f2,
 };
@@ -1237,7 +1230,7 @@ static unsigned int dell9200_d22_pin_configs[8] = {
     102801DA
     102801E3
 */
-static unsigned int dell9200_d23_pin_configs[8] = {
+static const unsigned int dell9200_d23_pin_configs[8] = {
         0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
         0x01813020, 0x01a19021, 0x90100140, 0x400001f2, 
 };
@@ -1248,7 +1241,7 @@ static unsigned int dell9200_d23_pin_configs[8] = {
     102801B5 (Dell Inspiron 630m)
     102801D8 (Dell Inspiron 640m)
 */
-static unsigned int dell9200_m21_pin_configs[8] = {
+static const unsigned int dell9200_m21_pin_configs[8] = {
         0x40c003fa, 0x03441340, 0x0321121f, 0x90170310,
         0x408003fb, 0x03a11020, 0x401003fc, 0x403003fd,
 };
@@ -1261,7 +1254,7 @@ static unsigned int dell9200_m21_pin_configs[8] = {
     102801D4 
     102801D6 
 */
-static unsigned int dell9200_m22_pin_configs[8] = {
+static const unsigned int dell9200_m22_pin_configs[8] = {
         0x40c003fa, 0x0144131f, 0x0321121f, 0x90170310, 
         0x90a70321, 0x03a11020, 0x401003fb, 0x40f000fc,
 };
@@ -1271,7 +1264,7 @@ static unsigned int dell9200_m22_pin_configs[8] = {
     102801CE (Dell XPS M1710)
     102801CF (Dell Precision M90)
 */
-static unsigned int dell9200_m23_pin_configs[8] = {
+static const unsigned int dell9200_m23_pin_configs[8] = {
         0x40c003fa, 0x01441340, 0x0421421f, 0x90170310,
         0x408003fb, 0x04a1102e, 0x90170311, 0x403003fc,
 };
@@ -1283,7 +1276,7 @@ static unsigned int dell9200_m23_pin_configs[8] = {
     102801CB (Dell Latitude 120L)
     102801D3
 */
-static unsigned int dell9200_m24_pin_configs[8] = {
+static const unsigned int dell9200_m24_pin_configs[8] = {
         0x40c003fa, 0x404003fb, 0x0321121f, 0x90170310, 
         0x408003fc, 0x03a11020, 0x401003fd, 0x403003fe, 
 };
@@ -1294,7 +1287,7 @@ static unsigned int dell9200_m24_pin_configs[8] = {
     102801EE
     102801EF
 */
-static unsigned int dell9200_m25_pin_configs[8] = {
+static const unsigned int dell9200_m25_pin_configs[8] = {
         0x40c003fa, 0x01441340, 0x0421121f, 0x90170310, 
         0x408003fb, 0x04a11020, 0x401003fc, 0x403003fd,
 };
@@ -1304,7 +1297,7 @@ static unsigned int dell9200_m25_pin_configs[8] = {
     102801F5 (Dell Inspiron 1501)
     102801F6
 */
-static unsigned int dell9200_m26_pin_configs[8] = {
+static const unsigned int dell9200_m26_pin_configs[8] = {
         0x40c003fa, 0x404003fb, 0x0421121f, 0x90170310, 
         0x408003fc, 0x04a11020, 0x401003fd, 0x403003fe,
 };
@@ -1313,18 +1306,18 @@ static unsigned int dell9200_m26_pin_configs[8] = {
     STAC 9200-32
     102801CD (Dell Inspiron E1705/9400)
 */
-static unsigned int dell9200_m27_pin_configs[8] = {
+static const unsigned int dell9200_m27_pin_configs[8] = {
         0x40c003fa, 0x01441340, 0x0421121f, 0x90170310,
         0x90170310, 0x04a11020, 0x90170310, 0x40f003fc,
 };
 
-static unsigned int oqo9200_pin_configs[8] = {
+static const unsigned int oqo9200_pin_configs[8] = {
         0x40c000f0, 0x404000f1, 0x0221121f, 0x02211210,
         0x90170111, 0x90a70120, 0x400000f2, 0x400000f3,
 };
 
 
-static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
+static const unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
         [STAC_REF] = ref9200_pin_configs,
         [STAC_9200_OQO] = oqo9200_pin_configs,
         [STAC_9200_DELL_D21] = dell9200_d21_pin_configs,
@@ -1342,7 +1335,7 @@ static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
         [STAC_9200_PANASONIC] = ref9200_pin_configs,
 };
 
-static const char *stac9200_models[STAC_9200_MODELS] = {
+static const char * const stac9200_models[STAC_9200_MODELS] = {
         [STAC_AUTO] = "auto",
         [STAC_REF] = "ref",
         [STAC_9200_OQO] = "oqo",
@@ -1361,7 +1354,7 @@ static const char *stac9200_models[STAC_9200_MODELS] = {
         [STAC_9200_PANASONIC] = "panasonic",
 };
 
-static struct snd_pci_quirk stac9200_cfg_tbl[] = {
+static const struct snd_pci_quirk stac9200_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_REF),
@@ -1437,47 +1430,47 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref925x_pin_configs[8] = {
+static const unsigned int ref925x_pin_configs[8] = {
         0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,
         0x90a70320, 0x02214210, 0x01019020, 0x9033032e,
 };
 
-static unsigned int stac925xM1_pin_configs[8] = {
+static const unsigned int stac925xM1_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
 };
 
-static unsigned int stac925xM1_2_pin_configs[8] = {
+static const unsigned int stac925xM1_2_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
 };
 
-static unsigned int stac925xM2_pin_configs[8] = {
+static const unsigned int stac925xM2_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
 };
 
-static unsigned int stac925xM2_2_pin_configs[8] = {
+static const unsigned int stac925xM2_2_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
 };
 
-static unsigned int stac925xM3_pin_configs[8] = {
+static const unsigned int stac925xM3_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x503303f3,
 };
 
-static unsigned int stac925xM5_pin_configs[8] = {
+static const unsigned int stac925xM5_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x9033032e,
 };
 
-static unsigned int stac925xM6_pin_configs[8] = {
+static const unsigned int stac925xM6_pin_configs[8] = {
         0x40c003f4, 0x424503f2, 0x400000f3, 0x02a19020,
         0x40a000f0, 0x90100210, 0x400003f1, 0x90330320,
 };
 
-static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
+static const unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
         [STAC_REF] = ref925x_pin_configs,
         [STAC_M1] = stac925xM1_pin_configs,
         [STAC_M1_2] = stac925xM1_2_pin_configs,
@@ -1488,7 +1481,7 @@ static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
         [STAC_M6] = stac925xM6_pin_configs,
 };
 
-static const char *stac925x_models[STAC_925x_MODELS] = {
+static const char * const stac925x_models[STAC_925x_MODELS] = {
         [STAC_925x_AUTO] = "auto",
         [STAC_REF] = "ref",
         [STAC_M1] = "m1",
@@ -1500,7 +1493,7 @@ static const char *stac925x_models[STAC_925x_MODELS] = {
         [STAC_M6] = "m6",
 };
 
-static struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {
+static const struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {
         SND_PCI_QUIRK(0x107b, 0x0316, "Gateway M255", STAC_M2),
         SND_PCI_QUIRK(0x107b, 0x0366, "Gateway MP6954", STAC_M5),
         SND_PCI_QUIRK(0x107b, 0x0461, "Gateway NX560XL", STAC_M1),
@@ -1514,7 +1507,7 @@ static struct snd_pci_quirk stac925x_codec_id_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static struct snd_pci_quirk stac925x_cfg_tbl[] = {
+static const 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),
@@ -1526,33 +1519,33 @@ static struct snd_pci_quirk stac925x_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref92hd73xx_pin_configs[13] = {
+static const unsigned int ref92hd73xx_pin_configs[13] = {
         0x02214030, 0x02a19040, 0x01a19020, 0x02214030,
         0x0181302e, 0x01014010, 0x01014020, 0x01014030,
         0x02319040, 0x90a000f0, 0x90a000f0, 0x01452050,
         0x01452050,
 };
 
-static unsigned int dell_m6_pin_configs[13] = {
+static const unsigned int dell_m6_pin_configs[13] = {
         0x0321101f, 0x4f00000f, 0x4f0000f0, 0x90170110,
         0x03a11020, 0x0321101f, 0x4f0000f0, 0x4f0000f0,
         0x4f0000f0, 0x90a60160, 0x4f0000f0, 0x4f0000f0,
         0x4f0000f0,
 };
 
-static unsigned int alienware_m17x_pin_configs[13] = {
+static const unsigned int alienware_m17x_pin_configs[13] = {
         0x0321101f, 0x0321101f, 0x03a11020, 0x03014020,
         0x90170110, 0x4f0000f0, 0x4f0000f0, 0x4f0000f0,
         0x4f0000f0, 0x90a60160, 0x4f0000f0, 0x4f0000f0,
         0x904601b0,
 };
 
-static unsigned int intel_dg45id_pin_configs[13] = {
+static const unsigned int intel_dg45id_pin_configs[13] = {
         0x02214230, 0x02A19240, 0x01013214, 0x01014210,
         0x01A19250, 0x01011212, 0x01016211
 };
 
-static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
+static const unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_REF]     = ref92hd73xx_pin_configs,
         [STAC_DELL_M6_AMIC]     = dell_m6_pin_configs,
         [STAC_DELL_M6_DMIC]     = dell_m6_pin_configs,
@@ -1562,7 +1555,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_INTEL]   = intel_dg45id_pin_configs,
 };
 
-static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
+static const char * const stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
         [STAC_92HD73XX_AUTO] = "auto",
         [STAC_92HD73XX_NO_JD] = "no-jd",
         [STAC_92HD73XX_REF] = "ref",
@@ -1574,7 +1567,7 @@ static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
         [STAC_ALIENWARE_M17X] = "alienware",
 };
 
-static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
+static const struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                                 "DFI LanParty", STAC_92HD73XX_REF),
@@ -1611,42 +1604,44 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe,
                                 "Dell Studio XPS 1645", STAC_DELL_M6_BOTH),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413,
-                                "Dell Studio 1558", STAC_DELL_M6_BOTH),
+                                "Dell Studio 1558", STAC_DELL_M6_DMIC),
         {} /* terminator */
 };
 
-static struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
+static const struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a1,
                       "Alienware M17x", STAC_ALIENWARE_M17X),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,
+                      "Alienware M17x", STAC_ALIENWARE_M17X),
         {} /* terminator */
 };
 
-static unsigned int ref92hd83xxx_pin_configs[10] = {
+static const unsigned int ref92hd83xxx_pin_configs[10] = {
         0x02214030, 0x02211010, 0x02a19020, 0x02170130,
         0x01014050, 0x01819040, 0x01014020, 0x90a3014e,
         0x01451160, 0x98560170,
 };
 
-static unsigned int dell_s14_pin_configs[10] = {
+static const unsigned int dell_s14_pin_configs[10] = {
         0x0221403f, 0x0221101f, 0x02a19020, 0x90170110,
         0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a60160,
         0x40f000f0, 0x40f000f0,
 };
 
-static unsigned int hp_dv7_4000_pin_configs[10] = {
+static const unsigned int hp_dv7_4000_pin_configs[10] = {
         0x03a12050, 0x0321201f, 0x40f000f0, 0x90170110,
         0x40f000f0, 0x40f000f0, 0x90170110, 0xd5a30140,
         0x40f000f0, 0x40f000f0,
 };
 
-static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
+static const 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,
         [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs,
 };
 
-static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
+static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
         [STAC_92HD83XXX_AUTO] = "auto",
         [STAC_92HD83XXX_REF] = "ref",
         [STAC_92HD83XXX_PWR_REF] = "mic-ref",
@@ -1655,7 +1650,7 @@ static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
         [STAC_HP_DV7_4000] = "hp-dv7-4000",
 };
 
-static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
+static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD83XXX_REF),
@@ -1668,35 +1663,35 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref92hd71bxx_pin_configs[STAC92HD71BXX_NUM_PINS] = {
+static const unsigned int ref92hd71bxx_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x02214030, 0x02a19040, 0x01a19020, 0x01014010,
         0x0181302e, 0x01014010, 0x01019020, 0x90a000f0,
         0x90a000f0, 0x01452050, 0x01452050, 0x00000000,
         0x00000000
 };
 
-static unsigned int dell_m4_1_pin_configs[STAC92HD71BXX_NUM_PINS] = {
+static const unsigned int dell_m4_1_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x40f000f0, 0x90170110,
         0x23a1902e, 0x23014250, 0x40f000f0, 0x90a000f0,
         0x40f000f0, 0x4f0000f0, 0x4f0000f0, 0x00000000,
         0x00000000
 };
 
-static unsigned int dell_m4_2_pin_configs[STAC92HD71BXX_NUM_PINS] = {
+static const unsigned int dell_m4_2_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
         0x23a1902e, 0x23014250, 0x40f000f0, 0x40f000f0,
         0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,
         0x00000000
 };
 
-static unsigned int dell_m4_3_pin_configs[STAC92HD71BXX_NUM_PINS] = {
+static const unsigned int dell_m4_3_pin_configs[STAC92HD71BXX_NUM_PINS] = {
         0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
         0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0,
         0x40f000f0, 0x044413b0, 0x044413b0, 0x00000000,
         0x00000000
 };
 
-static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
+static const unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,
         [STAC_DELL_M4_1]        = dell_m4_1_pin_configs,
         [STAC_DELL_M4_2]        = dell_m4_2_pin_configs,
@@ -1708,7 +1703,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
         [STAC_HP_DV4_1222NR]    = NULL,
 };
 
-static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
+static const char * const stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
         [STAC_92HD71BXX_AUTO] = "auto",
         [STAC_92HD71BXX_REF] = "ref",
         [STAC_DELL_M4_1] = "dell-m4-1",
@@ -1721,7 +1716,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
         [STAC_HP_DV4_1222NR] = "hp-dv4-1222nr",
 };
 
-static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
+static const struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD71BXX_REF),
@@ -1778,7 +1773,7 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref922x_pin_configs[10] = {
+static const unsigned int ref922x_pin_configs[10] = {
         0x01014010, 0x01016011, 0x01012012, 0x0221401f,
         0x01813122, 0x01011014, 0x01441030, 0x01c41030,
         0x40000100, 0x40000100,
@@ -1792,7 +1787,7 @@ static unsigned int ref922x_pin_configs[10] = {
     102801D1
     102801D2
 */
-static unsigned int dell_922x_d81_pin_configs[10] = {
+static const unsigned int dell_922x_d81_pin_configs[10] = {
         0x02214030, 0x01a19021, 0x01111012, 0x01114010,
         0x02a19020, 0x01117011, 0x400001f0, 0x400001f1,
         0x01813122, 0x400001f2,
@@ -1803,7 +1798,7 @@ static unsigned int dell_922x_d81_pin_configs[10] = {
     102801AC
     102801D0
 */
-static unsigned int dell_922x_d82_pin_configs[10] = {
+static const unsigned int dell_922x_d82_pin_configs[10] = {
         0x02214030, 0x01a19021, 0x01111012, 0x01114010,
         0x02a19020, 0x01117011, 0x01451140, 0x400001f0,
         0x01813122, 0x400001f1,
@@ -1813,7 +1808,7 @@ static unsigned int dell_922x_d82_pin_configs[10] = {
     STAC 922X pin configs for
     102801BF
 */
-static unsigned int dell_922x_m81_pin_configs[10] = {
+static const unsigned int dell_922x_m81_pin_configs[10] = {
         0x0321101f, 0x01112024, 0x01111222, 0x91174220,
         0x03a11050, 0x01116221, 0x90a70330, 0x01452340, 
         0x40C003f1, 0x405003f0,
@@ -1823,61 +1818,61 @@ static unsigned int dell_922x_m81_pin_configs[10] = {
     STAC 9221 A1 pin configs for
     102801D7 (Dell XPS M1210)
 */
-static unsigned int dell_922x_m82_pin_configs[10] = {
+static const unsigned int dell_922x_m82_pin_configs[10] = {
         0x02211211, 0x408103ff, 0x02a1123e, 0x90100310, 
         0x408003f1, 0x0221121f, 0x03451340, 0x40c003f2, 
         0x508003f3, 0x405003f4, 
 };
 
-static unsigned int d945gtp3_pin_configs[10] = {
+static const unsigned int d945gtp3_pin_configs[10] = {
         0x0221401f, 0x01a19022, 0x01813021, 0x01014010,
         0x40000100, 0x40000100, 0x40000100, 0x40000100,
         0x02a19120, 0x40000100,
 };
 
-static unsigned int d945gtp5_pin_configs[10] = {
+static const unsigned int d945gtp5_pin_configs[10] = {
         0x0221401f, 0x01011012, 0x01813024, 0x01014010,
         0x01a19021, 0x01016011, 0x01452130, 0x40000100,
         0x02a19320, 0x40000100,
 };
 
-static unsigned int intel_mac_v1_pin_configs[10] = {
+static const unsigned int intel_mac_v1_pin_configs[10] = {
         0x0121e21f, 0x400000ff, 0x9017e110, 0x400000fd,
         0x400000fe, 0x0181e020, 0x1145e030, 0x11c5e240,
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int intel_mac_v2_pin_configs[10] = {
+static const unsigned int intel_mac_v2_pin_configs[10] = {
         0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,
         0x400000fe, 0x0181e020, 0x1145e230, 0x500000fa,
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int intel_mac_v3_pin_configs[10] = {
+static const unsigned int intel_mac_v3_pin_configs[10] = {
         0x0121e21f, 0x90a7012e, 0x9017e110, 0x400000fd,
         0x400000fe, 0x0181e020, 0x1145e230, 0x11c5e240,
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int intel_mac_v4_pin_configs[10] = {
+static const unsigned int intel_mac_v4_pin_configs[10] = {
         0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,
         0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int intel_mac_v5_pin_configs[10] = {
+static const unsigned int intel_mac_v5_pin_configs[10] = {
         0x0321e21f, 0x03a1e02e, 0x9017e110, 0x9017e11f,
         0x400000fe, 0x0381e020, 0x1345e230, 0x13c5e240,
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int ecs202_pin_configs[10] = {
+static const unsigned int ecs202_pin_configs[10] = {
         0x0221401f, 0x02a19020, 0x01a19020, 0x01114010,
         0x408000f0, 0x01813022, 0x074510a0, 0x40c400f1,
         0x9037012e, 0x40e000f2,
 };
 
-static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
+static const unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
         [STAC_D945_REF] = ref922x_pin_configs,
         [STAC_D945GTP3] = d945gtp3_pin_configs,
         [STAC_D945GTP5] = d945gtp5_pin_configs,
@@ -1901,7 +1896,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
         [STAC_922X_DELL_M82] = dell_922x_m82_pin_configs,       
 };
 
-static const char *stac922x_models[STAC_922X_MODELS] = {
+static const char * const stac922x_models[STAC_922X_MODELS] = {
         [STAC_922X_AUTO] = "auto",
         [STAC_D945_REF] = "ref",
         [STAC_D945GTP5] = "5stack",
@@ -1926,7 +1921,7 @@ static const char *stac922x_models[STAC_922X_MODELS] = {
         [STAC_922X_DELL_M82] = "dell-m82",
 };
 
-static struct snd_pci_quirk stac922x_cfg_tbl[] = {
+static const struct snd_pci_quirk stac922x_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_D945_REF),
@@ -2017,42 +2012,42 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref927x_pin_configs[14] = {
+static const unsigned int ref927x_pin_configs[14] = {
         0x02214020, 0x02a19080, 0x0181304e, 0x01014010,
         0x01a19040, 0x01011012, 0x01016011, 0x0101201f, 
         0x183301f0, 0x18a001f0, 0x18a001f0, 0x01442070,
         0x01c42190, 0x40000100,
 };
 
-static unsigned int d965_3st_pin_configs[14] = {
+static const unsigned int d965_3st_pin_configs[14] = {
         0x0221401f, 0x02a19120, 0x40000100, 0x01014011,
         0x01a19021, 0x01813024, 0x40000100, 0x40000100,
         0x40000100, 0x40000100, 0x40000100, 0x40000100,
         0x40000100, 0x40000100
 };
 
-static unsigned int d965_5st_pin_configs[14] = {
+static const unsigned int d965_5st_pin_configs[14] = {
         0x02214020, 0x02a19080, 0x0181304e, 0x01014010,
         0x01a19040, 0x01011012, 0x01016011, 0x40000100,
         0x40000100, 0x40000100, 0x40000100, 0x01442070,
         0x40000100, 0x40000100
 };
 
-static unsigned int d965_5st_no_fp_pin_configs[14] = {
+static const unsigned int d965_5st_no_fp_pin_configs[14] = {
         0x40000100, 0x40000100, 0x0181304e, 0x01014010,
         0x01a19040, 0x01011012, 0x01016011, 0x40000100,
         0x40000100, 0x40000100, 0x40000100, 0x01442070,
         0x40000100, 0x40000100
 };
 
-static unsigned int dell_3st_pin_configs[14] = {
+static const unsigned int dell_3st_pin_configs[14] = {
         0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
         0x01111212, 0x01116211, 0x01813050, 0x01112214,
         0x403003fa, 0x90a60040, 0x90a60040, 0x404003fb,
         0x40c003fc, 0x40000100
 };
 
-static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
+static const unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
         [STAC_D965_REF_NO_JD] = ref927x_pin_configs,
         [STAC_D965_REF]  = ref927x_pin_configs,
         [STAC_D965_3ST]  = d965_3st_pin_configs,
@@ -2063,7 +2058,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
         [STAC_927X_VOLKNOB] = NULL,
 };
 
-static const char *stac927x_models[STAC_927X_MODELS] = {
+static const char * const stac927x_models[STAC_927X_MODELS] = {
         [STAC_927X_AUTO]        = "auto",
         [STAC_D965_REF_NO_JD]   = "ref-no-jd",
         [STAC_D965_REF]         = "ref",
@@ -2075,7 +2070,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = {
         [STAC_927X_VOLKNOB]     = "volknob",
 };
 
-static struct snd_pci_quirk stac927x_cfg_tbl[] = {
+static const struct snd_pci_quirk stac927x_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_D965_REF),
@@ -2113,7 +2108,7 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
         {} /* terminator */
 };
 
-static unsigned int ref9205_pin_configs[12] = {
+static const unsigned int ref9205_pin_configs[12] = {
         0x40000100, 0x40000100, 0x01016011, 0x01014010,
         0x01813122, 0x01a19021, 0x01019020, 0x40000100,
         0x90a000f0, 0x90a000f0, 0x01441030, 0x01c41030
@@ -2130,7 +2125,7 @@ static unsigned int ref9205_pin_configs[12] = {
     10280228 (Dell Vostro 1500)
     10280229 (Dell Vostro 1700)
 */
-static unsigned int dell_9205_m42_pin_configs[12] = {
+static const unsigned int dell_9205_m42_pin_configs[12] = {
         0x0321101F, 0x03A11020, 0x400003FA, 0x90170310,
         0x400003FB, 0x400003FC, 0x400003FD, 0x40F000F9,
         0x90A60330, 0x400003FF, 0x0144131F, 0x40C003FE,
@@ -2146,19 +2141,19 @@ static unsigned int dell_9205_m42_pin_configs[12] = {
     10280200
     10280201
 */
-static unsigned int dell_9205_m43_pin_configs[12] = {
+static const unsigned int dell_9205_m43_pin_configs[12] = {
         0x0321101f, 0x03a11020, 0x90a70330, 0x90170310,
         0x400000fe, 0x400000ff, 0x400000fd, 0x40f000f9,
         0x400000fa, 0x400000fc, 0x0144131f, 0x40c003f8,
 };
 
-static unsigned int dell_9205_m44_pin_configs[12] = {
+static const unsigned int dell_9205_m44_pin_configs[12] = {
         0x0421101f, 0x04a11020, 0x400003fa, 0x90170310,
         0x400003fb, 0x400003fc, 0x400003fd, 0x400003f9,
         0x90a60330, 0x400003ff, 0x01441340, 0x40c003fe,
 };
 
-static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
+static const unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
         [STAC_9205_REF] = ref9205_pin_configs,
         [STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
         [STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
@@ -2166,7 +2161,7 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
         [STAC_9205_EAPD] = NULL,
 };
 
-static const char *stac9205_models[STAC_9205_MODELS] = {
+static const char * const stac9205_models[STAC_9205_MODELS] = {
         [STAC_9205_AUTO] = "auto",
         [STAC_9205_REF] = "ref",
         [STAC_9205_DELL_M42] = "dell-m42",
@@ -2175,7 +2170,7 @@ static const char *stac9205_models[STAC_9205_MODELS] = {
         [STAC_9205_EAPD] = "eapd",
 };
 
-static struct snd_pci_quirk stac9205_cfg_tbl[] = {
+static const struct snd_pci_quirk stac9205_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_9205_REF),
@@ -2223,7 +2218,7 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
 };
 
 static void stac92xx_set_config_regs(struct hda_codec *codec,
-                                     unsigned int *pincfgs)
+                                     const unsigned int *pincfgs)
 {
         int i;
         struct sigmatel_spec *spec = codec->spec;
@@ -2343,7 +2338,7 @@ static int stac92xx_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
+static const struct hda_pcm_stream stac92xx_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -2356,14 +2351,14 @@ static struct hda_pcm_stream stac92xx_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream stac92xx_pcm_digital_capture = {
+static const struct hda_pcm_stream stac92xx_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
         /* NID is set in stac92xx_build_pcms */
 };
 
-static struct hda_pcm_stream stac92xx_pcm_analog_playback = {
+static const struct hda_pcm_stream stac92xx_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 8,
@@ -2375,7 +2370,7 @@ static struct hda_pcm_stream stac92xx_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
+static const struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -2387,7 +2382,7 @@ static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
         },
 };
 
-static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
+static const struct hda_pcm_stream stac92xx_pcm_analog_capture = {
         .channels_min = 2,
         .channels_max = 2,
         /* NID + .substreams is set in stac92xx_build_pcms */
@@ -2484,7 +2479,7 @@ static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol,
  
         spec->hp_switch = ucontrol->value.integer.value[0] ? nid : 0;
 
-        /* check to be sure that the ports are upto date with
+        /* check to be sure that the ports are up to date with
          * switch changes
          */
         stac_issue_unsol_event(codec, nid);
@@ -2496,7 +2491,7 @@ static int stac92xx_dc_bias_info(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_info *uinfo)
 {
         int i;
-        static char *texts[] = {
+        static const char * const texts[] = {
                 "Mic In", "Line In", "Line Out"
         };
 
@@ -2565,7 +2560,7 @@ static int stac92xx_dc_bias_put(struct snd_kcontrol *kcontrol,
 static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[2];
+        char *texts[2];
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct sigmatel_spec *spec = codec->spec;
 
@@ -2696,7 +2691,7 @@ enum {
         STAC_CTL_WIDGET_DC_BIAS
 };
 
-static struct snd_kcontrol_new stac92xx_control_templates[] = {
+static const struct snd_kcontrol_new stac92xx_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
         HDA_CODEC_MUTE_BEEP(NULL, 0, 0, 0),
@@ -2710,7 +2705,7 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = {
 /* add dynamic controls */
 static struct snd_kcontrol_new *
 stac_control_new(struct sigmatel_spec *spec,
-                 struct snd_kcontrol_new *ktemp,
+                 const struct snd_kcontrol_new *ktemp,
                  const char *name,
                  unsigned int subdev)
 {
@@ -2733,7 +2728,7 @@ stac_control_new(struct sigmatel_spec *spec,
 }
 
 static int stac92xx_add_control_temp(struct sigmatel_spec *spec,
-                                     struct snd_kcontrol_new *ktemp,
+                                     const struct snd_kcontrol_new *ktemp,
                                      int idx, const char *name,
                                      unsigned long val)
 {
@@ -2763,7 +2758,7 @@ 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 = {
+static const struct snd_kcontrol_new stac_input_src_temp = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Input Source",
         .info = stac92xx_mux_enum_info,
@@ -2779,7 +2774,7 @@ static inline int stac92xx_add_jack_mode_control(struct hda_codec *codec,
         struct sigmatel_spec *spec = codec->spec;
         char name[22];
 
-        if (!((get_defcfg_connect(def_conf)) & AC_JACK_PORT_FIXED)) {
+        if (snd_hda_get_input_pin_attr(def_conf) != INPUT_PIN_ATTR_INT) {
                 if (stac92xx_get_default_vref(codec, nid) == AC_PINCTL_VREF_GRD
                         && nid == spec->line_switch)
                         control = STAC_CTL_WIDGET_IO_SWITCH;
@@ -2791,7 +2786,7 @@ static inline int stac92xx_add_jack_mode_control(struct hda_codec *codec,
         }
 
         if (control) {
-                strcpy(name, auto_pin_cfg_labels[idx]);
+                strcpy(name, hda_get_input_pin_label(codec, nid, 1));
                 return stac92xx_add_control(codec->spec, control,
                                         strcat(name, " Jack Mode"), nid);
         }
@@ -2823,41 +2818,49 @@ static hda_nid_t check_line_out_switch(struct hda_codec *codec)
         struct auto_pin_cfg *cfg = &spec->autocfg;
         hda_nid_t nid;
         unsigned int pincap;
+        int i;
 
         if (cfg->line_out_type != AUTO_PIN_LINE_OUT)
                 return 0;
-        nid = cfg->input_pins[AUTO_PIN_LINE];
-        pincap = snd_hda_query_pin_caps(codec, nid);
-        if (pincap & AC_PINCAP_OUT)
-                return nid;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                if (cfg->inputs[i].type == AUTO_PIN_LINE_IN) {
+                        nid = cfg->inputs[i].pin;
+                        pincap = snd_hda_query_pin_caps(codec, nid);
+                        if (pincap & AC_PINCAP_OUT)
+                                return nid;
+                }
+        }
         return 0;
 }
 
+static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid);
+
 /* check whether the mic-input can be used as line-out */
-static hda_nid_t check_mic_out_switch(struct hda_codec *codec)
+static hda_nid_t check_mic_out_switch(struct hda_codec *codec, hda_nid_t *dac)
 {
         struct sigmatel_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
         unsigned int def_conf, pincap;
-        unsigned int mic_pin;
+        int i;
 
+        *dac = 0;
         if (cfg->line_out_type != AUTO_PIN_LINE_OUT)
                 return 0;
-        mic_pin = AUTO_PIN_MIC;
-        for (;;) {
-                hda_nid_t nid = cfg->input_pins[mic_pin];
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                if (cfg->inputs[i].type != AUTO_PIN_MIC)
+                        continue;
                 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) {
+                if (snd_hda_get_input_pin_attr(def_conf) != INPUT_PIN_ATTR_INT) {
                         pincap = snd_hda_query_pin_caps(codec, nid);
-                        if (pincap & AC_PINCAP_OUT)
-                                return nid;
+                        if (pincap & AC_PINCAP_OUT) {
+                                *dac = get_unassigned_dac(codec, nid);
+                                if (*dac)
+                                        return nid;
+                        }
                 }
-                if (mic_pin == AUTO_PIN_MIC)
-                        mic_pin = AUTO_PIN_FRONT_MIC;
-                else
-                        break;
         }
         return 0;
 }
@@ -3004,17 +3007,14 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec)
                 }
         }
         /* add mic as output */
-        nid = check_mic_out_switch(codec);
-        if (nid) {
-                dac = get_unassigned_dac(codec, nid);
-                if (dac) {
-                        snd_printdd("STAC: Add mic-in 0x%x as output %d\n",
-                                    nid, cfg->line_outs);
-                        cfg->line_out_pins[cfg->line_outs] = nid;
-                        cfg->line_outs++;
-                        spec->mic_switch = nid;
-                        add_spec_dacs(spec, dac);
-                }
+        nid = check_mic_out_switch(codec, &dac);
+        if (nid && dac) {
+                snd_printdd("STAC: Add mic-in 0x%x as output %d\n",
+                            nid, cfg->line_outs);
+                cfg->line_out_pins[cfg->line_outs] = nid;
+                cfg->line_outs++;
+                spec->mic_switch = nid;
+                add_spec_dacs(spec, dac);
         }
 
         snd_printd("stac92xx: dac_nids=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
@@ -3076,7 +3076,8 @@ static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
                 printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
                 return 1;
         } else {
-                spec->multiout.dac_nids[spec->multiout.num_dacs] = nid;
+                snd_BUG_ON(spec->multiout.dac_nids != spec->dac_nids);
+                spec->dac_nids[spec->multiout.num_dacs] = nid;
                 spec->multiout.num_dacs++;
         }
         return 0;
@@ -3104,7 +3105,7 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
                                  int type)
 {
         struct sigmatel_spec *spec = codec->spec;
-        static const char *chname[4] = {
+        static const char * const chname[4] = {
                 "Front", "Surround", NULL /*CLFE*/, "Side"
         };
         hda_nid_t nid;
@@ -3113,8 +3114,7 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
 
         for (i = 0; i < num_outs && i < ARRAY_SIZE(chname); i++) {
                 if (type == AUTO_PIN_HP_OUT && !spec->hp_detect) {
-                        wid_caps = get_wcaps(codec, pins[i]);
-                        if (wid_caps & AC_WCAP_UNSOL_CAP)
+                        if (is_jack_detectable(codec, pins[i]))
                                 spec->hp_detect = 1;
                 }
                 nid = dac_nids[i];
@@ -3204,13 +3204,13 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
                         return err;
         }
 
-        for (idx = AUTO_PIN_MIC; idx <= AUTO_PIN_FRONT_LINE; idx++) {
-                nid = cfg->input_pins[idx];
-                if (nid) {
-                        err = stac92xx_add_jack_mode_control(codec, nid, idx);
-                        if (err < 0)
-                                return err;
-                }
+        for (idx = 0; idx < cfg->num_inputs; idx++) {
+                if (cfg->inputs[idx].type > AUTO_PIN_LINE_IN)
+                        break;
+                nid = cfg->inputs[idx].pin;
+                err = stac92xx_add_jack_mode_control(codec, nid, idx);
+                if (err < 0)
+                        return err;
         }
 
         return 0;
@@ -3237,7 +3237,7 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
 }
 
 /* labels for mono mux outputs */
-static const char *stac92xx_mono_labels[4] = {
+static const char * const stac92xx_mono_labels[4] = {
         "DAC0", "DAC1", "Mixer", "DAC2"
 };
 
@@ -3256,12 +3256,9 @@ static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec)
         if (num_cons <= 0 || num_cons > ARRAY_SIZE(stac92xx_mono_labels))
                 return -EINVAL;
 
-        for (i = 0; i < num_cons; i++) {
-                mono_mux->items[mono_mux->num_items].label =
-                                        stac92xx_mono_labels[i];
-                mono_mux->items[mono_mux->num_items].index = i;
-                mono_mux->num_items++;
-        }
+        for (i = 0; i < num_cons; i++)
+                snd_hda_add_imux_item(mono_mux, stac92xx_mono_labels[i], i,
+                                      NULL);
 
         return stac92xx_add_control(spec, STAC_CTL_WIDGET_MONO_MUX,
                                 "Mono Mux", spec->mono_nid);
@@ -3316,7 +3313,7 @@ static int stac92xx_dig_beep_switch_put(struct snd_kcontrol *kcontrol,
         return snd_hda_enable_beep_device(codec, ucontrol->value.integer.value[0]);
 }
 
-static struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {
+static const struct snd_kcontrol_new stac92xx_dig_beep_ctrl = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .info = stac92xx_dig_beep_switch_info,
         .get = stac92xx_dig_beep_switch_get,
@@ -3364,7 +3361,7 @@ static int stac92xx_auto_create_mux_input_ctls(struct hda_codec *codec)
         return 0;
 };
 
-static const char *stac92xx_spdif_labels[3] = {
+static const char * const stac92xx_spdif_labels[3] = {
         "Digital Playback", "Analog Mux 1", "Analog Mux 2",
 };
 
@@ -3372,7 +3369,7 @@ static int stac92xx_auto_create_spdif_mux_ctls(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
         struct hda_input_mux *spdif_mux = &spec->private_smux;
-        const char **labels = spec->spdif_labels;
+        const char * const *labels = spec->spdif_labels;
         int i, num_cons;
         hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
 
@@ -3386,38 +3383,58 @@ static int stac92xx_auto_create_spdif_mux_ctls(struct hda_codec *codec)
         if (!labels)
                 labels = stac92xx_spdif_labels;
 
-        for (i = 0; i < num_cons; i++) {
-                spdif_mux->items[spdif_mux->num_items].label = labels[i];
-                spdif_mux->items[spdif_mux->num_items].index = i;
-                spdif_mux->num_items++;
-        }
+        for (i = 0; i < num_cons; i++)
+                snd_hda_add_imux_item(spdif_mux, labels[i], i, NULL);
 
         return 0;
 }
 
 /* labels for dmic mux inputs */
-static const char *stac92xx_dmic_labels[5] = {
+static const char * const stac92xx_dmic_labels[5] = {
         "Analog Inputs", "Digital Mic 1", "Digital Mic 2",
         "Digital Mic 3", "Digital Mic 4"
 };
 
+static hda_nid_t get_connected_node(struct hda_codec *codec, hda_nid_t mux,
+                                    int idx)
+{
+        hda_nid_t conn[HDA_MAX_NUM_INPUTS];
+        int nums;
+        nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));
+        if (idx >= 0 && idx < nums)
+                return conn[idx];
+        return 0;
+}
+
 static int get_connection_index(struct hda_codec *codec, hda_nid_t mux,
                                 hda_nid_t nid)
 {
         hda_nid_t conn[HDA_MAX_NUM_INPUTS];
         int i, nums;
 
+        if (!(get_wcaps(codec, mux) & AC_WCAP_CONN_LIST))
+                return -1;
+
         nums = snd_hda_get_connections(codec, mux, conn, ARRAY_SIZE(conn));
         for (i = 0; i < nums; i++)
                 if (conn[i] == nid)
                         return i;
+
+        for (i = 0; i < nums; i++) {
+                unsigned int wid_caps = get_wcaps(codec, conn[i]);
+                unsigned int wid_type = get_wcaps_type(wid_caps);
+
+                if (wid_type != AC_WID_PIN && wid_type != AC_WID_AUD_MIX)
+                        if (get_connection_index(codec, conn[i], nid) >= 0)
+                                return i;
+        }
         return -1;
 }
 
 /* create a volume assigned to the given pin (only if supported) */
 /* return 1 if the volume control is created */
 static int create_elem_capture_vol(struct hda_codec *codec, hda_nid_t nid,
-                                   const char *label, int direction)
+                                   const char *label, int idx, int direction)
 {
         unsigned int caps, nums;
         char name[32];
@@ -3434,8 +3451,8 @@ static int create_elem_capture_vol(struct hda_codec *codec, hda_nid_t nid,
         if (!nums)
                 return 0;
         snprintf(name, sizeof(name), "%s Capture Volume", label);
-        err = stac92xx_add_control(codec->spec, STAC_CTL_WIDGET_VOL, name,
-                                    HDA_COMPOSE_AMP_VAL(nid, 3, 0, direction));
+        err = stac92xx_add_control_idx(codec->spec, STAC_CTL_WIDGET_VOL, idx, name,
+                                       HDA_COMPOSE_AMP_VAL(nid, 3, 0, direction));
         if (err < 0)
                 return err;
         return 1;
@@ -3448,27 +3465,14 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
         struct sigmatel_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux;
         struct hda_input_mux *dimux = &spec->private_dimux;
-        int err, i, active_mics;
+        int err, i;
         unsigned int def_conf;
 
-        dimux->items[dimux->num_items].label = stac92xx_dmic_labels[0];
-        dimux->items[dimux->num_items].index = 0;
-        dimux->num_items++;
-
-        active_mics = 0;
-        for (i = 0; i < spec->num_dmics; i++) {
-                /* check the validity: sometimes it's a dead vendor-spec node */
-                if (get_wcaps_type(get_wcaps(codec, spec->dmic_nids[i]))
-                    != AC_WID_PIN)
-                        continue;
-                def_conf = snd_hda_codec_get_pincfg(codec, spec->dmic_nids[i]);
-                if (get_defcfg_connect(def_conf) != AC_JACK_PORT_NONE)
-                        active_mics++;
-        }
+        snd_hda_add_imux_item(dimux, stac92xx_dmic_labels[0], 0, NULL);
 
         for (i = 0; i < spec->num_dmics; i++) {
                 hda_nid_t nid;
-                int index;
+                int index, type_idx;
                 const char *label;
 
                 nid = spec->dmic_nids[i];
@@ -3482,28 +3486,30 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
                 if (index < 0)
                         continue;
 
-                if (active_mics == 1)
-                        label = "Digital Mic";
-                else
-                        label = stac92xx_dmic_labels[dimux->num_items];
+                label = hda_get_input_pin_label(codec, nid, 1);
+                snd_hda_add_imux_item(dimux, label, index, &type_idx);
+                if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1)
+                        snd_hda_add_imux_item(imux, label, index, &type_idx);
 
-                err = create_elem_capture_vol(codec, nid, label, HDA_INPUT);
+                err = create_elem_capture_vol(codec, nid, label, type_idx,
+                                              HDA_INPUT);
                 if (err < 0)
                         return err;
                 if (!err) {
                         err = create_elem_capture_vol(codec, nid, label,
-                                                      HDA_OUTPUT);
+                                                      type_idx, HDA_OUTPUT);
                         if (err < 0)
                                 return err;
-                }
-
-                dimux->items[dimux->num_items].label = label;
-                dimux->items[dimux->num_items].index = index;
-                dimux->num_items++;
-                if (snd_hda_get_bool_hint(codec, "separate_dmux") != 1) {
-                        imux->items[imux->num_items].label = label;
-                        imux->items[imux->num_items].index = index;
-                        imux->num_items++;
+                        if (!err) {
+                                nid = get_connected_node(codec,
+                                                spec->dmux_nids[0], index);
+                                if (nid)
+                                        err = create_elem_capture_vol(codec,
+                                                        nid, label,
+                                                        type_idx, HDA_INPUT);
+                                if (err < 0)
+                                        return err;
+                        }
                 }
         }
 
@@ -3511,22 +3517,37 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,
 }
 
 static int check_mic_pin(struct hda_codec *codec, hda_nid_t nid,
-                         hda_nid_t *fixed, hda_nid_t *ext)
+                         hda_nid_t *fixed, hda_nid_t *ext, hda_nid_t *dock)
 {
         unsigned int cfg;
+        unsigned int type;
 
         if (!nid)
                 return 0;
         cfg = snd_hda_codec_get_pincfg(codec, nid);
-        switch (get_defcfg_connect(cfg)) {
-        case AC_JACK_PORT_FIXED:
+        type = get_defcfg_device(cfg);
+        switch (snd_hda_get_input_pin_attr(cfg)) {
+        case INPUT_PIN_ATTR_INT:
                 if (*fixed)
                         return 1; /* already occupied */
+                if (type != AC_JACK_MIC_IN)
+                        return 1; /* invalid type */
                 *fixed = nid;
                 break;
-        case AC_JACK_PORT_COMPLEX:
+        case INPUT_PIN_ATTR_UNUSED:
+                break;
+        case INPUT_PIN_ATTR_DOCK:
+                if (*dock)
+                        return 1; /* already occupied */
+                if (type != AC_JACK_MIC_IN && type != AC_JACK_LINE_IN)
+                        return 1; /* invalid type */
+                *dock = nid;
+                break;
+        default:
                 if (*ext)
                         return 1; /* already occupied */
+                if (type != AC_JACK_MIC_IN)
+                        return 1; /* invalid type */
                 *ext = nid;
                 break;
         }
@@ -3542,10 +3563,13 @@ static int set_mic_route(struct hda_codec *codec,
         int i;
 
         mic->pin = pin;
-        for (i = AUTO_PIN_MIC; i <= AUTO_PIN_FRONT_MIC; i++)
-                if (pin == cfg->input_pins[i])
+        if (pin == 0)
+                return 0;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                if (pin == cfg->inputs[i].pin)
                         break;
-        if (i <= AUTO_PIN_FRONT_MIC) {
+        }
+        if (i < cfg->num_inputs && cfg->inputs[i].type == AUTO_PIN_MIC) {
                 /* analog pin */
                 i = get_connection_index(codec, spec->mux_nids[0], pin);
                 if (i < 0)
@@ -3576,26 +3600,25 @@ static int stac_check_auto_mic(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
-        hda_nid_t fixed, ext;
+        hda_nid_t fixed, ext, dock;
         int i;
 
-        for (i = AUTO_PIN_LINE; i < AUTO_PIN_LAST; i++) {
-                if (cfg->input_pins[i])
-                        return 0; /* must be exclusively mics */
-        }
-        fixed = ext = 0;
-        for (i = AUTO_PIN_MIC; i <= AUTO_PIN_FRONT_MIC; i++)
-                if (check_mic_pin(codec, cfg->input_pins[i], &fixed, &ext))
+        fixed = ext = dock = 0;
+        for (i = 0; i < cfg->num_inputs; i++)
+                if (check_mic_pin(codec, cfg->inputs[i].pin,
+                    &fixed, &ext, &dock))
                         return 0;
         for (i = 0; i < spec->num_dmics; i++)
-                if (check_mic_pin(codec, spec->dmic_nids[i], &fixed, &ext))
+                if (check_mic_pin(codec, spec->dmic_nids[i],
+                    &fixed, &ext, &dock))
                         return 0;
-        if (!fixed || !ext)
-                return 0;
-        if (!(get_wcaps(codec, ext) & AC_WCAP_UNSOL_CAP))
+        if (!fixed || (!ext && !dock))
+                return 0; /* no input to switch */
+        if (!is_jack_detectable(codec, ext))
                 return 0; /* no unsol support */
         if (set_mic_route(codec, &spec->ext_mic, ext) ||
-            set_mic_route(codec, &spec->int_mic, fixed))
+            set_mic_route(codec, &spec->int_mic, fixed) ||
+            set_mic_route(codec, &spec->dock_mic, dock))
                 return 0; /* something is wrong */
         return 1;
 }
@@ -3606,13 +3629,12 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
         struct sigmatel_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux;
         int i, j;
+        const char *label;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = cfg->input_pins[i];
-                int index, err;
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                int index, err, type_idx;
 
-                if (!nid)
-                        continue;
                 index = -1;
                 for (j = 0; j < spec->num_muxes; j++) {
                         index = get_connection_index(codec, spec->mux_nids[j],
@@ -3623,15 +3645,14 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
                 if (index < 0)
                         continue;
 
+                label = hda_get_autocfg_input_label(codec, cfg, i);
+                snd_hda_add_imux_item(imux, label, index, &type_idx);
+
                 err = create_elem_capture_vol(codec, nid,
-                                              auto_pin_cfg_labels[i],
+                                              label, type_idx,
                                               HDA_INPUT);
                 if (err < 0)
                         return err;
-
-                imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
-                imux->items[imux->num_items].index = index;
-                imux->num_items++;
         }
         spec->num_analog_muxes = imux->num_items;
 
@@ -3908,13 +3929,11 @@ static int stac9200_auto_create_hp_ctls(struct hda_codec *codec,
 {
         struct sigmatel_spec *spec = codec->spec;
         hda_nid_t pin = cfg->hp_pins[0];
-        unsigned int wid_caps;
 
         if (! pin)
                 return 0;
 
-        wid_caps = get_wcaps(codec, pin);
-        if (wid_caps & AC_WCAP_UNSOL_CAP)
+        if (is_jack_detectable(codec, pin))
                 spec->hp_detect = 1;
 
         return 0;
@@ -4046,21 +4065,10 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask,
                            AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */
 }
 
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-static void stac92xx_free_jack_priv(struct snd_jack *jack)
-{
-        struct sigmatel_jack *jacks = jack->private_data;
-        jacks->nid = 0;
-        jacks->jack = NULL;
-}
-#endif
-
 static int stac92xx_add_jack(struct hda_codec *codec,
                 hda_nid_t nid, int type)
 {
 #ifdef CONFIG_SND_HDA_INPUT_JACK
-        struct sigmatel_spec *spec = codec->spec;
-        struct sigmatel_jack *jack;
         int def_conf = snd_hda_codec_get_pincfg(codec, nid);
         int connectivity = get_defcfg_connect(def_conf);
         char name[32];
@@ -4069,26 +4077,15 @@ static int stac92xx_add_jack(struct hda_codec *codec,
         if (connectivity && connectivity != AC_JACK_PORT_FIXED)
                 return 0;
 
-        snd_array_init(&spec->jacks, sizeof(*jack), 32);
-        jack = snd_array_new(&spec->jacks);
-        if (!jack)
-                return -ENOMEM;
-        jack->nid = nid;
-        jack->type = type;
-
         snprintf(name, sizeof(name), "%s at %s %s Jack",
                 snd_hda_get_jack_type(def_conf),
                 snd_hda_get_jack_connectivity(def_conf),
                 snd_hda_get_jack_location(def_conf));
 
-        err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
-        if (err < 0) {
-                jack->nid = 0;
+        err = snd_hda_input_jack_add(codec, nid, type, name);
+        if (err < 0)
                 return err;
-        }
-        jack->jack->private_data = jack;
-        jack->jack->private_free = stac92xx_free_jack_priv;
-#endif
+#endif /* CONFIG_SND_HDA_INPUT_JACK */
         return 0;
 }
 
@@ -4147,7 +4144,7 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
         struct sigmatel_event *event;
         int tag;
 
-        if (!(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP))
+        if (!is_jack_detectable(codec, nid))
                 return 0;
         event = stac_get_event(codec, nid);
         if (event) {
@@ -4180,7 +4177,7 @@ static void stac92xx_power_down(struct hda_codec *codec)
         struct sigmatel_spec *spec = codec->spec;
 
         /* power down inactive DACs */
-        hda_nid_t *dac;
+        const hda_nid_t *dac;
         for (dac = spec->dac_list; *dac; dac++)
                 if (!check_all_dac_nids(spec, *dac))
                         snd_hda_codec_write(codec, *dac, 0,
@@ -4305,38 +4302,38 @@ static int stac92xx_init(struct hda_codec *codec)
                                           AC_VERB_SET_CONNECT_SEL, 0);
                 if (enable_pin_detect(codec, spec->ext_mic.pin, STAC_MIC_EVENT))
                         stac_issue_unsol_event(codec, spec->ext_mic.pin);
-        }
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = cfg->input_pins[i];
-                if (nid) {
-                        unsigned int pinctl, conf;
-                        if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) {
-                                /* for mic pins, force to initialize */
-                                pinctl = stac92xx_get_default_vref(codec, nid);
+                if (enable_pin_detect(codec, spec->dock_mic.pin,
+                    STAC_MIC_EVENT))
+                        stac_issue_unsol_event(codec, spec->dock_mic.pin);
+        }
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                int type = cfg->inputs[i].type;
+                unsigned int pinctl, conf;
+                if (type == AUTO_PIN_MIC) {
+                        /* for mic pins, force to initialize */
+                        pinctl = stac92xx_get_default_vref(codec, nid);
+                        pinctl |= AC_PINCTL_IN_EN;
+                        stac92xx_auto_set_pinctl(codec, nid, pinctl);
+                } else {
+                        pinctl = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                        /* if PINCTL already set then skip */
+                        /* Also, if both INPUT and OUTPUT are set,
+                         * it must be a BIOS bug; need to override, too
+                         */
+                        if (!(pinctl & AC_PINCTL_IN_EN) ||
+                            (pinctl & AC_PINCTL_OUT_EN)) {
+                                pinctl &= ~AC_PINCTL_OUT_EN;
                                 pinctl |= AC_PINCTL_IN_EN;
                                 stac92xx_auto_set_pinctl(codec, nid, pinctl);
-                        } else {
-                                pinctl = snd_hda_codec_read(codec, nid, 0,
-                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                                /* if PINCTL already set then skip */
-                                /* Also, if both INPUT and OUTPUT are set,
-                                 * it must be a BIOS bug; need to override, too
-                                 */
-                                if (!(pinctl & AC_PINCTL_IN_EN) ||
-                                    (pinctl & AC_PINCTL_OUT_EN)) {
-                                        pinctl &= ~AC_PINCTL_OUT_EN;
-                                        pinctl |= AC_PINCTL_IN_EN;
-                                        stac92xx_auto_set_pinctl(codec, nid,
-                                                                 pinctl);
-                                }
-                        }
-                        conf = snd_hda_codec_get_pincfg(codec, nid);
-                        if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {
-                                if (enable_pin_detect(codec, nid,
-                                                      STAC_INSERT_EVENT))
-                                        stac_issue_unsol_event(codec, nid);
                         }
                 }
+                conf = snd_hda_codec_get_pincfg(codec, nid);
+                if (get_defcfg_connect(conf) != AC_JACK_PORT_FIXED) {
+                        if (enable_pin_detect(codec, nid, STAC_INSERT_EVENT))
+                                stac_issue_unsol_event(codec, nid);
+                }
         }
         for (i = 0; i < spec->num_dmics; i++)
                 stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i],
@@ -4383,33 +4380,14 @@ static int stac92xx_init(struct hda_codec *codec)
                         stac_issue_unsol_event(codec, nid);
         }
 
-#ifdef CONFIG_SND_HDA_POWER_SAVE
         /* sync mute LED */
-        if (spec->gpio_led && codec->patch_ops.check_power_status)
-                codec->patch_ops.check_power_status(codec, 0x01);
-#endif  
+        if (spec->gpio_led)
+                hda_call_check_power_status(codec, 0x01);
         if (spec->dac_list)
                 stac92xx_power_down(codec);
         return 0;
 }
 
-static void stac92xx_free_jacks(struct hda_codec *codec)
-{
-#ifdef CONFIG_SND_HDA_INPUT_JACK
-        /* free jack instances manually when clearing/reconfiguring */
-        struct sigmatel_spec *spec = codec->spec;
-        if (!codec->bus->shutdown && spec->jacks.list) {
-                struct sigmatel_jack *jacks = spec->jacks.list;
-                int i;
-                for (i = 0; i < spec->jacks.used; i++, jacks++) {
-                        if (jacks->jack)
-                                snd_device_free(codec->bus->card, jacks->jack);
-                }
-        }
-        snd_array_free(&spec->jacks);
-#endif
-}
-
 static void stac92xx_free_kctls(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -4443,7 +4421,7 @@ static void stac92xx_free(struct hda_codec *codec)
                 return;
 
         stac92xx_shutup(codec);
-        stac92xx_free_jacks(codec);
+        snd_hda_input_jack_free(codec);
         snd_array_free(&spec->events);
 
         kfree(spec);
@@ -4661,31 +4639,34 @@ static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid)
         stac_toggle_power_map(codec, nid, get_pin_presence(codec, nid));
 }
 
-static void stac92xx_report_jack(struct hda_codec *codec, hda_nid_t nid)
+/* 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;
-        struct sigmatel_jack *jacks = spec->jacks.list;
+        unsigned int cfg;
 
-        if (jacks) {
-                int i;
-                for (i = 0; i < spec->jacks.used; i++) {
-                        if (jacks->nid == nid) {
-                                unsigned int pin_ctl =
-                                        snd_hda_codec_read(codec, nid,
-                                        0, AC_VERB_GET_PIN_WIDGET_CONTROL,
-                                         0x00);
-                                int type = jacks->type;
-                                if (type == (SND_JACK_LINEOUT
-                                                | SND_JACK_HEADPHONE))
-                                        type = (pin_ctl & AC_PINCTL_HP_EN)
-                                        ? SND_JACK_HEADPHONE : SND_JACK_LINEOUT;
-                                snd_jack_report(jacks->jack,
-                                        get_pin_presence(codec, nid)
-                                        ? type : 0);
-                        }
-                        jacks++;
-                }
+        cfg = snd_hda_codec_get_pincfg(codec, spec->pin_nids[idx]);
+        return get_defcfg_connect(cfg);
+}
+
+static int stac92xx_connected_ports(struct hda_codec *codec,
+                                    const 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 void stac92xx_mic_detect(struct hda_codec *codec)
@@ -4695,6 +4676,8 @@ static void stac92xx_mic_detect(struct hda_codec *codec)
 
         if (get_pin_presence(codec, spec->ext_mic.pin))
                 mic = &spec->ext_mic;
+        else if (get_pin_presence(codec, spec->dock_mic.pin))
+                mic = &spec->dock_mic;
         else
                 mic = &spec->int_mic;
         if (mic->dmux_idx >= 0)
@@ -4744,7 +4727,7 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
         case STAC_PWR_EVENT:
                 if (spec->num_pwrs > 0)
                         stac92xx_pin_sense(codec, event->nid);
-                stac92xx_report_jack(codec, event->nid);
+                snd_hda_input_jack_report(codec, event->nid);
 
                 switch (codec->subsystem_id) {
                 case 0x103c308f:
@@ -4937,11 +4920,9 @@ static int stac92xx_resume(struct hda_codec *codec)
                         stac_issue_unsol_event(codec,
                                                spec->autocfg.line_out_pins[0]);
         }
-#ifdef CONFIG_SND_HDA_POWER_SAVE
         /* sync mute LED */
-        if (spec->gpio_led && codec->patch_ops.check_power_status)
-                codec->patch_ops.check_power_status(codec, 0x01);
-#endif  
+        if (spec->gpio_led)
+                hda_call_check_power_status(codec, 0x01);
         return 0;
 }
 
@@ -4993,7 +4974,7 @@ static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
 }
 #endif
 
-static struct hda_codec_ops stac92xx_patch_ops = {
+static const struct hda_codec_ops stac92xx_patch_ops = {
         .build_controls = stac92xx_build_controls,
         .build_pcms = stac92xx_build_pcms,
         .init = stac92xx_init,
@@ -5302,6 +5283,145 @@ again:
         return 0;
 }
 
+static int hp_bnb2011_with_dock(struct hda_codec *codec)
+{
+        if (codec->vendor_id != 0x111d7605 &&
+            codec->vendor_id != 0x111d76d1)
+                return 0;
+
+        switch (codec->subsystem_id) {
+        case 0x103c1618:
+        case 0x103c1619:
+        case 0x103c161a:
+        case 0x103c161b:
+        case 0x103c161c:
+        case 0x103c161d:
+        case 0x103c161e:
+        case 0x103c161f:
+
+        case 0x103c162a:
+        case 0x103c162b:
+
+        case 0x103c1630:
+        case 0x103c1631:
+
+        case 0x103c1633:
+        case 0x103c1634:
+        case 0x103c1635:
+
+        case 0x103c3587:
+        case 0x103c3588:
+        case 0x103c3589:
+        case 0x103c358a:
+
+        case 0x103c3667:
+        case 0x103c3668:
+        case 0x103c3669:
+
+                return 1;
+        }
+        return 0;
+}
+
+static void stac92hd8x_add_pin(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int def_conf = snd_hda_codec_get_pincfg(codec, nid);
+        int i;
+
+        spec->auto_pin_nids[spec->auto_pin_cnt] = nid;
+        spec->auto_pin_cnt++;
+
+        if (get_defcfg_device(def_conf) == AC_JACK_MIC_IN &&
+            get_defcfg_connect(def_conf) != AC_JACK_PORT_NONE) {
+                for (i = 0; i < ARRAY_SIZE(stac92hd83xxx_dmic_nids); i++) {
+                        if (nid == stac92hd83xxx_dmic_nids[i]) {
+                                spec->auto_dmic_nids[spec->auto_dmic_cnt] = nid;
+                                spec->auto_dmic_cnt++;
+                        }
+                }
+        }
+}
+
+static void stac92hd8x_add_adc(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct sigmatel_spec *spec = codec->spec;
+
+        spec->auto_adc_nids[spec->auto_adc_cnt] = nid;
+        spec->auto_adc_cnt++;
+}
+
+static void stac92hd8x_add_mux(struct hda_codec *codec, hda_nid_t nid)
+{
+        int i, j;
+        struct sigmatel_spec *spec = codec->spec;
+
+        for (i = 0; i < spec->auto_adc_cnt; i++) {
+                if (get_connection_index(codec,
+                                spec->auto_adc_nids[i], nid) >= 0) {
+                        /* mux and volume for adc_nids[i] */
+                        if (!spec->auto_mux_nids[i]) {
+                                spec->auto_mux_nids[i] = nid;
+                                /* 92hd codecs capture volume is in mux */
+                                spec->auto_capvols[i] = HDA_COMPOSE_AMP_VAL(nid,
+                                                        3, 0, HDA_OUTPUT);
+                        }
+                        for (j = 0; j < spec->auto_dmic_cnt; j++) {
+                                if (get_connection_index(codec, nid,
+                                                spec->auto_dmic_nids[j]) >= 0) {
+                                        /* dmux for adc_nids[i] */
+                                        if (!spec->auto_dmux_nids[i])
+                                                spec->auto_dmux_nids[i] = nid;
+                                        break;
+                                }
+                        }
+                        break;
+                }
+        }
+}
+
+static void stac92hd8x_fill_auto_spec(struct hda_codec *codec)
+{
+        hda_nid_t nid, end_nid;
+        unsigned int wid_caps, wid_type;
+        struct sigmatel_spec *spec = codec->spec;
+
+        end_nid = codec->start_nid + codec->num_nodes;
+
+        for (nid = codec->start_nid; nid < end_nid; nid++) {
+                wid_caps = get_wcaps(codec, nid);
+                wid_type = get_wcaps_type(wid_caps);
+
+                if (wid_type == AC_WID_PIN)
+                        stac92hd8x_add_pin(codec, nid);
+
+                if (wid_type == AC_WID_AUD_IN && !(wid_caps & AC_WCAP_DIGITAL))
+                        stac92hd8x_add_adc(codec, nid);
+        }
+
+        for (nid = codec->start_nid; nid < end_nid; nid++) {
+                wid_caps = get_wcaps(codec, nid);
+                wid_type = get_wcaps_type(wid_caps);
+
+                if (wid_type == AC_WID_AUD_SEL)
+                        stac92hd8x_add_mux(codec, nid);
+        }
+
+        spec->pin_nids = spec->auto_pin_nids;
+        spec->num_pins = spec->auto_pin_cnt;
+        spec->adc_nids = spec->auto_adc_nids;
+        spec->num_adcs = spec->auto_adc_cnt;
+        spec->capvols = spec->auto_capvols;
+        spec->capsws = spec->auto_capvols;
+        spec->num_caps = spec->auto_adc_cnt;
+        spec->mux_nids = spec->auto_mux_nids;
+        spec->num_muxes = spec->auto_adc_cnt;
+        spec->dmux_nids = spec->auto_dmux_nids;
+        spec->num_dmuxes = spec->auto_adc_cnt;
+        spec->dmic_nids = spec->auto_dmic_nids;
+        spec->num_dmics = spec->auto_dmic_cnt;
+}
+
 static int patch_stac92hd83xxx(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
@@ -5313,26 +5433,27 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
+        if (hp_bnb2011_with_dock(codec)) {
+                snd_hda_codec_set_pincfg(codec, 0xa, 0x2101201f);
+                snd_hda_codec_set_pincfg(codec, 0xf, 0x2181205e);
+        }
+
+        /* reset pin power-down; Windows may leave these bits after reboot */
+        snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7EC, 0);
+        snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7ED, 0);
         codec->no_trigger_sense = 1;
         codec->spec = spec;
-        spec->linear_tone_beep = 1;
+
+        stac92hd8x_fill_auto_spec(codec);
+
+        spec->linear_tone_beep = 0;
         codec->slave_dig_outs = stac92hd83xxx_slave_dig_outs;
         spec->digbeep_nid = 0x21;
-        spec->mux_nids = stac92hd83xxx_mux_nids;
-        spec->num_muxes = ARRAY_SIZE(stac92hd83xxx_mux_nids);
-        spec->adc_nids = stac92hd83xxx_adc_nids;
-        spec->num_adcs = ARRAY_SIZE(stac92hd83xxx_adc_nids);
         spec->pwr_nids = stac92hd83xxx_pwr_nids;
         spec->pwr_mapping = stac92hd83xxx_pwr_mapping;
         spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
         spec->multiout.dac_nids = spec->dac_nids;
-
         spec->init = stac92hd83xxx_core_init;
-        spec->num_pins = ARRAY_SIZE(stac92hd83xxx_pin_nids);
-        spec->pin_nids = stac92hd83xxx_pin_nids;
-        spec->num_caps = STAC92HD83XXX_NUM_CAPS;
-        spec->capvols = stac92hd83xxx_capvols;
-        spec->capsws = stac92hd83xxx_capsws;
 
         spec->board_config = snd_hda_check_board_config(codec,
                                                         STAC_92HD83XXX_MODELS,
@@ -5347,22 +5468,19 @@ again:
                                 stac92hd83xxx_brd_tbl[spec->board_config]);
 
         switch (codec->vendor_id) {
+        case 0x111d76d1:
+        case 0x111d76d9:
+        case 0x111d76e5:
         case 0x111d7666:
         case 0x111d7667:
         case 0x111d7668:
         case 0x111d7669:
-        case 0x111d76d1:
-        case 0x111d76d9:
-                spec->num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids);
-                spec->pin_nids = stac92hd88xxx_pin_nids;
-                spec->mono_nid = 0;
-                spec->digbeep_nid = 0;
-                spec->num_pwrs = 0;
-                break;
+        case 0x111d76e3:
         case 0x111d7604:
         case 0x111d76d4:
         case 0x111d7605:
         case 0x111d76d5:
+        case 0x111d76e7:
                 if (spec->board_config == STAC_92HD83XXX_PWR_REF)
                         break;
                 spec->num_pwrs = 0;
@@ -5424,36 +5542,6 @@ again:
         return 0;
 }
 
-/* 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)
 {
@@ -5506,7 +5594,7 @@ static int stac_hp_bass_gpio_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
-static struct snd_kcontrol_new stac_hp_bass_sw_ctrl = {
+static const struct snd_kcontrol_new stac_hp_bass_sw_ctrl = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .info = stac_hp_bass_gpio_info,
         .get = stac_hp_bass_gpio_get,
@@ -5530,7 +5618,7 @@ static int stac_add_hp_bass_switch(struct hda_codec *codec)
 static int patch_stac92hd71bxx(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
-        struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;
+        const struct hda_verb *unmute_init = stac92hd71bxx_unmute_core_init;
         unsigned int pin_cfg;
         int err = 0;
 
@@ -5592,7 +5680,7 @@ again:
         case 0x111d76b5:
                 spec->init = stac92hd71bxx_core_init;
                 codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
-                spec->num_dmics = stac92hd71bxx_connected_ports(codec,
+                spec->num_dmics = stac92xx_connected_ports(codec,
                                         stac92hd71bxx_dmic_nids,
                                         STAC92HD71BXX_NUM_DMICS);
                 break;
@@ -5623,9 +5711,9 @@ again:
                 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,
+                spec->dmic_nids = stac92hd71bxx_dmic_5port_nids;
+                spec->num_dmics = stac92xx_connected_ports(codec,
+                                        stac92hd71bxx_dmic_5port_nids,
                                         STAC92HD71BXX_NUM_DMICS - 1);
                 break;
         case 0x111d7603: /* 6 Port with Analog Mixer */
@@ -5638,7 +5726,7 @@ again:
         default:
                 spec->init = stac92hd71bxx_core_init;
                 codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
-                spec->num_dmics = stac92hd71bxx_connected_ports(codec,
+                spec->num_dmics = stac92xx_connected_ports(codec,
                                         stac92hd71bxx_dmic_nids,
                                         STAC92HD71BXX_NUM_DMICS);
                 break;
@@ -5647,15 +5735,6 @@ again:
         if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP)
                 snd_hda_sequence_write_cache(codec, unmute_init);
 
-        /* Some HP machines seem to have unstable codec communications
-         * especially with ATI fglrx driver.  For recovering from the
-         * CORB/RIRB stall, allow the BUS reset and keep always sync
-         */
-        if (spec->board_config == STAC_HP_DV5) {
-                codec->bus->sync_write = 1;
-                codec->bus->allow_bus_reset = 1;
-        }
-
         spec->aloopback_ctl = stac92hd71bxx_loopback;
         spec->aloopback_mask = 0x50;
         spec->aloopback_shift = 0;
@@ -6141,46 +6220,46 @@ static int patch_stac9205(struct hda_codec *codec)
  * STAC9872 hack
  */
 
-static struct hda_verb stac9872_core_init[] = {
+static const struct hda_verb stac9872_core_init[] = {
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x1}, /* mic-sel: 0a,0d,14,02 */
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -> 0x9 */
         {}
 };
 
-static hda_nid_t stac9872_pin_nids[] = {
+static const hda_nid_t stac9872_pin_nids[] = {
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
         0x11, 0x13, 0x14,
 };
 
-static hda_nid_t stac9872_adc_nids[] = {
+static const hda_nid_t stac9872_adc_nids[] = {
         0x8 /*,0x6*/
 };
 
-static hda_nid_t stac9872_mux_nids[] = {
+static const hda_nid_t stac9872_mux_nids[] = {
         0x15
 };
 
-static unsigned long stac9872_capvols[] = {
+static const unsigned long stac9872_capvols[] = {
         HDA_COMPOSE_AMP_VAL(0x09, 3, 0, HDA_INPUT),
 };
 #define stac9872_capsws         stac9872_capvols
 
-static unsigned int stac9872_vaio_pin_configs[9] = {
+static const unsigned int stac9872_vaio_pin_configs[9] = {
         0x03211020, 0x411111f0, 0x411111f0, 0x03a15030,
         0x411111f0, 0x90170110, 0x411111f0, 0x411111f0,
         0x90a7013e
 };
 
-static const char *stac9872_models[STAC_9872_MODELS] = {
+static const char * const stac9872_models[STAC_9872_MODELS] = {
         [STAC_9872_AUTO] = "auto",
         [STAC_9872_VAIO] = "vaio",
 };
 
-static unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
+static const unsigned int *stac9872_brd_tbl[STAC_9872_MODELS] = {
         [STAC_9872_VAIO] = stac9872_vaio_pin_configs,
 };
 
-static struct snd_pci_quirk stac9872_cfg_tbl[] = {
+static const struct snd_pci_quirk stac9872_cfg_tbl[] = {
         SND_PCI_QUIRK_MASK(0x104d, 0xfff0, 0x81e0,
                            "Sony VAIO F/S", STAC_9872_VAIO),
         {} /* terminator */
@@ -6234,7 +6313,7 @@ static int patch_stac9872(struct hda_codec *codec)
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
+static const struct hda_codec_preset snd_hda_preset_sigmatel[] = {
         { .id = 0x83847690, .name = "STAC9200", .patch = patch_stac9200 },
         { .id = 0x83847882, .name = "STAC9220 A1", .patch = patch_stac922x },
         { .id = 0x83847680, .name = "STAC9221 A1", .patch = patch_stac922x },
@@ -6320,6 +6399,10 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = {
         { .id = 0x111d76cc, .name = "92HD89F3", .patch = patch_stac92hd73xx },
         { .id = 0x111d76cd, .name = "92HD89F2", .patch = patch_stac92hd73xx },
         { .id = 0x111d76ce, .name = "92HD89F1", .patch = patch_stac92hd73xx },
+        { .id = 0x111d76e0, .name = "92HD91BXX", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx},
+        { .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx},
         {} /* terminator */
 };
 
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index ae3acb2b42d1..f43bb0eaed8b 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -98,24 +98,30 @@ enum VIA_HDA_CODEC {
         VT1716S,
         VT2002P,
         VT1812,
+        VT1802,
         CODEC_TYPES,
 };
 
+#define VT2002P_COMPATIBLE(spec) \
+        ((spec)->codec_type == VT2002P ||\
+         (spec)->codec_type == VT1812 ||\
+         (spec)->codec_type == VT1802)
+
 struct via_spec {
         /* codec parameterization */
-        struct snd_kcontrol_new *mixers[6];
+        const struct snd_kcontrol_new *mixers[6];
         unsigned int num_mixers;
 
-        struct hda_verb *init_verbs[5];
+        const struct hda_verb *init_verbs[5];
         unsigned int num_iverbs;
 
         char *stream_name_analog;
-        struct hda_pcm_stream *stream_analog_playback;
-        struct hda_pcm_stream *stream_analog_capture;
+        const struct hda_pcm_stream *stream_analog_playback;
+        const struct hda_pcm_stream *stream_analog_capture;
 
         char *stream_name_digital;
-        struct hda_pcm_stream *stream_digital_playback;
-        struct hda_pcm_stream *stream_digital_capture;
+        const struct hda_pcm_stream *stream_digital_playback;
+        const struct hda_pcm_stream *stream_digital_capture;
 
         /* playback */
         struct hda_multi_out multiout;
@@ -123,7 +129,7 @@ struct via_spec {
 
         /* capture */
         unsigned int num_adc_nids;
-        hda_nid_t *adc_nids;
+        const hda_nid_t *adc_nids;
         hda_nid_t mux_nids[3];
         hda_nid_t dig_in_nid;
         hda_nid_t dig_in_pin;
@@ -154,11 +160,15 @@ struct via_spec {
         struct delayed_work vt1708_hp_work;
         int vt1708_jack_detectect;
         int vt1708_hp_present;
+
+        void (*set_widgets_power_state)(struct hda_codec *codec);
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         struct hda_loopback_check loopback;
 #endif
 };
 
+static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec);
 static struct via_spec * via_new_spec(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -169,6 +179,10 @@ static struct via_spec * via_new_spec(struct hda_codec *codec)
 
         codec->spec = spec;
         spec->codec = codec;
+        spec->codec_type = get_codec_type(codec);
+        /* VT1708BCE & VT1708S are almost same */
+        if (spec->codec_type == VT1708BCE)
+                spec->codec_type = VT1708S;
         return spec;
 }
 
@@ -213,17 +227,19 @@ static enum VIA_HDA_CODEC get_codec_type(struct hda_codec *codec)
                 codec_type = VT1812;
         else if (dev_id == 0x0440)
                 codec_type = VT1708S;
+        else if ((dev_id & 0xfff) == 0x446)
+                codec_type = VT1802;
         else
                 codec_type = UNKNOWN;
         return codec_type;
 };
 
+#define VIA_JACK_EVENT          0x20
 #define VIA_HP_EVENT            0x01
 #define VIA_GPIO_EVENT          0x02
-#define VIA_JACK_EVENT          0x04
-#define VIA_MONO_EVENT          0x08
-#define VIA_SPEAKER_EVENT       0x10
-#define VIA_BIND_HP_EVENT       0x20
+#define VIA_MONO_EVENT          0x03
+#define VIA_SPEAKER_EVENT       0x04
+#define VIA_BIND_HP_EVENT       0x05
 
 enum {
         VIA_CTL_WIDGET_VOL,
@@ -240,7 +256,6 @@ enum {
 };
 
 static void analog_low_current_mode(struct hda_codec *codec, int stream_idle);
-static void set_jack_power_state(struct hda_codec *codec);
 static int is_aa_path_mute(struct hda_codec *codec);
 
 static void vt1708_start_hp_work(struct via_spec *spec)
@@ -263,10 +278,15 @@ static void vt1708_stop_hp_work(struct via_spec *spec)
                 return;
         snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
                             !spec->vt1708_jack_detectect);
-        cancel_delayed_work(&spec->vt1708_hp_work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&spec->vt1708_hp_work);
 }
 
+static void set_widgets_power_state(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        if (spec->set_widgets_power_state)
+                spec->set_widgets_power_state(codec);
+}
 
 static int analog_input_switch_put(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
@@ -274,7 +294,7 @@ static int analog_input_switch_put(struct snd_kcontrol *kcontrol,
         int change = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
 
-        set_jack_power_state(codec);
+        set_widgets_power_state(codec);
         analog_low_current_mode(snd_kcontrol_chip(kcontrol), -1);
         if (snd_hda_get_bool_hint(codec, "analog_loopback_hp_detect") == 1) {
                 if (is_aa_path_mute(codec))
@@ -390,62 +410,62 @@ static int bind_pin_switch_put(struct snd_kcontrol *kcontrol,
                         .put = bind_pin_switch_put,                     \
                         .private_value = HDA_COMPOSE_AMP_VAL(0, 3, 0, 0) }
 
-static struct snd_kcontrol_new via_control_templates[] = {
+static const struct snd_kcontrol_new via_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
         ANALOG_INPUT_MUTE,
         BIND_PIN_MUTE,
 };
 
-static hda_nid_t vt1708_adc_nids[2] = {
+static const hda_nid_t vt1708_adc_nids[2] = {
         /* ADC1-2 */
         0x15, 0x27
 };
 
-static hda_nid_t vt1709_adc_nids[3] = {
+static const hda_nid_t vt1709_adc_nids[3] = {
         /* ADC1-2 */
         0x14, 0x15, 0x16
 };
 
-static hda_nid_t vt1708B_adc_nids[2] = {
+static const hda_nid_t vt1708B_adc_nids[2] = {
         /* ADC1-2 */
         0x13, 0x14
 };
 
-static hda_nid_t vt1708S_adc_nids[2] = {
+static const hda_nid_t vt1708S_adc_nids[2] = {
         /* ADC1-2 */
         0x13, 0x14
 };
 
-static hda_nid_t vt1702_adc_nids[3] = {
+static const hda_nid_t vt1702_adc_nids[3] = {
         /* ADC1-2 */
         0x12, 0x20, 0x1F
 };
 
-static hda_nid_t vt1718S_adc_nids[2] = {
+static const hda_nid_t vt1718S_adc_nids[2] = {
         /* ADC1-2 */
         0x10, 0x11
 };
 
-static hda_nid_t vt1716S_adc_nids[2] = {
+static const hda_nid_t vt1716S_adc_nids[2] = {
         /* ADC1-2 */
         0x13, 0x14
 };
 
-static hda_nid_t vt2002P_adc_nids[2] = {
+static const hda_nid_t vt2002P_adc_nids[2] = {
         /* ADC1-2 */
         0x10, 0x11
 };
 
-static hda_nid_t vt1812_adc_nids[2] = {
+static const hda_nid_t vt1812_adc_nids[2] = {
         /* ADC1-2 */
         0x10, 0x11
 };
 
 
 /* add dynamic controls */
-static int via_add_control(struct via_spec *spec, int type, const char *name,
-                           unsigned long val)
+static int __via_add_control(struct via_spec *spec, int type, const char *name,
+                             int idx, unsigned long val)
 {
         struct snd_kcontrol_new *knew;
 
@@ -463,8 +483,11 @@ static int via_add_control(struct via_spec *spec, int type, const char *name,
         return 0;
 }
 
+#define via_add_control(spec, type, name, val) \
+        __via_add_control(spec, type, name, 0, val)
+
 static struct snd_kcontrol_new *via_clone_control(struct via_spec *spec,
-                                                struct snd_kcontrol_new *tmpl)
+                                const struct snd_kcontrol_new *tmpl)
 {
         struct snd_kcontrol_new *knew;
 
@@ -494,18 +517,18 @@ static void via_free_kctls(struct hda_codec *codec)
 
 /* create input playback/capture controls for the given pin */
 static int via_new_analog_input(struct via_spec *spec, const char *ctlname,
-                                int idx, int mix_nid)
+                                int type_idx, int idx, int mix_nid)
 {
         char name[32];
         int err;
 
         sprintf(name, "%s Playback Volume", ctlname);
-        err = via_add_control(spec, VIA_CTL_WIDGET_VOL, name,
+        err = __via_add_control(spec, VIA_CTL_WIDGET_VOL, name, type_idx,
                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
         sprintf(name, "%s Playback Switch", ctlname);
-        err = via_add_control(spec, VIA_CTL_WIDGET_ANALOG_MUTE, name,
+        err = __via_add_control(spec, VIA_CTL_WIDGET_ANALOG_MUTE, name, type_idx,
                               HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
         if (err < 0)
                 return err;
@@ -557,17 +580,15 @@ static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin);
 static void via_auto_init_analog_input(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
         unsigned int ctl;
         int i;
 
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[i];
-                if (!nid)
-                        continue;
-
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
                 if (spec->smart51_enabled && is_smart51_pins(spec, nid))
                         ctl = PIN_OUT;
-                else if (i <= AUTO_PIN_FRONT_MIC)
+                else if (cfg->inputs[i].type == AUTO_PIN_MIC)
                         ctl = PIN_VREF50;
                 else
                         ctl = PIN_IN;
@@ -597,482 +618,6 @@ static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
         snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
 }
 
-static void set_jack_power_state(struct hda_codec *codec)
-{
-        struct via_spec *spec = codec->spec;
-        int imux_is_smixer;
-        unsigned int parm;
-
-        if (spec->codec_type == VT1702) {
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
-                /* inputs */
-                /* PW 1/2/5 (14h/15h/18h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x14, &parm);
-                set_pin_power_state(codec, 0x15, &parm);
-                set_pin_power_state(codec, 0x18, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0; /* SW0 = stereo mixer (idx 3) */
-                /* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */
-                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* outputs */
-                /* PW 3/4 (16h/17h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x16, &parm);
-                set_pin_power_state(codec, 0x17, &parm);
-                /* MW0 (1ah), AOW 0/1 (10h/1dh) */
-                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
-                                    imux_is_smixer ? AC_PWRST_D0 : parm);
-                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-        } else if (spec->codec_type == VT1708B_8CH
-                   || spec->codec_type == VT1708B_4CH
-                   || spec->codec_type == VT1708S) {
-                /* SW0 (17h) = stereo mixer */
-                int is_8ch = spec->codec_type != VT1708B_4CH;
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00)
-                        == ((spec->codec_type == VT1708S)  ? 5 : 0);
-                /* inputs */
-                /* PW 1/2/5 (1ah/1bh/1eh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x1a, &parm);
-                set_pin_power_state(codec, 0x1b, &parm);
-                set_pin_power_state(codec, 0x1e, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0;
-                /* SW0 (17h), AIW 0/1 (13h/14h) */
-                snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* outputs */
-                /* PW0 (19h), SW1 (18h), AOW1 (11h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x19, &parm);
-                if (spec->smart51_enabled)
-                        parm = AC_PWRST_D0;
-                snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* PW6 (22h), SW2 (26h), AOW2 (24h) */
-                if (is_8ch) {
-                        parm = AC_PWRST_D3;
-                        set_pin_power_state(codec, 0x22, &parm);
-                        if (spec->smart51_enabled)
-                                parm = AC_PWRST_D0;
-                        snd_hda_codec_write(codec, 0x26, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                        snd_hda_codec_write(codec, 0x24, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                }
-
-                /* PW 3/4/7 (1ch/1dh/23h) */
-                parm = AC_PWRST_D3;
-                /* force to D0 for internal Speaker */
-                set_pin_power_state(codec, 0x1c, &parm);
-                set_pin_power_state(codec, 0x1d, &parm);
-                if (is_8ch)
-                        set_pin_power_state(codec, 0x23, &parm);
-                /* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */
-                snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                                    imux_is_smixer ? AC_PWRST_D0 : parm);
-                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                if (is_8ch) {
-                        snd_hda_codec_write(codec, 0x25, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                        snd_hda_codec_write(codec, 0x27, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                }
-        }  else if (spec->codec_type == VT1718S) {
-                /* MUX6 (1eh) = stereo mixer */
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
-                /* inputs */
-                /* PW 5/6/7 (29h/2ah/2bh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x29, &parm);
-                set_pin_power_state(codec, 0x2a, &parm);
-                set_pin_power_state(codec, 0x2b, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0;
-                /* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */
-                snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* outputs */
-                /* PW3 (27h), MW2 (1ah), AOW3 (bh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x27, &parm);
-                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* PW2 (26h), AOW2 (ah) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x26, &parm);
-                snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* PW0/1 (24h/25h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x24, &parm);
-                set_pin_power_state(codec, 0x25, &parm);
-                if (!spec->hp_independent_mode) /* check for redirected HP */
-                        set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                /* MW9 (21h), Mw2 (1ah), AOW0 (8h) */
-                snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,
-                                    imux_is_smixer ? AC_PWRST_D0 : parm);
-                if (spec->hp_independent_mode) {
-                        /* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */
-                        parm = AC_PWRST_D3;
-                        set_pin_power_state(codec, 0x28, &parm);
-                        snd_hda_codec_write(codec, 0x1b, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                        snd_hda_codec_write(codec, 0x34, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                        snd_hda_codec_write(codec, 0xc, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                }
-        } else if (spec->codec_type == VT1716S) {
-                unsigned int mono_out, present;
-                /* SW0 (17h) = stereo mixer */
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00) ==  5;
-                /* inputs */
-                /* PW 1/2/5 (1ah/1bh/1eh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x1a, &parm);
-                set_pin_power_state(codec, 0x1b, &parm);
-                set_pin_power_state(codec, 0x1e, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0;
-                /* SW0 (17h), AIW0(13h) */
-                snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x1e, &parm);
-                /* PW11 (22h) */
-                if (spec->dmic_enabled)
-                        set_pin_power_state(codec, 0x22, &parm);
-                else
-                        snd_hda_codec_write(
-                                codec, 0x22, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-
-                /* SW2(26h), AIW1(14h) */
-                snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* outputs */
-                /* PW0 (19h), SW1 (18h), AOW1 (11h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x19, &parm);
-                /* Smart 5.1 PW2(1bh) */
-                if (spec->smart51_enabled)
-                        set_pin_power_state(codec, 0x1b, &parm);
-                snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* PW7 (23h), SW3 (27h), AOW3 (25h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x23, &parm);
-                /* Smart 5.1 PW1(1ah) */
-                if (spec->smart51_enabled)
-                        set_pin_power_state(codec, 0x1a, &parm);
-                snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* Smart 5.1 PW5(1eh) */
-                if (spec->smart51_enabled)
-                        set_pin_power_state(codec, 0x1e, &parm);
-                snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* Mono out */
-                /* SW4(28h)->MW1(29h)-> PW12 (2ah)*/
-                present = snd_hda_jack_detect(codec, 0x1c);
-                if (present)
-                        mono_out = 0;
-                else {
-                        present = snd_hda_jack_detect(codec, 0x1d);
-                        if (!spec->hp_independent_mode && present)
-                                mono_out = 0;
-                        else
-                                mono_out = 1;
-                }
-                parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;
-                snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-                snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE,
-                                    parm);
-
-                /* PW 3/4 (1ch/1dh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x1c, &parm);
-                set_pin_power_state(codec, 0x1d, &parm);
-                /* HP Independent Mode, power on AOW3 */
-                if (spec->hp_independent_mode)
-                        snd_hda_codec_write(codec, 0x25, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-
-                /* force to D0 for internal Speaker */
-                /* MW0 (16h), AOW0 (10h) */
-                snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                                    imux_is_smixer ? AC_PWRST_D0 : parm);
-                snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                                    mono_out ? AC_PWRST_D0 : parm);
-        } else if (spec->codec_type == VT2002P) {
-                unsigned int present;
-                /* MUX9 (1eh) = stereo mixer */
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
-                /* inputs */
-                /* PW 5/6/7 (29h/2ah/2bh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x29, &parm);
-                set_pin_power_state(codec, 0x2a, &parm);
-                set_pin_power_state(codec, 0x2b, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0;
-                /* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */
-                snd_hda_codec_write(codec, 0x1e, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x1f, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x10, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x11, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-
-                /* outputs */
-                /* AOW0 (8h)*/
-                snd_hda_codec_write(codec, 0x8, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-
-                /* PW4 (26h), MW4 (1ch), MUX4(37h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x26, &parm);
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x37,
-                                    0, AC_VERB_SET_POWER_STATE, parm);
-
-                /* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x19, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                if (spec->hp_independent_mode)  {
-                        snd_hda_codec_write(codec, 0x9, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                }
-
-                /* Class-D */
-                /* PW0 (24h), MW0(18h), MUX0(34h) */
-                present = snd_hda_jack_detect(codec, 0x25);
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x24, &parm);
-                if (present) {
-                        snd_hda_codec_write(
-                                codec, 0x18, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                        snd_hda_codec_write(
-                                codec, 0x34, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                } else {
-                        snd_hda_codec_write(
-                                codec, 0x18, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                        snd_hda_codec_write(
-                                codec, 0x34, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                }
-
-                /* Mono Out */
-                /* PW15 (31h), MW8(17h), MUX8(3bh) */
-                present = snd_hda_jack_detect(codec, 0x26);
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x31, &parm);
-                if (present) {
-                        snd_hda_codec_write(
-                                codec, 0x17, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                        snd_hda_codec_write(
-                                codec, 0x3b, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                } else {
-                        snd_hda_codec_write(
-                                codec, 0x17, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                        snd_hda_codec_write(
-                                codec, 0x3b, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                }
-
-                /* MW9 (21h) */
-                if (imux_is_smixer || !is_aa_path_mute(codec))
-                        snd_hda_codec_write(
-                                codec, 0x21, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                else
-                        snd_hda_codec_write(
-                                codec, 0x21, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-        } else if (spec->codec_type == VT1812) {
-                unsigned int present;
-                /* MUX10 (1eh) = stereo mixer */
-                imux_is_smixer = snd_hda_codec_read(
-                        codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
-                /* inputs */
-                /* PW 5/6/7 (29h/2ah/2bh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x29, &parm);
-                set_pin_power_state(codec, 0x2a, &parm);
-                set_pin_power_state(codec, 0x2b, &parm);
-                if (imux_is_smixer)
-                        parm = AC_PWRST_D0;
-                /* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */
-                snd_hda_codec_write(codec, 0x1e, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x1f, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x10, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x11, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-
-                /* outputs */
-                /* AOW0 (8h)*/
-                snd_hda_codec_write(codec, 0x8, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-
-                /* PW4 (28h), MW4 (18h), MUX4(38h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x18, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x38, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-
-                /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x15, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                if (spec->hp_independent_mode)  {
-                        snd_hda_codec_write(codec, 0x9, 0,
-                                            AC_VERB_SET_POWER_STATE, parm);
-                }
-
-                /* Internal Speaker */
-                /* PW0 (24h), MW0(14h), MUX0(34h) */
-                present = snd_hda_jack_detect(codec, 0x25);
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x24, &parm);
-                if (present) {
-                        snd_hda_codec_write(codec, 0x14, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D3);
-                        snd_hda_codec_write(codec, 0x34, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D3);
-                } else {
-                        snd_hda_codec_write(codec, 0x14, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D0);
-                        snd_hda_codec_write(codec, 0x34, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D0);
-                }
-                /* Mono Out */
-                /* PW13 (31h), MW13(1ch), MUX13(3ch), MW14(3eh) */
-                present = snd_hda_jack_detect(codec, 0x28);
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x31, &parm);
-                if (present) {
-                        snd_hda_codec_write(codec, 0x1c, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D3);
-                        snd_hda_codec_write(codec, 0x3c, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D3);
-                        snd_hda_codec_write(codec, 0x3e, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D3);
-                } else {
-                        snd_hda_codec_write(codec, 0x1c, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D0);
-                        snd_hda_codec_write(codec, 0x3c, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D0);
-                        snd_hda_codec_write(codec, 0x3e, 0,
-                                            AC_VERB_SET_POWER_STATE,
-                                            AC_PWRST_D0);
-                }
-
-                /* PW15 (33h), MW15 (1dh), MUX15(3dh) */
-                parm = AC_PWRST_D3;
-                set_pin_power_state(codec, 0x33, &parm);
-                snd_hda_codec_write(codec, 0x1d, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x3d, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-
-                /* MW9 (21h) */
-                if (imux_is_smixer || !is_aa_path_mute(codec))
-                        snd_hda_codec_write(
-                                codec, 0x21, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                else
-                        snd_hda_codec_write(
-                                codec, 0x21, 0,
-                                AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-        }
-}
-
 /*
  * input MUX handling
  */
@@ -1101,6 +646,7 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+        int ret;
 
         if (!spec->mux_nids[adc_idx])
                 return -EINVAL;
@@ -1109,12 +655,14 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
                                AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)
                 snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0,
                                     AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-        /* update jack power state */
-        set_jack_power_state(codec);
 
-        return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
+        ret = snd_hda_input_mux_put(codec, spec->input_mux, ucontrol,
                                      spec->mux_nids[adc_idx],
                                      &spec->cur_mux[adc_idx]);
+        /* update jack power state */
+        set_widgets_power_state(codec);
+
+        return ret;
 }
 
 static int via_independent_hp_info(struct snd_kcontrol *kcontrol,
@@ -1160,6 +708,9 @@ static hda_nid_t side_mute_channel(struct via_spec *spec)
         case VT1709_10CH:       return 0x29;
         case VT1708B_8CH:       /* fall thru */
         case VT1708S:           return 0x27;
+        case VT2002P:           return 0x19;
+        case VT1802:            return 0x15;
+        case VT1812:            return 0x15;
         default:                return 0;
         }
 }
@@ -1168,13 +719,22 @@ static int update_side_mute_status(struct hda_codec *codec)
 {
         /* mute side channel */
         struct via_spec *spec = codec->spec;
-        unsigned int parm = spec->hp_independent_mode
-                ? AMP_OUT_MUTE : AMP_OUT_UNMUTE;
+        unsigned int parm;
         hda_nid_t sw3 = side_mute_channel(spec);
 
-        if (sw3)
-                snd_hda_codec_write(codec, sw3, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    parm);
+        if (sw3) {
+                if (VT2002P_COMPATIBLE(spec))
+                        parm = spec->hp_independent_mode ?
+                               AMP_IN_MUTE(1) : AMP_IN_UNMUTE(1);
+                else
+                        parm = spec->hp_independent_mode ?
+                               AMP_OUT_MUTE : AMP_OUT_UNMUTE;
+                snd_hda_codec_write(codec, sw3, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, parm);
+                if (spec->codec_type == VT1812)
+                        snd_hda_codec_write(codec, 0x1d, 0,
+                                            AC_VERB_SET_AMP_GAIN_MUTE, parm);
+        }
         return 0;
 }
 
@@ -1185,11 +745,30 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol,
         struct via_spec *spec = codec->spec;
         hda_nid_t nid = kcontrol->private_value;
         unsigned int pinsel = ucontrol->value.enumerated.item[0];
+        unsigned int parm0, parm1;
         /* Get Independent Mode index of headphone pin widget */
         spec->hp_independent_mode = spec->hp_independent_mode_index == pinsel
                 ? 1 : 0;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, pinsel);
+        if (spec->codec_type == VT1718S) {
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel ? 2 : 0);
+                /* Set correct mute switch for MW3 */
+                parm0 = spec->hp_independent_mode ?
+                               AMP_IN_UNMUTE(0) : AMP_IN_MUTE(0);
+                parm1 = spec->hp_independent_mode ?
+                               AMP_IN_MUTE(1) : AMP_IN_UNMUTE(1);
+                snd_hda_codec_write(codec, 0x1b, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, parm0);
+                snd_hda_codec_write(codec, 0x1b, 0,
+                                    AC_VERB_SET_AMP_GAIN_MUTE, parm1);
+        }
+        else
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel);
 
+        if (spec->codec_type == VT1812)
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel);
         if (spec->multiout.hp_nid && spec->multiout.hp_nid
             != spec->multiout.dac_nids[HDA_FRONT])
                 snd_hda_codec_setup_stream(codec, spec->multiout.hp_nid,
@@ -1201,17 +780,18 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol,
             || spec->codec_type == VT1702
             || spec->codec_type == VT1718S
             || spec->codec_type == VT1716S
-            || spec->codec_type == VT2002P
-            || spec->codec_type == VT1812) {
+            || VT2002P_COMPATIBLE(spec)) {
                 activate_ctl(codec, "Headphone Playback Volume",
                              spec->hp_independent_mode);
                 activate_ctl(codec, "Headphone Playback Switch",
                              spec->hp_independent_mode);
         }
+        /* update jack power state */
+        set_widgets_power_state(codec);
         return 0;
 }
 
-static struct snd_kcontrol_new via_hp_mixer[2] = {
+static const struct snd_kcontrol_new via_hp_mixer[2] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Independent HP",
@@ -1238,6 +818,7 @@ static int via_hp_build(struct hda_codec *codec)
                 nid = 0x34;
                 break;
         case VT2002P:
+        case VT1802:
                 nid = 0x35;
                 break;
         case VT1812:
@@ -1248,9 +829,12 @@ static int via_hp_build(struct hda_codec *codec)
                 break;
         }
 
-        nums = snd_hda_get_connections(codec, nid, conn, HDA_MAX_CONNECTIONS);
-        if (nums <= 1)
-                return 0;
+        if (spec->codec_type != VT1708) {
+                nums = snd_hda_get_connections(codec, nid,
+                                               conn, HDA_MAX_CONNECTIONS);
+                if (nums <= 1)
+                        return 0;
+        }
 
         knew = via_clone_control(spec, &via_hp_mixer[0]);
         if (knew == NULL)
@@ -1259,10 +843,13 @@ static int via_hp_build(struct hda_codec *codec)
         knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
         knew->private_value = nid;
 
-        knew = via_clone_control(spec, &via_hp_mixer[1]);
-        if (knew == NULL)
-                return -ENOMEM;
-        knew->subdevice = side_mute_channel(spec);
+        nid = side_mute_channel(spec);
+        if (nid) {
+                knew = via_clone_control(spec, &via_hp_mixer[1]);
+                if (knew == NULL)
+                        return -ENOMEM;
+                knew->subdevice = nid;
+        }
 
         return 0;
 }
@@ -1271,14 +858,18 @@ static void notify_aa_path_ctls(struct hda_codec *codec)
 {
         int i;
         struct snd_ctl_elem_id id;
-        const char *labels[] = {"Mic", "Front Mic", "Line"};
+        const char *labels[] = {"Mic", "Front Mic", "Line", "Rear Mic"};
+        struct snd_kcontrol *ctl;
 
         memset(&id, 0, sizeof(id));
         id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         for (i = 0; i < ARRAY_SIZE(labels); i++) {
                 sprintf(id.name, "%s Playback Volume", labels[i]);
-                snd_ctl_notify(codec->bus->card, SNDRV_CTL_EVENT_MASK_VALUE,
-                               &id);
+                ctl = snd_hda_find_mixer_ctl(codec, id.name);
+                if (ctl)
+                        snd_ctl_notify(codec->bus->card,
+                                        SNDRV_CTL_EVENT_MASK_VALUE,
+                                        &ctl->id);
         }
 }
 
@@ -1310,6 +901,11 @@ static void mute_aa_path(struct hda_codec *codec, int mute)
                 start_idx = 2;
                 end_idx = 4;
                 break;
+        case VT1718S:
+                nid_mixer = 0x21;
+                start_idx = 1;
+                end_idx = 3;
+                break;
         default:
                 return;
         }
@@ -1322,15 +918,14 @@ static void mute_aa_path(struct hda_codec *codec, int mute)
 }
 static int is_smart51_pins(struct via_spec *spec, hda_nid_t pin)
 {
-        int res = 0;
-        int index;
-        for (index = AUTO_PIN_MIC; index < AUTO_PIN_FRONT_LINE; index++) {
-                if (pin == spec->autocfg.input_pins[index]) {
-                        res = 1;
-                        break;
-                }
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
+        int i;
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                if (pin == cfg->inputs[i].pin)
+                        return cfg->inputs[i].type <= AUTO_PIN_LINE_IN;
         }
-        return res;
+        return 0;
 }
 
 static int via_smart51_info(struct snd_kcontrol *kcontrol,
@@ -1348,25 +943,21 @@ static int via_smart51_get(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
-        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
         int on = 1;
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(index); i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[index[i]];
-                if (nid) {
-                        int ctl =
-                            snd_hda_codec_read(codec, nid, 0,
-                                               AC_VERB_GET_PIN_WIDGET_CONTROL,
-                                               0);
-                        if (i == AUTO_PIN_FRONT_MIC
-                            && spec->hp_independent_mode
-                            && spec->codec_type != VT1718S)
-                                continue; /* ignore FMic for independent HP */
-                        if (ctl & AC_PINCTL_IN_EN
-                            && !(ctl & AC_PINCTL_OUT_EN))
-                                on = 0;
-                }
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                int ctl = snd_hda_codec_read(codec, nid, 0,
+                                             AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                if (cfg->inputs[i].type > AUTO_PIN_LINE_IN)
+                        continue;
+                if (cfg->inputs[i].type == AUTO_PIN_MIC &&
+                    spec->hp_independent_mode && spec->codec_type != VT1718S)
+                        continue; /* ignore FMic for independent HP */
+                if ((ctl & AC_PINCTL_IN_EN) && !(ctl & AC_PINCTL_OUT_EN))
+                        on = 0;
         }
         *ucontrol->value.integer.value = on;
         return 0;
@@ -1377,36 +968,38 @@ static int via_smart51_put(struct snd_kcontrol *kcontrol,
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         struct via_spec *spec = codec->spec;
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
         int out_in = *ucontrol->value.integer.value
                 ? AC_PINCTL_OUT_EN : AC_PINCTL_IN_EN;
-        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(index); i++) {
-                hda_nid_t nid = spec->autocfg.input_pins[index[i]];
-                if (i == AUTO_PIN_FRONT_MIC
-                    && spec->hp_independent_mode
-                    && spec->codec_type != VT1718S)
+        for (i = 0; i < cfg->num_inputs; i++) {
+                hda_nid_t nid = cfg->inputs[i].pin;
+                unsigned int parm;
+
+                if (cfg->inputs[i].type > AUTO_PIN_LINE_IN)
+                        continue;
+                if (cfg->inputs[i].type == AUTO_PIN_MIC &&
+                    spec->hp_independent_mode && spec->codec_type != VT1718S)
                         continue; /* don't retask FMic for independent HP */
-                if (nid) {
-                        unsigned int parm = snd_hda_codec_read(
-                                codec, nid, 0,
-                                AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-                        parm &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
-                        parm |= out_in;
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            parm);
-                        if (out_in == AC_PINCTL_OUT_EN) {
-                                mute_aa_path(codec, 1);
-                                notify_aa_path_ctls(codec);
-                        }
-                        if (spec->codec_type == VT1718S)
-                                snd_hda_codec_amp_stereo(
+
+                parm = snd_hda_codec_read(codec, nid, 0,
+                                          AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                parm &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
+                parm |= out_in;
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                    parm);
+                if (out_in == AC_PINCTL_OUT_EN) {
+                        mute_aa_path(codec, 1);
+                        notify_aa_path_ctls(codec);
+                }
+                if (spec->codec_type == VT1718S) {
+                        snd_hda_codec_amp_stereo(
                                         codec, nid, HDA_OUTPUT, 0, HDA_AMP_MUTE,
                                         HDA_AMP_UNMUTE);
                 }
-                if (i == AUTO_PIN_FRONT_MIC) {
+                if (cfg->inputs[i].type == AUTO_PIN_MIC) {
                         if (spec->codec_type == VT1708S
                             || spec->codec_type == VT1716S) {
                                 /* input = index 1 (AOW3) */
@@ -1420,11 +1013,11 @@ static int via_smart51_put(struct snd_kcontrol *kcontrol,
                 }
         }
         spec->smart51_enabled = *ucontrol->value.integer.value;
-        set_jack_power_state(codec);
+        set_widgets_power_state(codec);
         return 1;
 }
 
-static struct snd_kcontrol_new via_smart51_mixer[2] = {
+static const struct snd_kcontrol_new via_smart51_mixer[2] = {
         {
          .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
          .name = "Smart 5.1",
@@ -1442,21 +1035,27 @@ static struct snd_kcontrol_new via_smart51_mixer[2] = {
 static int via_smart51_build(struct via_spec *spec)
 {
         struct snd_kcontrol_new *knew;
-        int index[] = { AUTO_PIN_MIC, AUTO_PIN_FRONT_MIC, AUTO_PIN_LINE };
+        const struct auto_pin_cfg *cfg = &spec->autocfg;
         hda_nid_t nid;
         int i;
 
+        if (!cfg)
+                return 0;
+        if (cfg->line_outs > 2)
+                return 0;
+
         knew = via_clone_control(spec, &via_smart51_mixer[0]);
         if (knew == NULL)
                 return -ENOMEM;
 
-        for (i = 0; i < ARRAY_SIZE(index); i++) {
-                nid = spec->autocfg.input_pins[index[i]];
-                if (nid) {
+        for (i = 0; i < cfg->num_inputs; i++) {
+                nid = cfg->inputs[i].pin;
+                if (cfg->inputs[i].type <= AUTO_PIN_LINE_IN) {
                         knew = via_clone_control(spec, &via_smart51_mixer[1]);
                         if (knew == NULL)
                                 return -ENOMEM;
                         knew->subdevice = nid;
+                        break;
                 }
         }
 
@@ -1464,7 +1063,7 @@ static int via_smart51_build(struct via_spec *spec)
 }
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1708_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1708_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x27, 0x0, HDA_INPUT),
@@ -1515,6 +1114,7 @@ static int is_aa_path_mute(struct hda_codec *codec)
                 break;
         case VT2002P:
         case VT1812:
+        case VT1802:
                 nid_mixer = 0x21;
                 start_idx = 0;
                 end_idx = 2;
@@ -1579,6 +1179,7 @@ static void analog_low_current_mode(struct hda_codec *codec, int stream_idle)
                 break;
         case VT2002P:
         case VT1812:
+        case VT1802:
                 verb = 0xf93;
                 parm = enable ? 0x00 : 0xe0; /* 0x00: 4/40x, 0xe0: 1x */
                 break;
@@ -1592,7 +1193,7 @@ static void analog_low_current_mode(struct hda_codec *codec, int stream_idle)
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb vt1708_volume_init_verbs[] = {
+static const struct hda_verb vt1708_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -1622,6 +1223,8 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
         {0x20, AC_VERB_SET_CONNECT_SEL, 0},
         /* PW9 Output enable */
         {0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40},
+        /* power down jack detect function */
+        {0x1, 0xf81, 0x1},
         { }
 };
 
@@ -1644,7 +1247,7 @@ static void playback_multi_pcm_prep_0(struct hda_codec *codec,
 {
         struct via_spec *spec = codec->spec;
         struct hda_multi_out *mout = &spec->multiout;
-        hda_nid_t *nids = mout->dac_nids;
+        const hda_nid_t *nids = mout->dac_nids;
         int chs = substream->runtime->channels;
         int i;
 
@@ -1713,7 +1316,7 @@ static int via_playback_multi_pcm_prepare(struct hda_pcm_stream *hinfo,
 {
         struct via_spec *spec = codec->spec;
         struct hda_multi_out *mout = &spec->multiout;
-        hda_nid_t *nids = mout->dac_nids;
+        const hda_nid_t *nids = mout->dac_nids;
 
         if (substream->number == 0)
                 playback_multi_pcm_prep_0(codec, stream_tag, format,
@@ -1734,7 +1337,7 @@ static int via_playback_multi_pcm_cleanup(struct hda_pcm_stream *hinfo,
 {
         struct via_spec *spec = codec->spec;
         struct hda_multi_out *mout = &spec->multiout;
-        hda_nid_t *nids = mout->dac_nids;
+        const hda_nid_t *nids = mout->dac_nids;
         int i;
 
         if (substream->number == 0) {
@@ -1832,7 +1435,7 @@ static int via_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream vt1708_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1708_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 8,
@@ -1844,7 +1447,7 @@ static struct hda_pcm_stream vt1708_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
+static const struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 8,
@@ -1861,7 +1464,7 @@ static struct hda_pcm_stream vt1708_pcm_analog_s16_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1708_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -1872,7 +1475,7 @@ static struct hda_pcm_stream vt1708_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1708_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1708_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -1885,7 +1488,7 @@ static struct hda_pcm_stream vt1708_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708_pcm_digital_capture = {
+static const struct hda_pcm_stream vt1708_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -1895,7 +1498,7 @@ static int via_build_controls(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
         struct snd_kcontrol *kctl;
-        struct snd_kcontrol_new *knew;
+        const struct snd_kcontrol_new *knew;
         int err, i;
 
         for (i = 0; i < spec->num_mixers; i++) {
@@ -1943,7 +1546,7 @@ static int via_build_controls(struct hda_codec *codec)
         }
 
         /* init power states */
-        set_jack_power_state(codec);
+        set_widgets_power_state(codec);
         analog_low_current_mode(codec, 1);
 
         via_free_kctls(codec); /* no longer needed */
@@ -2107,7 +1710,7 @@ static void via_speaker_automute(struct hda_codec *codec)
         unsigned int hp_present;
         struct via_spec *spec = codec->spec;
 
-        if (spec->codec_type != VT2002P && spec->codec_type != VT1812)
+        if (!VT2002P_COMPATIBLE(spec))
                 return;
 
         hp_present = snd_hda_jack_detect(codec, spec->autocfg.hp_pins[0]);
@@ -2166,17 +1769,21 @@ static void via_unsol_event(struct hda_codec *codec,
                                   unsigned int res)
 {
         res >>= 26;
-        if (res & VIA_HP_EVENT)
+
+        if (res & VIA_JACK_EVENT)
+                set_widgets_power_state(codec);
+
+        res &= ~VIA_JACK_EVENT;
+
+        if (res == VIA_HP_EVENT)
                 via_hp_automute(codec);
-        if (res & VIA_GPIO_EVENT)
+        else if (res == VIA_GPIO_EVENT)
                 via_gpio_control(codec);
-        if (res & VIA_JACK_EVENT)
-                set_jack_power_state(codec);
-        if (res & VIA_MONO_EVENT)
+        else if (res == VIA_MONO_EVENT)
                 via_mono_automute(codec);
-        if (res & VIA_SPEAKER_EVENT)
+        else if (res == VIA_SPEAKER_EVENT)
                 via_speaker_automute(codec);
-        if (res & VIA_BIND_HP_EVENT)
+        else if (res == VIA_BIND_HP_EVENT)
                 via_hp_bind_automute(codec);
 }
 
@@ -2187,10 +1794,6 @@ static int via_init(struct hda_codec *codec)
         for (i = 0; i < spec->num_iverbs; i++)
                 snd_hda_sequence_write(codec, spec->init_verbs[i]);
 
-        spec->codec_type = get_codec_type(codec);
-        if (spec->codec_type == VT1708BCE)
-                spec->codec_type = VT1708S; /* VT1708BCE & VT1708S are almost
-                                               same */
         /* Lydia Add for EAPD enable */
         if (!spec->dig_in_nid) { /* No Digital In connection */
                 if (spec->dig_in_pin) {
@@ -2230,7 +1833,7 @@ static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 
 /*
  */
-static struct hda_codec_ops via_patch_ops = {
+static const struct hda_codec_ops via_patch_ops = {
         .build_controls = via_build_controls,
         .build_pcms = via_build_pcms,
         .init = via_init,
@@ -2260,16 +1863,16 @@ static int vt1708_auto_fill_dac_nids(struct via_spec *spec,
                         /* config dac list */
                         switch (i) {
                         case AUTO_SEQ_FRONT:
-                                spec->multiout.dac_nids[i] = 0x10;
+                                spec->private_dac_nids[i] = 0x10;
                                 break;
                         case AUTO_SEQ_CENLFE:
-                                spec->multiout.dac_nids[i] = 0x12;
+                                spec->private_dac_nids[i] = 0x12;
                                 break;
                         case AUTO_SEQ_SURROUND:
-                                spec->multiout.dac_nids[i] = 0x11;
+                                spec->private_dac_nids[i] = 0x11;
                                 break;
                         case AUTO_SEQ_SIDE:
-                                spec->multiout.dac_nids[i] = 0x13;
+                                spec->private_dac_nids[i] = 0x13;
                                 break;
                         }
                 }
@@ -2283,7 +1886,9 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+        static const char * const chname[4] = {
+                "Front", "Surround", "C/LFE", "Side"
+        };
         hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
         int i, err;
 
@@ -2372,16 +1977,11 @@ static void create_hp_imux(struct via_spec *spec)
 {
         int i;
         struct hda_input_mux *imux = &spec->private_imux[1];
-        static const char *texts[] = { "OFF", "ON", NULL};
+        static const char * const texts[] = { "OFF", "ON", NULL};
 
         /* for hp mode select */
-        i = 0;
-        while (texts[i] != NULL) {
-                imux->items[imux->num_items].label =  texts[i];
-                imux->items[imux->num_items].index = i;
-                imux->num_items++;
-                i++;
-        }
+        for (i = 0; texts[i]; i++)
+                snd_hda_add_imux_item(imux, texts[i], i, NULL);
 
         spec->hp_mux = &spec->private_imux[1];
 }
@@ -2413,53 +2013,63 @@ static int vt1708_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
-                                                const struct auto_pin_cfg *cfg)
+static int vt_auto_create_analog_input_ctls(struct hda_codec *codec,
+                                            const struct auto_pin_cfg *cfg,
+                                            hda_nid_t cap_nid,
+                                            const hda_nid_t pin_idxs[],
+                                            int num_idxs)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
+        struct via_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
+        int i, err, idx, type, type_idx = 0;
 
         /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = idx;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x1d: /* Mic */
-                        idx = 2;
-                        break;
-
-                case 0x1e: /* Line In */
-                        idx = 3;
-                        break;
-
-                case 0x21: /* Front Mic */
-                        idx = 4;
-                        break;
-
-                case 0x24: /* CD */
-                        idx = 1;
+        for (idx = 0; idx < num_idxs; idx++) {
+                if (pin_idxs[idx] == 0xff) {
+                        snd_hda_add_imux_item(imux, "Stereo Mixer", idx, NULL);
                         break;
                 }
-                err = via_new_analog_input(spec, labels[i], idx, 0x17);
+        }
+
+        for (i = 0; i < cfg->num_inputs; i++) {
+                const char *label;
+                type = cfg->inputs[i].type;
+                for (idx = 0; idx < num_idxs; idx++)
+                        if (pin_idxs[idx] == cfg->inputs[i].pin)
+                                break;
+                if (idx >= num_idxs)
+                        continue;
+                if (i > 0 && type == cfg->inputs[i - 1].type)
+                        type_idx++;
+                else
+                        type_idx = 0;
+                label = hda_get_autocfg_input_label(codec, cfg, i);
+                if (spec->codec_type == VT1708S ||
+                    spec->codec_type == VT1702 ||
+                    spec->codec_type == VT1716S)
+                        err = via_new_analog_input(spec, label, type_idx,
+                                                   idx+1, cap_nid);
+                else
+                        err = via_new_analog_input(spec, label, type_idx,
+                                                   idx, cap_nid);
                 if (err < 0)
                         return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
+                snd_hda_add_imux_item(imux, label, idx, NULL);
         }
         return 0;
 }
 
+/* create playback/capture controls for input pins */
+static int vt1708_auto_create_analog_input_ctls(struct hda_codec *codec,
+                                                const struct auto_pin_cfg *cfg)
+{
+        static const hda_nid_t pin_idxs[] = { 0xff, 0x24, 0x1d, 0x1e, 0x21 };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x17, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
+}
+
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1708_loopbacks[] = {
+static const struct hda_amp_list vt1708_loopbacks[] = {
         { 0x17, HDA_INPUT, 1 },
         { 0x17, HDA_INPUT, 2 },
         { 0x17, HDA_INPUT, 3 },
@@ -2518,7 +2128,7 @@ static int vt1708_jack_detectect_put(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-static struct snd_kcontrol_new vt1708_jack_detectect[] = {
+static const struct snd_kcontrol_new vt1708_jack_detectect[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Jack Detect",
@@ -2554,7 +2164,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
         err = vt1708_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1708_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1708_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
         /* add jack detect on/off control */
@@ -2593,7 +2203,8 @@ static int via_auto_init(struct hda_codec *codec)
         via_auto_init_multi_out(codec);
         via_auto_init_hp_out(codec);
         via_auto_init_analog_input(codec);
-        if (spec->codec_type == VT2002P || spec->codec_type == VT1812) {
+
+        if (VT2002P_COMPATIBLE(spec)) {
                 via_hp_bind_automute(codec);
         } else {
                 via_hp_automute(codec);
@@ -2697,7 +2308,7 @@ static int patch_vt1708(struct hda_codec *codec)
 }
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1709_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1709_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x14, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x15, 0x0, HDA_INPUT),
@@ -2719,7 +2330,7 @@ static struct snd_kcontrol_new vt1709_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt1709_uniwill_init_verbs[] = {
+static const struct hda_verb vt1709_uniwill_init_verbs[] = {
         {0x20, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         { }
@@ -2728,7 +2339,7 @@ static struct hda_verb vt1709_uniwill_init_verbs[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
+static const struct hda_verb vt1709_10ch_volume_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -2768,7 +2379,7 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1709_10ch_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1709_10ch_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 10,
@@ -2780,7 +2391,7 @@ static struct hda_pcm_stream vt1709_10ch_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1709_6ch_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1709_6ch_pcm_analog_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 6,
@@ -2792,7 +2403,7 @@ static struct hda_pcm_stream vt1709_6ch_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1709_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1709_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -2803,7 +2414,7 @@ static struct hda_pcm_stream vt1709_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1709_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1709_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -2814,7 +2425,7 @@ static struct hda_pcm_stream vt1709_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1709_pcm_digital_capture = {
+static const struct hda_pcm_stream vt1709_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -2841,26 +2452,26 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
                                 switch (i) {
                                 case AUTO_SEQ_FRONT:
                                         /* AOW0 */
-                                        spec->multiout.dac_nids[i] = 0x10;
+                                        spec->private_dac_nids[i] = 0x10;
                                         break;
                                 case AUTO_SEQ_CENLFE:
                                         /* AOW2 */
-                                        spec->multiout.dac_nids[i] = 0x12;
+                                        spec->private_dac_nids[i] = 0x12;
                                         break;
                                 case AUTO_SEQ_SURROUND:
                                         /* AOW3 */
-                                        spec->multiout.dac_nids[i] = 0x11;
+                                        spec->private_dac_nids[i] = 0x11;
                                         break;
                                 case AUTO_SEQ_SIDE:
                                         /* AOW1 */
-                                        spec->multiout.dac_nids[i] = 0x27;
+                                        spec->private_dac_nids[i] = 0x27;
                                         break;
                                 default:
                                         break;
                                 }
                         }
                 }
-                spec->multiout.dac_nids[cfg->line_outs] = 0x28; /* AOW4 */
+                spec->private_dac_nids[cfg->line_outs] = 0x28; /* AOW4 */
 
         } else if (cfg->line_outs == 3) { /* 6 channels */
                 for (i = 0; i < cfg->line_outs; i++) {
@@ -2870,15 +2481,15 @@ static int vt1709_auto_fill_dac_nids(struct via_spec *spec,
                                 switch (i) {
                                 case AUTO_SEQ_FRONT:
                                         /* AOW0 */
-                                        spec->multiout.dac_nids[i] = 0x10;
+                                        spec->private_dac_nids[i] = 0x10;
                                         break;
                                 case AUTO_SEQ_CENLFE:
                                         /* AOW2 */
-                                        spec->multiout.dac_nids[i] = 0x12;
+                                        spec->private_dac_nids[i] = 0x12;
                                         break;
                                 case AUTO_SEQ_SURROUND:
                                         /* AOW1 */
-                                        spec->multiout.dac_nids[i] = 0x11;
+                                        spec->private_dac_nids[i] = 0x11;
                                         break;
                                 default:
                                         break;
@@ -2895,7 +2506,9 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+        static const char * const chname[4] = {
+                "Front", "Surround", "C/LFE", "Side"
+        };
         hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29};
         int i, err;
 
@@ -3021,49 +2634,12 @@ static int vt1709_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1709_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = idx;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x1d: /* Mic */
-                        idx = 2;
-                        break;
-
-                case 0x1e: /* Line In */
-                        idx = 3;
-                        break;
-
-                case 0x21: /* Front Mic */
-                        idx = 4;
-                        break;
-
-                case 0x23: /* CD */
-                        idx = 1;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x18);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0xff, 0x23, 0x1d, 0x1e, 0x21 };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x18, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 static int vt1709_parse_auto_config(struct hda_codec *codec)
@@ -3086,7 +2662,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
         err = vt1709_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1709_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1709_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -3111,7 +2687,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1709_loopbacks[] = {
+static const struct hda_amp_list vt1709_loopbacks[] = {
         { 0x18, HDA_INPUT, 1 },
         { 0x18, HDA_INPUT, 2 },
         { 0x18, HDA_INPUT, 3 },
@@ -3172,7 +2748,7 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb vt1709_6ch_volume_init_verbs[] = {
+static const struct hda_verb vt1709_6ch_volume_init_verbs[] = {
         /*
          * Unmute ADC0-2 and set the default input to mic-in
          */
@@ -3262,7 +2838,7 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
 }
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1708B_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1708B_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),
@@ -3284,7 +2860,7 @@ static struct snd_kcontrol_new vt1708B_capture_mixer[] = {
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
-static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
+static const struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -3319,7 +2895,7 @@ static struct hda_verb vt1708B_8ch_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
+static const struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -3354,7 +2930,7 @@ static struct hda_verb vt1708B_4ch_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_verb vt1708B_uniwill_init_verbs[] = {
+static const struct hda_verb vt1708B_uniwill_init_verbs[] = {
         {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
@@ -3378,7 +2954,7 @@ static int via_pcm_open_close(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
-static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 8,
@@ -3391,7 +2967,7 @@ static struct hda_pcm_stream vt1708B_8ch_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 4,
@@ -3403,7 +2979,7 @@ static struct hda_pcm_stream vt1708B_4ch_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708B_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1708B_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -3416,7 +2992,7 @@ static struct hda_pcm_stream vt1708B_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1708B_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1708B_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3429,7 +3005,7 @@ static struct hda_pcm_stream vt1708B_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708B_pcm_digital_capture = {
+static const struct hda_pcm_stream vt1708B_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3452,16 +3028,16 @@ static int vt1708B_auto_fill_dac_nids(struct via_spec *spec,
                         /* config dac list */
                         switch (i) {
                         case AUTO_SEQ_FRONT:
-                                spec->multiout.dac_nids[i] = 0x10;
+                                spec->private_dac_nids[i] = 0x10;
                                 break;
                         case AUTO_SEQ_CENLFE:
-                                spec->multiout.dac_nids[i] = 0x24;
+                                spec->private_dac_nids[i] = 0x24;
                                 break;
                         case AUTO_SEQ_SURROUND:
-                                spec->multiout.dac_nids[i] = 0x11;
+                                spec->private_dac_nids[i] = 0x11;
                                 break;
                         case AUTO_SEQ_SIDE:
-                                spec->multiout.dac_nids[i] = 0x25;
+                                spec->private_dac_nids[i] = 0x25;
                                 break;
                         }
                 }
@@ -3475,7 +3051,9 @@ static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+        static const char * const chname[4] = {
+                "Front", "Surround", "C/LFE", "Side"
+        };
         hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27};
         hda_nid_t nid, nid_vol = 0;
         int i, err;
@@ -3588,49 +3166,12 @@ static int vt1708B_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1708B_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = idx;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x1a: /* Mic */
-                        idx = 2;
-                        break;
-
-                case 0x1b: /* Line In */
-                        idx = 3;
-                        break;
-
-                case 0x1e: /* Front Mic */
-                        idx = 4;
-                        break;
-
-                case 0x1f: /* CD */
-                        idx = 1;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x16);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0xff, 0x1f, 0x1a, 0x1b, 0x1e };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 static int vt1708B_parse_auto_config(struct hda_codec *codec)
@@ -3653,7 +3194,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
         err = vt1708B_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1708B_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1708B_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -3678,7 +3219,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1708B_loopbacks[] = {
+static const struct hda_amp_list vt1708B_loopbacks[] = {
         { 0x16, HDA_INPUT, 1 },
         { 0x16, HDA_INPUT, 2 },
         { 0x16, HDA_INPUT, 3 },
@@ -3686,6 +3227,87 @@ static struct hda_amp_list vt1708B_loopbacks[] = {
         { } /* end */
 };
 #endif
+
+static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer;
+        unsigned int parm;
+        int is_8ch = 0;
+        if ((spec->codec_type != VT1708B_4CH) &&
+            (codec->vendor_id != 0x11064397))
+                is_8ch = 1;
+
+        /* SW0 (17h) = stereo mixer */
+        imux_is_smixer =
+        (snd_hda_codec_read(codec, 0x17, 0, AC_VERB_GET_CONNECT_SEL, 0x00)
+         == ((spec->codec_type == VT1708S) ? 5 : 0));
+        /* inputs */
+        /* PW 1/2/5 (1ah/1bh/1eh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x1a, &parm);
+        set_pin_power_state(codec, 0x1b, &parm);
+        set_pin_power_state(codec, 0x1e, &parm);
+        if (imux_is_smixer)
+                parm = AC_PWRST_D0;
+        /* SW0 (17h), AIW 0/1 (13h/14h) */
+        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* PW0 (19h), SW1 (18h), AOW1 (11h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x19, &parm);
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x1b, &parm);
+        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW6 (22h), SW2 (26h), AOW2 (24h) */
+        if (is_8ch) {
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x22, &parm);
+                if (spec->smart51_enabled)
+                        set_pin_power_state(codec, 0x1a, &parm);
+                snd_hda_codec_write(codec, 0x26, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x24, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        } else if (codec->vendor_id == 0x11064397) {
+                /* PW7(23h), SW2(27h), AOW2(25h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x23, &parm);
+                if (spec->smart51_enabled)
+                        set_pin_power_state(codec, 0x1a, &parm);
+                snd_hda_codec_write(codec, 0x27, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x25, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        }
+
+        /* PW 3/4/7 (1ch/1dh/23h) */
+        parm = AC_PWRST_D3;
+        /* force to D0 for internal Speaker */
+        set_pin_power_state(codec, 0x1c, &parm);
+        set_pin_power_state(codec, 0x1d, &parm);
+        if (is_8ch)
+                set_pin_power_state(codec, 0x23, &parm);
+
+        /* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */
+        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
+                            imux_is_smixer ? AC_PWRST_D0 : parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        if (is_8ch) {
+                snd_hda_codec_write(codec, 0x25, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x27, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        } else if (codec->vendor_id == 0x11064397 && spec->hp_independent_mode)
+                snd_hda_codec_write(codec, 0x25, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+}
+
 static int patch_vt1708S(struct hda_codec *codec);
 static int patch_vt1708B_8ch(struct hda_codec *codec)
 {
@@ -3736,6 +3358,8 @@ static int patch_vt1708B_8ch(struct hda_codec *codec)
         spec->loopback.amplist = vt1708B_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1708B;
+
         return 0;
 }
 
@@ -3786,13 +3410,15 @@ static int patch_vt1708B_4ch(struct hda_codec *codec)
         spec->loopback.amplist = vt1708B_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1708B;
+
         return 0;
 }
 
 /* Patch for VT1708S */
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1708S_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1708S_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),
@@ -3815,7 +3441,7 @@ static struct snd_kcontrol_new vt1708S_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt1708S_volume_init_verbs[] = {
+static const struct hda_verb vt1708S_volume_init_verbs[] = {
         /* Unmute ADC0-1 and set the default input to mic-in */
         {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -3841,7 +3467,7 @@ static struct hda_verb vt1708S_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_verb vt1708S_uniwill_init_verbs[] = {
+static const struct hda_verb vt1708S_uniwill_init_verbs[] = {
         {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
@@ -3854,7 +3480,19 @@ static struct hda_verb vt1708S_uniwill_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1708S_pcm_analog_playback = {
+static const struct hda_verb vt1705_uniwill_init_verbs[] = {
+        {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
+        {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x1e, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x23, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
+
+static const struct hda_pcm_stream vt1708S_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 8,
@@ -3867,7 +3505,20 @@ static struct hda_pcm_stream vt1708S_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1708S_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1705_pcm_analog_playback = {
+        .substreams = 2,
+        .channels_min = 2,
+        .channels_max = 6,
+        .nid = 0x10, /* NID to query formats and rates */
+        .ops = {
+                .open = via_playback_pcm_open,
+                .prepare = via_playback_multi_pcm_prepare,
+                .cleanup = via_playback_multi_pcm_cleanup,
+                .close = via_pcm_open_close
+        },
+};
+
+static const struct hda_pcm_stream vt1708S_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -3880,7 +3531,7 @@ static struct hda_pcm_stream vt1708S_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1708S_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1708S_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -3910,16 +3561,19 @@ static int vt1708S_auto_fill_dac_nids(struct via_spec *spec,
                         /* config dac list */
                         switch (i) {
                         case AUTO_SEQ_FRONT:
-                                spec->multiout.dac_nids[i] = 0x10;
+                                spec->private_dac_nids[i] = 0x10;
                                 break;
                         case AUTO_SEQ_CENLFE:
-                                spec->multiout.dac_nids[i] = 0x24;
+                                if (spec->codec->vendor_id == 0x11064397)
+                                        spec->private_dac_nids[i] = 0x25;
+                                else
+                                        spec->private_dac_nids[i] = 0x24;
                                 break;
                         case AUTO_SEQ_SURROUND:
-                                spec->multiout.dac_nids[i] = 0x11;
+                                spec->private_dac_nids[i] = 0x11;
                                 break;
                         case AUTO_SEQ_SIDE:
-                                spec->multiout.dac_nids[i] = 0x25;
+                                spec->private_dac_nids[i] = 0x25;
                                 break;
                         }
                 }
@@ -3928,21 +3582,29 @@ static int vt1708S_auto_fill_dac_nids(struct via_spec *spec,
         /* for Smart 5.1, line/mic inputs double as output pins */
         if (cfg->line_outs == 1) {
                 spec->multiout.num_dacs = 3;
-                spec->multiout.dac_nids[AUTO_SEQ_SURROUND] = 0x11;
-                spec->multiout.dac_nids[AUTO_SEQ_CENLFE] = 0x24;
+                spec->private_dac_nids[AUTO_SEQ_SURROUND] = 0x11;
+                if (spec->codec->vendor_id == 0x11064397)
+                        spec->private_dac_nids[AUTO_SEQ_CENLFE] = 0x25;
+                else
+                        spec->private_dac_nids[AUTO_SEQ_CENLFE] = 0x24;
         }
 
         return 0;
 }
 
 /* add playback controls from the parsed DAC table */
-static int vt1708S_auto_create_multi_out_ctls(struct via_spec *spec,
+static int vt1708S_auto_create_multi_out_ctls(struct hda_codec *codec,
                                              const struct auto_pin_cfg *cfg)
 {
+        struct via_spec *spec = codec->spec;
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
-        hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25};
-        hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27};
+        static const char * const chname[4] = {
+                "Front", "Surround", "C/LFE", "Side"
+        };
+        hda_nid_t nid_vols[2][4] = { {0x10, 0x11, 0x24, 0x25},
+                                     {0x10, 0x11, 0x25, 0} };
+        hda_nid_t nid_mutes[2][4] = { {0x1C, 0x18, 0x26, 0x27},
+                                      {0x1C, 0x18, 0x27, 0} };
         hda_nid_t nid, nid_vol, nid_mute;
         int i, err;
 
@@ -3953,8 +3615,15 @@ static int vt1708S_auto_create_multi_out_ctls(struct via_spec *spec,
                 if (!nid && i > AUTO_SEQ_CENLFE)
                         continue;
 
-                nid_vol = nid_vols[i];
-                nid_mute = nid_mutes[i];
+                if (codec->vendor_id == 0x11064397) {
+                        nid_vol = nid_vols[1][i];
+                        nid_mute = nid_mutes[1][i];
+                } else {
+                        nid_vol = nid_vols[0][i];
+                        nid_mute = nid_mutes[0][i];
+                }
+                if (!nid_vol && !nid_mute)
+                        continue;
 
                 if (i == AUTO_SEQ_CENLFE) {
                         /* Center/LFE */
@@ -4061,49 +3730,12 @@ static int vt1708S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1708S_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 5;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x1a: /* Mic */
-                        idx = 2;
-                        break;
-
-                case 0x1b: /* Line In */
-                        idx = 3;
-                        break;
-
-                case 0x1e: /* Front Mic */
-                        idx = 4;
-                        break;
-
-                case 0x1f: /* CD */
-                        idx = 1;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x16);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx-1;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0x1f, 0x1a, 0x1b, 0x1e, 0, 0xff };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 /* fill out digital output widgets; one for master and one for slave outputs */
@@ -4145,13 +3777,13 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
         if (!spec->autocfg.line_outs && !spec->autocfg.hp_pins[0])
                 return 0; /* can't find valid BIOS pin config */
 
-        err = vt1708S_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        err = vt1708S_auto_create_multi_out_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
         err = vt1708S_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1708S_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1708S_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -4172,7 +3804,7 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1708S_loopbacks[] = {
+static const struct hda_amp_list vt1708S_loopbacks[] = {
         { 0x16, HDA_INPUT, 1 },
         { 0x16, HDA_INPUT, 2 },
         { 0x16, HDA_INPUT, 3 },
@@ -4212,17 +3844,29 @@ static int patch_vt1708S(struct hda_codec *codec)
         }
 
         spec->init_verbs[spec->num_iverbs++] = vt1708S_volume_init_verbs;
-        spec->init_verbs[spec->num_iverbs++] = vt1708S_uniwill_init_verbs;
+        if (codec->vendor_id == 0x11064397)
+                spec->init_verbs[spec->num_iverbs++] =
+                        vt1705_uniwill_init_verbs;
+        else
+                spec->init_verbs[spec->num_iverbs++] =
+                        vt1708S_uniwill_init_verbs;
 
         if (codec->vendor_id == 0x11060440)
                 spec->stream_name_analog = "VT1818S Analog";
+        else if (codec->vendor_id == 0x11064397)
+                spec->stream_name_analog = "VT1705 Analog";
         else
                 spec->stream_name_analog = "VT1708S Analog";
-        spec->stream_analog_playback = &vt1708S_pcm_analog_playback;
+        if (codec->vendor_id == 0x11064397)
+                spec->stream_analog_playback = &vt1705_pcm_analog_playback;
+        else
+                spec->stream_analog_playback = &vt1708S_pcm_analog_playback;
         spec->stream_analog_capture = &vt1708S_pcm_analog_capture;
 
         if (codec->vendor_id == 0x11060440)
                 spec->stream_name_digital = "VT1818S Digital";
+        else if (codec->vendor_id == 0x11064397)
+                spec->stream_name_digital = "VT1705 Digital";
         else
                 spec->stream_name_digital = "VT1708S Digital";
         spec->stream_digital_playback = &vt1708S_pcm_digital_playback;
@@ -4255,13 +3899,27 @@ static int patch_vt1708S(struct hda_codec *codec)
                 spec->stream_name_analog = "VT1708BCE Analog";
                 spec->stream_name_digital = "VT1708BCE Digital";
         }
+        /* correct names for VT1818S */
+        if (codec->vendor_id == 0x11060440) {
+                spec->stream_name_analog = "VT1818S Analog";
+                spec->stream_name_digital = "VT1818S Digital";
+        }
+        /* correct names for VT1705 */
+        if (codec->vendor_id == 0x11064397)     {
+                kfree(codec->chip_name);
+                codec->chip_name = kstrdup("VT1705", GFP_KERNEL);
+                snprintf(codec->bus->card->mixername,
+                         sizeof(codec->bus->card->mixername),
+                         "%s %s", codec->vendor_name, codec->chip_name);
+        }
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1708B;
         return 0;
 }
 
 /* Patch for VT1702 */
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1702_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1702_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x20, 0x0, HDA_INPUT),
@@ -4285,7 +3943,7 @@ static struct snd_kcontrol_new vt1702_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt1702_volume_init_verbs[] = {
+static const struct hda_verb vt1702_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -4316,7 +3974,7 @@ static struct hda_verb vt1702_volume_init_verbs[] = {
         { }
 };
 
-static struct hda_verb vt1702_uniwill_init_verbs[] = {
+static const struct hda_verb vt1702_uniwill_init_verbs[] = {
         {0x17, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
@@ -4326,7 +3984,7 @@ static struct hda_verb vt1702_uniwill_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1702_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1702_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -4339,7 +3997,7 @@ static struct hda_pcm_stream vt1702_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1702_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1702_pcm_analog_capture = {
         .substreams = 3,
         .channels_min = 2,
         .channels_max = 2,
@@ -4352,7 +4010,7 @@ static struct hda_pcm_stream vt1702_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1702_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1702_pcm_digital_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -4374,7 +4032,7 @@ static int vt1702_auto_fill_dac_nids(struct via_spec *spec,
 
         if (cfg->line_out_pins[0]) {
                 /* config dac list */
-                spec->multiout.dac_nids[0] = 0x10;
+                spec->private_dac_nids[0] = 0x10;
         }
 
         return 0;
@@ -4420,7 +4078,7 @@ static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 {
         int err, i;
         struct hda_input_mux *imux;
-        static const char *texts[] = { "ON", "OFF", NULL};
+        static const char * const texts[] = { "ON", "OFF", NULL};
         if (!pin)
                 return 0;
         spec->multiout.hp_nid = 0x1D;
@@ -4441,58 +4099,20 @@ static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
         imux = &spec->private_imux[1];
 
         /* for hp mode select */
-        i = 0;
-        while (texts[i] != NULL)        {
-                imux->items[imux->num_items].label =  texts[i];
-                imux->items[imux->num_items].index = i;
-                imux->num_items++;
-                i++;
-        }
+        for (i = 0; texts[i]; i++)
+                snd_hda_add_imux_item(imux, texts[i], i, NULL);
 
         spec->hp_mux = &spec->private_imux[1];
         return 0;
 }
 
 /* create playback/capture controls for input pins */
-static int vt1702_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1702_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 3;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x14: /* Mic */
-                        idx = 1;
-                        break;
-
-                case 0x15: /* Line In */
-                        idx = 2;
-                        break;
-
-                case 0x18: /* Front Mic */
-                        idx = 3;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x1A);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx-1;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0x14, 0x15, 0x18, 0xff };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x1a, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 static int vt1702_parse_auto_config(struct hda_codec *codec)
@@ -4521,7 +4141,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
                                   (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
                                   (0x5 << AC_AMPCAP_STEP_SIZE_SHIFT) |
                                   (1 << AC_AMPCAP_MUTE_SHIFT));
-        err = vt1702_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1702_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -4541,7 +4161,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1702_loopbacks[] = {
+static const struct hda_amp_list vt1702_loopbacks[] = {
         { 0x1A, HDA_INPUT, 1 },
         { 0x1A, HDA_INPUT, 2 },
         { 0x1A, HDA_INPUT, 3 },
@@ -4550,6 +4170,37 @@ static struct hda_amp_list vt1702_loopbacks[] = {
 };
 #endif
 
+static void set_widgets_power_state_vt1702(struct hda_codec *codec)
+{
+        int imux_is_smixer =
+        snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
+        unsigned int parm;
+        /* inputs */
+        /* PW 1/2/5 (14h/15h/18h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x14, &parm);
+        set_pin_power_state(codec, 0x15, &parm);
+        set_pin_power_state(codec, 0x18, &parm);
+        if (imux_is_smixer)
+                parm = AC_PWRST_D0; /* SW0 (13h) = stereo mixer (idx 3) */
+        /* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */
+        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* PW 3/4 (16h/17h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x17, &parm);
+        set_pin_power_state(codec, 0x16, &parm);
+        /* MW0 (1ah), AOW 0/1 (10h/1dh) */
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
+                            imux_is_smixer ? AC_PWRST_D0 : parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
+}
+
 static int patch_vt1702(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -4596,13 +4247,14 @@ static int patch_vt1702(struct hda_codec *codec)
         spec->loopback.amplist = vt1702_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1702;
         return 0;
 }
 
 /* Patch for VT1718S */
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1718S_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1718S_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
@@ -4624,14 +4276,15 @@ static struct snd_kcontrol_new vt1718S_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt1718S_volume_init_verbs[] = {
+static const struct hda_verb vt1718S_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
         {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-
+        /* Enable MW0 adjust Gain 5 */
+        {0x1, 0xfb2, 0x10},
         /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          */
@@ -4640,10 +4293,7 @@ static struct hda_verb vt1718S_volume_init_verbs[] = {
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
         {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
-        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
-
-        /* Setup default input of Front HP to MW9 */
-        {0x28, AC_VERB_SET_CONNECT_SEL, 0x1},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
         /* PW9 PW10 Output enable */
         {0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
         {0x2e, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
@@ -4652,10 +4302,10 @@ static struct hda_verb vt1718S_volume_init_verbs[] = {
         /* Enable Boost Volume backdoor */
         {0x1, 0xf88, 0x8},
         /* MW0/1/2/3/4: un-mute index 0 (AOWx), mute index 1 (MW9) */
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
@@ -4665,13 +4315,11 @@ static struct hda_verb vt1718S_volume_init_verbs[] = {
         /* set MUX1 = 2 (AOW4), MUX2 = 1 (AOW3) */
         {0x34, AC_VERB_SET_CONNECT_SEL, 0x2},
         {0x35, AC_VERB_SET_CONNECT_SEL, 0x1},
-        /* Unmute MW4's index 0 */
-        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { }
 };
 
 
-static struct hda_verb vt1718S_uniwill_init_verbs[] = {
+static const struct hda_verb vt1718S_uniwill_init_verbs[] = {
         {0x28, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         {0x24, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
@@ -4684,7 +4332,7 @@ static struct hda_verb vt1718S_uniwill_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1718S_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1718S_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 10,
@@ -4697,7 +4345,7 @@ static struct hda_pcm_stream vt1718S_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1718S_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1718S_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -4710,7 +4358,7 @@ static struct hda_pcm_stream vt1718S_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1718S_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1718S_pcm_digital_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -4723,7 +4371,7 @@ static struct hda_pcm_stream vt1718S_pcm_digital_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1718S_pcm_digital_capture = {
+static const struct hda_pcm_stream vt1718S_pcm_digital_capture = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -4746,16 +4394,16 @@ static int vt1718S_auto_fill_dac_nids(struct via_spec *spec,
                         /* config dac list */
                         switch (i) {
                         case AUTO_SEQ_FRONT:
-                                spec->multiout.dac_nids[i] = 0x8;
+                                spec->private_dac_nids[i] = 0x8;
                                 break;
                         case AUTO_SEQ_CENLFE:
-                                spec->multiout.dac_nids[i] = 0xa;
+                                spec->private_dac_nids[i] = 0xa;
                                 break;
                         case AUTO_SEQ_SURROUND:
-                                spec->multiout.dac_nids[i] = 0x9;
+                                spec->private_dac_nids[i] = 0x9;
                                 break;
                         case AUTO_SEQ_SIDE:
-                                spec->multiout.dac_nids[i] = 0xb;
+                                spec->private_dac_nids[i] = 0xb;
                                 break;
                         }
                 }
@@ -4769,7 +4417,9 @@ static int vt1718S_auto_create_multi_out_ctls(struct via_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" };
+        static const char * const chname[4] = {
+                "Front", "Surround", "C/LFE", "Side"
+        };
         hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb};
         hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27};
         hda_nid_t nid, nid_vol, nid_mute = 0;
@@ -4812,6 +4462,19 @@ static int vt1718S_auto_create_multi_out_ctls(struct via_spec *spec,
                         if (err < 0)
                                 return err;
                 } else if (i == AUTO_SEQ_FRONT) {
+                        /* add control to mixer index 0 */
+                        err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
+                                              "Master Front Playback Volume",
+                                              HDA_COMPOSE_AMP_VAL(0x21, 3, 5,
+                                                                  HDA_INPUT));
+                        if (err < 0)
+                                return err;
+                        err = via_add_control(spec, VIA_CTL_WIDGET_MUTE,
+                                              "Master Front Playback Switch",
+                                              HDA_COMPOSE_AMP_VAL(0x21, 3, 5,
+                                                                  HDA_INPUT));
+                        if (err < 0)
+                                return err;
                         /* Front */
                         sprintf(name, "%s Playback Volume", chname[i]);
                         err = via_add_control(
@@ -4872,49 +4535,12 @@ static int vt1718S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1718S_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1718S_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 5;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x2b: /* Mic */
-                        idx = 1;
-                        break;
-
-                case 0x2a: /* Line In */
-                        idx = 2;
-                        break;
-
-                case 0x29: /* Front Mic */
-                        idx = 3;
-                        break;
-
-                case 0x2c: /* CD */
-                        idx = 0;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x21);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0x2c, 0x2b, 0x2a, 0x29, 0, 0xff };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 static int vt1718S_parse_auto_config(struct hda_codec *codec)
@@ -4938,7 +4564,7 @@ static int vt1718S_parse_auto_config(struct hda_codec *codec)
         err = vt1718S_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1718S_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1718S_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -4963,7 +4589,7 @@ static int vt1718S_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1718S_loopbacks[] = {
+static const struct hda_amp_list vt1718S_loopbacks[] = {
         { 0x21, HDA_INPUT, 1 },
         { 0x21, HDA_INPUT, 2 },
         { 0x21, HDA_INPUT, 3 },
@@ -4972,6 +4598,72 @@ static struct hda_amp_list vt1718S_loopbacks[] = {
 };
 #endif
 
+static void set_widgets_power_state_vt1718S(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer;
+        unsigned int parm;
+        /* MUX6 (1eh) = stereo mixer */
+        imux_is_smixer =
+        snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
+        /* inputs */
+        /* PW 5/6/7 (29h/2ah/2bh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x29, &parm);
+        set_pin_power_state(codec, 0x2a, &parm);
+        set_pin_power_state(codec, 0x2b, &parm);
+        if (imux_is_smixer)
+                parm = AC_PWRST_D0;
+        /* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */
+        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* PW3 (27h), MW2 (1ah), AOW3 (bh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x27, &parm);
+        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW2 (26h), AOW2 (ah) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x26, &parm);
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x2b, &parm);
+        snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW0 (24h), AOW0 (8h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x24, &parm);
+        if (!spec->hp_independent_mode) /* check for redirected HP */
+                set_pin_power_state(codec, 0x28, &parm);
+        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+        /* MW9 (21h), Mw2 (1ah), AOW0 (8h) */
+        snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,
+                            imux_is_smixer ? AC_PWRST_D0 : parm);
+
+        /* PW1 (25h), AOW1 (9h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x25, &parm);
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x2a, &parm);
+        snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        if (spec->hp_independent_mode) {
+                /* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x28, &parm);
+                snd_hda_codec_write(codec, 0x1b, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x34, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0xc, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        }
+}
+
 static int patch_vt1718S(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -5033,6 +4725,8 @@ static int patch_vt1718S(struct hda_codec *codec)
         spec->loopback.amplist = vt1718S_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1718S;
+
         return 0;
 }
 
@@ -5072,13 +4766,12 @@ static int vt1716s_dmic_put(struct snd_kcontrol *kcontrol,
         snd_hda_codec_write(codec, 0x26, 0,
                                                AC_VERB_SET_CONNECT_SEL, index);
         spec->dmic_enabled = index;
-        set_jack_power_state(codec);
-
+        set_widgets_power_state(codec);
         return 1;
 }
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1716S_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1716S_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x13, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x14, 0x0, HDA_INPUT),
@@ -5097,7 +4790,7 @@ static struct snd_kcontrol_new vt1716S_capture_mixer[] = {
         { } /* end */
 };
 
-static struct snd_kcontrol_new vt1716s_dmic_mixer[] = {
+static const struct snd_kcontrol_new vt1716s_dmic_mixer[] = {
         HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x22, 0x0, HDA_INPUT),
         {
          .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -5113,12 +4806,12 @@ static struct snd_kcontrol_new vt1716s_dmic_mixer[] = {
 
 
 /* mono-out mixer elements */
-static struct snd_kcontrol_new vt1716S_mono_out_mixer[] = {
+static const struct snd_kcontrol_new vt1716S_mono_out_mixer[] = {
         HDA_CODEC_MUTE("Mono Playback Switch", 0x2a, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
-static struct hda_verb vt1716S_volume_init_verbs[] = {
+static const struct hda_verb vt1716S_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -5167,7 +4860,7 @@ static struct hda_verb vt1716S_volume_init_verbs[] = {
 };
 
 
-static struct hda_verb vt1716S_uniwill_init_verbs[] = {
+static const struct hda_verb vt1716S_uniwill_init_verbs[] = {
         {0x1d, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT},
         {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
@@ -5180,7 +4873,7 @@ static struct hda_verb vt1716S_uniwill_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1716S_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1716S_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 6,
@@ -5193,7 +4886,7 @@ static struct hda_pcm_stream vt1716S_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1716S_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1716S_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5206,7 +4899,7 @@ static struct hda_pcm_stream vt1716S_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1716S_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1716S_pcm_digital_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5235,13 +4928,13 @@ static int vt1716S_auto_fill_dac_nids(struct via_spec *spec,
                         /* config dac list */
                         switch (i) {
                         case AUTO_SEQ_FRONT:
-                                spec->multiout.dac_nids[i] = 0x10;
+                                spec->private_dac_nids[i] = 0x10;
                                 break;
                         case AUTO_SEQ_CENLFE:
-                                spec->multiout.dac_nids[i] = 0x25;
+                                spec->private_dac_nids[i] = 0x25;
                                 break;
                         case AUTO_SEQ_SURROUND:
-                                spec->multiout.dac_nids[i] = 0x11;
+                                spec->private_dac_nids[i] = 0x11;
                                 break;
                         }
                 }
@@ -5255,7 +4948,9 @@ static int vt1716S_auto_create_multi_out_ctls(struct via_spec *spec,
                                               const struct auto_pin_cfg *cfg)
 {
         char name[32];
-        static const char *chname[3] = { "Front", "Surround", "C/LFE" };
+        static const char * const chname[3] = {
+                "Front", "Surround", "C/LFE"
+        };
         hda_nid_t nid_vols[] = {0x10, 0x11, 0x25};
         hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27};
         hda_nid_t nid, nid_vol, nid_mute;
@@ -5371,49 +5066,12 @@ static int vt1716S_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1716S_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1716S_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
-        struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 5;
-        imux->num_items++;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x1a: /* Mic */
-                        idx = 2;
-                        break;
-
-                case 0x1b: /* Line In */
-                        idx = 3;
-                        break;
-
-                case 0x1e: /* Front Mic */
-                        idx = 4;
-                        break;
-
-                case 0x1f: /* CD */
-                        idx = 1;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x16);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx-1;
-                imux->num_items++;
-        }
-        return 0;
+        static const hda_nid_t pin_idxs[] = { 0x1f, 0x1a, 0x1b, 0x1e, 0, 0xff };
+        return vt_auto_create_analog_input_ctls(codec, cfg, 0x16, pin_idxs,
+                                                ARRAY_SIZE(pin_idxs));
 }
 
 static int vt1716S_parse_auto_config(struct hda_codec *codec)
@@ -5436,7 +5094,7 @@ static int vt1716S_parse_auto_config(struct hda_codec *codec)
         err = vt1716S_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1716S_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1716S_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -5458,7 +5116,7 @@ static int vt1716S_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1716S_loopbacks[] = {
+static const struct hda_amp_list vt1716S_loopbacks[] = {
         { 0x16, HDA_INPUT, 1 },
         { 0x16, HDA_INPUT, 2 },
         { 0x16, HDA_INPUT, 3 },
@@ -5467,6 +5125,99 @@ static struct hda_amp_list vt1716S_loopbacks[] = {
 };
 #endif
 
+static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer;
+        unsigned int parm;
+        unsigned int mono_out, present;
+        /* SW0 (17h) = stereo mixer */
+        imux_is_smixer =
+        (snd_hda_codec_read(codec, 0x17, 0,
+                            AC_VERB_GET_CONNECT_SEL, 0x00) ==  5);
+        /* inputs */
+        /* PW 1/2/5 (1ah/1bh/1eh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x1a, &parm);
+        set_pin_power_state(codec, 0x1b, &parm);
+        set_pin_power_state(codec, 0x1e, &parm);
+        if (imux_is_smixer)
+                parm = AC_PWRST_D0;
+        /* SW0 (17h), AIW0(13h) */
+        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x1e, &parm);
+        /* PW11 (22h) */
+        if (spec->dmic_enabled)
+                set_pin_power_state(codec, 0x22, &parm);
+        else
+                snd_hda_codec_write(codec, 0x22, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+
+        /* SW2(26h), AIW1(14h) */
+        snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* PW0 (19h), SW1 (18h), AOW1 (11h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x19, &parm);
+        /* Smart 5.1 PW2(1bh) */
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x1b, &parm);
+        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW7 (23h), SW3 (27h), AOW3 (25h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x23, &parm);
+        /* Smart 5.1 PW1(1ah) */
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x1a, &parm);
+        snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* Smart 5.1 PW5(1eh) */
+        if (spec->smart51_enabled)
+                set_pin_power_state(codec, 0x1e, &parm);
+        snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* Mono out */
+        /* SW4(28h)->MW1(29h)-> PW12 (2ah)*/
+        present = snd_hda_jack_detect(codec, 0x1c);
+
+        if (present)
+                mono_out = 0;
+        else {
+                present = snd_hda_jack_detect(codec, 0x1d);
+                if (!spec->hp_independent_mode && present)
+                        mono_out = 0;
+                else
+                        mono_out = 1;
+        }
+        parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;
+        snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW 3/4 (1ch/1dh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x1c, &parm);
+        set_pin_power_state(codec, 0x1d, &parm);
+        /* HP Independent Mode, power on AOW3 */
+        if (spec->hp_independent_mode)
+                snd_hda_codec_write(codec, 0x25, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+
+        /* force to D0 for internal Speaker */
+        /* MW0 (16h), AOW0 (10h) */
+        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
+                            imux_is_smixer ? AC_PWRST_D0 : parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
+                            mono_out ? AC_PWRST_D0 : parm);
+}
+
 static int patch_vt1716S(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -5521,13 +5272,14 @@ static int patch_vt1716S(struct hda_codec *codec)
         spec->loopback.amplist = vt1716S_loopbacks;
 #endif
 
+        spec->set_widgets_power_state = set_widgets_power_state_vt1716S;
         return 0;
 }
 
 /* for vt2002P */
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt2002P_capture_mixer[] = {
+static const struct snd_kcontrol_new vt2002P_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
@@ -5550,7 +5302,11 @@ static struct snd_kcontrol_new vt2002P_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt2002P_volume_init_verbs[] = {
+static const struct hda_verb vt2002P_volume_init_verbs[] = {
+        /* Class-D speaker related verbs */
+        {0x1, 0xfe0, 0x4},
+        {0x1, 0xfe9, 0x80},
+        {0x1, 0xfe2, 0x22},
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -5601,9 +5357,60 @@ static struct hda_verb vt2002P_volume_init_verbs[] = {
         {0x1, 0xfb8, 0x88},
         { }
 };
+static const struct hda_verb vt1802_volume_init_verbs[] = {
+        /*
+         * Unmute ADC0-1 and set the default input to mic-in
+         */
+        {0x8, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x9, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
 
-static struct hda_verb vt2002P_uniwill_init_verbs[] = {
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+         * mixer widget
+         */
+        /* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+
+        /* MUX Indices: Mic = 0 */
+        {0x1e, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x1f, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* PW9 Output enable */
+        {0x2d, AC_VERB_SET_PIN_WIDGET_CONTROL, AC_PINCTL_OUT_EN},
+
+        /* Enable Boost Volume backdoor */
+        {0x1, 0xfb9, 0x24},
+
+        /* MW0/1/4/8: un-mute index 0 (MUXx), un-mute index 1 (MW9) */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        /* set MUX0/1/4/8 = 0 (AOW0) */
+        {0x34, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x35, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x38, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x3c, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* set PW0 index=0 (MW0) */
+        {0x24, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Enable AOW0 to MW9 */
+        {0x1, 0xfb8, 0x88},
+        { }
+};
+
+
+static const struct hda_verb vt2002P_uniwill_init_verbs[] = {
         {0x25, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
         {0x26, AC_VERB_SET_UNSOLICITED_ENABLE,
@@ -5613,8 +5420,18 @@ static struct hda_verb vt2002P_uniwill_init_verbs[] = {
         {0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
         { }
 };
+static const struct hda_verb vt1802_uniwill_init_verbs[] = {
+        {0x25, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x28, AC_VERB_SET_UNSOLICITED_ENABLE,
+         AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
+        {0x29, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        {0x2b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT},
+        { }
+};
 
-static struct hda_pcm_stream vt2002P_pcm_analog_playback = {
+static const struct hda_pcm_stream vt2002P_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5627,7 +5444,7 @@ static struct hda_pcm_stream vt2002P_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt2002P_pcm_analog_capture = {
+static const struct hda_pcm_stream vt2002P_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5640,7 +5457,7 @@ static struct hda_pcm_stream vt2002P_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt2002P_pcm_digital_playback = {
+static const struct hda_pcm_stream vt2002P_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -5660,7 +5477,7 @@ static int vt2002P_auto_fill_dac_nids(struct via_spec *spec,
         spec->multiout.num_dacs = 1;
         spec->multiout.dac_nids = spec->private_dac_nids;
         if (cfg->line_out_pins[0])
-                spec->multiout.dac_nids[0] = 0x8;
+                spec->private_dac_nids[0] = 0x8;
         return 0;
 }
 
@@ -5669,10 +5486,15 @@ static int vt2002P_auto_create_multi_out_ctls(struct via_spec *spec,
                                              const struct auto_pin_cfg *cfg)
 {
         int err;
+        hda_nid_t sw_nid;
 
         if (!cfg->line_out_pins[0])
                 return -1;
 
+        if (spec->codec_type == VT1802)
+                sw_nid = 0x28;
+        else
+                sw_nid = 0x26;
 
         /* Line-Out: PortE */
         err = via_add_control(spec, VIA_CTL_WIDGET_VOL,
@@ -5682,7 +5504,7 @@ static int vt2002P_auto_create_multi_out_ctls(struct via_spec *spec,
                 return err;
         err = via_add_control(spec, VIA_CTL_WIDGET_BIND_PIN_MUTE,
                               "Master Front Playback Switch",
-                              HDA_COMPOSE_AMP_VAL(0x26, 3, 0, HDA_OUTPUT));
+                              HDA_COMPOSE_AMP_VAL(sw_nid, 3, 0, HDA_OUTPUT));
         if (err < 0)
                 return err;
 
@@ -5717,54 +5539,25 @@ static int vt2002P_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt2002P_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt2002P_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
+        struct via_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x2b: /* Mic */
-                        idx = 0;
-                        break;
-
-                case 0x2a: /* Line In */
-                        idx = 1;
-                        break;
-
-                case 0x29: /* Front Mic */
-                        idx = 2;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x21);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
-        }
+        static const hda_nid_t pin_idxs[] = { 0x2b, 0x2a, 0x29, 0xff };
+        int err;
 
+        err = vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,
+                                               ARRAY_SIZE(pin_idxs));
+        if (err < 0)
+                return err;
         /* build volume/mute control of loopback */
-        err = via_new_analog_input(spec, "Stereo Mixer", 3, 0x21);
+        err = via_new_analog_input(spec, "Stereo Mixer", 0, 3, 0x21);
         if (err < 0)
                 return err;
 
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 3;
-        imux->num_items++;
-
         /* for digital mic select */
-        imux->items[imux->num_items].label = "Digital Mic";
-        imux->items[imux->num_items].index = 4;
-        imux->num_items++;
+        snd_hda_add_imux_item(imux, "Digital Mic", 4, NULL);
 
         return 0;
 }
@@ -5792,7 +5585,7 @@ static int vt2002P_parse_auto_config(struct hda_codec *codec)
         err = vt2002P_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt2002P_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt2002P_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -5812,7 +5605,7 @@ static int vt2002P_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt2002P_loopbacks[] = {
+static const struct hda_amp_list vt2002P_loopbacks[] = {
         { 0x21, HDA_INPUT, 0 },
         { 0x21, HDA_INPUT, 1 },
         { 0x21, HDA_INPUT, 2 },
@@ -5820,6 +5613,116 @@ static struct hda_amp_list vt2002P_loopbacks[] = {
 };
 #endif
 
+static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer;
+        unsigned int parm;
+        unsigned int present;
+        /* MUX9 (1eh) = stereo mixer */
+        imux_is_smixer =
+        snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
+        /* inputs */
+        /* PW 5/6/7 (29h/2ah/2bh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x29, &parm);
+        set_pin_power_state(codec, 0x2a, &parm);
+        set_pin_power_state(codec, 0x2b, &parm);
+        parm = AC_PWRST_D0;
+        /* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */
+        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* AOW0 (8h)*/
+        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        if (spec->codec_type == VT1802) {
+                /* PW4 (28h), MW4 (18h), MUX4(38h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x28, &parm);
+                snd_hda_codec_write(codec, 0x18, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x38, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        } else {
+                /* PW4 (26h), MW4 (1ch), MUX4(37h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x26, &parm);
+                snd_hda_codec_write(codec, 0x1c, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x37, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        }
+
+        if (spec->codec_type == VT1802) {
+                /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x25, &parm);
+                snd_hda_codec_write(codec, 0x15, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        } else {
+                /* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */
+                parm = AC_PWRST_D3;
+                set_pin_power_state(codec, 0x25, &parm);
+                snd_hda_codec_write(codec, 0x19, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        }
+
+        if (spec->hp_independent_mode)
+                snd_hda_codec_write(codec, 0x9, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+        /* Class-D */
+        /* PW0 (24h), MW0(18h/14h), MUX0(34h) */
+        present = snd_hda_jack_detect(codec, 0x25);
+
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x24, &parm);
+        parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
+        if (spec->codec_type == VT1802)
+                snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        else
+                snd_hda_codec_write(codec, 0x18, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* Mono Out */
+        present = snd_hda_jack_detect(codec, 0x26);
+
+        parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
+        if (spec->codec_type == VT1802) {
+                /* PW15 (33h), MW8(1ch), MUX8(3ch) */
+                snd_hda_codec_write(codec, 0x33, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x1c, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x3c, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        } else {
+                /* PW15 (31h), MW8(17h), MUX8(3bh) */
+                snd_hda_codec_write(codec, 0x31, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x17, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+                snd_hda_codec_write(codec, 0x3b, 0,
+                                    AC_VERB_SET_POWER_STATE, parm);
+        }
+        /* MW9 (21h) */
+        if (imux_is_smixer || !is_aa_path_mute(codec))
+                snd_hda_codec_write(codec, 0x21, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        else
+                snd_hda_codec_write(codec, 0x21, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+}
 
 /* patch for vt2002P */
 static int patch_vt2002P(struct hda_codec *codec)
@@ -5842,14 +5745,31 @@ static int patch_vt2002P(struct hda_codec *codec)
                        "from BIOS.  Using genenic mode...\n");
         }
 
-        spec->init_verbs[spec->num_iverbs++]  = vt2002P_volume_init_verbs;
-        spec->init_verbs[spec->num_iverbs++] = vt2002P_uniwill_init_verbs;
+        if (spec->codec_type == VT1802)
+                spec->init_verbs[spec->num_iverbs++]  =
+                        vt1802_volume_init_verbs;
+        else
+                spec->init_verbs[spec->num_iverbs++]  =
+                        vt2002P_volume_init_verbs;
+
+        if (spec->codec_type == VT1802)
+                spec->init_verbs[spec->num_iverbs++] =
+                        vt1802_uniwill_init_verbs;
+        else
+                spec->init_verbs[spec->num_iverbs++] =
+                        vt2002P_uniwill_init_verbs;
 
-        spec->stream_name_analog = "VT2002P Analog";
+        if (spec->codec_type == VT1802)
+                spec->stream_name_analog = "VT1802 Analog";
+        else
+                spec->stream_name_analog = "VT2002P Analog";
         spec->stream_analog_playback = &vt2002P_pcm_analog_playback;
         spec->stream_analog_capture = &vt2002P_pcm_analog_capture;
 
-        spec->stream_name_digital = "VT2002P Digital";
+        if (spec->codec_type == VT1802)
+                spec->stream_name_digital = "VT1802 Digital";
+        else
+                spec->stream_name_digital = "VT2002P Digital";
         spec->stream_digital_playback = &vt2002P_pcm_digital_playback;
 
         if (!spec->adc_nids && spec->input_mux) {
@@ -5871,13 +5791,14 @@ static int patch_vt2002P(struct hda_codec *codec)
         spec->loopback.amplist = vt2002P_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt2002P;
         return 0;
 }
 
 /* for vt1812 */
 
 /* capture mixer elements */
-static struct snd_kcontrol_new vt1812_capture_mixer[] = {
+static const struct snd_kcontrol_new vt1812_capture_mixer[] = {
         HDA_CODEC_VOLUME("Capture Volume", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x10, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x11, 0x0, HDA_INPUT),
@@ -5899,7 +5820,7 @@ static struct snd_kcontrol_new vt1812_capture_mixer[] = {
         { } /* end */
 };
 
-static struct hda_verb vt1812_volume_init_verbs[] = {
+static const struct hda_verb vt1812_volume_init_verbs[] = {
         /*
          * Unmute ADC0-1 and set the default input to mic-in
          */
@@ -5952,7 +5873,7 @@ static struct hda_verb vt1812_volume_init_verbs[] = {
 };
 
 
-static struct hda_verb vt1812_uniwill_init_verbs[] = {
+static const struct hda_verb vt1812_uniwill_init_verbs[] = {
         {0x33, AC_VERB_SET_UNSOLICITED_ENABLE,
          AC_USRSP_EN | VIA_JACK_EVENT | VIA_BIND_HP_EVENT},
         {0x25, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | VIA_JACK_EVENT },
@@ -5964,7 +5885,7 @@ static struct hda_verb vt1812_uniwill_init_verbs[] = {
         { }
 };
 
-static struct hda_pcm_stream vt1812_pcm_analog_playback = {
+static const struct hda_pcm_stream vt1812_pcm_analog_playback = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5977,7 +5898,7 @@ static struct hda_pcm_stream vt1812_pcm_analog_playback = {
         },
 };
 
-static struct hda_pcm_stream vt1812_pcm_analog_capture = {
+static const struct hda_pcm_stream vt1812_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
@@ -5990,7 +5911,7 @@ static struct hda_pcm_stream vt1812_pcm_analog_capture = {
         },
 };
 
-static struct hda_pcm_stream vt1812_pcm_digital_playback = {
+static const struct hda_pcm_stream vt1812_pcm_digital_playback = {
         .substreams = 1,
         .channels_min = 2,
         .channels_max = 2,
@@ -6009,7 +5930,7 @@ static int vt1812_auto_fill_dac_nids(struct via_spec *spec,
         spec->multiout.num_dacs = 1;
         spec->multiout.dac_nids = spec->private_dac_nids;
         if (cfg->line_out_pins[0])
-                spec->multiout.dac_nids[0] = 0x8;
+                spec->private_dac_nids[0] = 0x8;
         return 0;
 }
 
@@ -6067,53 +5988,26 @@ static int vt1812_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
 }
 
 /* create playback/capture controls for input pins */
-static int vt1812_auto_create_analog_input_ctls(struct via_spec *spec,
+static int vt1812_auto_create_analog_input_ctls(struct hda_codec *codec,
                                                 const struct auto_pin_cfg *cfg)
 {
-        static char *labels[] = {
-                "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux", NULL
-        };
+        struct via_spec *spec = codec->spec;
         struct hda_input_mux *imux = &spec->private_imux[0];
-        int i, err, idx = 0;
-
-        for (i = 0; i < AUTO_PIN_LAST; i++) {
-                if (!cfg->input_pins[i])
-                        continue;
-
-                switch (cfg->input_pins[i]) {
-                case 0x2b: /* Mic */
-                        idx = 0;
-                        break;
+        static const hda_nid_t pin_idxs[] = { 0x2b, 0x2a, 0x29, 0, 0, 0xff };
+        int err;
 
-                case 0x2a: /* Line In */
-                        idx = 1;
-                        break;
+        err = vt_auto_create_analog_input_ctls(codec, cfg, 0x21, pin_idxs,
+                                               ARRAY_SIZE(pin_idxs));
+        if (err < 0)
+                return err;
 
-                case 0x29: /* Front Mic */
-                        idx = 2;
-                        break;
-                }
-                err = via_new_analog_input(spec, labels[i], idx, 0x21);
-                if (err < 0)
-                        return err;
-                imux->items[imux->num_items].label = labels[i];
-                imux->items[imux->num_items].index = idx;
-                imux->num_items++;
-        }
         /* build volume/mute control of loopback */
-        err = via_new_analog_input(spec, "Stereo Mixer", 5, 0x21);
+        err = via_new_analog_input(spec, "Stereo Mixer", 0, 5, 0x21);
         if (err < 0)
                 return err;
 
-        /* for internal loopback recording select */
-        imux->items[imux->num_items].label = "Stereo Mixer";
-        imux->items[imux->num_items].index = 5;
-        imux->num_items++;
-
         /* for digital mic select */
-        imux->items[imux->num_items].label = "Digital Mic";
-        imux->items[imux->num_items].index = 6;
-        imux->num_items++;
+        snd_hda_add_imux_item(imux, "Digital Mic", 6, NULL);
 
         return 0;
 }
@@ -6141,7 +6035,7 @@ static int vt1812_parse_auto_config(struct hda_codec *codec)
         err = vt1812_auto_create_hp_ctls(spec, spec->autocfg.hp_pins[0]);
         if (err < 0)
                 return err;
-        err = vt1812_auto_create_analog_input_ctls(spec, &spec->autocfg);
+        err = vt1812_auto_create_analog_input_ctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
 
@@ -6161,7 +6055,7 @@ static int vt1812_parse_auto_config(struct hda_codec *codec)
 }
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
-static struct hda_amp_list vt1812_loopbacks[] = {
+static const struct hda_amp_list vt1812_loopbacks[] = {
         { 0x21, HDA_INPUT, 0 },
         { 0x21, HDA_INPUT, 1 },
         { 0x21, HDA_INPUT, 2 },
@@ -6169,6 +6063,97 @@ static struct hda_amp_list vt1812_loopbacks[] = {
 };
 #endif
 
+static void set_widgets_power_state_vt1812(struct hda_codec *codec)
+{
+        struct via_spec *spec = codec->spec;
+        int imux_is_smixer =
+        snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
+        unsigned int parm;
+        unsigned int present;
+        /* MUX10 (1eh) = stereo mixer */
+        imux_is_smixer =
+        snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
+        /* inputs */
+        /* PW 5/6/7 (29h/2ah/2bh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x29, &parm);
+        set_pin_power_state(codec, 0x2a, &parm);
+        set_pin_power_state(codec, 0x2b, &parm);
+        parm = AC_PWRST_D0;
+        /* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */
+        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* outputs */
+        /* AOW0 (8h)*/
+        snd_hda_codec_write(codec, 0x8, 0,
+                            AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+        /* PW4 (28h), MW4 (18h), MUX4(38h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x28, &parm);
+        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x38, 0, AC_VERB_SET_POWER_STATE, parm);
+
+        /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x25, &parm);
+        snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x35, 0, AC_VERB_SET_POWER_STATE, parm);
+        if (spec->hp_independent_mode)
+                snd_hda_codec_write(codec, 0x9, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+
+        /* Internal Speaker */
+        /* PW0 (24h), MW0(14h), MUX0(34h) */
+        present = snd_hda_jack_detect(codec, 0x25);
+
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x24, &parm);
+        if (present) {
+                snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                snd_hda_codec_write(codec, 0x34, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+        } else {
+                snd_hda_codec_write(codec, 0x14, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                snd_hda_codec_write(codec, 0x34, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        }
+
+
+        /* Mono Out */
+        /* PW13 (31h), MW13(1ch), MUX13(3ch), MW14(3eh) */
+        present = snd_hda_jack_detect(codec, 0x28);
+
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x31, &parm);
+        if (present) {
+                snd_hda_codec_write(codec, 0x1c, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                snd_hda_codec_write(codec, 0x3c, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                snd_hda_codec_write(codec, 0x3e, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+        } else {
+                snd_hda_codec_write(codec, 0x1c, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                snd_hda_codec_write(codec, 0x3c, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                snd_hda_codec_write(codec, 0x3e, 0,
+                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        }
+
+        /* PW15 (33h), MW15 (1dh), MUX15(3dh) */
+        parm = AC_PWRST_D3;
+        set_pin_power_state(codec, 0x33, &parm);
+        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
+        snd_hda_codec_write(codec, 0x3d, 0, AC_VERB_SET_POWER_STATE, parm);
+
+}
 
 /* patch for vt1812 */
 static int patch_vt1812(struct hda_codec *codec)
@@ -6222,13 +6207,14 @@ static int patch_vt1812(struct hda_codec *codec)
         spec->loopback.amplist = vt1812_loopbacks;
 #endif
 
+        spec->set_widgets_power_state =  set_widgets_power_state_vt1812;
         return 0;
 }
 
 /*
  * patch entries
  */
-static struct hda_codec_preset snd_hda_preset_via[] = {
+static const struct hda_codec_preset snd_hda_preset_via[] = {
         { .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708},
         { .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708},
         { .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708},
@@ -6273,7 +6259,7 @@ static struct hda_codec_preset snd_hda_preset_via[] = {
           .patch = patch_vt1708S},
         { .id = 0x11063397, .name = "VT1708S",
           .patch = patch_vt1708S},
-        { .id = 0x11064397, .name = "VT1708S",
+        { .id = 0x11064397, .name = "VT1705",
           .patch = patch_vt1708S},
         { .id = 0x11065397, .name = "VT1708S",
           .patch = patch_vt1708S},
@@ -6314,6 +6300,10 @@ static struct hda_codec_preset snd_hda_preset_via[] = {
         { .id = 0x11060448, .name = "VT1812", .patch = patch_vt1812},
         { .id = 0x11060440, .name = "VT1818S",
           .patch = patch_vt1708S},
+        { .id = 0x11060446, .name = "VT1802",
+                .patch = patch_vt2002P},
+        { .id = 0x11068446, .name = "VT1802",
+                .patch = patch_vt2002P},
         {} /* terminator */
 };
 
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 2f6252266a02..3e4f8c12ffce 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -148,7 +148,7 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,
         udelay(100);
         /*
          * send device address, command and value,
-         * skipping ack cycles inbetween
+         * skipping ack cycles in between
          */
         for (j = 0; j < 3; j++) {
                 switch (j) {
@@ -2143,7 +2143,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
                 ice->num_total_adcs = 2;
         }
 
-        /* to remeber the register values of CS8415 */
+        /* to remember the register values of CS8415 */
         ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (!ice->akm)
                 return -ENOMEM;
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index d216362626d0..20c6b079d0df 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -96,6 +96,11 @@ static unsigned char ap_cs8427_codec_select(struct snd_ice1712 *ice)
                 tmp |= ICE1712_DELTA_AP_CCLK | ICE1712_DELTA_AP_CS_CODEC;
                 tmp &= ~ICE1712_DELTA_AP_CS_DIGITAL;
                 break;
+        case ICE1712_SUBDEVICE_DELTA66E:
+                tmp |= ICE1712_DELTA_66E_CCLK | ICE1712_DELTA_66E_CS_CHIP_A |
+                       ICE1712_DELTA_66E_CS_CHIP_B;
+                tmp &= ~ICE1712_DELTA_66E_CS_CS8427;
+                break;
         case ICE1712_SUBDEVICE_VX442:
                 tmp |= ICE1712_VX442_CCLK | ICE1712_VX442_CODEC_CHIP_A | ICE1712_VX442_CODEC_CHIP_B;
                 tmp &= ~ICE1712_VX442_CS_DIGITAL;
@@ -119,6 +124,9 @@ static void ap_cs8427_codec_deassert(struct snd_ice1712 *ice, unsigned char tmp)
         case ICE1712_SUBDEVICE_DELTA410:
                 tmp |= ICE1712_DELTA_AP_CS_DIGITAL;
                 break;
+        case ICE1712_SUBDEVICE_DELTA66E:
+                tmp |= ICE1712_DELTA_66E_CS_CS8427;
+                break;
         case ICE1712_SUBDEVICE_VX442:
                 tmp |= ICE1712_VX442_CS_DIGITAL;
                 break;
@@ -276,6 +284,20 @@ static void delta1010lt_ak4524_lock(struct snd_akm4xxx *ak, int chip)
 }
 
 /*
+ * AK4524 on Delta66 rev E to choose the chip address
+ */
+static void delta66e_ak4524_lock(struct snd_akm4xxx *ak, int chip)
+{
+        struct snd_ak4xxx_private *priv = (void *)ak->private_value[0];
+        struct snd_ice1712 *ice = ak->private_data[0];
+
+        snd_ice1712_save_gpio_status(ice);
+        priv->cs_mask =
+        priv->cs_addr = chip == 0 ? ICE1712_DELTA_66E_CS_CHIP_A :
+                                    ICE1712_DELTA_66E_CS_CHIP_B;
+}
+
+/*
  * AK4528 on VX442 to choose the chip mask
  */
 static void vx442_ak4524_lock(struct snd_akm4xxx *ak, int chip)
@@ -487,6 +509,29 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = {
         .mask_flags = 0,
 };
 
+static struct snd_akm4xxx akm_delta66e __devinitdata = {
+        .type = SND_AK4524,
+        .num_adcs = 4,
+        .num_dacs = 4,
+        .ops = {
+                .lock = delta66e_ak4524_lock,
+                .set_rate_val = delta_ak4524_set_rate_val
+        }
+};
+
+static struct snd_ak4xxx_private akm_delta66e_priv __devinitdata = {
+        .caddr = 2,
+        .cif = 0, /* the default level of the CIF pin from AK4524 */
+        .data_mask = ICE1712_DELTA_66E_DOUT,
+        .clk_mask = ICE1712_DELTA_66E_CCLK,
+        .cs_mask = 0,
+        .cs_addr = 0, /* set later */
+        .cs_none = 0,
+        .add_flags = 0,
+        .mask_flags = 0,
+};
+
+
 static struct snd_akm4xxx akm_delta44 __devinitdata = {
         .type = SND_AK4524,
         .num_adcs = 4,
@@ -535,6 +580,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
 {
         int err;
         struct snd_akm4xxx *ak;
+        unsigned char tmp;
 
         if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DELTA1010 &&
             ice->eeprom.gpiodir == 0x7b)
@@ -563,6 +609,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
         case ICE1712_SUBDEVICE_DELTA1010E:
         case ICE1712_SUBDEVICE_DELTA1010LT:
         case ICE1712_SUBDEVICE_MEDIASTATION:
+        case ICE1712_SUBDEVICE_EDIROLDA2496:
                 ice->num_total_dacs = 8;
                 ice->num_total_adcs = 8;
                 break;
@@ -576,6 +623,12 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                 break;
         }
 
+        /* initialize the SPI clock to high */
+        tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);
+        tmp |= ICE1712_DELTA_AP_CCLK;
+        snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);
+        udelay(5);
+
         /* initialize spdif */
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_AUDIOPHILE:
@@ -635,6 +688,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                 err = snd_ice1712_akm4xxx_init(ak, &akm_delta410, &akm_delta410_priv, ice);
                 break;
         case ICE1712_SUBDEVICE_DELTA1010LT:
+        case ICE1712_SUBDEVICE_EDIROLDA2496:
                 err = snd_ice1712_akm4xxx_init(ak, &akm_delta1010lt, &akm_delta1010lt_priv, ice);
                 break;
         case ICE1712_SUBDEVICE_DELTA66:
@@ -642,9 +696,11 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                 err = snd_ice1712_akm4xxx_init(ak, &akm_delta44, &akm_delta44_priv, ice);
                 break;
         case ICE1712_SUBDEVICE_VX442:
-        case ICE1712_SUBDEVICE_DELTA66E:
                 err = snd_ice1712_akm4xxx_init(ak, &akm_vx442, &akm_vx442_priv, ice);
                 break;
+        case ICE1712_SUBDEVICE_DELTA66E:
+                err = snd_ice1712_akm4xxx_init(ak, &akm_delta66e, &akm_delta66e_priv, ice);
+                break;
         default:
                 snd_BUG();
                 return -EINVAL;
@@ -734,6 +790,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice)
         case ICE1712_SUBDEVICE_DELTA66:
         case ICE1712_SUBDEVICE_VX442:
         case ICE1712_SUBDEVICE_DELTA66E:
+        case ICE1712_SUBDEVICE_EDIROLDA2496:
                 err = snd_ice1712_akm4xxx_build_controls(ice);
                 if (err < 0)
                         return err;
@@ -813,5 +870,12 @@ struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = {
                 .chip_init = snd_ice1712_delta_init,
                 .build_controls = snd_ice1712_delta_add_controls,
         },
+        {
+                .subvendor = ICE1712_SUBDEVICE_EDIROLDA2496,
+                .name = "Edirol DA2496",
+                .model = "da2496",
+                .chip_init = snd_ice1712_delta_init,
+                .build_controls = snd_ice1712_delta_add_controls,
+        },
         { } /* terminator */
 };
diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h
index f7f14df81f26..11a9c3a76507 100644
--- a/sound/pci/ice1712/delta.h
+++ b/sound/pci/ice1712/delta.h
@@ -34,7 +34,8 @@
                 "{MidiMan M Audio,Delta 410},"\
                 "{MidiMan M Audio,Audiophile 24/96},"\
                 "{Digigram,VX442},"\
-                "{Lionstracs,Mediastation},"
+                "{Lionstracs,Mediastation},"\
+                "{Edirol,DA2496},"
 
 #define ICE1712_SUBDEVICE_DELTA1010     0x121430d6
 #define ICE1712_SUBDEVICE_DELTA1010E    0xff1430d6
@@ -47,6 +48,7 @@
 #define ICE1712_SUBDEVICE_DELTA1010LT   0x12143bd6
 #define ICE1712_SUBDEVICE_VX442         0x12143cd6
 #define ICE1712_SUBDEVICE_MEDIASTATION  0x694c0100
+#define ICE1712_SUBDEVICE_EDIROLDA2496  0xce164010
 
 /* entry point */
 extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];
@@ -142,6 +144,17 @@ extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];
 #define ICE1712_DELTA_1010LT_CS_NONE    0x50    /* nothing */
 #define ICE1712_DELTA_1010LT_WORDCLOCK 0x80     /* sample clock source: 0 = Word Clock Input, 1 = S/PDIF Input ??? */
 
+/* M-Audio Delta 66 rev. E definitions.
+ * Newer revisions of Delta 66 have CS8427 over SPI for
+ * S/PDIF transceiver instead of CS8404/CS8414. */
+/* 0x01 = DFS */
+#define ICE1712_DELTA_66E_CCLK          0x02    /* SPI clock */
+#define ICE1712_DELTA_66E_DIN           0x04    /* data input */
+#define ICE1712_DELTA_66E_DOUT          0x08    /* data output */
+#define ICE1712_DELTA_66E_CS_CS8427     0x10    /* chip select, low = CS8427 */
+#define ICE1712_DELTA_66E_CS_CHIP_A     0x20    /* AK4524 #0 */
+#define ICE1712_DELTA_66E_CS_CHIP_B     0x40    /* AK4524 #1 */
+
 /* Digigram VX442 definitions */
 #define ICE1712_VX442_CCLK              0x02    /* SPI clock */
 #define ICE1712_VX442_DIN               0x04    /* data input */
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 4fc6d8bc637e..f4594d76b6ea 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2755,7 +2755,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                         return err;
                 }
                 if (c->mpu401_1_name)
-                        /*  Prefered name available in card_info */
+                        /*  Preferred name available in card_info */
                         snprintf(ice->rmidi[0]->name,
                                  sizeof(ice->rmidi[0]->name),
                                  "%s %d", c->mpu401_1_name, card->number);
@@ -2772,7 +2772,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                                 return err;
                         }
                         if (c->mpu401_2_name)
-                                /*  Prefered name available in card_info */
+                                /*  Preferred name available in card_info */
                                 snprintf(ice->rmidi[1]->name,
                                          sizeof(ice->rmidi[1]->name),
                                          "%s %d", c->mpu401_2_name,
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 6bc3f91b7281..92c1160d7ab5 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -638,7 +638,7 @@ static struct snd_kcontrol_new pontis_controls[] __devinitdata = {
  */
 static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-        struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+        struct snd_ice1712 *ice = entry->private_data;
         char line[64];
         unsigned int reg, val;
         mutex_lock(&ice->gpio_mutex);
@@ -653,7 +653,7 @@ static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buf
 
 static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-        struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+        struct snd_ice1712 *ice = entry->private_data;
         int reg, val;
 
         mutex_lock(&ice->gpio_mutex);
@@ -676,7 +676,7 @@ static void wm_proc_init(struct snd_ice1712 *ice)
 
 static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-        struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+        struct snd_ice1712 *ice = entry->private_data;
         int reg, val;
 
         mutex_lock(&ice->gpio_mutex);
@@ -768,7 +768,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
         ice->num_total_dacs = 2;
         ice->num_total_adcs = 2;
 
-        /* to remeber the register values */
+        /* to remember the register values */
         ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (! ice->akm)
                 return -ENOMEM;
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index 2a8e5cd8f2d8..e36ddb94c382 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -654,7 +654,7 @@ static int prodigy192_ak4114_init(struct snd_ice1712 *ice)
 static void stac9460_proc_regs_read(struct snd_info_entry *entry,
                 struct snd_info_buffer *buffer)
 {
-        struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+        struct snd_ice1712 *ice = entry->private_data;
         int reg, val;
         /* registers 0x0 - 0x14 */
         for (reg = 0; reg <= 0x15; reg++) {
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 6a9fee3ee78f..764cc93dbca4 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1046,7 +1046,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)
         * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten
         */
         ice->gpio.saved[0] = 0;
-        /* to remeber the register values */
+        /* to remember the register values */
 
         ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (! ice->akm)
@@ -1128,7 +1128,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
         * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten
         */
         ice->gpio.saved[0] = 0;
-        /* to remeber the register values */
+        /* to remember the register values */
 
         ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
         if (! ice->akm)
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 467749249576..6c896dbfd796 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -534,7 +534,7 @@ static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int code
                 udelay(10);
         } while (time--);
 
-        /* access to some forbidden (non existant) ac97 registers will not
+        /* access to some forbidden (non existent) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
         snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
@@ -716,7 +716,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
  * Intel 82443MX running a 100MHz processor system bus has a hardware bug,
  * which aborts PCI busmaster for audio transfer.  A workaround is to set
  * the pages as non-cached.  For details, see the errata in
- *      http://www.intel.com/design/chipsets/specupdt/245051.htm
+ *      http://download.intel.com/design/chipsets/specupdt/24505108.pdf
  */
 static void fill_nocache(void *buf, int size, int nocache)
 {
@@ -1866,6 +1866,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
         },
         {
                 .subvendor = 0x1028,
+                .subdevice = 0x0182,
+                .name = "Dell Latitude D610",   /* STAC9750/51 */
+                .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x1028,
                 .subdevice = 0x0186,
                 .name = "Dell Latitude D810", /* cf. Malone #41015 */
                 .type = AC97_TUNE_HP_MUTE_LED
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 13cec1e5ced9..f3353b49c785 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -235,8 +235,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = {
         { PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
         { PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
         { PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
+        { PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL },     /* AMD8111 */
 #if 0
-        { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL },     /* AMD8111 */
         { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI },   /* Ali5455 */
 #endif
         { 0, }
@@ -331,7 +331,7 @@ static int snd_intel8x0m_codec_semaphore(struct intel8x0m *chip, unsigned int co
                 udelay(10);
         } while (time--);
 
-        /* access to some forbidden (non existant) ac97 registers will not
+        /* access to some forbidden (non existent) ac97 registers will not
          * reset the semaphore. So even if you don't get the semaphore, still
          * continue the access. We don't need the semaphore anyway. */
         snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
@@ -341,9 +341,9 @@ static int snd_intel8x0m_codec_semaphore(struct intel8x0m *chip, unsigned int co
         return -EBUSY;
 }
  
-static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
-                                     unsigned short reg,
-                                     unsigned short val)
+static void snd_intel8x0m_codec_write(struct snd_ac97 *ac97,
+                                      unsigned short reg,
+                                      unsigned short val)
 {
         struct intel8x0m *chip = ac97->private_data;
         
@@ -354,8 +354,8 @@ static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
         iaputword(chip, reg + ac97->num * 0x80, val);
 }
 
-static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,
-                                              unsigned short reg)
+static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97,
+                                               unsigned short reg)
 {
         struct intel8x0m *chip = ac97->private_data;
         unsigned short res;
@@ -385,7 +385,7 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,
 /*
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev) 
+static void snd_intel8x0m_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev)
 {
         int idx;
         u32 *bdbar = ichdev->bdbar;
@@ -437,7 +437,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
  *  Interrupt handler
  */
 
-static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ichdev)
+static inline void snd_intel8x0m_update(struct intel8x0m *chip, struct ichdev *ichdev)
 {
         unsigned long port = ichdev->reg_offset;
         int civ, i, step;
@@ -489,7 +489,7 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
 }
 
-static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
+static irqreturn_t snd_intel8x0m_interrupt(int irq, void *dev_id)
 {
         struct intel8x0m *chip = dev_id;
         struct ichdev *ichdev;
@@ -512,7 +512,7 @@ static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
         for (i = 0; i < chip->bdbars_count; i++) {
                 ichdev = &chip->ichd[i];
                 if (status & ichdev->int_sta_mask)
-                        snd_intel8x0_update(chip, ichdev);
+                        snd_intel8x0m_update(chip, ichdev);
         }
 
         /* ack them */
@@ -526,7 +526,7 @@ static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
  *  PCM part
  */
 
-static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+static int snd_intel8x0m_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct intel8x0m *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
@@ -561,18 +561,18 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd
         return 0;
 }
 
-static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,
+static int snd_intel8x0m_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 
-static int snd_intel8x0_hw_free(struct snd_pcm_substream *substream)
+static int snd_intel8x0m_hw_free(struct snd_pcm_substream *substream)
 {
         return snd_pcm_lib_free_pages(substream);
 }
 
-static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t snd_intel8x0m_pcm_pointer(struct snd_pcm_substream *substream)
 {
         struct intel8x0m *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
@@ -600,7 +600,7 @@ static int snd_intel8x0m_pcm_prepare(struct snd_pcm_substream *substream)
         ichdev->fragsize = snd_pcm_lib_period_bytes(substream);
         snd_ac97_write(ichdev->ac97, AC97_LINE1_RATE, runtime->rate);
         snd_ac97_write(ichdev->ac97, AC97_LINE1_LEVEL, 0);
-        snd_intel8x0_setup_periods(chip, ichdev);
+        snd_intel8x0m_setup_periods(chip, ichdev);
         return 0;
 }
 
@@ -682,22 +682,22 @@ static struct snd_pcm_ops snd_intel8x0m_playback_ops = {
         .open =         snd_intel8x0m_playback_open,
         .close =        snd_intel8x0m_playback_close,
         .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0_hw_params,
-        .hw_free =      snd_intel8x0_hw_free,
+        .hw_params =    snd_intel8x0m_hw_params,
+        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0_pcm_trigger,
-        .pointer =      snd_intel8x0_pcm_pointer,
+        .trigger =      snd_intel8x0m_pcm_trigger,
+        .pointer =      snd_intel8x0m_pcm_pointer,
 };
 
 static struct snd_pcm_ops snd_intel8x0m_capture_ops = {
         .open =         snd_intel8x0m_capture_open,
         .close =        snd_intel8x0m_capture_close,
         .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0_hw_params,
-        .hw_free =      snd_intel8x0_hw_free,
+        .hw_params =    snd_intel8x0m_hw_params,
+        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0_pcm_trigger,
-        .pointer =      snd_intel8x0_pcm_pointer,
+        .trigger =      snd_intel8x0m_pcm_trigger,
+        .pointer =      snd_intel8x0m_pcm_pointer,
 };
 
 
@@ -710,7 +710,7 @@ struct ich_pcm_table {
         int ac97_idx;
 };
 
-static int __devinit snd_intel8x0_pcm1(struct intel8x0m *chip, int device,
+static int __devinit snd_intel8x0m_pcm1(struct intel8x0m *chip, int device,
                                        struct ich_pcm_table *rec)
 {
         struct snd_pcm *pcm;
@@ -759,7 +759,7 @@ static struct ich_pcm_table intel_pcms[] __devinitdata = {
         },
 };
 
-static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
+static int __devinit snd_intel8x0m_pcm(struct intel8x0m *chip)
 {
         int i, tblsize, device, err;
         struct ich_pcm_table *tbl, *rec;
@@ -791,7 +791,7 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
                         if (! chip->ichd[rec->ac97_idx].ac97)
                                 continue;
                 }
-                err = snd_intel8x0_pcm1(chip, device, rec);
+                err = snd_intel8x0m_pcm1(chip, device, rec);
                 if (err < 0)
                         return err;
                 device++;
@@ -806,20 +806,20 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
  *  Mixer part
  */
 
-static void snd_intel8x0_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
+static void snd_intel8x0m_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
 {
         struct intel8x0m *chip = bus->private_data;
         chip->ac97_bus = NULL;
 }
 
-static void snd_intel8x0_mixer_free_ac97(struct snd_ac97 *ac97)
+static void snd_intel8x0m_mixer_free_ac97(struct snd_ac97 *ac97)
 {
         struct intel8x0m *chip = ac97->private_data;
         chip->ac97 = NULL;
 }
 
 
-static int __devinit snd_intel8x0_mixer(struct intel8x0m *chip, int ac97_clock)
+static int __devinit snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock)
 {
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
@@ -827,22 +827,22 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0m *chip, int ac97_clock)
         int err;
         unsigned int glob_sta = 0;
         static struct snd_ac97_bus_ops ops = {
-                .write = snd_intel8x0_codec_write,
-                .read = snd_intel8x0_codec_read,
+                .write = snd_intel8x0m_codec_write,
+                .read = snd_intel8x0m_codec_read,
         };
 
         chip->in_ac97_init = 1;
         
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
-        ac97.private_free = snd_intel8x0_mixer_free_ac97;
+        ac97.private_free = snd_intel8x0m_mixer_free_ac97;
         ac97.scaps = AC97_SCAP_SKIP_AUDIO | AC97_SCAP_POWER_SAVE;
 
         glob_sta = igetdword(chip, ICHREG(GLOB_STA));
 
         if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0)
                 goto __err;
-        pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
+        pbus->private_free = snd_intel8x0m_mixer_free_ac97_bus;
         if (ac97_clock >= 8000 && ac97_clock <= 48000)
                 pbus->clock = ac97_clock;
         chip->ac97_bus = pbus;
@@ -894,7 +894,8 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)
         /* 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;
+        usleep_range(500, 1000); /* give warm reset some time */
+        end_time = jiffies + HZ / 4;
         do {
                 if ((igetdword(chip, ICHREG(GLOB_CNT)) & ICH_AC97WARM) == 0)
                         goto __ok;
@@ -959,7 +960,7 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)
         return 0;
 }
 
-static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)
+static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing)
 {
         unsigned int i;
         int err;
@@ -980,7 +981,7 @@ static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)
         return 0;
 }
 
-static int snd_intel8x0_free(struct intel8x0m *chip)
+static int snd_intel8x0m_free(struct intel8x0m *chip)
 {
         unsigned int i;
 
@@ -1045,7 +1046,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
                 return -EIO;
         }
         pci_set_master(pci);
-        if (request_irq(pci->irq, snd_intel8x0_interrupt,
+        if (request_irq(pci->irq, snd_intel8x0m_interrupt,
                         IRQF_SHARED, card->shortname, chip)) {
                 printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
@@ -1053,7 +1054,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
                 return -EIO;
         }
         chip->irq = pci->irq;
-        snd_intel8x0_chip_init(chip, 0);
+        snd_intel8x0m_chip_init(chip, 0);
         snd_ac97_resume(chip->ac97);
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -1094,10 +1095,10 @@ static void __devinit snd_intel8x0m_proc_init(struct intel8x0m * chip)
 #endif /* CONFIG_PROC_FS */
 
 
-static int snd_intel8x0_dev_free(struct snd_device *device)
+static int snd_intel8x0m_dev_free(struct snd_device *device)
 {
         struct intel8x0m *chip = device->device_data;
-        return snd_intel8x0_free(chip);
+        return snd_intel8x0m_free(chip);
 }
 
 struct ich_reg_info {
@@ -1108,7 +1109,7 @@ struct ich_reg_info {
 static int __devinit snd_intel8x0m_create(struct snd_card *card,
                                          struct pci_dev *pci,
                                          unsigned long device_type,
-                                         struct intel8x0m ** r_intel8x0)
+                                         struct intel8x0m **r_intel8x0m)
 {
         struct intel8x0m *chip;
         int err;
@@ -1116,7 +1117,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         unsigned int int_sta_masks;
         struct ichdev *ichdev;
         static struct snd_device_ops ops = {
-                .dev_free =     snd_intel8x0_dev_free,
+                .dev_free =     snd_intel8x0m_dev_free,
         };
         static struct ich_reg_info intel_regs[2] = {
                 { ICH_MIINT, 0 },
@@ -1124,7 +1125,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         };
         struct ich_reg_info *tbl;
 
-        *r_intel8x0 = NULL;
+        *r_intel8x0m = NULL;
 
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
@@ -1158,7 +1159,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
                 chip->addr = pci_iomap(pci, 0, 0);
         if (!chip->addr) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EIO;
         }
         if (pci_resource_flags(pci, 3) & IORESOURCE_MEM) /* ICH4 */
@@ -1167,15 +1168,15 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
                 chip->bmaddr = pci_iomap(pci, 1, 0);
         if (!chip->bmaddr) {
                 snd_printk(KERN_ERR "Controller space ioremap problem\n");
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EIO;
         }
 
  port_inited:
-        if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_SHARED,
+        if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED,
                         card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
@@ -1210,7 +1211,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,
                                 &chip->bdbars) < 0) {
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -ENOMEM;
         }
         /* tables must be aligned to 8 bytes here, but the kernel pages
@@ -1225,19 +1226,19 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         chip->int_sta_reg = ICH_REG_GLOB_STA;
         chip->int_sta_mask = int_sta_masks;
 
-        if ((err = snd_intel8x0_chip_init(chip, 1)) < 0) {
-                snd_intel8x0_free(chip);
+        if ((err = snd_intel8x0m_chip_init(chip, 1)) < 0) {
+                snd_intel8x0m_free(chip);
                 return err;
         }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return err;
         }
 
         snd_card_set_dev(card, &pci->dev);
 
-        *r_intel8x0 = chip;
+        *r_intel8x0m = chip;
         return 0;
 }
 
@@ -1260,9 +1261,9 @@ static struct shortname_table {
         { PCI_DEVICE_ID_NVIDIA_MCP2_MODEM, "NVidia nForce2" },
         { PCI_DEVICE_ID_NVIDIA_MCP2S_MODEM, "NVidia nForce2s" },
         { PCI_DEVICE_ID_NVIDIA_MCP3_MODEM, "NVidia nForce3" },
+        { 0x746e, "AMD AMD8111" },
 #if 0
         { 0x5455, "ALi M5455" },
-        { 0x746d, "AMD AMD8111" },
 #endif
         { 0 },
 };
@@ -1295,11 +1296,11 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
         }
         card->private_data = chip;
 
-        if ((err = snd_intel8x0_mixer(chip, ac97_clock)) < 0) {
+        if ((err = snd_intel8x0m_mixer(chip, ac97_clock)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_intel8x0_pcm(chip)) < 0) {
+        if ((err = snd_intel8x0m_pcm(chip)) < 0) {
                 snd_card_free(card);
                 return err;
         }
diff --git a/sound/pci/lola/Makefile b/sound/pci/lola/Makefile
new file mode 100644
index 000000000000..8178a2a59d00
--- /dev/null
+++ b/sound/pci/lola/Makefile
@@ -0,0 +1,4 @@
+snd-lola-y := lola.o lola_pcm.o lola_clock.o lola_mixer.o
+snd-lola-$(CONFIG_SND_DEBUG) += lola_proc.o
+
+obj-$(CONFIG_SND_LOLA) += snd-lola.o
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
new file mode 100644
index 000000000000..2692e5ae5f2d
--- /dev/null
+++ b/sound/pci/lola/lola.c
@@ -0,0 +1,791 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/initval.h>
+#include "lola.h"
+
+/* Standard options */
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for Digigram Lola driver.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for Digigram Lola driver.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable Digigram Lola driver.");
+
+/* Lola-specific options */
+
+/* for instance use always max granularity which is compatible
+ * with all sample rates
+ */
+static int granularity[SNDRV_CARDS] = {
+        [0 ... (SNDRV_CARDS - 1)] = LOLA_GRANULARITY_MAX
+};
+
+/* below a sample_rate of 16kHz the analogue audio quality is NOT excellent */
+static int sample_rate_min[SNDRV_CARDS] = {
+        [0 ... (SNDRV_CARDS - 1) ] = 16000
+};
+
+module_param_array(granularity, int, NULL, 0444);
+MODULE_PARM_DESC(granularity, "Granularity value");
+module_param_array(sample_rate_min, int, NULL, 0444);
+MODULE_PARM_DESC(sample_rate_min, "Minimal sample rate");
+
+/*
+ */
+
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{Digigram, Lola}}");
+MODULE_DESCRIPTION("Digigram Lola driver");
+MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
+
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+static int debug;
+module_param(debug, int, 0644);
+#define verbose_debug(fmt, args...)                     \
+        do { if (debug > 1) printk(KERN_DEBUG SFX fmt, ##args); } while (0)
+#else
+#define verbose_debug(fmt, args...)
+#endif
+
+/*
+ * pseudo-codec read/write via CORB/RIRB
+ */
+
+static int corb_send_verb(struct lola *chip, unsigned int nid,
+                          unsigned int verb, unsigned int data,
+                          unsigned int extdata)
+{
+        unsigned long flags;
+        int ret = -EIO;
+
+        chip->last_cmd_nid = nid;
+        chip->last_verb = verb;
+        chip->last_data = data;
+        chip->last_extdata = extdata;
+        data |= (nid << 20) | (verb << 8);
+
+        spin_lock_irqsave(&chip->reg_lock, flags);
+        if (chip->rirb.cmds < LOLA_CORB_ENTRIES - 1) {
+                unsigned int wp = chip->corb.wp + 1;
+                wp %= LOLA_CORB_ENTRIES;
+                chip->corb.wp = wp;
+                chip->corb.buf[wp * 2] = cpu_to_le32(data);
+                chip->corb.buf[wp * 2 + 1] = cpu_to_le32(extdata);
+                lola_writew(chip, BAR0, CORBWP, wp);
+                chip->rirb.cmds++;
+                smp_wmb();
+                ret = 0;
+        }
+        spin_unlock_irqrestore(&chip->reg_lock, flags);
+        return ret;
+}
+
+static void lola_queue_unsol_event(struct lola *chip, unsigned int res,
+                                   unsigned int res_ex)
+{
+        lola_update_ext_clock_freq(chip, res);
+}
+
+/* retrieve RIRB entry - called from interrupt handler */
+static void lola_update_rirb(struct lola *chip)
+{
+        unsigned int rp, wp;
+        u32 res, res_ex;
+
+        wp = lola_readw(chip, BAR0, RIRBWP);
+        if (wp == chip->rirb.wp)
+                return;
+        chip->rirb.wp = wp;
+
+        while (chip->rirb.rp != wp) {
+                chip->rirb.rp++;
+                chip->rirb.rp %= LOLA_CORB_ENTRIES;
+
+                rp = chip->rirb.rp << 1; /* an RIRB entry is 8-bytes */
+                res_ex = le32_to_cpu(chip->rirb.buf[rp + 1]);
+                res = le32_to_cpu(chip->rirb.buf[rp]);
+                if (res_ex & LOLA_RIRB_EX_UNSOL_EV)
+                        lola_queue_unsol_event(chip, res, res_ex);
+                else if (chip->rirb.cmds) {
+                        chip->res = res;
+                        chip->res_ex = res_ex;
+                        smp_wmb();
+                        chip->rirb.cmds--;
+                }
+        }
+}
+
+static int rirb_get_response(struct lola *chip, unsigned int *val,
+                             unsigned int *extval)
+{
+        unsigned long timeout;
+
+ again:
+        timeout = jiffies + msecs_to_jiffies(1000);
+        for (;;) {
+                if (chip->polling_mode) {
+                        spin_lock_irq(&chip->reg_lock);
+                        lola_update_rirb(chip);
+                        spin_unlock_irq(&chip->reg_lock);
+                }
+                if (!chip->rirb.cmds) {
+                        *val = chip->res;
+                        if (extval)
+                                *extval = chip->res_ex;
+                        verbose_debug("get_response: %x, %x\n",
+                                      chip->res, chip->res_ex);
+                        if (chip->res_ex & LOLA_RIRB_EX_ERROR) {
+                                printk(KERN_WARNING SFX "RIRB ERROR: "
+                                       "NID=%x, verb=%x, data=%x, ext=%x\n",
+                                       chip->last_cmd_nid,
+                                       chip->last_verb, chip->last_data,
+                                       chip->last_extdata);
+                                return -EIO;
+                        }
+                        return 0;
+                }
+                if (time_after(jiffies, timeout))
+                        break;
+                udelay(20);
+                cond_resched();
+        }
+        printk(KERN_WARNING SFX "RIRB response error\n");
+        if (!chip->polling_mode) {
+                printk(KERN_WARNING SFX "switching to polling mode\n");
+                chip->polling_mode = 1;
+                goto again;
+        }
+        return -EIO;
+}
+
+/* aynchronous write of a codec verb with data */
+int lola_codec_write(struct lola *chip, unsigned int nid, unsigned int verb,
+                     unsigned int data, unsigned int extdata)
+{
+        verbose_debug("codec_write NID=%x, verb=%x, data=%x, ext=%x\n",
+                      nid, verb, data, extdata);
+        return corb_send_verb(chip, nid, verb, data, extdata);
+}
+
+/* write a codec verb with data and read the returned status */
+int lola_codec_read(struct lola *chip, unsigned int nid, unsigned int verb,
+                    unsigned int data, unsigned int extdata,
+                    unsigned int *val, unsigned int *extval)
+{
+        int err;
+
+        verbose_debug("codec_read NID=%x, verb=%x, data=%x, ext=%x\n",
+                      nid, verb, data, extdata);
+        err = corb_send_verb(chip, nid, verb, data, extdata);
+        if (err < 0)
+                return err;
+        err = rirb_get_response(chip, val, extval);
+        return err;
+}
+
+/* flush all pending codec writes */
+int lola_codec_flush(struct lola *chip)
+{
+        unsigned int tmp;
+        return rirb_get_response(chip, &tmp, NULL);
+}
+
+/*
+ * interrupt handler
+ */
+static irqreturn_t lola_interrupt(int irq, void *dev_id)
+{
+        struct lola *chip = dev_id;
+        unsigned int notify_ins, notify_outs, error_ins, error_outs;
+        int handled = 0;
+        int i;
+
+        notify_ins = notify_outs = error_ins = error_outs = 0;
+        spin_lock(&chip->reg_lock);
+        for (;;) {
+                unsigned int status, in_sts, out_sts;
+                unsigned int reg;
+
+                status = lola_readl(chip, BAR1, DINTSTS);
+                if (!status || status == -1)
+                        break;
+
+                in_sts = lola_readl(chip, BAR1, DIINTSTS);
+                out_sts = lola_readl(chip, BAR1, DOINTSTS);
+
+                /* clear Input Interrupts */
+                for (i = 0; in_sts && i < chip->pcm[CAPT].num_streams; i++) {
+                        if (!(in_sts & (1 << i)))
+                                continue;
+                        in_sts &= ~(1 << i);
+                        reg = lola_dsd_read(chip, i, STS);
+                        if (reg & LOLA_DSD_STS_DESE) /* error */
+                                error_ins |= (1 << i);
+                        if (reg & LOLA_DSD_STS_BCIS) /* notify */
+                                notify_ins |= (1 << i);
+                        /* clear */
+                        lola_dsd_write(chip, i, STS, reg);
+                }
+
+                /* clear Output Interrupts */
+                for (i = 0; out_sts && i < chip->pcm[PLAY].num_streams; i++) {
+                        if (!(out_sts & (1 << i)))
+                                continue;
+                        out_sts &= ~(1 << i);
+                        reg = lola_dsd_read(chip, i + MAX_STREAM_IN_COUNT, STS);
+                        if (reg & LOLA_DSD_STS_DESE) /* error */
+                                error_outs |= (1 << i);
+                        if (reg & LOLA_DSD_STS_BCIS) /* notify */
+                                notify_outs |= (1 << i);
+                        lola_dsd_write(chip, i + MAX_STREAM_IN_COUNT, STS, reg);
+                }
+
+                if (status & LOLA_DINT_CTRL) {
+                        unsigned char rbsts; /* ring status is byte access */
+                        rbsts = lola_readb(chip, BAR0, RIRBSTS);
+                        rbsts &= LOLA_RIRB_INT_MASK;
+                        if (rbsts)
+                                lola_writeb(chip, BAR0, RIRBSTS, rbsts);
+                        rbsts = lola_readb(chip, BAR0, CORBSTS);
+                        rbsts &= LOLA_CORB_INT_MASK;
+                        if (rbsts)
+                                lola_writeb(chip, BAR0, CORBSTS, rbsts);
+
+                        lola_update_rirb(chip);
+                }
+
+                if (status & (LOLA_DINT_FIFOERR | LOLA_DINT_MUERR)) {
+                        /* clear global fifo error interrupt */
+                        lola_writel(chip, BAR1, DINTSTS,
+                                    (status & (LOLA_DINT_FIFOERR | LOLA_DINT_MUERR)));
+                }
+                handled = 1;
+        }
+        spin_unlock(&chip->reg_lock);
+
+        lola_pcm_update(chip, &chip->pcm[CAPT], notify_ins);
+        lola_pcm_update(chip, &chip->pcm[PLAY], notify_outs);
+
+        return IRQ_RETVAL(handled);
+}
+
+
+/*
+ * controller
+ */
+static int reset_controller(struct lola *chip)
+{
+        unsigned int gctl = lola_readl(chip, BAR0, GCTL);
+        unsigned long end_time;
+
+        if (gctl) {
+                /* to be sure */
+                lola_writel(chip, BAR1, BOARD_MODE, 0);
+                return 0;
+        }
+
+        chip->cold_reset = 1;
+        lola_writel(chip, BAR0, GCTL, LOLA_GCTL_RESET);
+        end_time = jiffies + msecs_to_jiffies(200);
+        do {
+                msleep(1);
+                gctl = lola_readl(chip, BAR0, GCTL);
+                if (gctl)
+                        break;
+        } while (time_before(jiffies, end_time));
+        if (!gctl) {
+                printk(KERN_ERR SFX "cannot reset controller\n");
+                return -EIO;
+        }
+        return 0;
+}
+
+static void lola_irq_enable(struct lola *chip)
+{
+        unsigned int val;
+
+        /* enalbe all I/O streams */
+        val = (1 << chip->pcm[PLAY].num_streams) - 1;
+        lola_writel(chip, BAR1, DOINTCTL, val);
+        val = (1 << chip->pcm[CAPT].num_streams) - 1;
+        lola_writel(chip, BAR1, DIINTCTL, val);
+
+        /* enable global irqs */
+        val = LOLA_DINT_GLOBAL | LOLA_DINT_CTRL | LOLA_DINT_FIFOERR |
+                LOLA_DINT_MUERR;
+        lola_writel(chip, BAR1, DINTCTL, val);
+}
+
+static void lola_irq_disable(struct lola *chip)
+{
+        lola_writel(chip, BAR1, DINTCTL, 0);
+        lola_writel(chip, BAR1, DIINTCTL, 0);
+        lola_writel(chip, BAR1, DOINTCTL, 0);
+}
+
+static int setup_corb_rirb(struct lola *chip)
+{
+        int err;
+        unsigned char tmp;
+        unsigned long end_time;
+
+        err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                  snd_dma_pci_data(chip->pci),
+                                  PAGE_SIZE, &chip->rb);
+        if (err < 0)
+                return err;
+
+        chip->corb.addr = chip->rb.addr;
+        chip->corb.buf = (u32 *)chip->rb.area;
+        chip->rirb.addr = chip->rb.addr + 2048;
+        chip->rirb.buf = (u32 *)(chip->rb.area + 2048);
+
+        /* disable ringbuffer DMAs */
+        lola_writeb(chip, BAR0, RIRBCTL, 0);
+        lola_writeb(chip, BAR0, CORBCTL, 0);
+
+        end_time = jiffies + msecs_to_jiffies(200);
+        do {
+                if (!lola_readb(chip, BAR0, RIRBCTL) &&
+                    !lola_readb(chip, BAR0, CORBCTL))
+                        break;
+                msleep(1);
+        } while (time_before(jiffies, end_time));
+
+        /* CORB set up */
+        lola_writel(chip, BAR0, CORBLBASE, (u32)chip->corb.addr);
+        lola_writel(chip, BAR0, CORBUBASE, upper_32_bits(chip->corb.addr));
+        /* set the corb size to 256 entries */
+        lola_writeb(chip, BAR0, CORBSIZE, 0x02);
+        /* set the corb write pointer to 0 */
+        lola_writew(chip, BAR0, CORBWP, 0);
+        /* reset the corb hw read pointer */
+        lola_writew(chip, BAR0, CORBRP, LOLA_RBRWP_CLR);
+        /* enable corb dma */
+        lola_writeb(chip, BAR0, CORBCTL, LOLA_RBCTL_DMA_EN);
+        /* clear flags if set */
+        tmp = lola_readb(chip, BAR0, CORBSTS) & LOLA_CORB_INT_MASK;
+        if (tmp)
+                lola_writeb(chip, BAR0, CORBSTS, tmp);
+        chip->corb.wp = 0;
+
+        /* RIRB set up */
+        lola_writel(chip, BAR0, RIRBLBASE, (u32)chip->rirb.addr);
+        lola_writel(chip, BAR0, RIRBUBASE, upper_32_bits(chip->rirb.addr));
+        /* set the rirb size to 256 entries */
+        lola_writeb(chip, BAR0, RIRBSIZE, 0x02);
+        /* reset the rirb hw write pointer */
+        lola_writew(chip, BAR0, RIRBWP, LOLA_RBRWP_CLR);
+        /* set N=1, get RIRB response interrupt for new entry */
+        lola_writew(chip, BAR0, RINTCNT, 1);
+        /* enable rirb dma and response irq */
+        lola_writeb(chip, BAR0, RIRBCTL, LOLA_RBCTL_DMA_EN | LOLA_RBCTL_IRQ_EN);
+        /* clear flags if set */
+        tmp =  lola_readb(chip, BAR0, RIRBSTS) & LOLA_RIRB_INT_MASK;
+        if (tmp)
+                lola_writeb(chip, BAR0, RIRBSTS, tmp);
+        chip->rirb.rp = chip->rirb.cmds = 0;
+
+        return 0;
+}
+
+static void stop_corb_rirb(struct lola *chip)
+{
+        /* disable ringbuffer DMAs */
+        lola_writeb(chip, BAR0, RIRBCTL, 0);
+        lola_writeb(chip, BAR0, CORBCTL, 0);
+}
+
+static void lola_reset_setups(struct lola *chip)
+{
+        /* update the granularity */
+        lola_set_granularity(chip, chip->granularity, true);
+        /* update the sample clock */
+        lola_set_clock_index(chip, chip->clock.cur_index);
+        /* enable unsolicited events of the clock widget */
+        lola_enable_clock_events(chip);
+        /* update the analog gains */
+        lola_setup_all_analog_gains(chip, CAPT, false); /* input, update */
+        /* update SRC configuration if applicable */
+        lola_set_src_config(chip, chip->input_src_mask, false);
+        /* update the analog outputs */
+        lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
+}
+
+static int __devinit lola_parse_tree(struct lola *chip)
+{
+        unsigned int val;
+        int nid, err;
+
+        err = lola_read_param(chip, 0, LOLA_PAR_VENDOR_ID, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read VENDOR_ID\n");
+                return err;
+        }
+        val >>= 16;
+        if (val != 0x1369) {
+                printk(KERN_ERR SFX "Unknown codec vendor 0x%x\n", val);
+                return -EINVAL;
+        }
+
+        err = lola_read_param(chip, 1, LOLA_PAR_FUNCTION_TYPE, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read FUNCTION_TYPE for 0x%x\n", nid);
+                return err;
+        }
+        if (val != 1) {
+                printk(KERN_ERR SFX "Unknown function type %d\n", val);
+                return -EINVAL;
+        }
+
+        err = lola_read_param(chip, 1, LOLA_PAR_SPECIFIC_CAPS, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read SPECCAPS\n");
+                return err;
+        }
+        chip->lola_caps = val;
+        chip->pin[CAPT].num_pins = LOLA_AFG_INPUT_PIN_COUNT(chip->lola_caps);
+        chip->pin[PLAY].num_pins = LOLA_AFG_OUTPUT_PIN_COUNT(chip->lola_caps);
+        snd_printdd(SFX "speccaps=0x%x, pins in=%d, out=%d\n",
+                    chip->lola_caps,
+                    chip->pin[CAPT].num_pins, chip->pin[PLAY].num_pins);
+
+        if (chip->pin[CAPT].num_pins > MAX_AUDIO_INOUT_COUNT ||
+            chip->pin[PLAY].num_pins > MAX_AUDIO_INOUT_COUNT) {
+                printk(KERN_ERR SFX "Invalid Lola-spec caps 0x%x\n", val);
+                return -EINVAL;
+        }
+
+        nid = 0x02;
+        err = lola_init_pcm(chip, CAPT, &nid);
+        if (err < 0)
+                return err;
+        err = lola_init_pcm(chip, PLAY, &nid);
+        if (err < 0)
+                return err;
+
+        err = lola_init_pins(chip, CAPT, &nid);
+        if (err < 0)
+                return err;
+        err = lola_init_pins(chip, PLAY, &nid);
+        if (err < 0)
+                return err;
+
+        if (LOLA_AFG_CLOCK_WIDGET_PRESENT(chip->lola_caps)) {
+                err = lola_init_clock_widget(chip, nid);
+                if (err < 0)
+                        return err;
+                nid++;
+        }
+        if (LOLA_AFG_MIXER_WIDGET_PRESENT(chip->lola_caps)) {
+                err = lola_init_mixer_widget(chip, nid);
+                if (err < 0)
+                        return err;
+                nid++;
+        }
+
+        /* enable unsolicited events of the clock widget */
+        err = lola_enable_clock_events(chip);
+        if (err < 0)
+                return err;
+
+        /* if last ResetController was not a ColdReset, we don't know
+         * the state of the card; initialize here again
+         */
+        if (!chip->cold_reset) {
+                lola_reset_setups(chip);
+                chip->cold_reset = 1;
+        } else {
+                /* set the granularity if it is not the default */
+                if (chip->granularity != LOLA_GRANULARITY_MIN)
+                        lola_set_granularity(chip, chip->granularity, true);
+        }
+
+        return 0;
+}
+
+static void lola_stop_hw(struct lola *chip)
+{
+        stop_corb_rirb(chip);
+        lola_irq_disable(chip);
+}
+
+static void lola_free(struct lola *chip)
+{
+        if (chip->initialized)
+                lola_stop_hw(chip);
+        lola_free_pcm(chip);
+        lola_free_mixer(chip);
+        if (chip->irq >= 0)
+                free_irq(chip->irq, (void *)chip);
+        if (chip->bar[0].remap_addr)
+                iounmap(chip->bar[0].remap_addr);
+        if (chip->bar[1].remap_addr)
+                iounmap(chip->bar[1].remap_addr);
+        if (chip->rb.area)
+                snd_dma_free_pages(&chip->rb);
+        pci_release_regions(chip->pci);
+        pci_disable_device(chip->pci);
+        kfree(chip);
+}
+
+static int lola_dev_free(struct snd_device *device)
+{
+        lola_free(device->device_data);
+        return 0;
+}
+
+static int __devinit lola_create(struct snd_card *card, struct pci_dev *pci,
+                                 int dev, struct lola **rchip)
+{
+        struct lola *chip;
+        int err;
+        unsigned int dever;
+        static struct snd_device_ops ops = {
+                .dev_free = lola_dev_free,
+        };
+
+        *rchip = NULL;
+
+        err = pci_enable_device(pci);
+        if (err < 0)
+                return err;
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip) {
+                snd_printk(KERN_ERR SFX "cannot allocate chip\n");
+                pci_disable_device(pci);
+                return -ENOMEM;
+        }
+
+        spin_lock_init(&chip->reg_lock);
+        mutex_init(&chip->open_mutex);
+        chip->card = card;
+        chip->pci = pci;
+        chip->irq = -1;
+
+        chip->granularity = granularity[dev];
+        switch (chip->granularity) {
+        case 8:
+                chip->sample_rate_max = 48000;
+                break;
+        case 16:
+                chip->sample_rate_max = 96000;
+                break;
+        case 32:
+                chip->sample_rate_max = 192000;
+                break;
+        default:
+                snd_printk(KERN_WARNING SFX
+                           "Invalid granularity %d, reset to %d\n",
+                           chip->granularity, LOLA_GRANULARITY_MAX);
+                chip->granularity = LOLA_GRANULARITY_MAX;
+                chip->sample_rate_max = 192000;
+                break;
+        }
+        chip->sample_rate_min = sample_rate_min[dev];
+        if (chip->sample_rate_min > chip->sample_rate_max) {
+                snd_printk(KERN_WARNING SFX
+                           "Invalid sample_rate_min %d, reset to 16000\n",
+                           chip->sample_rate_min);
+                chip->sample_rate_min = 16000;
+        }
+
+        err = pci_request_regions(pci, DRVNAME);
+        if (err < 0) {
+                kfree(chip);
+                pci_disable_device(pci);
+                return err;
+        }
+
+        chip->bar[0].addr = pci_resource_start(pci, 0);
+        chip->bar[0].remap_addr = pci_ioremap_bar(pci, 0);
+        chip->bar[1].addr = pci_resource_start(pci, 2);
+        chip->bar[1].remap_addr = pci_ioremap_bar(pci, 2);
+        if (!chip->bar[0].remap_addr || !chip->bar[1].remap_addr) {
+                snd_printk(KERN_ERR SFX "ioremap error\n");
+                err = -ENXIO;
+                goto errout;
+        }
+
+        pci_set_master(pci);
+
+        err = reset_controller(chip);
+        if (err < 0)
+                goto errout;
+
+        if (request_irq(pci->irq, lola_interrupt, IRQF_SHARED,
+                        DRVNAME, chip)) {
+                printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq);
+                err = -EBUSY;
+                goto errout;
+        }
+        chip->irq = pci->irq;
+        synchronize_irq(chip->irq);
+
+        dever = lola_readl(chip, BAR1, DEVER);
+        chip->pcm[CAPT].num_streams = (dever >> 0) & 0x3ff;
+        chip->pcm[PLAY].num_streams = (dever >> 10) & 0x3ff;
+        chip->version = (dever >> 24) & 0xff;
+        snd_printdd(SFX "streams in=%d, out=%d, version=0x%x\n",
+                    chip->pcm[CAPT].num_streams, chip->pcm[PLAY].num_streams,
+                    chip->version);
+
+        /* Test LOLA_BAR1_DEVER */
+        if (chip->pcm[CAPT].num_streams > MAX_STREAM_IN_COUNT ||
+            chip->pcm[PLAY].num_streams > MAX_STREAM_OUT_COUNT ||
+            (!chip->pcm[CAPT].num_streams &&
+             !chip->pcm[PLAY].num_streams)) {
+                printk(KERN_ERR SFX "invalid DEVER = %x\n", dever);
+                err = -EINVAL;
+                goto errout;
+        }
+
+        err = setup_corb_rirb(chip);
+        if (err < 0)
+                goto errout;
+
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0) {
+                snd_printk(KERN_ERR SFX "Error creating device [card]!\n");
+                goto errout;
+        }
+
+        strcpy(card->driver, "Lola");
+        strlcpy(card->shortname, "Digigram Lola", sizeof(card->shortname));
+        snprintf(card->longname, sizeof(card->longname),
+                 "%s at 0x%lx irq %i",
+                 card->shortname, chip->bar[0].addr, chip->irq);
+        strcpy(card->mixername, card->shortname);
+
+        lola_irq_enable(chip);
+
+        chip->initialized = 1;
+        *rchip = chip;
+        return 0;
+
+ errout:
+        lola_free(chip);
+        return err;
+}
+
+static int __devinit lola_probe(struct pci_dev *pci,
+                                const struct pci_device_id *pci_id)
+{
+        static int dev;
+        struct snd_card *card;
+        struct lola *chip;
+        int err;
+
+        if (dev >= SNDRV_CARDS)
+                return -ENODEV;
+        if (!enable[dev]) {
+                dev++;
+                return -ENOENT;
+        }
+
+        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 err;
+        }
+
+        snd_card_set_dev(card, &pci->dev);
+
+        err = lola_create(card, pci, dev, &chip);
+        if (err < 0)
+                goto out_free;
+        card->private_data = chip;
+
+        err = lola_parse_tree(chip);
+        if (err < 0)
+                goto out_free;
+
+        err = lola_create_pcm(chip);
+        if (err < 0)
+                goto out_free;
+
+        err = lola_create_mixer(chip);
+        if (err < 0)
+                goto out_free;
+
+        lola_proc_debug_new(chip);
+
+        err = snd_card_register(card);
+        if (err < 0)
+                goto out_free;
+
+        pci_set_drvdata(pci, card);
+        dev++;
+        return err;
+out_free:
+        snd_card_free(card);
+        return err;
+}
+
+static void __devexit lola_remove(struct pci_dev *pci)
+{
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
+}
+
+/* PCI IDs */
+static DEFINE_PCI_DEVICE_TABLE(lola_ids) = {
+        { PCI_VDEVICE(DIGIGRAM, 0x0001) },
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, lola_ids);
+
+/* pci_driver definition */
+static struct pci_driver driver = {
+        .name = DRVNAME,
+        .id_table = lola_ids,
+        .probe = lola_probe,
+        .remove = __devexit_p(lola_remove),
+};
+
+static int __init alsa_card_lola_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_lola_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(alsa_card_lola_init)
+module_exit(alsa_card_lola_exit)
diff --git a/sound/pci/lola/lola.h b/sound/pci/lola/lola.h
new file mode 100644
index 000000000000..d5708e29b16d
--- /dev/null
+++ b/sound/pci/lola/lola.h
@@ -0,0 +1,527 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _LOLA_H
+#define _LOLA_H
+
+#define DRVNAME "snd-lola"
+#define SFX     DRVNAME ": "
+
+/*
+ * Lola HD Audio Registers BAR0
+ */
+#define LOLA_BAR0_GCAP          0x00
+#define LOLA_BAR0_VMIN          0x02
+#define LOLA_BAR0_VMAJ          0x03
+#define LOLA_BAR0_OUTPAY        0x04
+#define LOLA_BAR0_INPAY         0x06
+#define LOLA_BAR0_GCTL          0x08
+#define LOLA_BAR0_WAKEEN        0x0c
+#define LOLA_BAR0_STATESTS      0x0e
+#define LOLA_BAR0_GSTS          0x10
+#define LOLA_BAR0_OUTSTRMPAY    0x18
+#define LOLA_BAR0_INSTRMPAY     0x1a
+#define LOLA_BAR0_INTCTL        0x20
+#define LOLA_BAR0_INTSTS        0x24
+#define LOLA_BAR0_WALCLK        0x30
+#define LOLA_BAR0_SSYNC         0x38
+
+#define LOLA_BAR0_CORBLBASE     0x40
+#define LOLA_BAR0_CORBUBASE     0x44
+#define LOLA_BAR0_CORBWP        0x48    /* no ULONG access */
+#define LOLA_BAR0_CORBRP        0x4a    /* no ULONG access */
+#define LOLA_BAR0_CORBCTL       0x4c    /* no ULONG access */
+#define LOLA_BAR0_CORBSTS       0x4d    /* UCHAR access only */
+#define LOLA_BAR0_CORBSIZE      0x4e    /* no ULONG access */
+
+#define LOLA_BAR0_RIRBLBASE     0x50
+#define LOLA_BAR0_RIRBUBASE     0x54
+#define LOLA_BAR0_RIRBWP        0x58
+#define LOLA_BAR0_RINTCNT       0x5a    /* no ULONG access */
+#define LOLA_BAR0_RIRBCTL       0x5c
+#define LOLA_BAR0_RIRBSTS       0x5d    /* UCHAR access only */
+#define LOLA_BAR0_RIRBSIZE      0x5e    /* no ULONG access */
+
+#define LOLA_BAR0_ICW           0x60
+#define LOLA_BAR0_IRR           0x64
+#define LOLA_BAR0_ICS           0x68
+#define LOLA_BAR0_DPLBASE       0x70
+#define LOLA_BAR0_DPUBASE       0x74
+
+/* stream register offsets from stream base 0x80 */
+#define LOLA_BAR0_SD0_OFFSET    0x80
+#define LOLA_REG0_SD_CTL        0x00
+#define LOLA_REG0_SD_STS        0x03
+#define LOLA_REG0_SD_LPIB       0x04
+#define LOLA_REG0_SD_CBL        0x08
+#define LOLA_REG0_SD_LVI        0x0c
+#define LOLA_REG0_SD_FIFOW      0x0e
+#define LOLA_REG0_SD_FIFOSIZE   0x10
+#define LOLA_REG0_SD_FORMAT     0x12
+#define LOLA_REG0_SD_BDLPL      0x18
+#define LOLA_REG0_SD_BDLPU      0x1c
+
+/*
+ * Lola Digigram Registers BAR1
+ */
+#define LOLA_BAR1_FPGAVER       0x00
+#define LOLA_BAR1_DEVER         0x04
+#define LOLA_BAR1_UCBMV         0x08
+#define LOLA_BAR1_JTAG          0x0c
+#define LOLA_BAR1_UARTRX        0x10
+#define LOLA_BAR1_UARTTX        0x14
+#define LOLA_BAR1_UARTCR        0x18
+#define LOLA_BAR1_NVRAMVER      0x1c
+#define LOLA_BAR1_CTRLSPI       0x20
+#define LOLA_BAR1_DSPI          0x24
+#define LOLA_BAR1_AISPI         0x28
+#define LOLA_BAR1_GRAN          0x2c
+
+#define LOLA_BAR1_DINTCTL       0x80
+#define LOLA_BAR1_DIINTCTL      0x84
+#define LOLA_BAR1_DOINTCTL      0x88
+#define LOLA_BAR1_LRC           0x90
+#define LOLA_BAR1_DINTSTS       0x94
+#define LOLA_BAR1_DIINTSTS      0x98
+#define LOLA_BAR1_DOINTSTS      0x9c
+
+#define LOLA_BAR1_DSD0_OFFSET   0xa0
+#define LOLA_BAR1_DSD_SIZE      0x18
+
+#define LOLA_BAR1_DSDnSTS       0x00
+#define LOLA_BAR1_DSDnLPIB      0x04
+#define LOLA_BAR1_DSDnCTL       0x08
+#define LOLA_BAR1_DSDnLVI       0x0c
+#define LOLA_BAR1_DSDnBDPL      0x10
+#define LOLA_BAR1_DSDnBDPU      0x14
+
+#define LOLA_BAR1_SSYNC         0x03e8
+
+#define LOLA_BAR1_BOARD_CTRL    0x0f00
+#define LOLA_BAR1_BOARD_MODE    0x0f02
+
+#define LOLA_BAR1_SOURCE_GAIN_ENABLE            0x1000
+#define LOLA_BAR1_DEST00_MIX_GAIN_ENABLE        0x1004
+#define LOLA_BAR1_DEST31_MIX_GAIN_ENABLE        0x1080
+#define LOLA_BAR1_SOURCE00_01_GAIN              0x1084
+#define LOLA_BAR1_SOURCE30_31_GAIN              0x10c0
+#define LOLA_BAR1_SOURCE_GAIN(src) \
+        (LOLA_BAR1_SOURCE00_01_GAIN + (src) * 2)
+#define LOLA_BAR1_DEST00_MIX00_01_GAIN          0x10c4
+#define LOLA_BAR1_DEST00_MIX30_31_GAIN          0x1100
+#define LOLA_BAR1_DEST01_MIX00_01_GAIN          0x1104
+#define LOLA_BAR1_DEST01_MIX30_31_GAIN          0x1140
+#define LOLA_BAR1_DEST31_MIX00_01_GAIN          0x1884
+#define LOLA_BAR1_DEST31_MIX30_31_GAIN          0x18c0
+#define LOLA_BAR1_MIX_GAIN(dest, mix) \
+        (LOLA_BAR1_DEST00_MIX00_01_GAIN + (dest) * 0x40 + (mix) * 2)
+#define LOLA_BAR1_ANALOG_CLIP_IN                0x18c4
+#define LOLA_BAR1_PEAKMETERS_SOURCE00_01        0x18c8
+#define LOLA_BAR1_PEAKMETERS_SOURCE30_31        0x1904
+#define LOLA_BAR1_PEAKMETERS_SOURCE(src) \
+        (LOLA_BAR1_PEAKMETERS_SOURCE00_01 + (src) * 2)
+#define LOLA_BAR1_PEAKMETERS_DEST00_01          0x1908
+#define LOLA_BAR1_PEAKMETERS_DEST30_31          0x1944
+#define LOLA_BAR1_PEAKMETERS_DEST(dest) \
+        (LOLA_BAR1_PEAKMETERS_DEST00_01 + (dest) * 2)
+#define LOLA_BAR1_PEAKMETERS_AGC00_01           0x1948
+#define LOLA_BAR1_PEAKMETERS_AGC14_15           0x1964
+#define LOLA_BAR1_PEAKMETERS_AGC(x) \
+        (LOLA_BAR1_PEAKMETERS_AGC00_01 + (x) * 2)
+
+/* GCTL reset bit */
+#define LOLA_GCTL_RESET         (1 << 0)
+/* GCTL unsolicited response enable bit */
+#define LOLA_GCTL_UREN          (1 << 8)
+
+/* CORB/RIRB control, read/write pointer */
+#define LOLA_RBCTL_DMA_EN       0x02    /* enable DMA */
+#define LOLA_RBCTL_IRQ_EN       0x01    /* enable IRQ */
+#define LOLA_RBRWP_CLR          0x8000  /* read/write pointer clear */
+
+#define LOLA_RIRB_EX_UNSOL_EV   0x40000000
+#define LOLA_RIRB_EX_ERROR      0x80000000
+
+/* CORB int mask: CMEI[0] */
+#define LOLA_CORB_INT_CMEI      0x01
+#define LOLA_CORB_INT_MASK      LOLA_CORB_INT_CMEI
+
+/* RIRB int mask: overrun[2], response[0] */
+#define LOLA_RIRB_INT_RESPONSE  0x01
+#define LOLA_RIRB_INT_OVERRUN   0x04
+#define LOLA_RIRB_INT_MASK      (LOLA_RIRB_INT_RESPONSE | LOLA_RIRB_INT_OVERRUN)
+
+/* DINTCTL and DINTSTS */
+#define LOLA_DINT_GLOBAL        0x80000000 /* global interrupt enable bit */
+#define LOLA_DINT_CTRL          0x40000000 /* controller interrupt enable bit */
+#define LOLA_DINT_FIFOERR       0x20000000 /* global fifo error enable bit */
+#define LOLA_DINT_MUERR         0x10000000 /* global microcontroller underrun error */
+
+/* DSDnCTL bits */
+#define LOLA_DSD_CTL_SRST       0x01    /* stream reset bit */
+#define LOLA_DSD_CTL_SRUN       0x02    /* stream DMA start bit */
+#define LOLA_DSD_CTL_IOCE       0x04    /* interrupt on completion enable */
+#define LOLA_DSD_CTL_DEIE       0x10    /* descriptor error interrupt enable */
+#define LOLA_DSD_CTL_VLRCV      0x20    /* valid LRCountValue information in bits 8..31 */
+#define LOLA_LRC_MASK           0xffffff00
+
+/* DSDnSTS */
+#define LOLA_DSD_STS_BCIS       0x04    /* buffer completion interrupt status */
+#define LOLA_DSD_STS_DESE       0x10    /* descriptor error interrupt */
+#define LOLA_DSD_STS_FIFORDY    0x20    /* fifo ready */
+
+#define LOLA_CORB_ENTRIES       256
+
+#define MAX_STREAM_IN_COUNT     16
+#define MAX_STREAM_OUT_COUNT    16
+#define MAX_STREAM_COUNT        16
+#define MAX_PINS                MAX_STREAM_COUNT
+#define MAX_STREAM_BUFFER_COUNT 16
+#define MAX_AUDIO_INOUT_COUNT   16
+
+#define LOLA_CLOCK_TYPE_INTERNAL    0
+#define LOLA_CLOCK_TYPE_AES         1
+#define LOLA_CLOCK_TYPE_AES_SYNC    2
+#define LOLA_CLOCK_TYPE_WORDCLOCK   3
+#define LOLA_CLOCK_TYPE_ETHERSOUND  4
+#define LOLA_CLOCK_TYPE_VIDEO       5
+
+#define LOLA_CLOCK_FORMAT_NONE      0
+#define LOLA_CLOCK_FORMAT_NTSC      1
+#define LOLA_CLOCK_FORMAT_PAL       2
+
+#define MAX_SAMPLE_CLOCK_COUNT  48
+
+/* parameters used with mixer widget's mixer capabilities */
+#define LOLA_PEAK_METER_CAN_AGC_MASK            1
+#define LOLA_PEAK_METER_CAN_ANALOG_CLIP_MASK    2
+
+struct lola_bar {
+        unsigned long addr;
+        void __iomem *remap_addr;
+};
+
+/* CORB/RIRB */
+struct lola_rb {
+        u32 *buf;               /* CORB/RIRB buffer, 8 byte per each entry */
+        dma_addr_t addr;        /* physical address of CORB/RIRB buffer */
+        unsigned short rp, wp;  /* read/write pointers */
+        int cmds;               /* number of pending requests */
+};
+
+/* Pin widget setup */
+struct lola_pin {
+        unsigned int nid;
+        bool is_analog;
+        unsigned int amp_mute;
+        unsigned int amp_step_size;
+        unsigned int amp_num_steps;
+        unsigned int amp_offset;
+        unsigned int max_level;
+        unsigned int config_default_reg;
+        unsigned int fixed_gain_list_len;
+        unsigned int cur_gain_step;
+};
+
+struct lola_pin_array {
+        unsigned int num_pins;
+        unsigned int num_analog_pins;
+        struct lola_pin pins[MAX_PINS];
+};
+
+/* Clock widget setup */
+struct lola_sample_clock {
+        unsigned int type;
+        unsigned int format;
+        unsigned int freq;
+};
+
+struct lola_clock_widget {
+        unsigned int nid;
+        unsigned int items;
+        unsigned int cur_index;
+        unsigned int cur_freq;
+        bool cur_valid;
+        struct lola_sample_clock sample_clock[MAX_SAMPLE_CLOCK_COUNT];
+        unsigned int idx_lookup[MAX_SAMPLE_CLOCK_COUNT];
+};
+
+#define LOLA_MIXER_DIM      32
+struct lola_mixer_array {
+        u32 src_gain_enable;
+        u32 dest_mix_gain_enable[LOLA_MIXER_DIM];
+        u16 src_gain[LOLA_MIXER_DIM];
+        u16 dest_mix_gain[LOLA_MIXER_DIM][LOLA_MIXER_DIM];
+};
+
+/* Mixer widget setup */
+struct lola_mixer_widget {
+        unsigned int nid;
+        unsigned int caps;
+        struct lola_mixer_array __user *array;
+        struct lola_mixer_array *array_saved;
+        unsigned int src_stream_outs;
+        unsigned int src_phys_ins;
+        unsigned int dest_stream_ins;
+        unsigned int dest_phys_outs;
+        unsigned int src_stream_out_ofs;
+        unsigned int dest_phys_out_ofs;
+        unsigned int src_mask;
+        unsigned int dest_mask;
+};
+
+/* Audio stream */
+struct lola_stream {
+        unsigned int nid;       /* audio widget NID */
+        unsigned int index;     /* array index */
+        unsigned int dsd;       /* DSD index */
+        bool can_float;
+        struct snd_pcm_substream *substream; /* assigned PCM substream */
+        struct lola_stream *master;     /* master stream (for multi-channel) */
+
+        /* buffer setup */
+        unsigned int bufsize;
+        unsigned int period_bytes;
+        unsigned int frags;
+
+        /* format + channel setup */
+        unsigned int format_verb;
+
+        /* flags */
+        unsigned int opened:1;
+        unsigned int prepared:1;
+        unsigned int paused:1;
+        unsigned int running:1;
+};
+
+#define PLAY    SNDRV_PCM_STREAM_PLAYBACK
+#define CAPT    SNDRV_PCM_STREAM_CAPTURE
+
+struct lola_pcm {
+        unsigned int num_streams;
+        struct snd_dma_buffer bdl; /* BDL buffer */
+        struct lola_stream streams[MAX_STREAM_COUNT];
+};
+
+/* card instance */
+struct lola {
+        struct snd_card *card;
+        struct pci_dev *pci;
+
+        /* pci resources */
+        struct lola_bar bar[2];
+        int irq;
+
+        /* locks */
+        spinlock_t reg_lock;
+        struct mutex open_mutex;
+
+        /* CORB/RIRB */
+        struct lola_rb corb;
+        struct lola_rb rirb;
+        unsigned int res, res_ex;       /* last read values */
+        /* last command (for debugging) */
+        unsigned int last_cmd_nid, last_verb, last_data, last_extdata;
+
+        /* CORB/RIRB buffers */
+        struct snd_dma_buffer rb;
+
+        /* unsolicited events */
+        unsigned int last_unsol_res;
+
+        /* streams */
+        struct lola_pcm pcm[2];
+
+        /* input src */
+        unsigned int input_src_caps_mask;
+        unsigned int input_src_mask;
+
+        /* pins */
+        struct lola_pin_array pin[2];
+
+        /* clock */
+        struct lola_clock_widget clock;
+        int ref_count_rate;
+        unsigned int sample_rate;
+
+        /* mixer */
+        struct lola_mixer_widget mixer;
+
+        /* hw info */
+        unsigned int version;
+        unsigned int lola_caps;
+
+        /* parameters */
+        unsigned int granularity;
+        unsigned int sample_rate_min;
+        unsigned int sample_rate_max;
+
+        /* flags */
+        unsigned int initialized:1;
+        unsigned int cold_reset:1;
+        unsigned int polling_mode:1;
+
+        /* for debugging */
+        unsigned int debug_res;
+        unsigned int debug_res_ex;
+};
+
+#define BAR0    0
+#define BAR1    1
+
+/* Helper macros */
+#define lola_readl(chip, idx, name) \
+        readl((chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+#define lola_readw(chip, idx, name) \
+        readw((chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+#define lola_readb(chip, idx, name) \
+        readb((chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+#define lola_writel(chip, idx, name, val) \
+        writel((val), (chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+#define lola_writew(chip, idx, name, val) \
+        writew((val), (chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+#define lola_writeb(chip, idx, name, val) \
+        writeb((val), (chip)->bar[idx].remap_addr + LOLA_##idx##_##name)
+
+#define lola_dsd_read(chip, dsd, name) \
+        readl((chip)->bar[BAR1].remap_addr + LOLA_BAR1_DSD0_OFFSET + \
+              (LOLA_BAR1_DSD_SIZE * (dsd)) + LOLA_BAR1_DSDn##name)
+#define lola_dsd_write(chip, dsd, name, val) \
+        writel((val), (chip)->bar[BAR1].remap_addr + LOLA_BAR1_DSD0_OFFSET + \
+               (LOLA_BAR1_DSD_SIZE * (dsd)) + LOLA_BAR1_DSDn##name)
+
+/* GET verbs HDAudio */
+#define LOLA_VERB_GET_STREAM_FORMAT             0xa00
+#define LOLA_VERB_GET_AMP_GAIN_MUTE             0xb00
+#define LOLA_VERB_PARAMETERS                    0xf00
+#define LOLA_VERB_GET_POWER_STATE               0xf05
+#define LOLA_VERB_GET_CONV                      0xf06
+#define LOLA_VERB_GET_UNSOLICITED_RESPONSE      0xf08
+#define LOLA_VERB_GET_DIGI_CONVERT_1            0xf0d
+#define LOLA_VERB_GET_CONFIG_DEFAULT            0xf1c
+#define LOLA_VERB_GET_SUBSYSTEM_ID              0xf20
+/* GET verbs Digigram */
+#define LOLA_VERB_GET_FIXED_GAIN                0xfc0
+#define LOLA_VERB_GET_GAIN_SELECT               0xfc1
+#define LOLA_VERB_GET_MAX_LEVEL                 0xfc2
+#define LOLA_VERB_GET_CLOCK_LIST                0xfc3
+#define LOLA_VERB_GET_CLOCK_SELECT              0xfc4
+#define LOLA_VERB_GET_CLOCK_STATUS              0xfc5
+
+/* SET verbs HDAudio */
+#define LOLA_VERB_SET_STREAM_FORMAT             0x200
+#define LOLA_VERB_SET_AMP_GAIN_MUTE             0x300
+#define LOLA_VERB_SET_POWER_STATE               0x705
+#define LOLA_VERB_SET_CHANNEL_STREAMID          0x706
+#define LOLA_VERB_SET_UNSOLICITED_ENABLE        0x708
+#define LOLA_VERB_SET_DIGI_CONVERT_1            0x70d
+/* SET verbs Digigram */
+#define LOLA_VERB_SET_GAIN_SELECT               0xf81
+#define LOLA_VERB_SET_CLOCK_SELECT              0xf84
+#define LOLA_VERB_SET_GRANULARITY_STEPS         0xf86
+#define LOLA_VERB_SET_SOURCE_GAIN               0xf87
+#define LOLA_VERB_SET_MIX_GAIN                  0xf88
+#define LOLA_VERB_SET_DESTINATION_GAIN          0xf89
+#define LOLA_VERB_SET_SRC                       0xf8a
+
+/* Parameter IDs used with LOLA_VERB_PARAMETERS */
+#define LOLA_PAR_VENDOR_ID                      0x00
+#define LOLA_PAR_FUNCTION_TYPE                  0x05
+#define LOLA_PAR_AUDIO_WIDGET_CAP               0x09
+#define LOLA_PAR_PCM                            0x0a
+#define LOLA_PAR_STREAM_FORMATS                 0x0b
+#define LOLA_PAR_PIN_CAP                        0x0c
+#define LOLA_PAR_AMP_IN_CAP                     0x0d
+#define LOLA_PAR_CONNLIST_LEN                   0x0e
+#define LOLA_PAR_POWER_STATE                    0x0f
+#define LOLA_PAR_GPIO_CAP                       0x11
+#define LOLA_PAR_AMP_OUT_CAP                    0x12
+#define LOLA_PAR_SPECIFIC_CAPS                  0x80
+#define LOLA_PAR_FIXED_GAIN_LIST                0x81
+
+/* extract results of LOLA_PAR_SPECIFIC_CAPS */
+#define LOLA_AFG_MIXER_WIDGET_PRESENT(res)      ((res & (1 << 21)) != 0)
+#define LOLA_AFG_CLOCK_WIDGET_PRESENT(res)      ((res & (1 << 20)) != 0)
+#define LOLA_AFG_INPUT_PIN_COUNT(res)           ((res >> 10) & 0x2ff)
+#define LOLA_AFG_OUTPUT_PIN_COUNT(res)          ((res) & 0x2ff)
+
+/* extract results of LOLA_PAR_AMP_IN_CAP / LOLA_PAR_AMP_OUT_CAP */
+#define LOLA_AMP_MUTE_CAPABLE(res)              ((res & (1 << 31)) != 0)
+#define LOLA_AMP_STEP_SIZE(res)                 ((res >> 24) & 0x7f)
+#define LOLA_AMP_NUM_STEPS(res)                 ((res >> 12) & 0x3ff)
+#define LOLA_AMP_OFFSET(res)                    ((res) & 0x3ff)
+
+#define LOLA_GRANULARITY_MIN            8
+#define LOLA_GRANULARITY_MAX            32
+#define LOLA_GRANULARITY_STEP           8
+
+/* parameters used with unsolicited command/response */
+#define LOLA_UNSOLICITED_TAG_MASK       0x3f
+#define LOLA_UNSOLICITED_TAG            0x1a
+#define LOLA_UNSOLICITED_ENABLE         0x80
+#define LOLA_UNSOL_RESP_TAG_OFFSET      26
+
+/* count values in the Vendor Specific Mixer Widget's Audio Widget Capabilities */
+#define LOLA_MIXER_SRC_INPUT_PLAY_SEPARATION(res)   ((res >> 2) & 0x1f)
+#define LOLA_MIXER_DEST_REC_OUTPUT_SEPATATION(res)  ((res >> 7) & 0x1f)
+
+int lola_codec_write(struct lola *chip, unsigned int nid, unsigned int verb,
+                     unsigned int data, unsigned int extdata);
+int lola_codec_read(struct lola *chip, unsigned int nid, unsigned int verb,
+                    unsigned int data, unsigned int extdata,
+                    unsigned int *val, unsigned int *extval);
+int lola_codec_flush(struct lola *chip);
+#define lola_read_param(chip, nid, param, val) \
+        lola_codec_read(chip, nid, LOLA_VERB_PARAMETERS, param, 0, val, NULL)
+
+/* PCM */
+int lola_create_pcm(struct lola *chip);
+void lola_free_pcm(struct lola *chip);
+int lola_init_pcm(struct lola *chip, int dir, int *nidp);
+void lola_pcm_update(struct lola *chip, struct lola_pcm *pcm, unsigned int bits);
+
+/* clock */
+int lola_init_clock_widget(struct lola *chip, int nid);
+int lola_set_granularity(struct lola *chip, unsigned int val, bool force);
+int lola_enable_clock_events(struct lola *chip);
+int lola_set_clock_index(struct lola *chip, unsigned int idx);
+int lola_set_clock(struct lola *chip, int idx);
+int lola_set_sample_rate(struct lola *chip, int rate);
+bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val);
+unsigned int lola_sample_rate_convert(unsigned int coded);
+
+/* mixer */
+int lola_init_pins(struct lola *chip, int dir, int *nidp);
+int lola_init_mixer_widget(struct lola *chip, int nid);
+void lola_free_mixer(struct lola *chip);
+int lola_create_mixer(struct lola *chip);
+int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute);
+void lola_save_mixer(struct lola *chip);
+void lola_restore_mixer(struct lola *chip);
+int lola_set_src_config(struct lola *chip, unsigned int src_mask, bool update);
+
+/* proc */
+#ifdef CONFIG_SND_DEBUG
+void lola_proc_debug_new(struct lola *chip);
+#else
+#define lola_proc_debug_new(chip)
+#endif
+
+#endif /* _LOLA_H */
diff --git a/sound/pci/lola/lola_clock.c b/sound/pci/lola/lola_clock.c
new file mode 100644
index 000000000000..72f8ef0ac865
--- /dev/null
+++ b/sound/pci/lola/lola_clock.c
@@ -0,0 +1,323 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include "lola.h"
+
+unsigned int lola_sample_rate_convert(unsigned int coded)
+{
+        unsigned int freq;
+
+        /* base frequency */
+        switch (coded & 0x3) {
+        case 0:     freq = 48000; break;
+        case 1:     freq = 44100; break;
+        case 2:     freq = 32000; break;
+        default:    return 0;   /* error */
+        }
+
+        /* multiplier / devisor */
+        switch (coded & 0x1c) {
+        case (0 << 2):    break;
+        case (4 << 2):    break;
+        case (1 << 2):    freq *= 2; break;
+        case (2 << 2):    freq *= 4; break;
+        case (5 << 2):    freq /= 2; break;
+        case (6 << 2):    freq /= 4; break;
+        default:        return 0;   /* error */
+        }
+
+        /* ajustement */
+        switch (coded & 0x60) {
+        case (0 << 5):    break;
+        case (1 << 5):    freq = (freq * 999) / 1000; break;
+        case (2 << 5):    freq = (freq * 1001) / 1000; break;
+        default:        return 0;   /* error */
+        }
+        return freq;
+}
+
+/*
+ * Granualrity
+ */
+
+#define LOLA_MAXFREQ_AT_GRANULARITY_MIN         48000
+#define LOLA_MAXFREQ_AT_GRANULARITY_BELOW_MAX   96000
+
+static bool check_gran_clock_compatibility(struct lola *chip,
+                                           unsigned int val,
+                                           unsigned int freq)
+{
+        if (!chip->granularity)
+                return true;
+
+        if (val < LOLA_GRANULARITY_MIN || val > LOLA_GRANULARITY_MAX ||
+            (val % LOLA_GRANULARITY_STEP) != 0)
+                return false;
+
+        if (val == LOLA_GRANULARITY_MIN) {
+                if (freq > LOLA_MAXFREQ_AT_GRANULARITY_MIN)
+                        return false;
+        } else if (val < LOLA_GRANULARITY_MAX) {
+                if (freq > LOLA_MAXFREQ_AT_GRANULARITY_BELOW_MAX)
+                        return false;
+        }
+        return true;
+}
+
+int lola_set_granularity(struct lola *chip, unsigned int val, bool force)
+{
+        int err;
+
+        if (!force) {
+                if (val == chip->granularity)
+                        return 0;
+#if 0
+                /* change Gran only if there are no streams allocated ! */
+                if (chip->audio_in_alloc_mask || chip->audio_out_alloc_mask)
+                        return -EBUSY;
+#endif
+                if (!check_gran_clock_compatibility(chip, val,
+                                                    chip->clock.cur_freq))
+                        return -EINVAL;
+        }
+
+        chip->granularity = val;
+        val /= LOLA_GRANULARITY_STEP;
+
+        /* audio function group */
+        err = lola_codec_write(chip, 1, LOLA_VERB_SET_GRANULARITY_STEPS,
+                               val, 0);
+        if (err < 0)
+                return err;
+        /* this can be a very slow function !!! */
+        usleep_range(400 * val, 20000);
+        return lola_codec_flush(chip);
+}
+
+/*
+ * Clock widget handling
+ */
+
+int __devinit lola_init_clock_widget(struct lola *chip, int nid)
+{
+        unsigned int val;
+        int i, j, nitems, nb_verbs, idx, idx_list;
+        int err;
+
+        err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read wcaps for 0x%x\n", nid);
+                return err;
+        }
+
+        if ((val & 0xfff00000) != 0x01f00000) { /* test SubType and Type */
+                snd_printdd("No valid clock widget\n");
+                return 0;
+        }
+
+        chip->clock.nid = nid;
+        chip->clock.items = val & 0xff;
+        snd_printdd("clock_list nid=%x, entries=%d\n", nid,
+                    chip->clock.items);
+        if (chip->clock.items > MAX_SAMPLE_CLOCK_COUNT) {
+                printk(KERN_ERR SFX "CLOCK_LIST too big: %d\n",
+                       chip->clock.items);
+                return -EINVAL;
+        }
+
+        nitems = chip->clock.items;
+        nb_verbs = (nitems + 3) / 4;
+        idx = 0;
+        idx_list = 0;
+        for (i = 0; i < nb_verbs; i++) {
+                unsigned int res_ex;
+                unsigned short items[4];
+
+                err = lola_codec_read(chip, nid, LOLA_VERB_GET_CLOCK_LIST,
+                                      idx, 0, &val, &res_ex);
+                if (err < 0) {
+                        printk(KERN_ERR SFX "Can't read CLOCK_LIST\n");
+                        return -EINVAL;
+                }
+
+                items[0] = val & 0xfff;
+                items[1] = (val >> 16) & 0xfff;
+                items[2] = res_ex & 0xfff;
+                items[3] = (res_ex >> 16) & 0xfff;
+
+                for (j = 0; j < 4; j++) {
+                        unsigned char type = items[j] >> 8;
+                        unsigned int freq = items[j] & 0xff;
+                        int format = LOLA_CLOCK_FORMAT_NONE;
+                        bool add_clock = true;
+                        if (type == LOLA_CLOCK_TYPE_INTERNAL) {
+                                freq = lola_sample_rate_convert(freq);
+                                if (freq < chip->sample_rate_min)
+                                        add_clock = false;
+                                else if (freq == 48000) {
+                                        chip->clock.cur_index = idx_list;
+                                        chip->clock.cur_freq = 48000;
+                                        chip->clock.cur_valid = true;
+                                }
+                        } else if (type == LOLA_CLOCK_TYPE_VIDEO) {
+                                freq = lola_sample_rate_convert(freq);
+                                if (freq < chip->sample_rate_min)
+                                        add_clock = false;
+                                /* video clock has a format (0:NTSC, 1:PAL)*/
+                                if (items[j] & 0x80)
+                                        format = LOLA_CLOCK_FORMAT_NTSC;
+                                else
+                                        format = LOLA_CLOCK_FORMAT_PAL;
+                        }
+                        if (add_clock) {
+                                struct lola_sample_clock *sc;
+                                sc = &chip->clock.sample_clock[idx_list];
+                                sc->type = type;
+                                sc->format = format;
+                                sc->freq = freq;
+                                /* keep the index used with the board */
+                                chip->clock.idx_lookup[idx_list] = idx;
+                                idx_list++;
+                        } else {
+                                chip->clock.items--;
+                        }
+                        if (++idx >= nitems)
+                                break;
+                }
+        }
+        return 0;
+}
+
+/* enable unsolicited events of the clock widget */
+int lola_enable_clock_events(struct lola *chip)
+{
+        unsigned int res;
+        int err;
+
+        err = lola_codec_read(chip, chip->clock.nid,
+                              LOLA_VERB_SET_UNSOLICITED_ENABLE,
+                              LOLA_UNSOLICITED_ENABLE | LOLA_UNSOLICITED_TAG,
+                              0, &res, NULL);
+        if (err < 0)
+                return err;
+        if (res) {
+                printk(KERN_WARNING SFX "error in enable_clock_events %d\n",
+                       res);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+int lola_set_clock_index(struct lola *chip, unsigned int idx)
+{
+        unsigned int res;
+        int err;
+
+        err = lola_codec_read(chip, chip->clock.nid,
+                              LOLA_VERB_SET_CLOCK_SELECT,
+                              chip->clock.idx_lookup[idx],
+                              0, &res, NULL);
+        if (err < 0)
+                return err;
+        if (res) {
+                printk(KERN_WARNING SFX "error in set_clock %d\n", res);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+bool lola_update_ext_clock_freq(struct lola *chip, unsigned int val)
+{
+        unsigned int tag;
+
+        /* the current EXTERNAL clock information gets updated by interrupt
+         * with an unsolicited response
+         */
+        if (!val)
+                return false;
+        tag = (val >> LOLA_UNSOL_RESP_TAG_OFFSET) & LOLA_UNSOLICITED_TAG_MASK;
+        if (tag != LOLA_UNSOLICITED_TAG)
+                return false;
+
+        /* only for current = external clocks */
+        if (chip->clock.sample_clock[chip->clock.cur_index].type !=
+            LOLA_CLOCK_TYPE_INTERNAL) {
+                chip->clock.cur_freq = lola_sample_rate_convert(val & 0x7f);
+                chip->clock.cur_valid = (val & 0x100) != 0;
+        }
+        return true;
+}
+
+int lola_set_clock(struct lola *chip, int idx)
+{
+        int freq = 0;
+        bool valid = false;
+
+        if (idx == chip->clock.cur_index) {
+                /* current clock is allowed */
+                freq = chip->clock.cur_freq;
+                valid = chip->clock.cur_valid;
+        } else if (chip->clock.sample_clock[idx].type ==
+                   LOLA_CLOCK_TYPE_INTERNAL) {
+                /* internal clocks allowed */
+                freq = chip->clock.sample_clock[idx].freq;
+                valid = true;
+        }
+
+        if (!freq || !valid)
+                return -EINVAL;
+
+        if (!check_gran_clock_compatibility(chip, chip->granularity, freq))
+                return -EINVAL;
+
+        if (idx != chip->clock.cur_index) {
+                int err = lola_set_clock_index(chip, idx);
+                if (err < 0)
+                        return err;
+                /* update new settings */
+                chip->clock.cur_index = idx;
+                chip->clock.cur_freq = freq;
+                chip->clock.cur_valid = true;
+        }
+        return 0;
+}
+
+int lola_set_sample_rate(struct lola *chip, int rate)
+{
+        int i;
+
+        if (chip->clock.cur_freq == rate && chip->clock.cur_valid)
+                return 0;
+        /* search for new dwClockIndex */
+        for (i = 0; i < chip->clock.items; i++) {
+                if (chip->clock.sample_clock[i].type == LOLA_CLOCK_TYPE_INTERNAL &&
+                    chip->clock.sample_clock[i].freq == rate)
+                        break;
+        }
+        if (i >= chip->clock.items)
+                return -EINVAL;
+        return lola_set_clock(chip, i);
+}
+
diff --git a/sound/pci/lola/lola_mixer.c b/sound/pci/lola/lola_mixer.c
new file mode 100644
index 000000000000..5d518f1a712c
--- /dev/null
+++ b/sound/pci/lola/lola_mixer.c
@@ -0,0 +1,839 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/vmalloc.h>
+#include <linux/io.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/tlv.h>
+#include "lola.h"
+
+static int __devinit lola_init_pin(struct lola *chip, struct lola_pin *pin,
+                                   int dir, int nid)
+{
+        unsigned int val;
+        int err;
+
+        pin->nid = nid;
+        err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read wcaps for 0x%x\n", nid);
+                return err;
+        }
+        val &= 0x00f00fff; /* test TYPE and bits 0..11 */
+        if (val == 0x00400200)    /* Type = 4, Digital = 1 */
+                pin->is_analog = false;
+        else if (val == 0x0040000a && dir == CAPT) /* Dig=0, InAmp/ovrd */
+                pin->is_analog = true;
+        else if (val == 0x0040000c && dir == PLAY) /* Dig=0, OutAmp/ovrd */
+                pin->is_analog = true;
+        else {
+                printk(KERN_ERR SFX "Invalid wcaps 0x%x for 0x%x\n", val, nid);
+                return -EINVAL;
+        }
+
+        /* analog parameters only following, so continue in case of Digital pin
+         */
+        if (!pin->is_analog)
+                return 0;
+
+        if (dir == PLAY)
+                err = lola_read_param(chip, nid, LOLA_PAR_AMP_OUT_CAP, &val);
+        else
+                err = lola_read_param(chip, nid, LOLA_PAR_AMP_IN_CAP, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read AMP-caps for 0x%x\n", nid);
+                return err;
+        }
+
+        pin->amp_mute = LOLA_AMP_MUTE_CAPABLE(val);
+        pin->amp_step_size = LOLA_AMP_STEP_SIZE(val);
+        pin->amp_num_steps = LOLA_AMP_NUM_STEPS(val);
+        if (pin->amp_num_steps) {
+                /* zero as mute state */
+                pin->amp_num_steps++;
+                pin->amp_step_size++;
+        }
+        pin->amp_offset = LOLA_AMP_OFFSET(val);
+
+        err = lola_codec_read(chip, nid, LOLA_VERB_GET_MAX_LEVEL, 0, 0, &val,
+                              NULL);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't get MAX_LEVEL 0x%x\n", nid);
+                return err;
+        }
+        pin->max_level = val & 0x3ff;   /* 10 bits */
+
+        pin->config_default_reg = 0;
+        pin->fixed_gain_list_len = 0;
+        pin->cur_gain_step = 0;
+
+        return 0;
+}
+
+int __devinit lola_init_pins(struct lola *chip, int dir, int *nidp)
+{
+        int i, err, nid;
+        nid = *nidp;
+        for (i = 0; i < chip->pin[dir].num_pins; i++, nid++) {
+                err = lola_init_pin(chip, &chip->pin[dir].pins[i], dir, nid);
+                if (err < 0)
+                        return err;
+                if (chip->pin[dir].pins[i].is_analog)
+                        chip->pin[dir].num_analog_pins++;
+        }
+        *nidp = nid;
+        return 0;
+}
+
+void lola_free_mixer(struct lola *chip)
+{
+        if (chip->mixer.array_saved)
+                vfree(chip->mixer.array_saved);
+}
+
+int __devinit lola_init_mixer_widget(struct lola *chip, int nid)
+{
+        unsigned int val;
+        int err;
+
+        err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read wcaps for 0x%x\n", nid);
+                return err;
+        }
+
+        if ((val & 0xfff00000) != 0x02f00000) { /* test SubType and Type */
+                snd_printdd("No valid mixer widget\n");
+                return 0;
+        }
+
+        chip->mixer.nid = nid;
+        chip->mixer.caps = val;
+        chip->mixer.array = (struct lola_mixer_array __iomem *)
+                (chip->bar[BAR1].remap_addr + LOLA_BAR1_SOURCE_GAIN_ENABLE);
+
+        /* reserve memory to copy mixer data for sleep mode transitions */
+        chip->mixer.array_saved = vmalloc(sizeof(struct lola_mixer_array));
+
+        /* mixer matrix sources are physical input data and play streams */
+        chip->mixer.src_stream_outs = chip->pcm[PLAY].num_streams;
+        chip->mixer.src_phys_ins = chip->pin[CAPT].num_pins;
+
+        /* mixer matrix destinations are record streams and physical output */
+        chip->mixer.dest_stream_ins = chip->pcm[CAPT].num_streams;
+        chip->mixer.dest_phys_outs = chip->pin[PLAY].num_pins;
+
+        /* mixer matrix can have unused areas between PhysIn and
+         * Play or Record and PhysOut zones
+         */
+        chip->mixer.src_stream_out_ofs = chip->mixer.src_phys_ins +
+                LOLA_MIXER_SRC_INPUT_PLAY_SEPARATION(val);
+        chip->mixer.dest_phys_out_ofs = chip->mixer.dest_stream_ins +
+                LOLA_MIXER_DEST_REC_OUTPUT_SEPATATION(val);
+
+        /* example : MixerMatrix of LoLa881
+         * 0-------8------16-------8------16
+         * |       |       |       |       |
+         * | INPUT |       | INPUT |       |
+         * | ->    |unused | ->    |unused |
+         * | RECORD|       | OUTPUT|       |
+         * |       |       |       |       |
+         * 8--------------------------------
+         * |       |       |       |       |
+         * |       |       |       |       |
+         * |unused |unused |unused |unused |
+         * |       |       |       |       |
+         * |       |       |       |       |
+         * 16-------------------------------
+         * |       |       |       |       |
+         * | PLAY  |       | PLAY  |       |
+         * |  ->   |unused | ->    |unused |
+         * | RECORD|       | OUTPUT|       |
+         * |       |       |       |       |
+         * 8--------------------------------
+         * |       |       |       |       |
+         * |       |       |       |       |
+         * |unused |unused |unused |unused |
+         * |       |       |       |       |
+         * |       |       |       |       |
+         * 16-------------------------------
+         */
+        if (chip->mixer.src_stream_out_ofs > MAX_AUDIO_INOUT_COUNT ||
+            chip->mixer.dest_phys_out_ofs > MAX_STREAM_IN_COUNT) {
+                printk(KERN_ERR SFX "Invalid mixer widget size\n");
+                return -EINVAL;
+        }
+
+        chip->mixer.src_mask = ((1U << chip->mixer.src_phys_ins) - 1) |
+                (((1U << chip->mixer.src_stream_outs) - 1)
+                 << chip->mixer.src_stream_out_ofs);
+        chip->mixer.dest_mask = ((1U << chip->mixer.dest_stream_ins) - 1) |
+                (((1U << chip->mixer.dest_phys_outs) - 1)
+                 << chip->mixer.dest_phys_out_ofs);
+
+        return 0;
+}
+
+static int lola_mixer_set_src_gain(struct lola *chip, unsigned int id,
+                                   unsigned short gain, bool on)
+{
+        unsigned int oldval, val;
+
+        if (!(chip->mixer.src_mask & (1 << id)))
+                return -EINVAL;
+        writew(gain, &chip->mixer.array->src_gain[id]);
+        oldval = val = readl(&chip->mixer.array->src_gain_enable);
+        if (on)
+                val |= (1 << id);
+        else
+                val &= ~(1 << id);
+        writel(val, &chip->mixer.array->src_gain_enable);
+        lola_codec_flush(chip);
+        /* inform micro-controller about the new source gain */
+        return lola_codec_write(chip, chip->mixer.nid,
+                                LOLA_VERB_SET_SOURCE_GAIN, id, 0);
+}
+
+#if 0 /* not used */
+static int lola_mixer_set_src_gains(struct lola *chip, unsigned int mask,
+                                    unsigned short *gains)
+{
+        int i;
+
+        if ((chip->mixer.src_mask & mask) != mask)
+                return -EINVAL;
+        for (i = 0; i < LOLA_MIXER_DIM; i++) {
+                if (mask & (1 << i)) {
+                        writew(*gains, &chip->mixer.array->src_gain[i]);
+                        gains++;
+                }
+        }
+        writel(mask, &chip->mixer.array->src_gain_enable);
+        lola_codec_flush(chip);
+        if (chip->mixer.caps & LOLA_PEAK_METER_CAN_AGC_MASK) {
+                /* update for all srcs at once */
+                return lola_codec_write(chip, chip->mixer.nid,
+                                        LOLA_VERB_SET_SOURCE_GAIN, 0x80, 0);
+        }
+        /* update manually */
+        for (i = 0; i < LOLA_MIXER_DIM; i++) {
+                if (mask & (1 << i)) {
+                        lola_codec_write(chip, chip->mixer.nid,
+                                         LOLA_VERB_SET_SOURCE_GAIN, i, 0);
+                }
+        }
+        return 0;
+}
+#endif /* not used */
+
+static int lola_mixer_set_mapping_gain(struct lola *chip,
+                                       unsigned int src, unsigned int dest,
+                                       unsigned short gain, bool on)
+{
+        unsigned int val;
+
+        if (!(chip->mixer.src_mask & (1 << src)) ||
+            !(chip->mixer.dest_mask & (1 << dest)))
+                return -EINVAL;
+        if (on)
+                writew(gain, &chip->mixer.array->dest_mix_gain[dest][src]);
+        val = readl(&chip->mixer.array->dest_mix_gain_enable[dest]);
+        if (on)
+                val |= (1 << src);
+        else
+                val &= ~(1 << src);
+        writel(val, &chip->mixer.array->dest_mix_gain_enable[dest]);
+        lola_codec_flush(chip);
+        return lola_codec_write(chip, chip->mixer.nid, LOLA_VERB_SET_MIX_GAIN,
+                                src, dest);
+}
+
+static int lola_mixer_set_dest_gains(struct lola *chip, unsigned int id,
+                                     unsigned int mask, unsigned short *gains)
+{
+        int i;
+
+        if (!(chip->mixer.dest_mask & (1 << id)) ||
+            (chip->mixer.src_mask & mask) != mask)
+                return -EINVAL;
+        for (i = 0; i < LOLA_MIXER_DIM; i++) {
+                if (mask & (1 << i)) {
+                        writew(*gains, &chip->mixer.array->dest_mix_gain[id][i]);
+                        gains++;
+                }
+        }
+        writel(mask, &chip->mixer.array->dest_mix_gain_enable[id]);
+        lola_codec_flush(chip);
+        /* update for all dests at once */
+        return lola_codec_write(chip, chip->mixer.nid,
+                                LOLA_VERB_SET_DESTINATION_GAIN, id, 0);
+}
+
+/*
+ */
+
+static int set_analog_volume(struct lola *chip, int dir,
+                             unsigned int idx, unsigned int val,
+                             bool external_call);
+
+int lola_setup_all_analog_gains(struct lola *chip, int dir, bool mute)
+{
+        struct lola_pin *pin;
+        int idx, max_idx;
+
+        pin = chip->pin[dir].pins;
+        max_idx = chip->pin[dir].num_pins;
+        for (idx = 0; idx < max_idx; idx++) {
+                if (pin[idx].is_analog) {
+                        unsigned int val = mute ? 0 : pin[idx].cur_gain_step;
+                        /* set volume and do not save the value */
+                        set_analog_volume(chip, dir, idx, val, false);
+                }
+        }
+        return lola_codec_flush(chip);
+}
+
+void lola_save_mixer(struct lola *chip)
+{
+        /* mute analog output */
+        if (chip->mixer.array_saved) {
+                /* store contents of mixer array */
+                memcpy_fromio(chip->mixer.array_saved, chip->mixer.array,
+                              sizeof(*chip->mixer.array));
+        }
+        lola_setup_all_analog_gains(chip, PLAY, true); /* output mute */
+}
+
+void lola_restore_mixer(struct lola *chip)
+{
+        int i;
+
+        /*lola_reset_setups(chip);*/
+        if (chip->mixer.array_saved) {
+                /* restore contents of mixer array */
+                memcpy_toio(chip->mixer.array, chip->mixer.array_saved,
+                            sizeof(*chip->mixer.array));
+                /* inform micro-controller about all restored values
+                 * and ignore return values
+                 */
+                for (i = 0; i < chip->mixer.src_phys_ins; i++)
+                        lola_codec_write(chip, chip->mixer.nid,
+                                         LOLA_VERB_SET_SOURCE_GAIN,
+                                         i, 0);
+                for (i = 0; i < chip->mixer.src_stream_outs; i++)
+                        lola_codec_write(chip, chip->mixer.nid,
+                                         LOLA_VERB_SET_SOURCE_GAIN,
+                                         chip->mixer.src_stream_out_ofs + i, 0);
+                for (i = 0; i < chip->mixer.dest_stream_ins; i++)
+                        lola_codec_write(chip, chip->mixer.nid,
+                                         LOLA_VERB_SET_DESTINATION_GAIN,
+                                         i, 0);
+                for (i = 0; i < chip->mixer.dest_phys_outs; i++)
+                        lola_codec_write(chip, chip->mixer.nid,
+                                         LOLA_VERB_SET_DESTINATION_GAIN,
+                                         chip->mixer.dest_phys_out_ofs + i, 0);
+                lola_codec_flush(chip);
+        }
+}
+
+/*
+ */
+
+static int set_analog_volume(struct lola *chip, int dir,
+                             unsigned int idx, unsigned int val,
+                             bool external_call)
+{
+        struct lola_pin *pin;
+        int err;
+
+        if (idx >= chip->pin[dir].num_pins)
+                return -EINVAL;
+        pin = &chip->pin[dir].pins[idx];
+        if (!pin->is_analog || pin->amp_num_steps <= val)
+                return -EINVAL;
+        if (external_call && pin->cur_gain_step == val)
+                return 0;
+        if (external_call)
+                lola_codec_flush(chip);
+        err = lola_codec_write(chip, pin->nid,
+                               LOLA_VERB_SET_AMP_GAIN_MUTE, val, 0);
+        if (err < 0)
+                return err;
+        if (external_call)
+                pin->cur_gain_step = val;
+        return 0;
+}
+
+int lola_set_src_config(struct lola *chip, unsigned int src_mask, bool update)
+{
+        int ret = 0;
+        int success = 0;
+        int n, err;
+
+        /* SRC can be activated and the dwInputSRCMask is valid? */
+        if ((chip->input_src_caps_mask & src_mask) != src_mask)
+                return -EINVAL;
+        /* handle all even Inputs - SRC is a stereo setting !!! */
+        for (n = 0; n < chip->pin[CAPT].num_pins; n += 2) {
+                unsigned int mask = 3U << n; /* handle the stereo case */
+                unsigned int new_src, src_state;
+                if (!(chip->input_src_caps_mask & mask))
+                        continue;
+                /* if one IO needs SRC, both stereo IO will get SRC */
+                new_src = (src_mask & mask) != 0;
+                if (update) {
+                        src_state = (chip->input_src_mask & mask) != 0;
+                        if (src_state == new_src)
+                                continue;   /* nothing to change for this IO */
+                }
+                err = lola_codec_write(chip, chip->pcm[CAPT].streams[n].nid,
+                                       LOLA_VERB_SET_SRC, new_src, 0);
+                if (!err)
+                        success++;
+                else
+                        ret = err;
+        }
+        if (success)
+                ret = lola_codec_flush(chip);
+        if (!ret)
+                chip->input_src_mask = src_mask;
+        return ret;
+}
+
+/*
+ */
+static int init_mixer_values(struct lola *chip)
+{
+        int i;
+
+        /* all src on */
+        lola_set_src_config(chip, (1 << chip->pin[CAPT].num_pins) - 1, false);
+
+        /* clear all matrix */
+        memset_io(chip->mixer.array, 0, sizeof(*chip->mixer.array));
+        /* set src gain to 0dB */
+        for (i = 0; i < chip->mixer.src_phys_ins; i++)
+                lola_mixer_set_src_gain(chip, i, 336, true); /* 0dB */
+        for (i = 0; i < chip->mixer.src_stream_outs; i++)
+                lola_mixer_set_src_gain(chip,
+                                        i + chip->mixer.src_stream_out_ofs,
+                                        336, true); /* 0dB */
+        /* set 1:1 dest gain */
+        for (i = 0; i < chip->mixer.dest_stream_ins; i++) {
+                int src = i % chip->mixer.src_phys_ins;
+                lola_mixer_set_mapping_gain(chip, src, i, 336, true);
+        }
+        for (i = 0; i < chip->mixer.src_stream_outs; i++) {
+                int src = chip->mixer.src_stream_out_ofs + i;
+                int dst = chip->mixer.dest_phys_out_ofs +
+                        i % chip->mixer.dest_phys_outs;
+                lola_mixer_set_mapping_gain(chip, src, dst, 336, true);
+        }
+        return 0;
+}
+
+/*
+ * analog mixer control element
+ */
+static int lola_analog_vol_info(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_info *uinfo)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int dir = kcontrol->private_value;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = chip->pin[dir].num_pins;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = chip->pin[dir].pins[0].amp_num_steps;
+        return 0;
+}
+
+static int lola_analog_vol_get(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int dir = kcontrol->private_value;
+        int i;
+
+        for (i = 0; i < chip->pin[dir].num_pins; i++)
+                ucontrol->value.integer.value[i] =
+                        chip->pin[dir].pins[i].cur_gain_step;
+        return 0;
+}
+
+static int lola_analog_vol_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int dir = kcontrol->private_value;
+        int i, err;
+
+        for (i = 0; i < chip->pin[dir].num_pins; i++) {
+                err = set_analog_volume(chip, dir, i,
+                                        ucontrol->value.integer.value[i],
+                                        true);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
+static int lola_analog_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+                               unsigned int size, unsigned int __user *tlv)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int dir = kcontrol->private_value;
+        unsigned int val1, val2;
+        struct lola_pin *pin;
+
+        if (size < 4 * sizeof(unsigned int))
+                return -ENOMEM;
+        pin = &chip->pin[dir].pins[0];
+
+        val2 = pin->amp_step_size * 25;
+        val1 = -1 * (int)pin->amp_offset * (int)val2;
+#ifdef TLV_DB_SCALE_MUTE
+        val2 |= TLV_DB_SCALE_MUTE;
+#endif
+        if (put_user(SNDRV_CTL_TLVT_DB_SCALE, tlv))
+                return -EFAULT;
+        if (put_user(2 * sizeof(unsigned int), tlv + 1))
+                return -EFAULT;
+        if (put_user(val1, tlv + 2))
+                return -EFAULT;
+        if (put_user(val2, tlv + 3))
+                return -EFAULT;
+        return 0;
+}
+
+static struct snd_kcontrol_new lola_analog_mixer __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_READ |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK),
+        .info = lola_analog_vol_info,
+        .get = lola_analog_vol_get,
+        .put = lola_analog_vol_put,
+        .tlv.c = lola_analog_vol_tlv,
+};
+
+static int __devinit create_analog_mixer(struct lola *chip, int dir, char *name)
+{
+        if (!chip->pin[dir].num_pins)
+                return 0;
+        /* no analog volumes on digital only adapters */
+        if (chip->pin[dir].num_pins != chip->pin[dir].num_analog_pins)
+                return 0;
+        lola_analog_mixer.name = name;
+        lola_analog_mixer.private_value = dir;
+        return snd_ctl_add(chip->card,
+                           snd_ctl_new1(&lola_analog_mixer, chip));
+}
+
+/*
+ * Hardware sample rate converter on digital input
+ */
+static int lola_input_src_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = chip->pin[CAPT].num_pins;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int lola_input_src_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int i;
+
+        for (i = 0; i < chip->pin[CAPT].num_pins; i++)
+                ucontrol->value.integer.value[i] =
+                        !!(chip->input_src_mask & (1 << i));
+        return 0;
+}
+
+static int lola_input_src_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        int i;
+        unsigned int mask;
+
+        mask = 0;
+        for (i = 0; i < chip->pin[CAPT].num_pins; i++)
+                if (ucontrol->value.integer.value[i])
+                        mask |= 1 << i;
+        return lola_set_src_config(chip, mask, true);
+}
+
+static struct snd_kcontrol_new lola_input_src_mixer __devinitdata = {
+        .name = "Digital SRC Capture Switch",
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .info = lola_input_src_info,
+        .get = lola_input_src_get,
+        .put = lola_input_src_put,
+};
+
+/*
+ * Lola16161 or Lola881 can have Hardware sample rate converters
+ * on its digital input pins
+ */
+static int __devinit create_input_src_mixer(struct lola *chip)
+{
+        if (!chip->input_src_caps_mask)
+                return 0;
+
+        return snd_ctl_add(chip->card,
+                           snd_ctl_new1(&lola_input_src_mixer, chip));
+}
+
+/*
+ * src gain mixer
+ */
+static int lola_src_gain_info(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_info *uinfo)
+{
+        unsigned int count = (kcontrol->private_value >> 8) & 0xff;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = count;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 409;
+        return 0;
+}
+
+static int lola_src_gain_get(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        unsigned int ofs = kcontrol->private_value & 0xff;
+        unsigned int count = (kcontrol->private_value >> 8) & 0xff;
+        unsigned int mask, i;
+
+        mask = readl(&chip->mixer.array->src_gain_enable);
+        for (i = 0; i < count; i++) {
+                unsigned int idx = ofs + i;
+                unsigned short val;
+                if (!(chip->mixer.src_mask & (1 << idx)))
+                        return -EINVAL;
+                if (mask & (1 << idx))
+                        val = readw(&chip->mixer.array->src_gain[idx]) + 1;
+                else
+                        val = 0;
+                ucontrol->value.integer.value[i] = val;
+        }
+        return 0;
+}
+
+static int lola_src_gain_put(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        unsigned int ofs = kcontrol->private_value & 0xff;
+        unsigned int count = (kcontrol->private_value >> 8) & 0xff;
+        int i, err;
+
+        for (i = 0; i < count; i++) {
+                unsigned int idx = ofs + i;
+                unsigned short val = ucontrol->value.integer.value[i];
+                if (val)
+                        val--;
+                err = lola_mixer_set_src_gain(chip, idx, val, !!val);
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
+/* raw value: 0 = -84dB, 336 = 0dB, 408=18dB, incremented 1 for mute */
+static const DECLARE_TLV_DB_SCALE(lola_src_gain_tlv, -8425, 25, 1);
+
+static struct snd_kcontrol_new lola_src_gain_mixer __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
+        .info = lola_src_gain_info,
+        .get = lola_src_gain_get,
+        .put = lola_src_gain_put,
+        .tlv.p = lola_src_gain_tlv,
+};
+
+static int __devinit create_src_gain_mixer(struct lola *chip,
+                                           int num, int ofs, char *name)
+{
+        lola_src_gain_mixer.name = name;
+        lola_src_gain_mixer.private_value = ofs + (num << 8);
+        return snd_ctl_add(chip->card,
+                           snd_ctl_new1(&lola_src_gain_mixer, chip));
+}
+
+/*
+ * destination gain (matrix-like) mixer
+ */
+static int lola_dest_gain_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo)
+{
+        unsigned int src_num = (kcontrol->private_value >> 8) & 0xff;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = src_num;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 433;
+        return 0;
+}
+
+static int lola_dest_gain_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        unsigned int src_ofs = kcontrol->private_value & 0xff;
+        unsigned int src_num = (kcontrol->private_value >> 8) & 0xff;
+        unsigned int dst_ofs = (kcontrol->private_value >> 16) & 0xff;
+        unsigned int dst, mask, i;
+
+        dst = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + dst_ofs;
+        mask = readl(&chip->mixer.array->dest_mix_gain_enable[dst]);
+        for (i = 0; i < src_num; i++) {
+                unsigned int src = src_ofs + i;
+                unsigned short val;
+                if (!(chip->mixer.src_mask & (1 << src)))
+                        return -EINVAL;
+                if (mask & (1 << dst))
+                        val = readw(&chip->mixer.array->dest_mix_gain[dst][src]) + 1;
+                else
+                        val = 0;
+                ucontrol->value.integer.value[i] = val;
+        }
+        return 0;
+}
+
+static int lola_dest_gain_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct lola *chip = snd_kcontrol_chip(kcontrol);
+        unsigned int src_ofs = kcontrol->private_value & 0xff;
+        unsigned int src_num = (kcontrol->private_value >> 8) & 0xff;
+        unsigned int dst_ofs = (kcontrol->private_value >> 16) & 0xff;
+        unsigned int dst, mask;
+        unsigned short gains[MAX_STREAM_COUNT];
+        int i, num;
+
+        mask = 0;
+        num = 0;
+        for (i = 0; i < src_num; i++) {
+                unsigned short val = ucontrol->value.integer.value[i];
+                if (val) {
+                        gains[num++] = val - 1;
+                        mask |= 1 << i;
+                }
+        }
+        mask <<= src_ofs;
+        dst = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id) + dst_ofs;
+        return lola_mixer_set_dest_gains(chip, dst, mask, gains);
+}
+
+static const DECLARE_TLV_DB_SCALE(lola_dest_gain_tlv, -8425, 25, 1);
+
+static struct snd_kcontrol_new lola_dest_gain_mixer __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
+        .info = lola_dest_gain_info,
+        .get = lola_dest_gain_get,
+        .put = lola_dest_gain_put,
+        .tlv.p = lola_dest_gain_tlv,
+};
+
+static int __devinit create_dest_gain_mixer(struct lola *chip,
+                                            int src_num, int src_ofs,
+                                            int num, int ofs, char *name)
+{
+        lola_dest_gain_mixer.count = num;
+        lola_dest_gain_mixer.name = name;
+        lola_dest_gain_mixer.private_value =
+                src_ofs + (src_num << 8) + (ofs << 16) + (num << 24);
+        return snd_ctl_add(chip->card,
+                          snd_ctl_new1(&lola_dest_gain_mixer, chip));
+}
+
+/*
+ */
+int __devinit lola_create_mixer(struct lola *chip)
+{
+        int err;
+
+        err = create_analog_mixer(chip, PLAY, "Analog Playback Volume");
+        if (err < 0)
+                return err;
+        err = create_analog_mixer(chip, CAPT, "Analog Capture Volume");
+        if (err < 0)
+                return err;
+        err = create_input_src_mixer(chip);
+        if (err < 0)
+                return err;
+        err = create_src_gain_mixer(chip, chip->mixer.src_phys_ins, 0,
+                                    "Line Source Gain Volume");
+        if (err < 0)
+                return err;
+        err = create_src_gain_mixer(chip, chip->mixer.src_stream_outs,
+                                    chip->mixer.src_stream_out_ofs,
+                                    "Stream Source Gain Volume");
+        if (err < 0)
+                return err;
+        err = create_dest_gain_mixer(chip,
+                                     chip->mixer.src_phys_ins, 0,
+                                     chip->mixer.dest_stream_ins, 0,
+                                     "Line Capture Volume");
+        if (err < 0)
+                return err;
+        err = create_dest_gain_mixer(chip,
+                                     chip->mixer.src_stream_outs,
+                                     chip->mixer.src_stream_out_ofs,
+                                     chip->mixer.dest_stream_ins, 0,
+                                     "Stream-Loopback Capture Volume");
+        if (err < 0)
+                return err;
+        err = create_dest_gain_mixer(chip,
+                                     chip->mixer.src_phys_ins, 0,
+                                     chip->mixer.dest_phys_outs,
+                                     chip->mixer.dest_phys_out_ofs,
+                                     "Line-Loopback Playback Volume");
+        if (err < 0)
+                return err;
+        err = create_dest_gain_mixer(chip,
+                                     chip->mixer.src_stream_outs,
+                                     chip->mixer.src_stream_out_ofs,
+                                     chip->mixer.dest_phys_outs,
+                                     chip->mixer.dest_phys_out_ofs,
+                                     "Stream Playback Volume");
+        if (err < 0)
+                return err;
+
+        return init_mixer_values(chip);
+}
diff --git a/sound/pci/lola/lola_pcm.c b/sound/pci/lola/lola_pcm.c
new file mode 100644
index 000000000000..c44db68eecb5
--- /dev/null
+++ b/sound/pci/lola/lola_pcm.c
@@ -0,0 +1,706 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include "lola.h"
+
+#define LOLA_MAX_BDL_ENTRIES    8
+#define LOLA_MAX_BUF_SIZE       (1024*1024*1024)
+#define LOLA_BDL_ENTRY_SIZE     (16 * 16)
+
+static struct lola_pcm *lola_get_pcm(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        return &chip->pcm[substream->stream];
+}
+
+static struct lola_stream *lola_get_stream(struct snd_pcm_substream *substream)
+{
+        struct lola_pcm *pcm = lola_get_pcm(substream);
+        unsigned int idx = substream->number;
+        return &pcm->streams[idx];
+}
+
+static unsigned int lola_get_lrc(struct lola *chip)
+{
+        return lola_readl(chip, BAR1, LRC);
+}
+
+static unsigned int lola_get_tstamp(struct lola *chip, bool quick_no_sync)
+{
+        unsigned int tstamp = lola_get_lrc(chip) >> 8;
+        if (chip->granularity) {
+                unsigned int wait_banks = quick_no_sync ? 0 : 8;
+                tstamp += (wait_banks + 1) * chip->granularity - 1;
+                tstamp -= tstamp % chip->granularity;
+        }
+        return tstamp << 8;
+}
+
+/* clear any pending interrupt status */
+static void lola_stream_clear_pending_irq(struct lola *chip,
+                                          struct lola_stream *str)
+{
+        unsigned int val = lola_dsd_read(chip, str->dsd, STS);
+        val &= LOLA_DSD_STS_DESE | LOLA_DSD_STS_BCIS;
+        if (val)
+                lola_dsd_write(chip, str->dsd, STS, val);
+}
+
+static void lola_stream_start(struct lola *chip, struct lola_stream *str,
+                              unsigned int tstamp)
+{
+        lola_stream_clear_pending_irq(chip, str);
+        lola_dsd_write(chip, str->dsd, CTL,
+                       LOLA_DSD_CTL_SRUN |
+                       LOLA_DSD_CTL_IOCE |
+                       LOLA_DSD_CTL_DEIE |
+                       LOLA_DSD_CTL_VLRCV |
+                       tstamp);
+}
+
+static void lola_stream_stop(struct lola *chip, struct lola_stream *str,
+                             unsigned int tstamp)
+{
+        lola_dsd_write(chip, str->dsd, CTL,
+                       LOLA_DSD_CTL_IOCE |
+                       LOLA_DSD_CTL_DEIE |
+                       LOLA_DSD_CTL_VLRCV |
+                       tstamp);
+        lola_stream_clear_pending_irq(chip, str);
+}
+
+static void wait_for_srst_clear(struct lola *chip, struct lola_stream *str)
+{
+        unsigned long end_time = jiffies + msecs_to_jiffies(200);
+        while (time_before(jiffies, end_time)) {
+                unsigned int val;
+                val = lola_dsd_read(chip, str->dsd, CTL);
+                if (!(val & LOLA_DSD_CTL_SRST))
+                        return;
+                msleep(1);
+        }
+        printk(KERN_WARNING SFX "SRST not clear (stream %d)\n", str->dsd);
+}
+
+static int lola_stream_wait_for_fifo(struct lola *chip,
+                                     struct lola_stream *str,
+                                     bool ready)
+{
+        unsigned int val = ready ? LOLA_DSD_STS_FIFORDY : 0;
+        unsigned long end_time = jiffies + msecs_to_jiffies(200);
+        while (time_before(jiffies, end_time)) {
+                unsigned int reg = lola_dsd_read(chip, str->dsd, STS);
+                if ((reg & LOLA_DSD_STS_FIFORDY) == val)
+                        return 0;
+                msleep(1);
+        }
+        printk(KERN_WARNING SFX "FIFO not ready (stream %d)\n", str->dsd);
+        return -EIO;
+}
+
+/* sync for FIFO ready/empty for all linked streams;
+ * clear paused flag when FIFO gets ready again
+ */
+static int lola_sync_wait_for_fifo(struct lola *chip,
+                                   struct snd_pcm_substream *substream,
+                                   bool ready)
+{
+        unsigned int val = ready ? LOLA_DSD_STS_FIFORDY : 0;
+        unsigned long end_time = jiffies + msecs_to_jiffies(200);
+        struct snd_pcm_substream *s;
+        int pending = 0;
+
+        while (time_before(jiffies, end_time)) {
+                pending = 0;
+                snd_pcm_group_for_each_entry(s, substream) {
+                        struct lola_stream *str;
+                        if (s->pcm->card != substream->pcm->card)
+                                continue;
+                        str = lola_get_stream(s);
+                        if (str->prepared && str->paused) {
+                                unsigned int reg;
+                                reg = lola_dsd_read(chip, str->dsd, STS);
+                                if ((reg & LOLA_DSD_STS_FIFORDY) != val) {
+                                        pending = str->dsd + 1;
+                                        break;
+                                }
+                                if (ready)
+                                        str->paused = 0;
+                        }
+                }
+                if (!pending)
+                        return 0;
+                msleep(1);
+        }
+        printk(KERN_WARNING SFX "FIFO not ready (pending %d)\n", pending - 1);
+        return -EIO;
+}
+
+/* finish pause - prepare for a new resume */
+static void lola_sync_pause(struct lola *chip,
+                            struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_substream *s;
+
+        lola_sync_wait_for_fifo(chip, substream, false);
+        snd_pcm_group_for_each_entry(s, substream) {
+                struct lola_stream *str;
+                if (s->pcm->card != substream->pcm->card)
+                        continue;
+                str = lola_get_stream(s);
+                if (str->paused && str->prepared)
+                        lola_dsd_write(chip, str->dsd, CTL, LOLA_DSD_CTL_SRUN |
+                                       LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE);
+        }
+        lola_sync_wait_for_fifo(chip, substream, true);
+}
+
+static void lola_stream_reset(struct lola *chip, struct lola_stream *str)
+{
+        if (str->prepared) {
+                if (str->paused)
+                        lola_sync_pause(chip, str->substream);
+                str->prepared = 0;
+                lola_dsd_write(chip, str->dsd, CTL,
+                               LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE);
+                lola_stream_wait_for_fifo(chip, str, false);
+                lola_stream_clear_pending_irq(chip, str);
+                lola_dsd_write(chip, str->dsd, CTL, LOLA_DSD_CTL_SRST);
+                lola_dsd_write(chip, str->dsd, LVI, 0);
+                lola_dsd_write(chip, str->dsd, BDPU, 0);
+                lola_dsd_write(chip, str->dsd, BDPL, 0);
+                wait_for_srst_clear(chip, str);
+        }
+}
+
+static struct snd_pcm_hardware lola_pcm_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID |
+                                 SNDRV_PCM_INFO_PAUSE),
+        .formats =              (SNDRV_PCM_FMTBIT_S16_LE |
+                                 SNDRV_PCM_FMTBIT_S24_LE |
+                                 SNDRV_PCM_FMTBIT_S32_LE |
+                                 SNDRV_PCM_FMTBIT_FLOAT_LE),
+        .rates =                SNDRV_PCM_RATE_8000_192000,
+        .rate_min =             8000,
+        .rate_max =             192000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     LOLA_MAX_BUF_SIZE,
+        .period_bytes_min =     128,
+        .period_bytes_max =     LOLA_MAX_BUF_SIZE / 2,
+        .periods_min =          2,
+        .periods_max =          LOLA_MAX_BDL_ENTRIES,
+        .fifo_size =            0,
+};
+
+static int lola_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_pcm *pcm = lola_get_pcm(substream);
+        struct lola_stream *str = lola_get_stream(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        mutex_lock(&chip->open_mutex);
+        if (str->opened) {
+                mutex_unlock(&chip->open_mutex);
+                return -EBUSY;
+        }
+        str->substream = substream;
+        str->master = NULL;
+        str->opened = 1;
+        runtime->hw = lola_pcm_hw;
+        runtime->hw.channels_max = pcm->num_streams - str->index;
+        if (chip->sample_rate) {
+                /* sample rate is locked */
+                runtime->hw.rate_min = chip->sample_rate;
+                runtime->hw.rate_max = chip->sample_rate;
+        } else {
+                runtime->hw.rate_min = chip->sample_rate_min;
+                runtime->hw.rate_max = chip->sample_rate_max;
+        }
+        chip->ref_count_rate++;
+        snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        /* period size = multiple of chip->granularity (8, 16 or 32 frames)*/
+        snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                   chip->granularity);
+        snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                   chip->granularity);
+        mutex_unlock(&chip->open_mutex);
+        return 0;
+}
+
+static void lola_cleanup_slave_streams(struct lola_pcm *pcm,
+                                       struct lola_stream *str)
+{
+        int i;
+        for (i = str->index + 1; i < pcm->num_streams; i++) {
+                struct lola_stream *s = &pcm->streams[i];
+                if (s->master != str)
+                        break;
+                s->master = NULL;
+                s->opened = 0;
+        }
+}
+
+static int lola_pcm_close(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_stream *str = lola_get_stream(substream);
+
+        mutex_lock(&chip->open_mutex);
+        if (str->substream == substream) {
+                str->substream = NULL;
+                str->opened = 0;
+        }
+        if (--chip->ref_count_rate == 0) {
+                /* release sample rate */
+                chip->sample_rate = 0;
+        }
+        mutex_unlock(&chip->open_mutex);
+        return 0;
+}
+
+static int lola_pcm_hw_params(struct snd_pcm_substream *substream,
+                              struct snd_pcm_hw_params *hw_params)
+{
+        struct lola_stream *str = lola_get_stream(substream);
+
+        str->bufsize = 0;
+        str->period_bytes = 0;
+        str->format_verb = 0;
+        return snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
+}
+
+static int lola_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_pcm *pcm = lola_get_pcm(substream);
+        struct lola_stream *str = lola_get_stream(substream);
+
+        mutex_lock(&chip->open_mutex);
+        lola_stream_reset(chip, str);
+        lola_cleanup_slave_streams(pcm, str);
+        mutex_unlock(&chip->open_mutex);
+        return snd_pcm_lib_free_pages(substream);
+}
+
+/*
+ * set up a BDL entry
+ */
+static int setup_bdle(struct snd_pcm_substream *substream,
+                      struct lola_stream *str, u32 **bdlp,
+                      int ofs, int size)
+{
+        u32 *bdl = *bdlp;
+
+        while (size > 0) {
+                dma_addr_t addr;
+                int chunk;
+
+                if (str->frags >= LOLA_MAX_BDL_ENTRIES)
+                        return -EINVAL;
+
+                addr = snd_pcm_sgbuf_get_addr(substream, ofs);
+                /* program the address field of the BDL entry */
+                bdl[0] = cpu_to_le32((u32)addr);
+                bdl[1] = cpu_to_le32(upper_32_bits(addr));
+                /* program the size field of the BDL entry */
+                chunk = snd_pcm_sgbuf_get_chunk_size(substream, ofs, size);
+                bdl[2] = cpu_to_le32(chunk);
+                /* program the IOC to enable interrupt
+                 * only when the whole fragment is processed
+                 */
+                size -= chunk;
+                bdl[3] = size ? 0 : cpu_to_le32(0x01);
+                bdl += 4;
+                str->frags++;
+                ofs += chunk;
+        }
+        *bdlp = bdl;
+        return ofs;
+}
+
+/*
+ * set up BDL entries
+ */
+static int lola_setup_periods(struct lola *chip, struct lola_pcm *pcm,
+                              struct snd_pcm_substream *substream,
+                              struct lola_stream *str)
+{
+        u32 *bdl;
+        int i, ofs, periods, period_bytes;
+
+        period_bytes = str->period_bytes;
+        periods = str->bufsize / period_bytes;
+
+        /* program the initial BDL entries */
+        bdl = (u32 *)(pcm->bdl.area + LOLA_BDL_ENTRY_SIZE * str->index);
+        ofs = 0;
+        str->frags = 0;
+        for (i = 0; i < periods; i++) {
+                ofs = setup_bdle(substream, str, &bdl, ofs, period_bytes);
+                if (ofs < 0)
+                        goto error;
+        }
+        return 0;
+
+ error:
+        snd_printk(KERN_ERR SFX "Too many BDL entries: buffer=%d, period=%d\n",
+                   str->bufsize, period_bytes);
+        return -EINVAL;
+}
+
+static unsigned int lola_get_format_verb(struct snd_pcm_substream *substream)
+{
+        unsigned int verb;
+
+        switch (substream->runtime->format) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                verb = 0x00000000;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                verb = 0x00000200;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                verb = 0x00000300;
+                break;
+        case SNDRV_PCM_FORMAT_FLOAT_LE:
+                verb = 0x00001300;
+                break;
+        default:
+                return 0;
+        }
+        verb |= substream->runtime->channels;
+        return verb;
+}
+
+static int lola_set_stream_config(struct lola *chip,
+                                  struct lola_stream *str,
+                                  int channels)
+{
+        int i, err;
+        unsigned int verb, val;
+
+        /* set format info for all channels
+         * (with only one command for the first channel)
+         */
+        err = lola_codec_read(chip, str->nid, LOLA_VERB_SET_STREAM_FORMAT,
+                              str->format_verb, 0, &val, NULL);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Cannot set stream format 0x%x\n",
+                       str->format_verb);
+                return err;
+        }
+
+        /* update stream - channel config */
+        for (i = 0; i < channels; i++) {
+                verb = (str->index << 6) | i;
+                err = lola_codec_read(chip, str[i].nid,
+                                      LOLA_VERB_SET_CHANNEL_STREAMID, 0, verb,
+                                      &val, NULL);
+                if (err < 0) {
+                        printk(KERN_ERR SFX "Cannot set stream channel %d\n", i);
+                        return err;
+                }
+        }
+        return 0;
+}
+
+/*
+ * set up the SD for streaming
+ */
+static int lola_setup_controller(struct lola *chip, struct lola_pcm *pcm,
+                                 struct lola_stream *str)
+{
+        dma_addr_t bdl;
+
+        if (str->prepared)
+                return -EINVAL;
+
+        /* set up BDL */
+        bdl = pcm->bdl.addr + LOLA_BDL_ENTRY_SIZE * str->index;
+        lola_dsd_write(chip, str->dsd, BDPL, (u32)bdl);
+        lola_dsd_write(chip, str->dsd, BDPU, upper_32_bits(bdl));
+        /* program the stream LVI (last valid index) of the BDL */
+        lola_dsd_write(chip, str->dsd, LVI, str->frags - 1);
+        lola_stream_clear_pending_irq(chip, str);
+
+        lola_dsd_write(chip, str->dsd, CTL,
+                       LOLA_DSD_CTL_IOCE | LOLA_DSD_CTL_DEIE | LOLA_DSD_CTL_SRUN);
+
+        str->prepared = 1;
+
+        return lola_stream_wait_for_fifo(chip, str, true);
+}
+
+static int lola_pcm_prepare(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_pcm *pcm = lola_get_pcm(substream);
+        struct lola_stream *str = lola_get_stream(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        unsigned int bufsize, period_bytes, format_verb;
+        int i, err;
+
+        mutex_lock(&chip->open_mutex);
+        lola_stream_reset(chip, str);
+        lola_cleanup_slave_streams(pcm, str);
+        if (str->index + runtime->channels > pcm->num_streams) {
+                mutex_unlock(&chip->open_mutex);
+                return -EINVAL;
+        }
+        for (i = 1; i < runtime->channels; i++) {
+                str[i].master = str;
+                str[i].opened = 1;
+        }
+        mutex_unlock(&chip->open_mutex);
+
+        bufsize = snd_pcm_lib_buffer_bytes(substream);
+        period_bytes = snd_pcm_lib_period_bytes(substream);
+        format_verb = lola_get_format_verb(substream);
+
+        str->bufsize = bufsize;
+        str->period_bytes = period_bytes;
+        str->format_verb = format_verb;
+
+        err = lola_setup_periods(chip, pcm, substream, str);
+        if (err < 0)
+                return err;
+
+        err = lola_set_sample_rate(chip, runtime->rate);
+        if (err < 0)
+                return err;
+        chip->sample_rate = runtime->rate;      /* sample rate gets locked */
+
+        err = lola_set_stream_config(chip, str, runtime->channels);
+        if (err < 0)
+                return err;
+
+        err = lola_setup_controller(chip, pcm, str);
+        if (err < 0) {
+                lola_stream_reset(chip, str);
+                return err;
+        }
+
+        return 0;
+}
+
+static int lola_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_stream *str;
+        struct snd_pcm_substream *s;
+        unsigned int start;
+        unsigned int tstamp;
+        bool sync_streams;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                start = 1;
+                break;
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_STOP:
+                start = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /*
+         * sample correct synchronization is only needed starting several
+         * streams. On stop or if only one stream do as quick as possible
+         */
+        sync_streams = (start && snd_pcm_stream_linked(substream));
+        tstamp = lola_get_tstamp(chip, !sync_streams);
+        spin_lock(&chip->reg_lock);
+        snd_pcm_group_for_each_entry(s, substream) {
+                if (s->pcm->card != substream->pcm->card)
+                        continue;
+                str = lola_get_stream(s);
+                if (start)
+                        lola_stream_start(chip, str, tstamp);
+                else
+                        lola_stream_stop(chip, str, tstamp);
+                str->running = start;
+                str->paused = !start;
+                snd_pcm_trigger_done(s, substream);
+        }
+        spin_unlock(&chip->reg_lock);
+        return 0;
+}
+
+static snd_pcm_uframes_t lola_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct lola *chip = snd_pcm_substream_chip(substream);
+        struct lola_stream *str = lola_get_stream(substream);
+        unsigned int pos = lola_dsd_read(chip, str->dsd, LPIB);
+
+        if (pos >= str->bufsize)
+                pos = 0;
+        return bytes_to_frames(substream->runtime, pos);
+}
+
+void lola_pcm_update(struct lola *chip, struct lola_pcm *pcm, unsigned int bits)
+{
+        int i;
+
+        for (i = 0; bits && i < pcm->num_streams; i++) {
+                if (bits & (1 << i)) {
+                        struct lola_stream *str = &pcm->streams[i];
+                        if (str->substream && str->running)
+                                snd_pcm_period_elapsed(str->substream);
+                        bits &= ~(1 << i);
+                }
+        }
+}
+
+static struct snd_pcm_ops lola_pcm_ops = {
+        .open = lola_pcm_open,
+        .close = lola_pcm_close,
+        .ioctl = snd_pcm_lib_ioctl,
+        .hw_params = lola_pcm_hw_params,
+        .hw_free = lola_pcm_hw_free,
+        .prepare = lola_pcm_prepare,
+        .trigger = lola_pcm_trigger,
+        .pointer = lola_pcm_pointer,
+        .page = snd_pcm_sgbuf_ops_page,
+};
+
+int __devinit lola_create_pcm(struct lola *chip)
+{
+        struct snd_pcm *pcm;
+        int i, err;
+
+        for (i = 0; i < 2; i++) {
+                err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                          snd_dma_pci_data(chip->pci),
+                                          PAGE_SIZE, &chip->pcm[i].bdl);
+                if (err < 0)
+                        return err;
+        }
+
+        err = snd_pcm_new(chip->card, "Digigram Lola", 0,
+                          chip->pcm[SNDRV_PCM_STREAM_PLAYBACK].num_streams,
+                          chip->pcm[SNDRV_PCM_STREAM_CAPTURE].num_streams,
+                          &pcm);
+        if (err < 0)
+                return err;
+        strlcpy(pcm->name, "Digigram Lola", sizeof(pcm->name));
+        pcm->private_data = chip;
+        for (i = 0; i < 2; i++) {
+                if (chip->pcm[i].num_streams)
+                        snd_pcm_set_ops(pcm, i, &lola_pcm_ops);
+        }
+        /* buffer pre-allocation */
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              1024 * 64, 32 * 1024 * 1024);
+        return 0;
+}
+
+void lola_free_pcm(struct lola *chip)
+{
+        snd_dma_free_pages(&chip->pcm[0].bdl);
+        snd_dma_free_pages(&chip->pcm[1].bdl);
+}
+
+/*
+ */
+
+static int lola_init_stream(struct lola *chip, struct lola_stream *str,
+                            int idx, int nid, int dir)
+{
+        unsigned int val;
+        int err;
+
+        str->nid = nid;
+        str->index = idx;
+        str->dsd = idx;
+        if (dir == PLAY)
+                str->dsd += MAX_STREAM_IN_COUNT;
+        err = lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read wcaps for 0x%x\n", nid);
+                return err;
+        }
+        if (dir == PLAY) {
+                /* test TYPE and bits 0..11 (no test bit9 : Digital = 0/1) */
+                if ((val & 0x00f00dff) != 0x00000010) {
+                        printk(KERN_ERR SFX "Invalid wcaps 0x%x for 0x%x\n",
+                               val, nid);
+                        return -EINVAL;
+                }
+        } else {
+                /* test TYPE and bits 0..11 (no test bit9 : Digital = 0/1)
+                 * (bug : ignore bit8: Conn list = 0/1)
+                 */
+                if ((val & 0x00f00cff) != 0x00100010) {
+                        printk(KERN_ERR SFX "Invalid wcaps 0x%x for 0x%x\n",
+                               val, nid);
+                        return -EINVAL;
+                }
+                /* test bit9:DIGITAL and bit12:SRC_PRESENT*/
+                if ((val & 0x00001200) == 0x00001200)
+                        chip->input_src_caps_mask |= (1 << idx);
+        }
+
+        err = lola_read_param(chip, nid, LOLA_PAR_STREAM_FORMATS, &val);
+        if (err < 0) {
+                printk(KERN_ERR SFX "Can't read FORMATS 0x%x\n", nid);
+                return err;
+        }
+        val &= 3;
+        if (val == 3)
+                str->can_float = true;
+        if (!(val & 1)) {
+                printk(KERN_ERR SFX "Invalid formats 0x%x for 0x%x", val, nid);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+int __devinit lola_init_pcm(struct lola *chip, int dir, int *nidp)
+{
+        struct lola_pcm *pcm = &chip->pcm[dir];
+        int i, nid, err;
+
+        nid = *nidp;
+        for (i = 0; i < pcm->num_streams; i++, nid++) {
+                err = lola_init_stream(chip, &pcm->streams[i], i, nid, dir);
+                if (err < 0)
+                        return err;
+        }
+        *nidp = nid;
+        return 0;
+}
diff --git a/sound/pci/lola/lola_proc.c b/sound/pci/lola/lola_proc.c
new file mode 100644
index 000000000000..9d7daf897c9d
--- /dev/null
+++ b/sound/pci/lola/lola_proc.c
@@ -0,0 +1,222 @@
+/*
+ *  Support for Digigram Lola PCI-e boards
+ *
+ *  Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the License, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc., 59
+ *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <sound/core.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+#include "lola.h"
+
+static void print_audio_widget(struct snd_info_buffer *buffer,
+                               struct lola *chip, int nid, const char *name)
+{
+        unsigned int val;
+
+        lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        snd_iprintf(buffer, "Node 0x%02x %s wcaps 0x%x\n", nid, name, val);
+        lola_read_param(chip, nid, LOLA_PAR_STREAM_FORMATS, &val);
+        snd_iprintf(buffer, "  Formats: 0x%x\n", val);
+}
+
+static void print_pin_widget(struct snd_info_buffer *buffer,
+                             struct lola *chip, int nid, unsigned int ampcap,
+                             const char *name)
+{
+        unsigned int val;
+
+        lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        snd_iprintf(buffer, "Node 0x%02x %s wcaps 0x%x\n", nid, name, val);
+        if (val == 0x00400200)
+                return;
+        lola_read_param(chip, nid, ampcap, &val);
+        snd_iprintf(buffer, "  Amp-Caps: 0x%x\n", val);
+        snd_iprintf(buffer, "    mute=%d, step-size=%d, steps=%d, ofs=%d\n",
+                    LOLA_AMP_MUTE_CAPABLE(val),
+                    LOLA_AMP_STEP_SIZE(val),
+                    LOLA_AMP_NUM_STEPS(val),
+                    LOLA_AMP_OFFSET(val));
+        lola_codec_read(chip, nid, LOLA_VERB_GET_MAX_LEVEL, 0, 0, &val, NULL);
+        snd_iprintf(buffer, "  Max-level: 0x%x\n", val);
+}
+
+static void print_clock_widget(struct snd_info_buffer *buffer,
+                               struct lola *chip, int nid)
+{
+        int i, j, num_clocks;
+        unsigned int val;
+
+        lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        snd_iprintf(buffer, "Node 0x%02x [Clock] wcaps 0x%x\n", nid, val);
+        num_clocks = val & 0xff;
+        for (i = 0; i < num_clocks; i += 4) {
+                unsigned int res_ex;
+                unsigned short items[4];
+                const char *name;
+
+                lola_codec_read(chip, nid, LOLA_VERB_GET_CLOCK_LIST,
+                                i, 0, &val, &res_ex);
+                items[0] = val & 0xfff;
+                items[1] = (val >> 16) & 0xfff;
+                items[2] = res_ex & 0xfff;
+                items[3] = (res_ex >> 16) & 0xfff;
+                for (j = 0; j < 4; j++) {
+                        unsigned char type = items[j] >> 8;
+                        unsigned int freq = items[j] & 0xff;
+                        if (i + j >= num_clocks)
+                                break;
+                        if (type == LOLA_CLOCK_TYPE_INTERNAL) {
+                                name = "Internal";
+                                freq = lola_sample_rate_convert(freq);
+                        } else if (type == LOLA_CLOCK_TYPE_VIDEO) {
+                                name = "Video";
+                                freq = lola_sample_rate_convert(freq);
+                        } else {
+                                name = "Other";
+                        }
+                        snd_iprintf(buffer, "  Clock %d: Type %d:%s, freq=%d\n",
+                                    i + j, type, name, freq);
+                }
+        }
+}
+
+static void print_mixer_widget(struct snd_info_buffer *buffer,
+                               struct lola *chip, int nid)
+{
+        unsigned int val;
+
+        lola_read_param(chip, nid, LOLA_PAR_AUDIO_WIDGET_CAP, &val);
+        snd_iprintf(buffer, "Node 0x%02x [Mixer] wcaps 0x%x\n", nid, val);
+}
+
+static void lola_proc_codec_read(struct snd_info_entry *entry,
+                                 struct snd_info_buffer *buffer)
+{
+        struct lola *chip = entry->private_data;
+        unsigned int val;
+        int i, nid;
+
+        lola_read_param(chip, 0, LOLA_PAR_VENDOR_ID, &val);
+        snd_iprintf(buffer, "Vendor: 0x%08x\n", val);
+        lola_read_param(chip, 1, LOLA_PAR_FUNCTION_TYPE, &val);
+        snd_iprintf(buffer, "Function Type: %d\n", val);
+        lola_read_param(chip, 1, LOLA_PAR_SPECIFIC_CAPS, &val);
+        snd_iprintf(buffer, "Specific-Caps: 0x%08x\n", val);
+        snd_iprintf(buffer, "  Pins-In %d, Pins-Out %d\n",
+                    chip->pin[CAPT].num_pins, chip->pin[PLAY].num_pins);
+        nid = 2;
+        for (i = 0; i < chip->pcm[CAPT].num_streams; i++, nid++)
+                print_audio_widget(buffer, chip, nid, "[Audio-In]");
+        for (i = 0; i < chip->pcm[PLAY].num_streams; i++, nid++)
+                print_audio_widget(buffer, chip, nid, "[Audio-Out]");
+        for (i = 0; i < chip->pin[CAPT].num_pins; i++, nid++)
+                print_pin_widget(buffer, chip, nid, LOLA_PAR_AMP_IN_CAP,
+                                 "[Pin-In]");
+        for (i = 0; i < chip->pin[PLAY].num_pins; i++, nid++)
+                print_pin_widget(buffer, chip, nid, LOLA_PAR_AMP_OUT_CAP,
+                                 "[Pin-Out]");
+        if (LOLA_AFG_CLOCK_WIDGET_PRESENT(chip->lola_caps)) {
+                print_clock_widget(buffer, chip, nid);
+                nid++;
+        }
+        if (LOLA_AFG_MIXER_WIDGET_PRESENT(chip->lola_caps)) {
+                print_mixer_widget(buffer, chip, nid);
+                nid++;
+        }
+}
+
+/* direct codec access for debugging */
+static void lola_proc_codec_rw_write(struct snd_info_entry *entry,
+                                     struct snd_info_buffer *buffer)
+{
+        struct lola *chip = entry->private_data;
+        char line[64];
+        unsigned int id, verb, data, extdata;
+        while (!snd_info_get_line(buffer, line, sizeof(line))) {
+                if (sscanf(line, "%i %i %i %i", &id, &verb, &data, &extdata) != 4)
+                        continue;
+                lola_codec_read(chip, id, verb, data, extdata,
+                                &chip->debug_res,
+                                &chip->debug_res_ex);
+        }
+}
+
+static void lola_proc_codec_rw_read(struct snd_info_entry *entry,
+                                    struct snd_info_buffer *buffer)
+{
+        struct lola *chip = entry->private_data;
+        snd_iprintf(buffer, "0x%x 0x%x\n", chip->debug_res, chip->debug_res_ex);
+}
+
+/*
+ * dump some registers
+ */
+static void lola_proc_regs_read(struct snd_info_entry *entry,
+                                struct snd_info_buffer *buffer)
+{
+        struct lola *chip = entry->private_data;
+        int i;
+
+        for (i = 0; i < 0x40; i += 4) {
+                snd_iprintf(buffer, "BAR0 %02x: %08x\n", i,
+                            readl(chip->bar[BAR0].remap_addr + i));
+        }
+        snd_iprintf(buffer, "\n");
+        for (i = 0; i < 0x30; i += 4) {
+                snd_iprintf(buffer, "BAR1 %02x: %08x\n", i,
+                            readl(chip->bar[BAR1].remap_addr + i));
+        }
+        snd_iprintf(buffer, "\n");
+        for (i = 0x80; i < 0xa0; i += 4) {
+                snd_iprintf(buffer, "BAR1 %02x: %08x\n", i,
+                            readl(chip->bar[BAR1].remap_addr + i));
+        }
+        snd_iprintf(buffer, "\n");
+        for (i = 0; i < 32; i++) {
+                snd_iprintf(buffer, "DSD %02x STS  %08x\n", i,
+                            lola_dsd_read(chip, i, STS));
+                snd_iprintf(buffer, "DSD %02x LPIB %08x\n", i,
+                            lola_dsd_read(chip, i, LPIB));
+                snd_iprintf(buffer, "DSD %02x CTL  %08x\n", i,
+                            lola_dsd_read(chip, i, CTL));
+                snd_iprintf(buffer, "DSD %02x LVIL %08x\n", i,
+                            lola_dsd_read(chip, i, LVI));
+                snd_iprintf(buffer, "DSD %02x BDPL %08x\n", i,
+                            lola_dsd_read(chip, i, BDPL));
+                snd_iprintf(buffer, "DSD %02x BDPU %08x\n", i,
+                            lola_dsd_read(chip, i, BDPU));
+        }
+}
+
+void __devinit lola_proc_debug_new(struct lola *chip)
+{
+        struct snd_info_entry *entry;
+
+        if (!snd_card_proc_new(chip->card, "codec", &entry))
+                snd_info_set_text_ops(entry, chip, lola_proc_codec_read);
+        if (!snd_card_proc_new(chip->card, "codec_rw", &entry)) {
+                snd_info_set_text_ops(entry, chip, lola_proc_codec_rw_read);
+                entry->mode |= S_IWUSR;
+                entry->c.text.write = lola_proc_codec_rw_write;
+        }
+        if (!snd_card_proc_new(chip->card, "regs", &entry))
+                snd_info_set_text_ops(entry, chip, lola_proc_regs_read);
+}
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index ef9af3f4ace2..1bd7a540fd49 100644
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -425,7 +425,7 @@ exit:
 static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)
 {
         struct snd_pcm_substream *substream = lx_stream->stream;
-        const int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
 
         int err;
 
@@ -473,7 +473,7 @@ static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)
 
 static void lx_trigger_stop(struct lx6464es *chip, struct lx_stream *lx_stream)
 {
-        const int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
         int err;
 
         snd_printd(LXP "stopping: stopping stream\n");
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h
index 51afc048961d..aea621eafbb5 100644
--- a/sound/pci/lx6464es/lx6464es.h
+++ b/sound/pci/lx6464es/lx6464es.h
@@ -60,7 +60,7 @@ struct lx_stream {
         snd_pcm_uframes_t          frame_pos;
         enum lx_stream_status      status; /* free, open, running, draining
                                             * pause */
-        int                        is_capture:1;
+        unsigned int               is_capture:1;
 };
 
 
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
index 3086b751da4a..617f98b0cbae 100644
--- a/sound/pci/lx6464es/lx_core.c
+++ b/sound/pci/lx6464es/lx_core.c
@@ -1152,7 +1152,7 @@ static int lx_interrupt_request_new_buffer(struct lx6464es *chip,
                                            struct lx_stream *lx_stream)
 {
         struct snd_pcm_substream *substream = lx_stream->stream;
-        int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
         int err;
         unsigned long flags;
 
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index d3350f383966..3df0f530f67c 100644
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -265,7 +265,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
         if (! timeout) {
                 /* error - no ack */
                 mutex_unlock(&mgr->msg_mutex);
-                snd_printk(KERN_ERR "error: no reponse on msg %x\n", msg_frame);
+                snd_printk(KERN_ERR "error: no response on msg %x\n", msg_frame);
                 return -EIO;
         }
 
@@ -278,7 +278,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
         err = get_msg(mgr, &resp, msg_frame);
 
         if( request->message_id != resp.message_id )
-                snd_printk(KERN_ERR "REPONSE ERROR!\n");
+                snd_printk(KERN_ERR "RESPONSE ERROR!\n");
 
         mutex_unlock(&mgr->msg_mutex);
         return err;
diff --git a/sound/pci/mixart/mixart_hwdep.h b/sound/pci/mixart/mixart_hwdep.h
index a46f5083db99..812e288ef2e7 100644
--- a/sound/pci/mixart/mixart_hwdep.h
+++ b/sound/pci/mixart/mixart_hwdep.h
@@ -25,11 +25,21 @@
 
 #include <sound/hwdep.h>
 
+#ifndef readl_be
 #define readl_be(x) be32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_be
 #define writel_be(data,addr) __raw_writel(cpu_to_be32(data),addr)
+#endif
 
+#ifndef readl_le
 #define readl_le(x) le32_to_cpu(__raw_readl(x))
+#endif
+
+#ifndef writel_le
 #define writel_le(data,addr) __raw_writel(cpu_to_le32(data),addr)
+#endif
 
 #define MIXART_MEM(mgr,x)       ((mgr)->mem[0].virt + (x))
 #define MIXART_REG(mgr,x)       ((mgr)->mem[1].virt + (x))
diff --git a/sound/pci/oxygen/Makefile b/sound/pci/oxygen/Makefile
index acd8f15f7bff..0f8726551fde 100644
--- a/sound/pci/oxygen/Makefile
+++ b/sound/pci/oxygen/Makefile
@@ -1,10 +1,8 @@
 snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
-snd-hifier-objs := hifier.o
-snd-oxygen-objs := oxygen.o
+snd-oxygen-objs := oxygen.o xonar_dg.o
 snd-virtuoso-objs := virtuoso.o xonar_lib.o \
         xonar_pcm179x.o xonar_cs43xx.o xonar_wm87x6.o xonar_hdmi.o
 
 obj-$(CONFIG_SND_OXYGEN_LIB) += snd-oxygen-lib.o
-obj-$(CONFIG_SND_HIFIER) += snd-hifier.o
 obj-$(CONFIG_SND_OXYGEN) += snd-oxygen.o
 obj-$(CONFIG_SND_VIRTUOSO) += snd-virtuoso.o
diff --git a/sound/pci/oxygen/cs4245.h b/sound/pci/oxygen/cs4245.h
new file mode 100644
index 000000000000..5e0197e07dd1
--- /dev/null
+++ b/sound/pci/oxygen/cs4245.h
@@ -0,0 +1,107 @@
+#define CS4245_CHIP_ID          0x01
+#define CS4245_POWER_CTRL       0x02
+#define CS4245_DAC_CTRL_1       0x03
+#define CS4245_ADC_CTRL         0x04
+#define CS4245_MCLK_FREQ        0x05
+#define CS4245_SIGNAL_SEL       0x06
+#define CS4245_PGA_B_CTRL       0x07
+#define CS4245_PGA_A_CTRL       0x08
+#define CS4245_ANALOG_IN        0x09
+#define CS4245_DAC_A_CTRL       0x0a
+#define CS4245_DAC_B_CTRL       0x0b
+#define CS4245_DAC_CTRL_2       0x0c
+#define CS4245_INT_STATUS       0x0d
+#define CS4245_INT_MASK         0x0e
+#define CS4245_INT_MODE_MSB     0x0f
+#define CS4245_INT_MODE_LSB     0x10
+
+/* Chip ID */
+#define CS4245_CHIP_PART_MASK   0xf0
+#define CS4245_CHIP_REV_MASK    0x0f
+
+/* Power Control */
+#define CS4245_FREEZE           0x80
+#define CS4245_PDN_MIC          0x08
+#define CS4245_PDN_ADC          0x04
+#define CS4245_PDN_DAC          0x02
+#define CS4245_PDN              0x01
+
+/* DAC Control */
+#define CS4245_DAC_FM_MASK      0xc0
+#define CS4245_DAC_FM_SINGLE    0x00
+#define CS4245_DAC_FM_DOUBLE    0x40
+#define CS4245_DAC_FM_QUAD      0x80
+#define CS4245_DAC_DIF_MASK     0x30
+#define CS4245_DAC_DIF_LJUST    0x00
+#define CS4245_DAC_DIF_I2S      0x10
+#define CS4245_DAC_DIF_RJUST_16 0x20
+#define CS4245_DAC_DIF_RJUST_24 0x30
+#define CS4245_RESERVED_1       0x08
+#define CS4245_MUTE_DAC         0x04
+#define CS4245_DEEMPH           0x02
+#define CS4245_DAC_MASTER       0x01
+
+/* ADC Control */
+#define CS4245_ADC_FM_MASK      0xc0
+#define CS4245_ADC_FM_SINGLE    0x00
+#define CS4245_ADC_FM_DOUBLE    0x40
+#define CS4245_ADC_FM_QUAD      0x80
+#define CS4245_ADC_DIF_MASK     0x10
+#define CS4245_ADC_DIF_LJUST    0x00
+#define CS4245_ADC_DIF_I2S      0x10
+#define CS4245_MUTE_ADC         0x04
+#define CS4245_HPF_FREEZE       0x02
+#define CS4245_ADC_MASTER       0x01
+
+/* MCLK Frequency */
+#define CS4245_MCLK1_MASK       0x70
+#define CS4245_MCLK1_SHIFT      4
+#define CS4245_MCLK2_MASK       0x07
+#define CS4245_MCLK2_SHIFT      0
+#define CS4245_MCLK_1           0
+#define CS4245_MCLK_1_5         1
+#define CS4245_MCLK_2           2
+#define CS4245_MCLK_3           3
+#define CS4245_MCLK_4           4
+
+/* Signal Selection */
+#define CS4245_A_OUT_SEL_MASK   0x60
+#define CS4245_A_OUT_SEL_HIZ    0x00
+#define CS4245_A_OUT_SEL_DAC    0x20
+#define CS4245_A_OUT_SEL_PGA    0x40
+#define CS4245_LOOP             0x02
+#define CS4245_ASYNCH           0x01
+
+/* Channel B/A PGA Control */
+#define CS4245_PGA_GAIN_MASK    0x3f
+
+/* ADC Input Control */
+#define CS4245_PGA_SOFT         0x10
+#define CS4245_PGA_ZERO         0x08
+#define CS4245_SEL_MASK         0x07
+#define CS4245_SEL_MIC          0x00
+#define CS4245_SEL_INPUT_1      0x01
+#define CS4245_SEL_INPUT_2      0x02
+#define CS4245_SEL_INPUT_3      0x03
+#define CS4245_SEL_INPUT_4      0x04
+#define CS4245_SEL_INPUT_5      0x05
+#define CS4245_SEL_INPUT_6      0x06
+
+/* DAC Channel A/B Volume Control */
+#define CS4245_VOL_MASK         0xff
+
+/* DAC Control 2 */
+#define CS4245_DAC_SOFT         0x80
+#define CS4245_DAC_ZERO         0x40
+#define CS4245_INVERT_DAC       0x20
+#define CS4245_INT_ACTIVE_HIGH  0x01
+
+/* Interrupt Status/Mask/Mode */
+#define CS4245_ADC_CLK_ERR      0x08
+#define CS4245_DAC_CLK_ERR      0x04
+#define CS4245_ADC_OVFL         0x02
+#define CS4245_ADC_UNDRFL       0x01
+
+
+#define CS4245_SPI_ADDRESS      (0x9e << 16)
+#define CS4245_SPI_WRITE        (0 << 16)
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c
deleted file mode 100644
index 5a87d683691f..000000000000
--- a/sound/pci/oxygen/hifier.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * C-Media CMI8788 driver for the MediaTek/TempoTec HiFier Fantasia
- *
- * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
- *
- *
- *  This driver is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License, version 2.
- *
- *  This driver is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this driver; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-
-/*
- * CMI8788:
- *
- * SPI 0 -> AK4396
- */
-
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <sound/control.h>
-#include <sound/core.h>
-#include <sound/initval.h>
-#include <sound/pcm.h>
-#include <sound/tlv.h>
-#include "oxygen.h"
-#include "ak4396.h"
-
-MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_DESCRIPTION("TempoTec HiFier driver");
-MODULE_LICENSE("GPL v2");
-
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-
-module_param_array(index, int, NULL, 0444);
-MODULE_PARM_DESC(index, "card index");
-module_param_array(id, charp, NULL, 0444);
-MODULE_PARM_DESC(id, "ID string");
-module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "enable card");
-
-static DEFINE_PCI_DEVICE_TABLE(hifier_ids) = {
-        { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
-        { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
-        { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
-        { }
-};
-MODULE_DEVICE_TABLE(pci, hifier_ids);
-
-struct hifier_data {
-        u8 ak4396_regs[5];
-};
-
-static void ak4396_write(struct oxygen *chip, u8 reg, u8 value)
-{
-        struct hifier_data *data = chip->model_data;
-
-        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER  |
-                         OXYGEN_SPI_DATA_LENGTH_2 |
-                         OXYGEN_SPI_CLOCK_160 |
-                         (0 << OXYGEN_SPI_CODEC_SHIFT) |
-                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
-                         AK4396_WRITE | (reg << 8) | value);
-        data->ak4396_regs[reg] = value;
-}
-
-static void ak4396_write_cached(struct oxygen *chip, u8 reg, u8 value)
-{
-        struct hifier_data *data = chip->model_data;
-
-        if (value != data->ak4396_regs[reg])
-                ak4396_write(chip, reg, value);
-}
-
-static void hifier_registers_init(struct oxygen *chip)
-{
-        struct hifier_data *data = chip->model_data;
-
-        ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
-        ak4396_write(chip, AK4396_CONTROL_2,
-                     data->ak4396_regs[AK4396_CONTROL_2]);
-        ak4396_write(chip, AK4396_CONTROL_3, AK4396_PCM);
-        ak4396_write(chip, AK4396_LCH_ATT, chip->dac_volume[0]);
-        ak4396_write(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
-}
-
-static void hifier_init(struct oxygen *chip)
-{
-        struct hifier_data *data = chip->model_data;
-
-        data->ak4396_regs[AK4396_CONTROL_2] =
-                AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
-        hifier_registers_init(chip);
-
-        snd_component_add(chip->card, "AK4396");
-        snd_component_add(chip->card, "CS5340");
-}
-
-static void hifier_cleanup(struct oxygen *chip)
-{
-}
-
-static void hifier_resume(struct oxygen *chip)
-{
-        hifier_registers_init(chip);
-}
-
-static void set_ak4396_params(struct oxygen *chip,
-                               struct snd_pcm_hw_params *params)
-{
-        struct hifier_data *data = chip->model_data;
-        u8 value;
-
-        value = data->ak4396_regs[AK4396_CONTROL_2] & ~AK4396_DFS_MASK;
-        if (params_rate(params) <= 54000)
-                value |= AK4396_DFS_NORMAL;
-        else if (params_rate(params) <= 108000)
-                value |= AK4396_DFS_DOUBLE;
-        else
-                value |= AK4396_DFS_QUAD;
-
-        msleep(1); /* wait for the new MCLK to become stable */
-
-        if (value != data->ak4396_regs[AK4396_CONTROL_2]) {
-                ak4396_write(chip, AK4396_CONTROL_1,
-                             AK4396_DIF_24_MSB);
-                ak4396_write(chip, AK4396_CONTROL_2, value);
-                ak4396_write(chip, AK4396_CONTROL_1,
-                             AK4396_DIF_24_MSB | AK4396_RSTN);
-        }
-}
-
-static void update_ak4396_volume(struct oxygen *chip)
-{
-        ak4396_write_cached(chip, AK4396_LCH_ATT, chip->dac_volume[0]);
-        ak4396_write_cached(chip, AK4396_RCH_ATT, chip->dac_volume[1]);
-}
-
-static void update_ak4396_mute(struct oxygen *chip)
-{
-        struct hifier_data *data = chip->model_data;
-        u8 value;
-
-        value = data->ak4396_regs[AK4396_CONTROL_2] & ~AK4396_SMUTE;
-        if (chip->dac_mute)
-                value |= AK4396_SMUTE;
-        ak4396_write_cached(chip, AK4396_CONTROL_2, value);
-}
-
-static void set_cs5340_params(struct oxygen *chip,
-                              struct snd_pcm_hw_params *params)
-{
-}
-
-static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
-
-static const struct oxygen_model model_hifier = {
-        .shortname = "C-Media CMI8787",
-        .longname = "C-Media Oxygen HD Audio",
-        .chip = "CMI8788",
-        .init = hifier_init,
-        .cleanup = hifier_cleanup,
-        .resume = hifier_resume,
-        .get_i2s_mclk = oxygen_default_i2s_mclk,
-        .set_dac_params = set_ak4396_params,
-        .set_adc_params = set_cs5340_params,
-        .update_dac_volume = update_ak4396_volume,
-        .update_dac_mute = update_ak4396_mute,
-        .dac_tlv = ak4396_db_scale,
-        .model_data_size = sizeof(struct hifier_data),
-        .device_config = PLAYBACK_0_TO_I2S |
-                         PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_1,
-        .dac_channels = 2,
-        .dac_volume_min = 0,
-        .dac_volume_max = 255,
-        .function_flags = OXYGEN_FUNCTION_SPI,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .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)
-{
-        static int dev;
-        int err;
-
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
-        if (!enable[dev]) {
-                ++dev;
-                return -ENOENT;
-        }
-        err = oxygen_pci_probe(pci, index[dev], id[dev], THIS_MODULE,
-                               hifier_ids, get_hifier_model);
-        if (err >= 0)
-                ++dev;
-        return err;
-}
-
-static struct pci_driver hifier_driver = {
-        .name = "CMI8787HiFier",
-        .id_table = hifier_ids,
-        .probe = hifier_probe,
-        .remove = __devexit_p(oxygen_pci_remove),
-#ifdef CONFIG_PM
-        .suspend = oxygen_pci_suspend,
-        .resume = oxygen_pci_resume,
-#endif
-};
-
-static int __init alsa_card_hifier_init(void)
-{
-        return pci_register_driver(&hifier_driver);
-}
-
-static void __exit alsa_card_hifier_exit(void)
-{
-        pci_unregister_driver(&hifier_driver);
-}
-
-module_init(alsa_card_hifier_init)
-module_exit(alsa_card_hifier_exit)
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 6c0a11adb2a8..d7e8ddd9a67b 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -20,19 +20,32 @@
 /*
  * CMI8788:
  *
- * SPI 0 -> 1st AK4396 (front)
- * SPI 1 -> 2nd AK4396 (surround)
- * SPI 2 -> 3rd AK4396 (center/LFE)
- * SPI 3 -> WM8785
- * SPI 4 -> 4th AK4396 (back)
+ *   SPI 0 -> 1st AK4396 (front)
+ *   SPI 1 -> 2nd AK4396 (surround)
+ *   SPI 2 -> 3rd AK4396 (center/LFE)
+ *   SPI 3 -> WM8785
+ *   SPI 4 -> 4th AK4396 (back)
  *
- * GPIO 0 -> DFS0 of AK5385
- * GPIO 1 -> DFS1 of AK5385
- * GPIO 8 -> enable headphone amplifier on HT-Omega models
+ *   GPIO 0 -> DFS0 of AK5385
+ *   GPIO 1 -> DFS1 of AK5385
+ *
+ * X-Meridian models:
+ *   GPIO 4 -> enable extension S/PDIF input
+ *   GPIO 6 -> enable on-board S/PDIF input
+ *
+ * Claro models:
+ *   GPIO 6 -> S/PDIF from optical (0) or coaxial (1) input
+ *   GPIO 8 -> enable headphone amplifier
  *
  * CM9780:
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to ADC input
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN <- aux
+ *   CD_IN  <- CD
+ *   MIC_IN <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to ADC input
  */
 
 #include <linux/delay.h>
@@ -41,18 +54,22 @@
 #include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
+#include <sound/info.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
+#include "xonar_dg.h"
 #include "ak4396.h"
 #include "wm8785.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
 MODULE_LICENSE("GPL v2");
-MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8788}}");
+MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8786}"
+                        ",{C-Media,CMI8787}"
+                        ",{C-Media,CMI8788}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
@@ -66,14 +83,22 @@ module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "enable card");
 
 enum {
-        MODEL_CMEDIA_REF,       /* C-Media's reference design */
-        MODEL_MERIDIAN,         /* AuzenTech X-Meridian */
-        MODEL_CLARO,            /* HT-Omega Claro */
-        MODEL_CLARO_HALO,       /* HT-Omega Claro halo */
+        MODEL_CMEDIA_REF,
+        MODEL_MERIDIAN,
+        MODEL_MERIDIAN_2G,
+        MODEL_CLARO,
+        MODEL_CLARO_HALO,
+        MODEL_FANTASIA,
+        MODEL_SERENADE,
+        MODEL_2CH_OUTPUT,
+        MODEL_HG2PCI,
+        MODEL_XONAR_DG,
 };
 
 static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
+        /* C-Media's reference design */
         { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x10b0, 0x0217), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x13f6, 0x0001), .driver_data = MODEL_CMEDIA_REF },
@@ -81,8 +106,23 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
         { OXYGEN_PCI_SUBID(0x13f6, 0x8788), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x147a, 0xa017), .driver_data = MODEL_CMEDIA_REF },
         { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
+        /* Asus Xonar DG */
+        { OXYGEN_PCI_SUBID(0x1043, 0x8467), .driver_data = MODEL_XONAR_DG },
+        /* PCI 2.0 HD Audio */
+        { OXYGEN_PCI_SUBID(0x13f6, 0x8782), .driver_data = MODEL_2CH_OUTPUT },
+        /* Kuroutoshikou CMI8787-HG2PCI */
+        { OXYGEN_PCI_SUBID(0x13f6, 0xffff), .driver_data = MODEL_HG2PCI },
+        /* TempoTec HiFier Fantasia */
+        { OXYGEN_PCI_SUBID(0x14c3, 0x1710), .driver_data = MODEL_FANTASIA },
+        /* TempoTec HiFier Serenade */
+        { OXYGEN_PCI_SUBID(0x14c3, 0x1711), .driver_data = MODEL_SERENADE },
+        /* AuzenTech X-Meridian */
         { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
+        /* AuzenTech X-Meridian 2G */
+        { OXYGEN_PCI_SUBID(0x5431, 0x017a), .driver_data = MODEL_MERIDIAN_2G },
+        /* HT-Omega Claro */
         { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
+        /* HT-Omega Claro halo */
         { OXYGEN_PCI_SUBID(0x7284, 0x9781), .driver_data = MODEL_CLARO_HALO },
         { }
 };
@@ -94,9 +134,15 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE  0x0001
 #define GPIO_AK5385_DFS_QUAD    0x0002
 
+#define GPIO_MERIDIAN_DIG_MASK  0x0050
+#define GPIO_MERIDIAN_DIG_EXT   0x0010
+#define GPIO_MERIDIAN_DIG_BOARD 0x0040
+
+#define GPIO_CLARO_DIG_COAX     0x0040
 #define GPIO_CLARO_HP           0x0100
 
 struct generic_data {
+        unsigned int dacs;
         u8 ak4396_regs[4][5];
         u16 wm8785_regs[3];
 };
@@ -147,7 +193,7 @@ static void ak4396_registers_init(struct oxygen *chip)
         struct generic_data *data = chip->model_data;
         unsigned int i;
 
-        for (i = 0; i < 4; ++i) {
+        for (i = 0; i < data->dacs; ++i) {
                 ak4396_write(chip, i, AK4396_CONTROL_1,
                              AK4396_DIF_24_MSB | AK4396_RSTN);
                 ak4396_write(chip, i, AK4396_CONTROL_2,
@@ -165,6 +211,7 @@ static void ak4396_init(struct oxygen *chip)
 {
         struct generic_data *data = chip->model_data;
 
+        data->dacs = chip->model.dac_channels_pcm / 2;
         data->ak4396_regs[0][AK4396_CONTROL_2] =
                 AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
         ak4396_registers_init(chip);
@@ -206,6 +253,10 @@ static void generic_init(struct oxygen *chip)
 
 static void meridian_init(struct oxygen *chip)
 {
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_MERIDIAN_DIG_MASK);
+        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                              GPIO_MERIDIAN_DIG_BOARD, GPIO_MERIDIAN_DIG_MASK);
         ak4396_init(chip);
         ak5385_init(chip);
 }
@@ -219,6 +270,8 @@ static void claro_enable_hp(struct oxygen *chip)
 
 static void claro_init(struct oxygen *chip)
 {
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_CLARO_DIG_COAX);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_DIG_COAX);
         ak4396_init(chip);
         wm8785_init(chip);
         claro_enable_hp(chip);
@@ -226,11 +279,24 @@ static void claro_init(struct oxygen *chip)
 
 static void claro_halo_init(struct oxygen *chip)
 {
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_CLARO_DIG_COAX);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_DIG_COAX);
         ak4396_init(chip);
         ak5385_init(chip);
         claro_enable_hp(chip);
 }
 
+static void fantasia_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+        snd_component_add(chip->card, "CS5340");
+}
+
+static void stereo_output_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+}
+
 static void generic_cleanup(struct oxygen *chip)
 {
 }
@@ -267,6 +333,11 @@ static void claro_resume(struct oxygen *chip)
         claro_enable_hp(chip);
 }
 
+static void stereo_resume(struct oxygen *chip)
+{
+        ak4396_registers_init(chip);
+}
+
 static void set_ak4396_params(struct oxygen *chip,
                               struct snd_pcm_hw_params *params)
 {
@@ -285,7 +356,7 @@ static void set_ak4396_params(struct oxygen *chip,
         msleep(1); /* wait for the new MCLK to become stable */
 
         if (value != data->ak4396_regs[0][AK4396_CONTROL_2]) {
-                for (i = 0; i < 4; ++i) {
+                for (i = 0; i < data->dacs; ++i) {
                         ak4396_write(chip, i, AK4396_CONTROL_1,
                                      AK4396_DIF_24_MSB);
                         ak4396_write(chip, i, AK4396_CONTROL_2, value);
@@ -297,9 +368,10 @@ static void set_ak4396_params(struct oxygen *chip,
 
 static void update_ak4396_volume(struct oxygen *chip)
 {
+        struct generic_data *data = chip->model_data;
         unsigned int i;
 
-        for (i = 0; i < 4; ++i) {
+        for (i = 0; i < data->dacs; ++i) {
                 ak4396_write_cached(chip, i, AK4396_LCH_ATT,
                                     chip->dac_volume[i * 2]);
                 ak4396_write_cached(chip, i, AK4396_RCH_ATT,
@@ -316,7 +388,7 @@ static void update_ak4396_mute(struct oxygen *chip)
         value = data->ak4396_regs[0][AK4396_CONTROL_2] & ~AK4396_SMUTE;
         if (chip->dac_mute)
                 value |= AK4396_SMUTE;
-        for (i = 0; i < 4; ++i)
+        for (i = 0; i < data->dacs; ++i)
                 ak4396_write_cached(chip, i, AK4396_CONTROL_2, value);
 }
 
@@ -355,6 +427,10 @@ static void set_ak5385_params(struct oxygen *chip,
                               value, GPIO_AK5385_DFS_MASK);
 }
 
+static void set_no_params(struct oxygen *chip, struct snd_pcm_hw_params *params)
+{
+}
+
 static int rolloff_info(struct snd_kcontrol *ctl,
                         struct snd_ctl_elem_info *info)
 {
@@ -362,13 +438,7 @@ static int rolloff_info(struct snd_kcontrol *ctl,
                 "Sharp Roll-off", "Slow Roll-off"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int rolloff_get(struct snd_kcontrol *ctl,
@@ -399,7 +469,7 @@ static int rolloff_put(struct snd_kcontrol *ctl,
                 reg &= ~AK4396_SLOW;
         changed = reg != data->ak4396_regs[0][AK4396_CONTROL_2];
         if (changed) {
-                for (i = 0; i < 4; ++i)
+                for (i = 0; i < data->dacs; ++i)
                         ak4396_write(chip, i, AK4396_CONTROL_2, reg);
         }
         mutex_unlock(&chip->mutex);
@@ -420,13 +490,7 @@ static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
                 "None", "High-pass Filter"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
@@ -465,6 +529,100 @@ static const struct snd_kcontrol_new hpf_control = {
         .put = hpf_put,
 };
 
+static int meridian_dig_source_info(struct snd_kcontrol *ctl,
+                                    struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = { "On-board", "Extension" };
+
+        return snd_ctl_enum_info(info, 1, 2, names);
+}
+
+static int claro_dig_source_info(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = { "Optical", "Coaxial" };
+
+        return snd_ctl_enum_info(info, 1, 2, names);
+}
+
+static int meridian_dig_source_get(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+
+        value->value.enumerated.item[0] =
+                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                   GPIO_MERIDIAN_DIG_EXT);
+        return 0;
+}
+
+static int claro_dig_source_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+
+        value->value.enumerated.item[0] =
+                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                   GPIO_CLARO_DIG_COAX);
+        return 0;
+}
+
+static int meridian_dig_source_put(struct snd_kcontrol *ctl,
+                                   struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 old_reg, new_reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        old_reg = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        new_reg = old_reg & ~GPIO_MERIDIAN_DIG_MASK;
+        if (value->value.enumerated.item[0] == 0)
+                new_reg |= GPIO_MERIDIAN_DIG_BOARD;
+        else
+                new_reg |= GPIO_MERIDIAN_DIG_EXT;
+        changed = new_reg != old_reg;
+        if (changed)
+                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_reg);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int claro_dig_source_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 old_reg, new_reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        old_reg = oxygen_read16(chip, OXYGEN_GPIO_DATA);
+        new_reg = old_reg & ~GPIO_CLARO_DIG_COAX;
+        if (value->value.enumerated.item[0])
+                new_reg |= GPIO_CLARO_DIG_COAX;
+        changed = new_reg != old_reg;
+        if (changed)
+                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_reg);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static const struct snd_kcontrol_new meridian_dig_source_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "IEC958 Source Capture Enum",
+        .info = meridian_dig_source_info,
+        .get = meridian_dig_source_get,
+        .put = meridian_dig_source_put,
+};
+
+static const struct snd_kcontrol_new claro_dig_source_control = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "IEC958 Source Capture Enum",
+        .info = claro_dig_source_info,
+        .get = claro_dig_source_get,
+        .put = claro_dig_source_put,
+};
+
 static int generic_mixer_init(struct oxygen *chip)
 {
         return snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
@@ -483,6 +641,81 @@ static int generic_wm8785_mixer_init(struct oxygen *chip)
         return 0;
 }
 
+static int meridian_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = generic_mixer_init(chip);
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card,
+                          snd_ctl_new1(&meridian_dig_source_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static int claro_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = generic_wm8785_mixer_init(chip);
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card,
+                          snd_ctl_new1(&claro_dig_source_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static int claro_halo_mixer_init(struct oxygen *chip)
+{
+        int err;
+
+        err = generic_mixer_init(chip);
+        if (err < 0)
+                return err;
+        err = snd_ctl_add(chip->card,
+                          snd_ctl_new1(&claro_dig_source_control, chip));
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static void dump_ak4396_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct generic_data *data = chip->model_data;
+        unsigned int dac, i;
+
+        for (dac = 0; dac < data->dacs; ++dac) {
+                snd_iprintf(buffer, "\nAK4396 %u:", dac + 1);
+                for (i = 0; i < 5; ++i)
+                        snd_iprintf(buffer, " %02x", data->ak4396_regs[dac][i]);
+        }
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_wm8785_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct generic_data *data = chip->model_data;
+        unsigned int i;
+
+        snd_iprintf(buffer, "\nWM8785:");
+        for (i = 0; i < 3; ++i)
+                snd_iprintf(buffer, " %03x", data->wm8785_regs[i]);
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_oxygen_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        dump_ak4396_registers(chip, buffer);
+        dump_wm8785_registers(chip, buffer);
+}
+
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
 static const struct oxygen_model model_generic = {
@@ -493,11 +726,11 @@ static const struct oxygen_model model_generic = {
         .mixer_init = generic_wm8785_mixer_init,
         .cleanup = generic_cleanup,
         .resume = generic_resume,
-        .get_i2s_mclk = oxygen_default_i2s_mclk,
         .set_dac_params = set_ak4396_params,
         .set_adc_params = set_wm8785_params,
         .update_dac_volume = update_ak4396_volume,
         .update_dac_mute = update_ak4396_mute,
+        .dump_registers = dump_oxygen_registers,
         .dac_tlv = ak4396_db_scale,
         .model_data_size = sizeof(struct generic_data),
         .device_config = PLAYBACK_0_TO_I2S |
@@ -505,12 +738,16 @@ static const struct oxygen_model model_generic = {
                          PLAYBACK_2_TO_AC97_1 |
                          CAPTURE_0_FROM_I2S_1 |
                          CAPTURE_1_FROM_SPDIF |
-                         CAPTURE_2_FROM_AC97_1,
-        .dac_channels = 8,
+                         CAPTURE_2_FROM_AC97_1 |
+                         AC97_CD_INPUT,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 8,
         .dac_volume_min = 0,
         .dac_volume_max = 255,
         .function_flags = OXYGEN_FUNCTION_SPI |
                           OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+        .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
         .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
@@ -518,42 +755,87 @@ static const struct oxygen_model model_generic = {
 static int __devinit get_oxygen_model(struct oxygen *chip,
                                       const struct pci_device_id *id)
 {
+        static const char *const names[] = {
+                [MODEL_MERIDIAN]        = "AuzenTech X-Meridian",
+                [MODEL_MERIDIAN_2G]     = "AuzenTech X-Meridian 2G",
+                [MODEL_CLARO]           = "HT-Omega Claro",
+                [MODEL_CLARO_HALO]      = "HT-Omega Claro halo",
+                [MODEL_FANTASIA]        = "TempoTec HiFier Fantasia",
+                [MODEL_SERENADE]        = "TempoTec HiFier Serenade",
+                [MODEL_HG2PCI]          = "CMI8787-HG2PCI",
+        };
+
         chip->model = model_generic;
         switch (id->driver_data) {
         case MODEL_MERIDIAN:
+        case MODEL_MERIDIAN_2G:
                 chip->model.init = meridian_init;
-                chip->model.mixer_init = generic_mixer_init;
+                chip->model.mixer_init = meridian_mixer_init;
                 chip->model.resume = meridian_resume;
                 chip->model.set_adc_params = set_ak5385_params;
+                chip->model.dump_registers = dump_ak4396_registers;
                 chip->model.device_config = PLAYBACK_0_TO_I2S |
                                             PLAYBACK_1_TO_SPDIF |
                                             CAPTURE_0_FROM_I2S_2 |
                                             CAPTURE_1_FROM_SPDIF;
+                if (id->driver_data == MODEL_MERIDIAN)
+                        chip->model.device_config |= AC97_CD_INPUT;
                 break;
         case MODEL_CLARO:
                 chip->model.init = claro_init;
+                chip->model.mixer_init = claro_mixer_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.mixer_init = generic_mixer_init;
+                chip->model.mixer_init = claro_halo_mixer_init;
                 chip->model.cleanup = claro_cleanup;
                 chip->model.suspend = claro_suspend;
                 chip->model.resume = claro_resume;
                 chip->model.set_adc_params = set_ak5385_params;
+                chip->model.dump_registers = dump_ak4396_registers;
                 chip->model.device_config = PLAYBACK_0_TO_I2S |
                                             PLAYBACK_1_TO_SPDIF |
                                             CAPTURE_0_FROM_I2S_2 |
                                             CAPTURE_1_FROM_SPDIF;
                 break;
+        case MODEL_FANTASIA:
+        case MODEL_SERENADE:
+        case MODEL_2CH_OUTPUT:
+        case MODEL_HG2PCI:
+                chip->model.shortname = "C-Media CMI8787";
+                chip->model.chip = "CMI8787";
+                if (id->driver_data == MODEL_FANTASIA)
+                        chip->model.init = fantasia_init;
+                else
+                        chip->model.init = stereo_output_init;
+                chip->model.resume = stereo_resume;
+                chip->model.mixer_init = generic_mixer_init;
+                chip->model.set_adc_params = set_no_params;
+                chip->model.dump_registers = dump_ak4396_registers;
+                chip->model.device_config = PLAYBACK_0_TO_I2S |
+                                            PLAYBACK_1_TO_SPDIF;
+                if (id->driver_data == MODEL_FANTASIA) {
+                        chip->model.device_config |= CAPTURE_0_FROM_I2S_1;
+                        chip->model.adc_mclks = OXYGEN_MCLKS(256, 128, 128);
+                }
+                chip->model.dac_channels_pcm = 2;
+                chip->model.dac_channels_mixer = 2;
+                break;
+        case MODEL_XONAR_DG:
+                chip->model = model_xonar_dg;
+                break;
         }
         if (id->driver_data == MODEL_MERIDIAN ||
+            id->driver_data == MODEL_MERIDIAN_2G ||
             id->driver_data == MODEL_CLARO_HALO) {
                 chip->model.misc_flags = OXYGEN_MISC_MIDI;
                 chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;
         }
+        if (id->driver_data < ARRAY_SIZE(names) && names[id->driver_data])
+                chip->model.shortname = names[id->driver_data];
         return 0;
 }
 
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index a3409edcfb50..f53897a708b4 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -16,6 +16,10 @@
 #define PCM_AC97        5
 #define PCM_COUNT       6
 
+#define OXYGEN_MCLKS(f_single, f_double, f_quad) ((MCLK_##f_single << 0) | \
+                                                  (MCLK_##f_double << 2) | \
+                                                  (MCLK_##f_quad   << 4))
+
 #define OXYGEN_IO_SIZE  0x100
 
 #define OXYGEN_EEPROM_ID        0x434d  /* "CM" */
@@ -34,6 +38,8 @@
      /* CAPTURE_3_FROM_I2S_3            not implemented */
 #define MIDI_OUTPUT             0x0800
 #define MIDI_INPUT              0x1000
+#define AC97_CD_INPUT           0x2000
+#define AC97_FMIC_SWITCH        0x4000
 
 enum {
         CONTROL_SPDIF_PCM,
@@ -64,6 +70,7 @@ struct snd_pcm_hardware;
 struct snd_pcm_hw_params;
 struct snd_kcontrol_new;
 struct snd_rawmidi;
+struct snd_info_buffer;
 struct oxygen;
 
 struct oxygen_model {
@@ -78,8 +85,6 @@ struct oxygen_model {
         void (*resume)(struct oxygen *chip);
         void (*pcm_hardware_filter)(unsigned int channel,
                                     struct snd_pcm_hardware *hardware);
-        unsigned int (*get_i2s_mclk)(struct oxygen *chip, unsigned int channel,
-                                     struct snd_pcm_hw_params *hw_params);
         void (*set_dac_params)(struct oxygen *chip,
                                struct snd_pcm_hw_params *params);
         void (*set_adc_params)(struct oxygen *chip,
@@ -87,19 +92,25 @@ struct oxygen_model {
         void (*update_dac_volume)(struct oxygen *chip);
         void (*update_dac_mute)(struct oxygen *chip);
         void (*update_center_lfe_mix)(struct oxygen *chip, bool mixed);
+        unsigned int (*adjust_dac_routing)(struct oxygen *chip,
+                                           unsigned int play_routing);
         void (*gpio_changed)(struct oxygen *chip);
         void (*uart_input)(struct oxygen *chip);
         void (*ac97_switch)(struct oxygen *chip,
                             unsigned int reg, unsigned int mute);
+        void (*dump_registers)(struct oxygen *chip,
+                               struct snd_info_buffer *buffer);
         const unsigned int *dac_tlv;
-        unsigned long private_data;
         size_t model_data_size;
         unsigned int device_config;
-        u8 dac_channels;
+        u8 dac_channels_pcm;
+        u8 dac_channels_mixer;
         u8 dac_volume_min;
         u8 dac_volume_max;
         u8 misc_flags;
         u8 function_flags;
+        u8 dac_mclks;
+        u8 adc_mclks;
         u16 dac_i2s_format;
         u16 adc_i2s_format;
 };
@@ -120,7 +131,6 @@ struct oxygen {
         u8 pcm_running;
         u8 dac_routing;
         u8 spdif_playback_enable;
-        u8 revision;
         u8 has_ac97_0;
         u8 has_ac97_1;
         u32 spdif_bits;
@@ -166,8 +176,6 @@ void oxygen_update_spdif_source(struct oxygen *chip);
 /* oxygen_pcm.c */
 
 int oxygen_pcm_init(struct oxygen *chip);
-unsigned int oxygen_default_i2s_mclk(struct oxygen *chip, unsigned int channel,
-                                     struct snd_pcm_hw_params *hw_params);
 
 /* oxygen_io.c */
 
diff --git a/sound/pci/oxygen/oxygen_io.c b/sound/pci/oxygen/oxygen_io.c
index 09b2b2a36df5..f5164b1e1c80 100644
--- a/sound/pci/oxygen/oxygen_io.c
+++ b/sound/pci/oxygen/oxygen_io.c
@@ -197,11 +197,11 @@ void oxygen_write_spi(struct oxygen *chip, u8 control, unsigned int data)
 {
         unsigned int count;
 
-        /* should not need more than 7.68 us (24 * 320 ns) */
+        /* should not need more than 30.72 us (24 * 1.28 us) */
         count = 10;
         while ((oxygen_read8(chip, OXYGEN_SPI_CONTROL) & OXYGEN_SPI_BUSY)
                && count > 0) {
-                udelay(1);
+                udelay(4);
                 --count;
         }
 
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 7e93cf884437..70b739816fcc 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -202,7 +202,13 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
         struct oxygen *chip = entry->private_data;
         int i, j;
 
-        snd_iprintf(buffer, "CMI8788\n\n");
+        switch (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_PACKAGE_ID_MASK) {
+        case OXYGEN_PACKAGE_ID_8786: i = '6'; break;
+        case OXYGEN_PACKAGE_ID_8787: i = '7'; break;
+        case OXYGEN_PACKAGE_ID_8788: i = '8'; break;
+        default:                     i = '?'; break;
+        }
+        snd_iprintf(buffer, "CMI878%c:\n", i);
         for (i = 0; i < OXYGEN_IO_SIZE; i += 0x10) {
                 snd_iprintf(buffer, "%02x:", i);
                 for (j = 0; j < 0x10; ++j)
@@ -212,7 +218,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
         if (mutex_lock_interruptible(&chip->mutex) < 0)
                 return;
         if (chip->has_ac97_0) {
-                snd_iprintf(buffer, "\nAC97\n");
+                snd_iprintf(buffer, "\nAC97:\n");
                 for (i = 0; i < 0x80; i += 0x10) {
                         snd_iprintf(buffer, "%02x:", i);
                         for (j = 0; j < 0x10; j += 2)
@@ -222,7 +228,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
                 }
         }
         if (chip->has_ac97_1) {
-                snd_iprintf(buffer, "\nAC97 2\n");
+                snd_iprintf(buffer, "\nAC97 2:\n");
                 for (i = 0; i < 0x80; i += 0x10) {
                         snd_iprintf(buffer, "%02x:", i);
                         for (j = 0; j < 0x10; j += 2)
@@ -232,13 +238,15 @@ static void oxygen_proc_read(struct snd_info_entry *entry,
                 }
         }
         mutex_unlock(&chip->mutex);
+        if (chip->model.dump_registers)
+                chip->model.dump_registers(chip, buffer);
 }
 
 static void oxygen_proc_init(struct oxygen *chip)
 {
         struct snd_info_entry *entry;
 
-        if (!snd_card_proc_new(chip->card, "cmi8788", &entry))
+        if (!snd_card_proc_new(chip->card, "oxygen", &entry))
                 snd_info_set_text_ops(entry, chip, oxygen_proc_read);
 }
 #else
@@ -262,7 +270,7 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
          */
         subdevice = oxygen_read_eeprom(chip, 2);
         /* use default ID if EEPROM is missing */
-        if (subdevice == 0xffff)
+        if (subdevice == 0xffff && oxygen_read_eeprom(chip, 1) == 0xffff)
                 subdevice = 0x8788;
         /*
          * We use only the subsystem device ID for searching because it is
@@ -308,25 +316,46 @@ static void oxygen_restore_eeprom(struct oxygen *chip,
         }
 }
 
-static void pci_bridge_magic(void)
+static void configure_pcie_bridge(struct pci_dev *pci)
 {
-        struct pci_dev *pci = NULL;
+        enum { PEX811X, PI7C9X110 };
+        static const struct pci_device_id bridge_ids[] = {
+                { PCI_VDEVICE(PLX, 0x8111), .driver_data = PEX811X },
+                { PCI_VDEVICE(PLX, 0x8112), .driver_data = PEX811X },
+                { PCI_DEVICE(0x12d8, 0xe110), .driver_data = PI7C9X110 },
+                { }
+        };
+        struct pci_dev *bridge;
+        const struct pci_device_id *id;
         u32 tmp;
 
-        for (;;) {
-                /* If there is any Pericom PI7C9X110 PCI-E/PCI bridge ... */
-                pci = pci_get_device(0x12d8, 0xe110, pci);
-                if (!pci)
-                        break;
-                /*
-                 * ... configure its secondary internal arbiter to park to
-                 * the secondary port, instead of to the last master.
-                 */
-                if (!pci_read_config_dword(pci, 0x40, &tmp)) {
-                        tmp |= 1;
-                        pci_write_config_dword(pci, 0x40, tmp);
-                }
-                /* Why?  Try asking C-Media. */
+        if (!pci->bus || !pci->bus->self)
+                return;
+        bridge = pci->bus->self;
+
+        id = pci_match_id(bridge_ids, bridge);
+        if (!id)
+                return;
+
+        switch (id->driver_data) {
+        case PEX811X:   /* PLX PEX8111/PEX8112 PCIe/PCI bridge */
+                pci_read_config_dword(bridge, 0x48, &tmp);
+                tmp |= 1;       /* enable blind prefetching */
+                tmp |= 1 << 11; /* enable beacon generation */
+                pci_write_config_dword(bridge, 0x48, tmp);
+
+                pci_write_config_dword(bridge, 0x84, 0x0c);
+                pci_read_config_dword(bridge, 0x88, &tmp);
+                tmp &= ~(7 << 27);
+                tmp |= 2 << 27; /* set prefetch size to 128 bytes */
+                pci_write_config_dword(bridge, 0x88, tmp);
+                break;
+
+        case PI7C9X110: /* Pericom PI7C9X110 PCIe/PCI bridge */
+                pci_read_config_dword(bridge, 0x40, &tmp);
+                tmp |= 1;       /* park the PCI arbiter to the sound chip */
+                pci_write_config_dword(bridge, 0x40, tmp);
+                break;
         }
 }
 
@@ -343,12 +372,7 @@ static void oxygen_init(struct oxygen *chip)
                 (IEC958_AES1_CON_PCM_CODER << OXYGEN_SPDIF_CATEGORY_SHIFT);
         chip->spdif_pcm_bits = chip->spdif_bits;
 
-        if (oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2)
-                chip->revision = 2;
-        else
-                chip->revision = 1;
-
-        if (chip->revision == 1)
+        if (!(oxygen_read8(chip, OXYGEN_REVISION) & OXYGEN_REVISION_2))
                 oxygen_set_bits8(chip, OXYGEN_MISC,
                                  OXYGEN_MISC_PCI_MEM_W_1_CLOCK);
 
@@ -385,28 +409,40 @@ static void oxygen_init(struct oxygen *chip)
                       (OXYGEN_FORMAT_16 << OXYGEN_MULTICH_FORMAT_SHIFT));
         oxygen_write8(chip, OXYGEN_REC_CHANNELS, OXYGEN_REC_CHANNELS_2_2_2);
         oxygen_write16(chip, OXYGEN_I2S_MULTICH_FORMAT,
-                       OXYGEN_RATE_48000 | chip->model.dac_i2s_format |
-                       OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |
-                       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+                       OXYGEN_RATE_48000 |
+                       chip->model.dac_i2s_format |
+                       OXYGEN_I2S_MCLK(chip->model.dac_mclks) |
+                       OXYGEN_I2S_BITS_16 |
+                       OXYGEN_I2S_MASTER |
+                       OXYGEN_I2S_BCLK_64);
         if (chip->model.device_config & CAPTURE_0_FROM_I2S_1)
                 oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,
-                               OXYGEN_RATE_48000 | chip->model.adc_i2s_format |
-                               OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |
-                               OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+                               OXYGEN_RATE_48000 |
+                               chip->model.adc_i2s_format |
+                               OXYGEN_I2S_MCLK(chip->model.adc_mclks) |
+                               OXYGEN_I2S_BITS_16 |
+                               OXYGEN_I2S_MASTER |
+                               OXYGEN_I2S_BCLK_64);
         else
                 oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,
-                               OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);
+                               OXYGEN_I2S_MASTER |
+                               OXYGEN_I2S_MUTE_MCLK);
         if (chip->model.device_config & (CAPTURE_0_FROM_I2S_2 |
                                          CAPTURE_2_FROM_I2S_2))
                 oxygen_write16(chip, OXYGEN_I2S_B_FORMAT,
-                               OXYGEN_RATE_48000 | chip->model.adc_i2s_format |
-                               OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 |
-                               OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+                               OXYGEN_RATE_48000 |
+                               chip->model.adc_i2s_format |
+                               OXYGEN_I2S_MCLK(chip->model.adc_mclks) |
+                               OXYGEN_I2S_BITS_16 |
+                               OXYGEN_I2S_MASTER |
+                               OXYGEN_I2S_BCLK_64);
         else
                 oxygen_write16(chip, OXYGEN_I2S_B_FORMAT,
-                               OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);
+                               OXYGEN_I2S_MASTER |
+                               OXYGEN_I2S_MUTE_MCLK);
         oxygen_write16(chip, OXYGEN_I2S_C_FORMAT,
-                       OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK);
+                       OXYGEN_I2S_MASTER |
+                       OXYGEN_I2S_MUTE_MCLK);
         oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL,
                             OXYGEN_SPDIF_OUT_ENABLE |
                             OXYGEN_SPDIF_LOOPBACK);
@@ -536,7 +572,8 @@ static void oxygen_card_free(struct snd_card *card)
         oxygen_shutdown(chip);
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        flush_scheduled_work();
+        flush_work_sync(&chip->spdif_input_bits_work);
+        flush_work_sync(&chip->gpio_work);
         chip->model.cleanup(chip);
         kfree(chip->model_data);
         mutex_destroy(&chip->mutex);
@@ -613,7 +650,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         snd_card_set_dev(card, &pci->dev);
         card->private_free = oxygen_card_free;
 
-        pci_bridge_magic();
+        configure_pcie_bridge(pci);
         oxygen_init(chip);
         chip->model.init(chip);
 
@@ -627,8 +664,8 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
 
         strcpy(card->driver, chip->model.chip);
         strcpy(card->shortname, chip->model.shortname);
-        sprintf(card->longname, "%s (rev %u) at %#lx, irq %i",
-                chip->model.longname, chip->revision, chip->addr, chip->irq);
+        sprintf(card->longname, "%s at %#lx, irq %i",
+                chip->model.longname, chip->addr, chip->irq);
         strcpy(card->mixername, chip->model.chip);
         snd_component_add(card, chip->model.chip);
 
@@ -712,7 +749,8 @@ int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state)
         spin_unlock_irq(&chip->reg_lock);
 
         synchronize_irq(chip->irq);
-        flush_scheduled_work();
+        flush_work_sync(&chip->spdif_input_bits_work);
+        flush_work_sync(&chip->gpio_work);
         chip->interrupt_mask = saved_interrupt_mask;
 
         pci_disable_device(pci);
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index f375b8a27862..26c7e8bcb229 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -31,7 +31,7 @@ static int dac_volume_info(struct snd_kcontrol *ctl,
         struct oxygen *chip = ctl->private_data;
 
         info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        info->count = chip->model.dac_channels;
+        info->count = chip->model.dac_channels_mixer;
         info->value.integer.min = chip->model.dac_volume_min;
         info->value.integer.max = chip->model.dac_volume_max;
         return 0;
@@ -44,7 +44,7 @@ static int dac_volume_get(struct snd_kcontrol *ctl,
         unsigned int i;
 
         mutex_lock(&chip->mutex);
-        for (i = 0; i < chip->model.dac_channels; ++i)
+        for (i = 0; i < chip->model.dac_channels_mixer; ++i)
                 value->value.integer.value[i] = chip->dac_volume[i];
         mutex_unlock(&chip->mutex);
         return 0;
@@ -59,7 +59,7 @@ static int dac_volume_put(struct snd_kcontrol *ctl,
 
         changed = 0;
         mutex_lock(&chip->mutex);
-        for (i = 0; i < chip->model.dac_channels; ++i)
+        for (i = 0; i < chip->model.dac_channels_mixer; ++i)
                 if (value->value.integer.value[i] != chip->dac_volume[i]) {
                         chip->dac_volume[i] = value->value.integer.value[i];
                         changed = 1;
@@ -97,6 +97,16 @@ static int dac_mute_put(struct snd_kcontrol *ctl,
         return changed;
 }
 
+static unsigned int upmix_item_count(struct oxygen *chip)
+{
+        if (chip->model.dac_channels_pcm < 8)
+                return 2;
+        else if (chip->model.update_center_lfe_mix)
+                return 5;
+        else
+                return 3;
+}
+
 static int upmix_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
 {
         static const char *const names[5] = {
@@ -107,15 +117,9 @@ static int upmix_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
                 "Front+Surround+Center/LFE+Back",
         };
         struct oxygen *chip = ctl->private_data;
-        unsigned int count = chip->model.update_center_lfe_mix ? 5 : 3;
+        unsigned int count = upmix_item_count(chip);
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = count;
-        if (info->value.enumerated.item >= count)
-                info->value.enumerated.item = count - 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, count, names);
 }
 
 static int upmix_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
@@ -176,6 +180,8 @@ void oxygen_update_dac_routing(struct oxygen *chip)
                             (1 << OXYGEN_PLAY_DAC1_SOURCE_SHIFT) |
                             (2 << OXYGEN_PLAY_DAC2_SOURCE_SHIFT) |
                             (3 << OXYGEN_PLAY_DAC3_SOURCE_SHIFT);
+        if (chip->model.adjust_dac_routing)
+                reg_value = chip->model.adjust_dac_routing(chip, reg_value);
         oxygen_write16_masked(chip, OXYGEN_PLAY_ROUTING, reg_value,
                               OXYGEN_PLAY_DAC0_SOURCE_MASK |
                               OXYGEN_PLAY_DAC1_SOURCE_MASK |
@@ -188,7 +194,7 @@ void oxygen_update_dac_routing(struct oxygen *chip)
 static int upmix_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
 {
         struct oxygen *chip = ctl->private_data;
-        unsigned int count = chip->model.update_center_lfe_mix ? 5 : 3;
+        unsigned int count = upmix_item_count(chip);
         int changed;
 
         if (value->value.enumerated.item[0] >= count)
@@ -430,30 +436,31 @@ static int spdif_input_default_get(struct snd_kcontrol *ctl,
         return 0;
 }
 
-static int spdif_loopback_get(struct snd_kcontrol *ctl,
-                              struct snd_ctl_elem_value *value)
+static int spdif_bit_switch_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
 {
         struct oxygen *chip = ctl->private_data;
+        u32 bit = ctl->private_value;
 
         value->value.integer.value[0] =
-                !!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL)
-                   & OXYGEN_SPDIF_LOOPBACK);
+                !!(oxygen_read32(chip, OXYGEN_SPDIF_CONTROL) & bit);
         return 0;
 }
 
-static int spdif_loopback_put(struct snd_kcontrol *ctl,
-                              struct snd_ctl_elem_value *value)
+static int spdif_bit_switch_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
 {
         struct oxygen *chip = ctl->private_data;
+        u32 bit = ctl->private_value;
         u32 oldreg, newreg;
         int changed;
 
         spin_lock_irq(&chip->reg_lock);
         oldreg = oxygen_read32(chip, OXYGEN_SPDIF_CONTROL);
         if (value->value.integer.value[0])
-                newreg = oldreg | OXYGEN_SPDIF_LOOPBACK;
+                newreg = oldreg | bit;
         else
-                newreg = oldreg & ~OXYGEN_SPDIF_LOOPBACK;
+                newreg = oldreg & ~bit;
         changed = newreg != oldreg;
         if (changed)
                 oxygen_write32(chip, OXYGEN_SPDIF_CONTROL, newreg);
@@ -644,6 +651,46 @@ static int ac97_volume_put(struct snd_kcontrol *ctl,
         return change;
 }
 
+static int mic_fmic_source_info(struct snd_kcontrol *ctl,
+                           struct snd_ctl_elem_info *info)
+{
+        static const char *const names[] = { "Mic Jack", "Front Panel" };
+
+        return snd_ctl_enum_info(info, 1, 2, names);
+}
+
+static int mic_fmic_source_get(struct snd_kcontrol *ctl,
+                               struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+
+        mutex_lock(&chip->mutex);
+        value->value.enumerated.item[0] =
+                !!(oxygen_read_ac97(chip, 0, CM9780_JACK) & CM9780_FMIC2MIC);
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int mic_fmic_source_put(struct snd_kcontrol *ctl,
+                               struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        u16 oldreg, newreg;
+        int change;
+
+        mutex_lock(&chip->mutex);
+        oldreg = oxygen_read_ac97(chip, 0, CM9780_JACK);
+        if (value->value.enumerated.item[0])
+                newreg = oldreg | CM9780_FMIC2MIC;
+        else
+                newreg = oldreg & ~CM9780_FMIC2MIC;
+        change = newreg != oldreg;
+        if (change)
+                oxygen_write_ac97(chip, 0, CM9780_JACK, newreg);
+        mutex_unlock(&chip->mutex);
+        return change;
+}
+
 static int ac97_fp_rec_volume_info(struct snd_kcontrol *ctl,
                                    struct snd_ctl_elem_info *info)
 {
@@ -708,7 +755,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl,
                 .private_value = ((codec) << 24) | ((stereo) << 16) | (index), \
         }
 
-static DECLARE_TLV_DB_SCALE(monitor_db_scale, -1000, 1000, 0);
+static DECLARE_TLV_DB_SCALE(monitor_db_scale, -600, 600, 0);
 static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
 static DECLARE_TLV_DB_SCALE(ac97_rec_db_scale, 0, 150, 0);
 
@@ -791,8 +838,17 @@ static const struct snd_kcontrol_new spdif_input_controls[] = {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = SNDRV_CTL_NAME_IEC958("Loopback ", NONE, SWITCH),
                 .info = snd_ctl_boolean_mono_info,
-                .get = spdif_loopback_get,
-                .put = spdif_loopback_put,
+                .get = spdif_bit_switch_get,
+                .put = spdif_bit_switch_put,
+                .private_value = OXYGEN_SPDIF_LOOPBACK,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = SNDRV_CTL_NAME_IEC958("Validity Check ",CAPTURE,SWITCH),
+                .info = snd_ctl_boolean_mono_info,
+                .get = spdif_bit_switch_get,
+                .put = spdif_bit_switch_put,
+                .private_value = OXYGEN_SPDIF_SPDVALID,
         },
 };
 
@@ -908,6 +964,13 @@ static const struct snd_kcontrol_new ac97_controls[] = {
         AC97_VOLUME("Mic Capture Volume", 0, AC97_MIC, 0),
         AC97_SWITCH("Mic Capture Switch", 0, AC97_MIC, 15, 1),
         AC97_SWITCH("Mic Boost (+20dB)", 0, AC97_MIC, 6, 0),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Mic Source Capture Enum",
+                .info = mic_fmic_source_info,
+                .get = mic_fmic_source_get,
+                .put = mic_fmic_source_put,
+        },
         AC97_SWITCH("Line Capture Switch", 0, AC97_LINE, 15, 1),
         AC97_VOLUME("CD Capture Volume", 0, AC97_CD, 1),
         AC97_SWITCH("CD Capture Switch", 0, AC97_CD, 15, 1),
@@ -970,7 +1033,13 @@ static int add_controls(struct oxygen *chip,
                                 continue;
                 }
                 if (!strcmp(template.name, "Stereo Upmixing") &&
-                    chip->model.dac_channels == 2)
+                    chip->model.dac_channels_pcm == 2)
+                        continue;
+                if (!strcmp(template.name, "Mic Source Capture Enum") &&
+                    !(chip->model.device_config & AC97_FMIC_SWITCH))
+                        continue;
+                if (!strncmp(template.name, "CD Capture ", 11) &&
+                    !(chip->model.device_config & AC97_CD_INPUT))
                         continue;
                 if (!strcmp(template.name, "Master Playback Volume") &&
                     chip->model.dac_tlv) {
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index 9dff6954c397..d5533e34ece9 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -39,7 +39,8 @@ static const struct snd_pcm_hardware oxygen_stereo_hardware = {
                 SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_INTERLEAVED |
                 SNDRV_PCM_INFO_PAUSE |
-                SNDRV_PCM_INFO_SYNC_START,
+                SNDRV_PCM_INFO_SYNC_START |
+                SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
         .formats = SNDRV_PCM_FMTBIT_S16_LE |
                    SNDRV_PCM_FMTBIT_S32_LE,
         .rates = SNDRV_PCM_RATE_32000 |
@@ -56,8 +57,8 @@ static const struct snd_pcm_hardware oxygen_stereo_hardware = {
         .channels_max = 2,
         .buffer_bytes_max = BUFFER_BYTES_MAX,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
 };
 static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
@@ -65,7 +66,8 @@ static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
                 SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_INTERLEAVED |
                 SNDRV_PCM_INFO_PAUSE |
-                SNDRV_PCM_INFO_SYNC_START,
+                SNDRV_PCM_INFO_SYNC_START |
+                SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
         .formats = SNDRV_PCM_FMTBIT_S16_LE |
                    SNDRV_PCM_FMTBIT_S32_LE,
         .rates = SNDRV_PCM_RATE_32000 |
@@ -82,8 +84,8 @@ static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
         .channels_max = 8,
         .buffer_bytes_max = BUFFER_BYTES_MAX_MULTICH,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX_MULTICH / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX_MULTICH,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX_MULTICH / PERIOD_BYTES_MIN,
 };
 static const struct snd_pcm_hardware oxygen_ac97_hardware = {
@@ -91,7 +93,8 @@ static const struct snd_pcm_hardware oxygen_ac97_hardware = {
                 SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_INTERLEAVED |
                 SNDRV_PCM_INFO_PAUSE |
-                SNDRV_PCM_INFO_SYNC_START,
+                SNDRV_PCM_INFO_SYNC_START |
+                SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
         .formats = SNDRV_PCM_FMTBIT_S16_LE,
         .rates = SNDRV_PCM_RATE_48000,
         .rate_min = 48000,
@@ -100,8 +103,8 @@ static const struct snd_pcm_hardware oxygen_ac97_hardware = {
         .channels_max = 2,
         .buffer_bytes_max = BUFFER_BYTES_MAX,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
 };
 
@@ -140,7 +143,7 @@ static int oxygen_open(struct snd_pcm_substream *substream,
                 runtime->hw.rate_min = 44100;
                 break;
         case PCM_MULTICH:
-                runtime->hw.channels_max = chip->model.dac_channels;
+                runtime->hw.channels_max = chip->model.dac_channels_pcm;
                 break;
         }
         if (chip->model.pcm_hardware_filter)
@@ -271,17 +274,6 @@ static unsigned int oxygen_rate(struct snd_pcm_hw_params *hw_params)
         }
 }
 
-unsigned int oxygen_default_i2s_mclk(struct oxygen *chip,
-                                     unsigned int channel,
-                                     struct snd_pcm_hw_params *hw_params)
-{
-        if (params_rate(hw_params) <= 96000)
-                return OXYGEN_I2S_MCLK_256;
-        else
-                return OXYGEN_I2S_MCLK_128;
-}
-EXPORT_SYMBOL(oxygen_default_i2s_mclk);
-
 static unsigned int oxygen_i2s_bits(struct snd_pcm_hw_params *hw_params)
 {
         if (params_format(hw_params) == SNDRV_PCM_FORMAT_S32_LE)
@@ -341,6 +333,26 @@ static int oxygen_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
+static u16 get_mclk(struct oxygen *chip, unsigned int channel,
+                    struct snd_pcm_hw_params *params)
+{
+        unsigned int mclks, shift;
+
+        if (channel == PCM_MULTICH)
+                mclks = chip->model.dac_mclks;
+        else
+                mclks = chip->model.adc_mclks;
+
+        if (params_rate(params) <= 48000)
+                shift = 0;
+        else if (params_rate(params) <= 96000)
+                shift = 2;
+        else
+                shift = 4;
+
+        return OXYGEN_I2S_MCLK(mclks >> shift);
+}
+
 static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *hw_params)
 {
@@ -357,8 +369,8 @@ static int oxygen_rec_a_hw_params(struct snd_pcm_substream *substream,
                              OXYGEN_REC_FORMAT_A_MASK);
         oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT,
                               oxygen_rate(hw_params) |
-                              chip->model.get_i2s_mclk(chip, PCM_A, hw_params) |
                               chip->model.adc_i2s_format |
+                              get_mclk(chip, PCM_A, hw_params) |
                               oxygen_i2s_bits(hw_params),
                               OXYGEN_I2S_RATE_MASK |
                               OXYGEN_I2S_FORMAT_MASK |
@@ -393,9 +405,8 @@ static int oxygen_rec_b_hw_params(struct snd_pcm_substream *substream,
         if (!is_ac97)
                 oxygen_write16_masked(chip, OXYGEN_I2S_B_FORMAT,
                                       oxygen_rate(hw_params) |
-                                      chip->model.get_i2s_mclk(chip, PCM_B,
-                                                               hw_params) |
                                       chip->model.adc_i2s_format |
+                                      get_mclk(chip, PCM_B, hw_params) |
                                       oxygen_i2s_bits(hw_params),
                                       OXYGEN_I2S_RATE_MASK |
                                       OXYGEN_I2S_FORMAT_MASK |
@@ -476,8 +487,7 @@ static int oxygen_multich_hw_params(struct snd_pcm_substream *substream,
         oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
                               oxygen_rate(hw_params) |
                               chip->model.dac_i2s_format |
-                              chip->model.get_i2s_mclk(chip, PCM_MULTICH,
-                                                       hw_params) |
+                              get_mclk(chip, PCM_MULTICH, hw_params) |
                               oxygen_i2s_bits(hw_params),
                               OXYGEN_I2S_RATE_MASK |
                               OXYGEN_I2S_FORMAT_MASK |
@@ -530,7 +540,10 @@ static int oxygen_prepare(struct snd_pcm_substream *substream)
         oxygen_set_bits8(chip, OXYGEN_DMA_FLUSH, channel_mask);
         oxygen_clear_bits8(chip, OXYGEN_DMA_FLUSH, channel_mask);
 
-        chip->interrupt_mask |= channel_mask;
+        if (substream->runtime->no_period_wakeup)
+                chip->interrupt_mask &= ~channel_mask;
+        else
+                chip->interrupt_mask |= channel_mask;
         oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, chip->interrupt_mask);
         spin_unlock_irq(&chip->reg_lock);
         return 0;
diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h
index 72de159d4567..63dc7a0ab555 100644
--- a/sound/pci/oxygen/oxygen_regs.h
+++ b/sound/pci/oxygen/oxygen_regs.h
@@ -139,9 +139,11 @@
 #define  OXYGEN_I2S_FORMAT_I2S          0x0000
 #define  OXYGEN_I2S_FORMAT_LJUST        0x0008
 #define  OXYGEN_I2S_MCLK_MASK           0x0030  /* MCLK/LRCK */
-#define  OXYGEN_I2S_MCLK_128            0x0000
-#define  OXYGEN_I2S_MCLK_256            0x0010
-#define  OXYGEN_I2S_MCLK_512            0x0020
+#define  OXYGEN_I2S_MCLK_SHIFT          4
+#define  MCLK_128                       0
+#define  MCLK_256                       1
+#define  MCLK_512                       2
+#define  OXYGEN_I2S_MCLK(f)             (((f) & 3) << OXYGEN_I2S_MCLK_SHIFT)
 #define  OXYGEN_I2S_BITS_MASK           0x00c0
 #define  OXYGEN_I2S_BITS_16             0x0000
 #define  OXYGEN_I2S_BITS_20             0x0040
@@ -238,11 +240,11 @@
 #define  OXYGEN_SPI_DATA_LENGTH_MASK    0x02
 #define  OXYGEN_SPI_DATA_LENGTH_2       0x00
 #define  OXYGEN_SPI_DATA_LENGTH_3       0x02
-#define  OXYGEN_SPI_CLOCK_MASK          0xc0
+#define  OXYGEN_SPI_CLOCK_MASK          0x0c
 #define  OXYGEN_SPI_CLOCK_160           0x00    /* ns */
-#define  OXYGEN_SPI_CLOCK_320           0x40
-#define  OXYGEN_SPI_CLOCK_640           0x80
-#define  OXYGEN_SPI_CLOCK_1280          0xc0
+#define  OXYGEN_SPI_CLOCK_320           0x04
+#define  OXYGEN_SPI_CLOCK_640           0x08
+#define  OXYGEN_SPI_CLOCK_1280          0x0c
 #define  OXYGEN_SPI_CODEC_MASK          0x70    /* 0..5 */
 #define  OXYGEN_SPI_CODEC_SHIFT         4
 #define  OXYGEN_SPI_CEN_MASK            0x80
@@ -436,13 +438,15 @@
 /* OXYGEN_CHANNEL_* */
 
 #define OXYGEN_CODEC_VERSION            0xe4
-#define  OXYGEN_XCID_MASK               0x07
+#define  OXYGEN_CODEC_ID_MASK           0x07
 
 #define OXYGEN_REVISION                 0xe6
-#define  OXYGEN_REVISION_XPKGID_MASK    0x0007
+#define  OXYGEN_PACKAGE_ID_MASK         0x0007
+#define  OXYGEN_PACKAGE_ID_8786         0x0004
+#define  OXYGEN_PACKAGE_ID_8787         0x0006
+#define  OXYGEN_PACKAGE_ID_8788         0x0007
 #define  OXYGEN_REVISION_MASK           0xfff8
-#define  OXYGEN_REVISION_2              0x0008  /* bit flag */
-#define  OXYGEN_REVISION_8787           0x0014  /* 8 bits */
+#define  OXYGEN_REVISION_2              0x0008
 
 #define OXYGEN_OFFSIN_48K               0xe8
 #define OXYGEN_OFFSBASE_48K             0xe9
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 06c863e86e3d..469010a8b849 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -25,9 +25,9 @@
 #include "xonar.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_DESCRIPTION("Asus AVx00 driver");
+MODULE_DESCRIPTION("Asus Virtuoso driver");
 MODULE_LICENSE("GPL v2");
-MODULE_SUPPORTED_DEVICE("{{Asus,AV100},{Asus,AV200}}");
+MODULE_SUPPORTED_DEVICE("{{Asus,AV66},{Asus,AV100},{Asus,AV200}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
@@ -49,6 +49,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
         { OXYGEN_PCI_SUBID(0x1043, 0x834f) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835c) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835d) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x835e) },
         { OXYGEN_PCI_SUBID(0x1043, 0x838e) },
         { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
diff --git a/sound/pci/oxygen/xonar.h b/sound/pci/oxygen/xonar.h
index b35343b0a9a5..0434c207e811 100644
--- a/sound/pci/oxygen/xonar.h
+++ b/sound/pci/oxygen/xonar.h
@@ -24,6 +24,8 @@ void xonar_init_ext_power(struct oxygen *chip);
 void xonar_init_cs53x1(struct oxygen *chip);
 void xonar_set_cs53x1_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params);
+
+#define XONAR_GPIO_BIT_INVERT   (1 << 16)
 int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
                               struct snd_ctl_elem_value *value);
 int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index 7c4986b27f2b..252719101c42 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -22,29 +22,28 @@
  *
  * CMI8788:
  *
- * I²C <-> CS4398 (front)
- *     <-> CS4362A (surround, center/LFE, back)
+ *   I²C <-> CS4398 (addr 1001111) (front)
+ *       <-> CS4362A (addr 0011000) (surround, center/LFE, back)
  *
- * GPI 0 <- external power present (DX only)
+ *   GPI 0 <- external power present (DX only)
  *
- * GPIO 0 -> enable output to speakers
- * GPIO 1 -> enable front panel I/O
- * GPIO 2 -> M0 of CS5361
- * GPIO 3 -> M1 of CS5361
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 0 -> enable output to speakers
+ *   GPIO 1 -> route output to front panel
+ *   GPIO 2 -> M0 of CS5361
+ *   GPIO 3 -> M1 of CS5361
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> ?
+ *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
- * CS4398:
- *
- * AD0 <- 1
- * AD1 <- 1
- *
- * CS4362A:
+ * CM9780:
  *
- * AD0 <- 0
+ *   LINE_OUT -> input of ADC
  *
- * CM9780:
+ *   AUX_IN  <- aux
+ *   MIC_IN  <- mic
+ *   FMIC_IN <- front mic
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5361 input
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5361 input
  */
 
 #include <linux/pci.h>
@@ -63,6 +62,7 @@
 #define GPI_EXT_POWER           0x01
 #define GPIO_D1_OUTPUT_ENABLE   0x0001
 #define GPIO_D1_FRONT_PANEL     0x0002
+#define GPIO_D1_MAGIC           0x00c0
 #define GPIO_D1_INPUT_ROUTE     0x0100
 
 #define I2C_DEVICE_CS4398       0x9e    /* 10011, AD1=1, AD0=1, /W=0 */
@@ -169,12 +169,12 @@ static void xonar_d1_init(struct oxygen *chip)
         cs43xx_registers_init(chip);
 
         oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
+                          GPIO_D1_FRONT_PANEL |
+                          GPIO_D1_MAGIC |
+                          GPIO_D1_INPUT_ROUTE);
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
                             GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
 
-        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
-
         xonar_init_cs53x1(chip);
         xonar_enable_output(chip);
 
@@ -284,7 +284,7 @@ static void update_cs43xx_center_lfe_mix(struct oxygen *chip, bool mixed)
 
 static const struct snd_kcontrol_new front_panel_switch = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "Front Panel Switch",
+        .name = "Front Panel Playback Switch",
         .info = snd_ctl_boolean_mono_info,
         .get = xonar_gpio_bit_switch_get,
         .put = xonar_gpio_bit_switch_put,
@@ -298,13 +298,7 @@ static int rolloff_info(struct snd_kcontrol *ctl,
                 "Fast Roll-off", "Slow Roll-off"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int rolloff_get(struct snd_kcontrol *ctl,
@@ -367,13 +361,6 @@ static void xonar_d1_line_mic_ac97_switch(struct oxygen *chip,
 
 static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -6000, 100, 0);
 
-static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        return 0;
-}
-
 static int xonar_d1_mixer_init(struct oxygen *chip)
 {
         int err;
@@ -387,31 +374,58 @@ static int xonar_d1_mixer_init(struct oxygen *chip)
         return 0;
 }
 
+static void dump_cs4362a_registers(struct xonar_cs43xx *data,
+                                   struct snd_info_buffer *buffer)
+{
+        unsigned int i;
+
+        snd_iprintf(buffer, "\nCS4362A:");
+        for (i = 1; i <= 14; ++i)
+                snd_iprintf(buffer, " %02x", data->cs4362a_regs[i]);
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_d1_registers(struct oxygen *chip,
+                              struct snd_info_buffer *buffer)
+{
+        struct xonar_cs43xx *data = chip->model_data;
+        unsigned int i;
+
+        snd_iprintf(buffer, "\nCS4398: 7?");
+        for (i = 2; i < 8; ++i)
+                snd_iprintf(buffer, " %02x", data->cs4398_regs[i]);
+        snd_iprintf(buffer, "\n");
+        dump_cs4362a_registers(data, buffer);
+}
+
 static const struct oxygen_model model_xonar_d1 = {
         .longname = "Asus Virtuoso 100",
         .chip = "AV200",
         .init = xonar_d1_init,
-        .control_filter = xonar_d1_control_filter,
         .mixer_init = xonar_d1_mixer_init,
         .cleanup = xonar_d1_cleanup,
         .suspend = xonar_d1_suspend,
         .resume = xonar_d1_resume,
-        .get_i2s_mclk = oxygen_default_i2s_mclk,
         .set_dac_params = set_cs43xx_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_cs43xx_volume,
         .update_dac_mute = update_cs43xx_mute,
         .update_center_lfe_mix = update_cs43xx_center_lfe_mix,
         .ac97_switch = xonar_d1_line_mic_ac97_switch,
+        .dump_registers = dump_d1_registers,
         .dac_tlv = cs4362a_db_scale,
         .model_data_size = sizeof(struct xonar_cs43xx),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
-        .dac_channels = 8,
+                         CAPTURE_0_FROM_I2S_2 |
+                         AC97_FMIC_SWITCH,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 8,
         .dac_volume_min = 127 - 60,
         .dac_volume_max = 127,
         .function_flags = OXYGEN_FUNCTION_2WIRE,
+        .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
         .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
diff --git a/sound/pci/oxygen/xonar_dg.c b/sound/pci/oxygen/xonar_dg.c
new file mode 100644
index 000000000000..bc6eb58be380
--- /dev/null
+++ b/sound/pci/oxygen/xonar_dg.c
@@ -0,0 +1,608 @@
+/*
+ * card driver for the Xonar DG
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  This driver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this driver; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Xonar DG
+ * --------
+ *
+ * CMI8788:
+ *
+ *   SPI 0 -> CS4245
+ *
+ *   I²S 1 -> CS4245
+ *   I²S 2 -> CS4361 (center/LFE)
+ *   I²S 3 -> CS4361 (surround)
+ *   I²S 4 -> CS4361 (front)
+ *
+ *   GPIO 3 <- ?
+ *   GPIO 4 <- headphone detect
+ *   GPIO 5 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 6 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 7 -> enable rear headphone amp
+ *   GPIO 8 -> enable output to speakers
+ *
+ * CS4245:
+ *
+ *   input 1 <- aux
+ *   input 2 <- front mic
+ *   input 4 <- line/mic
+ *   DAC out -> headphones
+ *   aux out -> front panel headphones
+ */
+
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/info.h>
+#include <sound/pcm.h>
+#include <sound/tlv.h>
+#include "oxygen.h"
+#include "xonar_dg.h"
+#include "cs4245.h"
+
+#define GPIO_MAGIC              0x0008
+#define GPIO_HP_DETECT          0x0010
+#define GPIO_INPUT_ROUTE        0x0060
+#define GPIO_HP_REAR            0x0080
+#define GPIO_OUTPUT_ENABLE      0x0100
+
+struct dg {
+        unsigned int output_sel;
+        s8 input_vol[4][2];
+        unsigned int input_sel;
+        u8 hp_vol_att;
+        u8 cs4245_regs[0x11];
+};
+
+static void cs4245_write(struct oxygen *chip, unsigned int reg, u8 value)
+{
+        struct dg *data = chip->model_data;
+
+        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
+                         OXYGEN_SPI_DATA_LENGTH_3 |
+                         OXYGEN_SPI_CLOCK_1280 |
+                         (0 << OXYGEN_SPI_CODEC_SHIFT) |
+                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
+                         CS4245_SPI_ADDRESS |
+                         CS4245_SPI_WRITE |
+                         (reg << 8) | value);
+        data->cs4245_regs[reg] = value;
+}
+
+static void cs4245_write_cached(struct oxygen *chip, unsigned int reg, u8 value)
+{
+        struct dg *data = chip->model_data;
+
+        if (value != data->cs4245_regs[reg])
+                cs4245_write(chip, reg, value);
+}
+
+static void cs4245_registers_init(struct oxygen *chip)
+{
+        struct dg *data = chip->model_data;
+
+        cs4245_write(chip, CS4245_POWER_CTRL, CS4245_PDN);
+        cs4245_write(chip, CS4245_DAC_CTRL_1,
+                     data->cs4245_regs[CS4245_DAC_CTRL_1]);
+        cs4245_write(chip, CS4245_ADC_CTRL,
+                     data->cs4245_regs[CS4245_ADC_CTRL]);
+        cs4245_write(chip, CS4245_SIGNAL_SEL,
+                     data->cs4245_regs[CS4245_SIGNAL_SEL]);
+        cs4245_write(chip, CS4245_PGA_B_CTRL,
+                     data->cs4245_regs[CS4245_PGA_B_CTRL]);
+        cs4245_write(chip, CS4245_PGA_A_CTRL,
+                     data->cs4245_regs[CS4245_PGA_A_CTRL]);
+        cs4245_write(chip, CS4245_ANALOG_IN,
+                     data->cs4245_regs[CS4245_ANALOG_IN]);
+        cs4245_write(chip, CS4245_DAC_A_CTRL,
+                     data->cs4245_regs[CS4245_DAC_A_CTRL]);
+        cs4245_write(chip, CS4245_DAC_B_CTRL,
+                     data->cs4245_regs[CS4245_DAC_B_CTRL]);
+        cs4245_write(chip, CS4245_DAC_CTRL_2,
+                     CS4245_DAC_SOFT | CS4245_DAC_ZERO | CS4245_INVERT_DAC);
+        cs4245_write(chip, CS4245_INT_MASK, 0);
+        cs4245_write(chip, CS4245_POWER_CTRL, 0);
+}
+
+static void cs4245_init(struct oxygen *chip)
+{
+        struct dg *data = chip->model_data;
+
+        data->cs4245_regs[CS4245_DAC_CTRL_1] =
+                CS4245_DAC_FM_SINGLE | CS4245_DAC_DIF_LJUST;
+        data->cs4245_regs[CS4245_ADC_CTRL] =
+                CS4245_ADC_FM_SINGLE | CS4245_ADC_DIF_LJUST;
+        data->cs4245_regs[CS4245_SIGNAL_SEL] =
+                CS4245_A_OUT_SEL_HIZ | CS4245_ASYNCH;
+        data->cs4245_regs[CS4245_PGA_B_CTRL] = 0;
+        data->cs4245_regs[CS4245_PGA_A_CTRL] = 0;
+        data->cs4245_regs[CS4245_ANALOG_IN] =
+                CS4245_PGA_SOFT | CS4245_PGA_ZERO | CS4245_SEL_INPUT_4;
+        data->cs4245_regs[CS4245_DAC_A_CTRL] = 0;
+        data->cs4245_regs[CS4245_DAC_B_CTRL] = 0;
+        cs4245_registers_init(chip);
+        snd_component_add(chip->card, "CS4245");
+}
+
+static void dg_output_enable(struct oxygen *chip)
+{
+        msleep(2500);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_OUTPUT_ENABLE);
+}
+
+static void dg_init(struct oxygen *chip)
+{
+        struct dg *data = chip->model_data;
+
+        data->output_sel = 0;
+        data->input_sel = 3;
+        data->hp_vol_att = 2 * 16;
+
+        cs4245_init(chip);
+
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                            GPIO_MAGIC | GPIO_HP_DETECT);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_INPUT_ROUTE | GPIO_HP_REAR | GPIO_OUTPUT_ENABLE);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
+                            GPIO_INPUT_ROUTE | GPIO_HP_REAR);
+        dg_output_enable(chip);
+}
+
+static void dg_cleanup(struct oxygen *chip)
+{
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_OUTPUT_ENABLE);
+}
+
+static void dg_suspend(struct oxygen *chip)
+{
+        dg_cleanup(chip);
+}
+
+static void dg_resume(struct oxygen *chip)
+{
+        cs4245_registers_init(chip);
+        dg_output_enable(chip);
+}
+
+static void set_cs4245_dac_params(struct oxygen *chip,
+                                  struct snd_pcm_hw_params *params)
+{
+        struct dg *data = chip->model_data;
+        u8 value;
+
+        value = data->cs4245_regs[CS4245_DAC_CTRL_1] & ~CS4245_DAC_FM_MASK;
+        if (params_rate(params) <= 50000)
+                value |= CS4245_DAC_FM_SINGLE;
+        else if (params_rate(params) <= 100000)
+                value |= CS4245_DAC_FM_DOUBLE;
+        else
+                value |= CS4245_DAC_FM_QUAD;
+        cs4245_write_cached(chip, CS4245_DAC_CTRL_1, value);
+}
+
+static void set_cs4245_adc_params(struct oxygen *chip,
+                                  struct snd_pcm_hw_params *params)
+{
+        struct dg *data = chip->model_data;
+        u8 value;
+
+        value = data->cs4245_regs[CS4245_ADC_CTRL] & ~CS4245_ADC_FM_MASK;
+        if (params_rate(params) <= 50000)
+                value |= CS4245_ADC_FM_SINGLE;
+        else if (params_rate(params) <= 100000)
+                value |= CS4245_ADC_FM_DOUBLE;
+        else
+                value |= CS4245_ADC_FM_QUAD;
+        cs4245_write_cached(chip, CS4245_ADC_CTRL, value);
+}
+
+static inline unsigned int shift_bits(unsigned int value,
+                                      unsigned int shift_from,
+                                      unsigned int shift_to,
+                                      unsigned int mask)
+{
+        if (shift_from < shift_to)
+                return (value << (shift_to - shift_from)) & mask;
+        else
+                return (value >> (shift_from - shift_to)) & mask;
+}
+
+static unsigned int adjust_dg_dac_routing(struct oxygen *chip,
+                                          unsigned int play_routing)
+{
+        return (play_routing & OXYGEN_PLAY_DAC0_SOURCE_MASK) |
+               shift_bits(play_routing,
+                          OXYGEN_PLAY_DAC2_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC1_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC1_SOURCE_MASK) |
+               shift_bits(play_routing,
+                          OXYGEN_PLAY_DAC1_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC2_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC2_SOURCE_MASK) |
+               shift_bits(play_routing,
+                          OXYGEN_PLAY_DAC0_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC3_SOURCE_SHIFT,
+                          OXYGEN_PLAY_DAC3_SOURCE_MASK);
+}
+
+static int output_switch_info(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_info *info)
+{
+        static const char *const names[3] = {
+                "Speakers", "Headphones", "FP Headphones"
+        };
+
+        return snd_ctl_enum_info(info, 1, 3, names);
+}
+
+static int output_switch_get(struct snd_kcontrol *ctl,
+                             struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        value->value.enumerated.item[0] = data->output_sel;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int output_switch_put(struct snd_kcontrol *ctl,
+                             struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        u8 reg;
+        int changed;
+
+        if (value->value.enumerated.item[0] > 2)
+                return -EINVAL;
+
+        mutex_lock(&chip->mutex);
+        changed = value->value.enumerated.item[0] != data->output_sel;
+        if (changed) {
+                data->output_sel = value->value.enumerated.item[0];
+
+                reg = data->cs4245_regs[CS4245_SIGNAL_SEL] &
+                                                ~CS4245_A_OUT_SEL_MASK;
+                reg |= data->output_sel == 2 ?
+                                CS4245_A_OUT_SEL_DAC : CS4245_A_OUT_SEL_HIZ;
+                cs4245_write_cached(chip, CS4245_SIGNAL_SEL, reg);
+
+                cs4245_write_cached(chip, CS4245_DAC_A_CTRL,
+                                    data->output_sel ? data->hp_vol_att : 0);
+                cs4245_write_cached(chip, CS4245_DAC_B_CTRL,
+                                    data->output_sel ? data->hp_vol_att : 0);
+
+                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                      data->output_sel == 1 ? GPIO_HP_REAR : 0,
+                                      GPIO_HP_REAR);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int hp_volume_offset_info(struct snd_kcontrol *ctl,
+                                 struct snd_ctl_elem_info *info)
+{
+        static const char *const names[3] = {
+                "< 64 ohms", "64-150 ohms", "150-300 ohms"
+        };
+
+        return snd_ctl_enum_info(info, 1, 3, names);
+}
+
+static int hp_volume_offset_get(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        if (data->hp_vol_att > 2 * 7)
+                value->value.enumerated.item[0] = 0;
+        else if (data->hp_vol_att > 0)
+                value->value.enumerated.item[0] = 1;
+        else
+                value->value.enumerated.item[0] = 2;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int hp_volume_offset_put(struct snd_kcontrol *ctl,
+                                struct snd_ctl_elem_value *value)
+{
+        static const s8 atts[3] = { 2 * 16, 2 * 7, 0 };
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        s8 att;
+        int changed;
+
+        if (value->value.enumerated.item[0] > 2)
+                return -EINVAL;
+        att = atts[value->value.enumerated.item[0]];
+        mutex_lock(&chip->mutex);
+        changed = att != data->hp_vol_att;
+        if (changed) {
+                data->hp_vol_att = att;
+                if (data->output_sel) {
+                        cs4245_write_cached(chip, CS4245_DAC_A_CTRL, att);
+                        cs4245_write_cached(chip, CS4245_DAC_B_CTRL, att);
+                }
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int input_vol_info(struct snd_kcontrol *ctl,
+                          struct snd_ctl_elem_info *info)
+{
+        info->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        info->count = 2;
+        info->value.integer.min = 2 * -12;
+        info->value.integer.max = 2 * 12;
+        return 0;
+}
+
+static int input_vol_get(struct snd_kcontrol *ctl,
+                         struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        unsigned int idx = ctl->private_value;
+
+        mutex_lock(&chip->mutex);
+        value->value.integer.value[0] = data->input_vol[idx][0];
+        value->value.integer.value[1] = data->input_vol[idx][1];
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int input_vol_put(struct snd_kcontrol *ctl,
+                         struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        unsigned int idx = ctl->private_value;
+        int changed = 0;
+
+        if (value->value.integer.value[0] < 2 * -12 ||
+            value->value.integer.value[0] > 2 * 12 ||
+            value->value.integer.value[1] < 2 * -12 ||
+            value->value.integer.value[1] > 2 * 12)
+                return -EINVAL;
+        mutex_lock(&chip->mutex);
+        changed = data->input_vol[idx][0] != value->value.integer.value[0] ||
+                  data->input_vol[idx][1] != value->value.integer.value[1];
+        if (changed) {
+                data->input_vol[idx][0] = value->value.integer.value[0];
+                data->input_vol[idx][1] = value->value.integer.value[1];
+                if (idx == data->input_sel) {
+                        cs4245_write_cached(chip, CS4245_PGA_A_CTRL,
+                                            data->input_vol[idx][0]);
+                        cs4245_write_cached(chip, CS4245_PGA_B_CTRL,
+                                            data->input_vol[idx][1]);
+                }
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static DECLARE_TLV_DB_SCALE(cs4245_pga_db_scale, -1200, 50, 0);
+
+static int input_sel_info(struct snd_kcontrol *ctl,
+                          struct snd_ctl_elem_info *info)
+{
+        static const char *const names[4] = {
+                "Mic", "Aux", "Front Mic", "Line"
+        };
+
+        return snd_ctl_enum_info(info, 1, 4, names);
+}
+
+static int input_sel_get(struct snd_kcontrol *ctl,
+                         struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+
+        mutex_lock(&chip->mutex);
+        value->value.enumerated.item[0] = data->input_sel;
+        mutex_unlock(&chip->mutex);
+        return 0;
+}
+
+static int input_sel_put(struct snd_kcontrol *ctl,
+                         struct snd_ctl_elem_value *value)
+{
+        static const u8 sel_values[4] = {
+                CS4245_SEL_MIC,
+                CS4245_SEL_INPUT_1,
+                CS4245_SEL_INPUT_2,
+                CS4245_SEL_INPUT_4
+        };
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        int changed;
+
+        if (value->value.enumerated.item[0] > 3)
+                return -EINVAL;
+
+        mutex_lock(&chip->mutex);
+        changed = value->value.enumerated.item[0] != data->input_sel;
+        if (changed) {
+                data->input_sel = value->value.enumerated.item[0];
+
+                cs4245_write(chip, CS4245_ANALOG_IN,
+                             (data->cs4245_regs[CS4245_ANALOG_IN] &
+                                                        ~CS4245_SEL_MASK) |
+                             sel_values[data->input_sel]);
+
+                cs4245_write_cached(chip, CS4245_PGA_A_CTRL,
+                                    data->input_vol[data->input_sel][0]);
+                cs4245_write_cached(chip, CS4245_PGA_B_CTRL,
+                                    data->input_vol[data->input_sel][1]);
+
+                oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                      data->input_sel ? 0 : GPIO_INPUT_ROUTE,
+                                      GPIO_INPUT_ROUTE);
+        }
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
+{
+        static const char *const names[2] = { "Active", "Frozen" };
+
+        return snd_ctl_enum_info(info, 1, 2, names);
+}
+
+static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+
+        value->value.enumerated.item[0] =
+                !!(data->cs4245_regs[CS4245_ADC_CTRL] & CS4245_HPF_FREEZE);
+        return 0;
+}
+
+static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+        struct oxygen *chip = ctl->private_data;
+        struct dg *data = chip->model_data;
+        u8 reg;
+        int changed;
+
+        mutex_lock(&chip->mutex);
+        reg = data->cs4245_regs[CS4245_ADC_CTRL] & ~CS4245_HPF_FREEZE;
+        if (value->value.enumerated.item[0])
+                reg |= CS4245_HPF_FREEZE;
+        changed = reg != data->cs4245_regs[CS4245_ADC_CTRL];
+        if (changed)
+                cs4245_write(chip, CS4245_ADC_CTRL, reg);
+        mutex_unlock(&chip->mutex);
+        return changed;
+}
+
+#define INPUT_VOLUME(xname, index) { \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .info = input_vol_info, \
+        .get = input_vol_get, \
+        .put = input_vol_put, \
+        .tlv = { .p = cs4245_pga_db_scale }, \
+        .private_value = index, \
+}
+static const struct snd_kcontrol_new dg_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Analog Output Playback Enum",
+                .info = output_switch_info,
+                .get = output_switch_get,
+                .put = output_switch_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Headphones Impedance Playback Enum",
+                .info = hp_volume_offset_info,
+                .get = hp_volume_offset_get,
+                .put = hp_volume_offset_put,
+        },
+        INPUT_VOLUME("Mic Capture Volume", 0),
+        INPUT_VOLUME("Aux Capture Volume", 1),
+        INPUT_VOLUME("Front Mic Capture Volume", 2),
+        INPUT_VOLUME("Line Capture Volume", 3),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = input_sel_info,
+                .get = input_sel_get,
+                .put = input_sel_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "ADC High-pass Filter Capture Enum",
+                .info = hpf_info,
+                .get = hpf_get,
+                .put = hpf_put,
+        },
+};
+
+static int dg_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "Master Playback ", 16))
+                return 1;
+        return 0;
+}
+
+static int dg_mixer_init(struct oxygen *chip)
+{
+        unsigned int i;
+        int err;
+
+        for (i = 0; i < ARRAY_SIZE(dg_controls); ++i) {
+                err = snd_ctl_add(chip->card,
+                                  snd_ctl_new1(&dg_controls[i], chip));
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
+static void dump_cs4245_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct dg *data = chip->model_data;
+        unsigned int i;
+
+        snd_iprintf(buffer, "\nCS4245:");
+        for (i = 1; i <= 0x10; ++i)
+                snd_iprintf(buffer, " %02x", data->cs4245_regs[i]);
+        snd_iprintf(buffer, "\n");
+}
+
+struct oxygen_model model_xonar_dg = {
+        .shortname = "Xonar DG",
+        .longname = "C-Media Oxygen HD Audio",
+        .chip = "CMI8786",
+        .init = dg_init,
+        .control_filter = dg_control_filter,
+        .mixer_init = dg_mixer_init,
+        .cleanup = dg_cleanup,
+        .suspend = dg_suspend,
+        .resume = dg_resume,
+        .set_dac_params = set_cs4245_dac_params,
+        .set_adc_params = set_cs4245_adc_params,
+        .adjust_dac_routing = adjust_dg_dac_routing,
+        .dump_registers = dump_cs4245_registers,
+        .model_data_size = sizeof(struct dg),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_2,
+        .dac_channels_pcm = 6,
+        .dac_channels_mixer = 0,
+        .function_flags = OXYGEN_FUNCTION_SPI,
+        .dac_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
diff --git a/sound/pci/oxygen/xonar_dg.h b/sound/pci/oxygen/xonar_dg.h
new file mode 100644
index 000000000000..5688d78609a9
--- /dev/null
+++ b/sound/pci/oxygen/xonar_dg.h
@@ -0,0 +1,8 @@
+#ifndef XONAR_DG_H_INCLUDED
+#define XONAR_DG_H_INCLUDED
+
+#include "oxygen.h"
+
+extern struct oxygen_model model_xonar_dg;
+
+#endif
diff --git a/sound/pci/oxygen/xonar_hdmi.c b/sound/pci/oxygen/xonar_hdmi.c
index b12db1f1cea9..136dac6a3964 100644
--- a/sound/pci/oxygen/xonar_hdmi.c
+++ b/sound/pci/oxygen/xonar_hdmi.c
@@ -1,5 +1,5 @@
 /*
- * helper functions for HDMI models (Xonar HDAV1.3)
+ * helper functions for HDMI models (Xonar HDAV1.3/HDAV1.3 Slim)
  *
  * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
  *
diff --git a/sound/pci/oxygen/xonar_lib.c b/sound/pci/oxygen/xonar_lib.c
index b3ff71316653..0ebe7f5916f9 100644
--- a/sound/pci/oxygen/xonar_lib.c
+++ b/sound/pci/oxygen/xonar_lib.c
@@ -104,9 +104,10 @@ int xonar_gpio_bit_switch_get(struct snd_kcontrol *ctl,
 {
         struct oxygen *chip = ctl->private_data;
         u16 bit = ctl->private_value;
+        bool invert = ctl->private_value & XONAR_GPIO_BIT_INVERT;
 
         value->value.integer.value[0] =
-                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit);
+                !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit) ^ invert;
         return 0;
 }
 
@@ -115,12 +116,13 @@ int xonar_gpio_bit_switch_put(struct snd_kcontrol *ctl,
 {
         struct oxygen *chip = ctl->private_data;
         u16 bit = ctl->private_value;
+        bool invert = ctl->private_value & XONAR_GPIO_BIT_INVERT;
         u16 old_bits, new_bits;
         int changed;
 
         spin_lock_irq(&chip->reg_lock);
         old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        if (value->value.integer.value[0])
+        if (!!value->value.integer.value[0] ^ invert)
                 new_bits = old_bits | bit;
         else
                 new_bits = old_bits & ~bit;
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index ba18fb546b4f..54cad38ec30a 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -22,20 +22,26 @@
  *
  * CMI8788:
  *
- * SPI 0 -> 1st PCM1796 (front)
- * SPI 1 -> 2nd PCM1796 (surround)
- * SPI 2 -> 3rd PCM1796 (center/LFE)
- * SPI 4 -> 4th PCM1796 (back)
+ *   SPI 0 -> 1st PCM1796 (front)
+ *   SPI 1 -> 2nd PCM1796 (surround)
+ *   SPI 2 -> 3rd PCM1796 (center/LFE)
+ *   SPI 4 -> 4th PCM1796 (back)
  *
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 5 <- external power present (D2X only)
- * GPIO 7 -> ALT
- * GPIO 8 -> enable output to speakers
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 5 <- external power present (D2X only)
+ *   GPIO 7 -> ALT
+ *   GPIO 8 -> enable output to speakers
  *
  * CM9780:
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN   <- aux
+ *   VIDEO_IN <- CD
+ *   FMIC_IN  <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  */
 
 /*
@@ -44,52 +50,53 @@
  *
  * CMI8788:
  *
- * I²C <-> PCM1796 (front)
+ *   I²C <-> PCM1796 (addr 1001100) (front)
  *
- * GPI 0 <- external power present
+ *   GPI 0 <- external power present
  *
- * GPIO 0 -> enable output to speakers
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 0 -> enable HDMI (0) or speaker (1) output
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 4 <- daughterboard detection
+ *   GPIO 5 <- daughterboard detection
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> ?
+ *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
- * TXD -> HDMI controller
- * RXD <- HDMI controller
- *
- * PCM1796 front: AD1,0 <- 0,0
+ *   UART <-> HDMI controller
  *
  * CM9780:
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN <- aux
+ *   CD_IN  <- CD
+ *   MIC_IN <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  *
  * no daughterboard
  * ----------------
  *
- * GPIO 4 <- 1
+ *   GPIO 4 <- 1
  *
  * H6 daughterboard
  * ----------------
  *
- * GPIO 4 <- 0
- * GPIO 5 <- 0
- *
- * I²C <-> PCM1796 (surround)
- *     <-> PCM1796 (center/LFE)
- *     <-> PCM1796 (back)
+ *   GPIO 4 <- 0
+ *   GPIO 5 <- 0
  *
- * PCM1796 surround:   AD1,0 <- 0,1
- * PCM1796 center/LFE: AD1,0 <- 1,0
- * PCM1796 back:       AD1,0 <- 1,1
+ *   I²C <-> PCM1796 (addr 1001101) (surround)
+ *       <-> PCM1796 (addr 1001110) (center/LFE)
+ *       <-> PCM1796 (addr 1001111) (back)
  *
  * unknown daughterboard
  * ---------------------
  *
- * GPIO 4 <- 0
- * GPIO 5 <- 1
- *
- * I²C <-> CS4362A (surround, center/LFE, back)
+ *   GPIO 4 <- 0
+ *   GPIO 5 <- 1
  *
- * CS4362A: AD0 <- 0
+ *   I²C <-> CS4362A (addr 0011000) (surround, center/LFE, back)
  */
 
 /*
@@ -98,32 +105,35 @@
  *
  * CMI8788:
  *
- * I²C <-> PCM1792A
- *     <-> CS2000 (ST only)
+ *   I²C <-> PCM1792A (addr 1001100)
+ *       <-> CS2000 (addr 1001110) (ST only)
  *
- * ADC1 MCLK -> REF_CLK of CS2000 (ST only)
+ *   ADC1 MCLK -> REF_CLK of CS2000 (ST only)
  *
- * GPI 0 <- external power present (STX only)
+ *   GPI 0 <- external power present (STX only)
  *
- * GPIO 0 -> enable output to speakers
- * GPIO 1 -> route HP to front panel (0) or rear jack (1)
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 7 -> route output to speaker jacks (0) or HP (1)
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *   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 4 <- daughterboard detection
+ *   GPIO 5 <- daughterboard detection
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> route output to speaker jacks (0) or HP (1)
+ *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
  * PCM1792A:
  *
- * AD1,0 <- 0,0
- * SCK <- CLK_OUT of CS2000 (ST only)
+ *   SCK <- CLK_OUT of CS2000 (ST only)
  *
- * CS2000:
+ * CM9780:
  *
- * AD0 <- 0
+ *   LINE_OUT -> input of ADC
  *
- * CM9780:
+ *   AUX_IN <- aux
+ *   MIC_IN <- mic
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  *
  * H6 daughterboard
  * ----------------
@@ -132,12 +142,49 @@
  * GPIO 5 <- 0
  */
 
+/*
+ * Xonar Xense
+ * -----------
+ *
+ * CMI8788:
+ *
+ *   I²C <-> PCM1796 (addr 1001100) (front)
+ *       <-> CS4362A (addr 0011000) (surround, center/LFE, back)
+ *       <-> CS2000 (addr 1001110)
+ *
+ *   ADC1 MCLK -> REF_CLK of CS2000
+ *
+ *   GPI 0 <- external power present
+ *
+ *   GPIO 0 -> enable output
+ *   GPIO 1 -> route HP to front panel (0) or rear jack (1)
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 4 -> enable output
+ *   GPIO 5 -> enable output
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> route output to HP (0) or speaker (1)
+ *   GPIO 8 -> route input jack to mic-in (0) or line-in (1)
+ *
+ * CM9780:
+ *
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN   <- aux
+ *   VIDEO_IN <- ?
+ *   FMIC_IN  <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   GPO 1 -> route mic-in from input jack (0) or front panel header (1)
+ */
+
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
+#include <sound/info.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
@@ -155,12 +202,14 @@
 #define GPIO_INPUT_ROUTE        0x0100
 
 #define GPIO_HDAV_OUTPUT_ENABLE 0x0001
+#define GPIO_HDAV_MAGIC         0x00c0
 
 #define GPIO_DB_MASK            0x0030
 #define GPIO_DB_H6              0x0000
 
 #define GPIO_ST_OUTPUT_ENABLE   0x0001
 #define GPIO_ST_HP_REAR         0x0002
+#define GPIO_ST_MAGIC           0x0040
 #define GPIO_ST_HP              0x0080
 
 #define I2C_DEVICE_PCM1796(i)   (0x98 + ((i) << 1))     /* 10011, ii, /W=0 */
@@ -174,11 +223,12 @@ struct xonar_pcm179x {
         unsigned int dacs;
         u8 pcm1796_regs[4][5];
         unsigned int current_rate;
-        bool os_128;
+        bool h6;
         bool hp_active;
         s8 hp_gain_offset;
         bool has_cs2000;
-        u8 cs2000_fun_cfg_1;
+        u8 cs2000_regs[0x1f];
+        bool broken_i2c;
 };
 
 struct xonar_hdav {
@@ -237,16 +287,14 @@ static void cs2000_write(struct oxygen *chip, u8 reg, u8 value)
         struct xonar_pcm179x *data = chip->model_data;
 
         oxygen_write_i2c(chip, I2C_DEVICE_CS2000, reg, value);
-        if (reg == CS2000_FUN_CFG_1)
-                data->cs2000_fun_cfg_1 = value;
+        data->cs2000_regs[reg] = value;
 }
 
 static void cs2000_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
-        if (reg != CS2000_FUN_CFG_1 ||
-            value != data->cs2000_fun_cfg_1)
+        if (value != data->cs2000_regs[reg])
                 cs2000_write(chip, reg, value);
 }
 
@@ -256,6 +304,7 @@ static void pcm1796_registers_init(struct oxygen *chip)
         unsigned int i;
         s8 gain_offset;
 
+        msleep(1);
         gain_offset = data->hp_active ? data->hp_gain_offset : 0;
         for (i = 0; i < data->dacs; ++i) {
                 /* set ATLD before ATL/ATR */
@@ -270,6 +319,7 @@ static void pcm1796_registers_init(struct oxygen *chip)
                 pcm1796_write(chip, i, 20,
                               data->pcm1796_regs[0][20 - PCM1796_REG_BASE]);
                 pcm1796_write(chip, i, 21, 0);
+                gain_offset = 0;
         }
 }
 
@@ -278,10 +328,11 @@ static void pcm1796_init(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE |
-                PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+                PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
         data->pcm1796_regs[0][19 - PCM1796_REG_BASE] =
                 PCM1796_FLT_SHARP | PCM1796_ATS_1;
-        data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = PCM1796_OS_64;
+        data->pcm1796_regs[0][20 - PCM1796_REG_BASE] =
+                data->h6 ? PCM1796_OS_64 : PCM1796_OS_128;
         pcm1796_registers_init(chip);
         data->current_rate = 48000;
 }
@@ -327,18 +378,20 @@ static void xonar_hdav_init(struct oxygen *chip)
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
                        OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
+                       OXYGEN_2WIRE_SPEED_STANDARD);
 
         data->pcm179x.generic.anti_pop_delay = 100;
         data->pcm179x.generic.output_enable_bit = GPIO_HDAV_OUTPUT_ENABLE;
         data->pcm179x.generic.ext_power_reg = OXYGEN_GPI_DATA;
         data->pcm179x.generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
         data->pcm179x.generic.ext_power_bit = GPI_EXT_POWER;
-        data->pcm179x.dacs = chip->model.private_data ? 4 : 1;
+        data->pcm179x.dacs = chip->model.dac_channels_mixer / 2;
+        data->pcm179x.h6 = chip->model.dac_channels_mixer > 2;
 
         pcm1796_init(chip);
 
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_HDAV_MAGIC | GPIO_INPUT_ROUTE);
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_INPUT_ROUTE);
 
         xonar_init_cs53x1(chip);
@@ -355,22 +408,22 @@ static void xonar_st_init_i2c(struct oxygen *chip)
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
                        OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
+                       OXYGEN_2WIRE_SPEED_STANDARD);
 }
 
 static void xonar_st_init_common(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
-        data->generic.anti_pop_delay = 100;
         data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE;
-        data->dacs = chip->model.private_data ? 4 : 1;
+        data->dacs = chip->model.dac_channels_mixer / 2;
         data->hp_gain_offset = 2*-18;
 
         pcm1796_init(chip);
 
         oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
+                          GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR |
+                          GPIO_ST_MAGIC | GPIO_ST_HP);
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
                             GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
 
@@ -399,22 +452,30 @@ static void cs2000_registers_init(struct oxygen *chip)
         cs2000_write(chip, CS2000_RATIO_0 + 1, 0x10);
         cs2000_write(chip, CS2000_RATIO_0 + 2, 0x00);
         cs2000_write(chip, CS2000_RATIO_0 + 3, 0x00);
-        cs2000_write(chip, CS2000_FUN_CFG_1, data->cs2000_fun_cfg_1);
+        cs2000_write(chip, CS2000_FUN_CFG_1,
+                     data->cs2000_regs[CS2000_FUN_CFG_1]);
         cs2000_write(chip, CS2000_FUN_CFG_2, 0);
         cs2000_write(chip, CS2000_GLOBAL_CFG, CS2000_EN_DEV_CFG_2);
+        msleep(3); /* PLL lock delay */
 }
 
 static void xonar_st_init(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
+        data->generic.anti_pop_delay = 100;
+        data->h6 = chip->model.dac_channels_mixer > 2;
         data->has_cs2000 = 1;
-        data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1;
+        data->cs2000_regs[CS2000_FUN_CFG_1] = CS2000_REF_CLK_DIV_1;
+        data->broken_i2c = true;
 
         oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,
-                       OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_I2S |
-                       OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 |
-                       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+                       OXYGEN_RATE_48000 |
+                       OXYGEN_I2S_FORMAT_I2S |
+                       OXYGEN_I2S_MCLK(data->h6 ? MCLK_256 : MCLK_512) |
+                       OXYGEN_I2S_BITS_16 |
+                       OXYGEN_I2S_MASTER |
+                       OXYGEN_I2S_BCLK_64);
 
         xonar_st_init_i2c(chip);
         cs2000_registers_init(chip);
@@ -428,6 +489,7 @@ static void xonar_stx_init(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         xonar_st_init_i2c(chip);
+        data->generic.anti_pop_delay = 800;
         data->generic.ext_power_reg = OXYGEN_GPI_DATA;
         data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
         data->generic.ext_power_bit = GPI_EXT_POWER;
@@ -494,44 +556,16 @@ static void xonar_st_resume(struct oxygen *chip)
         xonar_stx_resume(chip);
 }
 
-static unsigned int mclk_from_rate(struct oxygen *chip, unsigned int rate)
-{
-        struct xonar_pcm179x *data = chip->model_data;
-
-        if (rate <= 32000)
-                return OXYGEN_I2S_MCLK_512;
-        else if (rate <= 48000 && data->os_128)
-                return OXYGEN_I2S_MCLK_512;
-        else if (rate <= 96000)
-                return OXYGEN_I2S_MCLK_256;
-        else
-                return OXYGEN_I2S_MCLK_128;
-}
-
-static unsigned int get_pcm1796_i2s_mclk(struct oxygen *chip,
-                                         unsigned int channel,
-                                         struct snd_pcm_hw_params *params)
-{
-        if (channel == PCM_MULTICH)
-                return mclk_from_rate(chip, params_rate(params));
-        else
-                return oxygen_default_i2s_mclk(chip, channel, params);
-}
-
 static void update_pcm1796_oversampling(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
         unsigned int i;
         u8 reg;
 
-        if (data->current_rate <= 32000)
+        if (data->current_rate <= 48000 && !data->h6)
                 reg = PCM1796_OS_128;
-        else if (data->current_rate <= 48000 && data->os_128)
-                reg = PCM1796_OS_128;
-        else if (data->current_rate <= 96000 || data->os_128)
-                reg = PCM1796_OS_64;
         else
-                reg = PCM1796_OS_32;
+                reg = PCM1796_OS_64;
         for (i = 0; i < data->dacs; ++i)
                 pcm1796_write_cached(chip, i, 20, reg);
 }
@@ -541,6 +575,7 @@ static void set_pcm1796_params(struct oxygen *chip,
 {
         struct xonar_pcm179x *data = chip->model_data;
 
+        msleep(1);
         data->current_rate = params_rate(params);
         update_pcm1796_oversampling(chip);
 }
@@ -557,6 +592,7 @@ static void update_pcm1796_volume(struct oxygen *chip)
                                      + gain_offset);
                 pcm1796_write_cached(chip, i, 17, chip->dac_volume[i * 2 + 1]
                                      + gain_offset);
+                gain_offset = 0;
         }
 }
 
@@ -566,7 +602,7 @@ static void update_pcm1796_mute(struct oxygen *chip)
         unsigned int i;
         u8 value;
 
-        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
         if (chip->dac_mute)
                 value |= PCM1796_MUTE;
         for (i = 0; i < data->dacs; ++i)
@@ -579,45 +615,35 @@ static void update_cs2000_rate(struct oxygen *chip, unsigned int rate)
         u8 rate_mclk, reg;
 
         switch (rate) {
-                /* XXX Why is the I2S A MCLK half the actual I2S MCLK? */
         case 32000:
-                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
-                break;
-        case 44100:
-                if (data->os_128)
-                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
-                else
-                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_128;
-                break;
-        default: /* 48000 */
-                if (data->os_128)
-                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
-                else
-                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_128;
-                break;
         case 64000:
-                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_32000;
                 break;
+        case 44100:
         case 88200:
-                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
-                break;
-        case 96000:
-                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
-                break;
         case 176400:
-                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_44100;
                 break;
+        default:
+        case 48000:
+        case 96000:
         case 192000:
-                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_48000;
                 break;
         }
-        oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT, rate_mclk,
-                              OXYGEN_I2S_RATE_MASK | OXYGEN_I2S_MCLK_MASK);
-        if ((rate_mclk & OXYGEN_I2S_MCLK_MASK) <= OXYGEN_I2S_MCLK_128)
+
+        if (rate <= 96000 && (rate > 48000 || data->h6)) {
+                rate_mclk |= OXYGEN_I2S_MCLK(MCLK_256);
                 reg = CS2000_REF_CLK_DIV_1;
-        else
+        } else {
+                rate_mclk |= OXYGEN_I2S_MCLK(MCLK_512);
                 reg = CS2000_REF_CLK_DIV_2;
+        }
+
+        oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT, rate_mclk,
+                              OXYGEN_I2S_RATE_MASK | OXYGEN_I2S_MCLK_MASK);
         cs2000_write_cached(chip, CS2000_FUN_CFG_1, reg);
+        msleep(3); /* PLL lock delay */
 }
 
 static void set_st_params(struct oxygen *chip,
@@ -652,13 +678,7 @@ static int rolloff_info(struct snd_kcontrol *ctl,
                 "Sharp Roll-off", "Slow Roll-off"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int rolloff_get(struct snd_kcontrol *ctl,
@@ -706,57 +726,13 @@ static const struct snd_kcontrol_new rolloff_control = {
         .put = rolloff_put,
 };
 
-static int os_128_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
-{
-        static const char *const names[2] = { "64x", "128x" };
-
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
-}
-
-static int os_128_get(struct snd_kcontrol *ctl,
-                      struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        struct xonar_pcm179x *data = chip->model_data;
-
-        value->value.enumerated.item[0] = data->os_128;
-        return 0;
-}
-
-static int os_128_put(struct snd_kcontrol *ctl,
-                      struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        struct xonar_pcm179x *data = chip->model_data;
-        int changed;
-
-        mutex_lock(&chip->mutex);
-        changed = value->value.enumerated.item[0] != data->os_128;
-        if (changed) {
-                data->os_128 = value->value.enumerated.item[0];
-                if (data->has_cs2000)
-                        update_cs2000_rate(chip, data->current_rate);
-                oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
-                                      mclk_from_rate(chip, data->current_rate),
-                                      OXYGEN_I2S_MCLK_MASK);
-                update_pcm1796_oversampling(chip);
-        }
-        mutex_unlock(&chip->mutex);
-        return changed;
-}
-
-static const struct snd_kcontrol_new os_128_control = {
+static const struct snd_kcontrol_new hdav_hdmi_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "DAC Oversampling Playback Enum",
-        .info = os_128_info,
-        .get = os_128_get,
-        .put = os_128_put,
+        .name = "HDMI Playback Switch",
+        .info = snd_ctl_boolean_mono_info,
+        .get = xonar_gpio_bit_switch_get,
+        .put = xonar_gpio_bit_switch_put,
+        .private_value = GPIO_HDAV_OUTPUT_ENABLE | XONAR_GPIO_BIT_INVERT,
 };
 
 static int st_output_switch_info(struct snd_kcontrol *ctl,
@@ -766,13 +742,7 @@ static int st_output_switch_info(struct snd_kcontrol *ctl,
                 "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;
+        return snd_ctl_enum_info(info, 1, 3, names);
 }
 
 static int st_output_switch_get(struct snd_kcontrol *ctl,
@@ -827,13 +797,7 @@ static int st_hp_volume_offset_info(struct snd_kcontrol *ctl,
                 "< 64 ohms", "64-300 ohms", "300-600 ohms"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item > 2)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 3, names);
 }
 
 static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,
@@ -915,23 +879,25 @@ static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
         return 0;
 }
 
-static int xonar_st_control_filter(struct snd_kcontrol_new *template)
+static int xonar_st_h6_control_filter(struct snd_kcontrol_new *template)
 {
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
+        if (!strncmp(template->name, "Master Playback ", 16))
+                /* no volume/mute, as I²C to the third DAC does not work */
+                return 1;
         return 0;
 }
 
 static int add_pcm1796_controls(struct oxygen *chip)
 {
+        struct xonar_pcm179x *data = chip->model_data;
         int err;
 
-        err = snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
-        if (err < 0)
-                return err;
-        err = snd_ctl_add(chip->card, snd_ctl_new1(&os_128_control, chip));
-        if (err < 0)
-                return err;
+        if (!data->broken_i2c) {
+                err = snd_ctl_add(chip->card,
+                                  snd_ctl_new1(&rolloff_control, chip));
+                if (err < 0)
+                        return err;
+        }
         return 0;
 }
 
@@ -950,7 +916,15 @@ static int xonar_d2_mixer_init(struct oxygen *chip)
 
 static int xonar_hdav_mixer_init(struct oxygen *chip)
 {
-        return add_pcm1796_controls(chip);
+        int err;
+
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&hdav_hdmi_control, chip));
+        if (err < 0)
+                return err;
+        err = add_pcm1796_controls(chip);
+        if (err < 0)
+                return err;
+        return 0;
 }
 
 static int xonar_st_mixer_init(struct oxygen *chip)
@@ -970,6 +944,45 @@ static int xonar_st_mixer_init(struct oxygen *chip)
         return 0;
 }
 
+static void dump_pcm1796_registers(struct oxygen *chip,
+                                   struct snd_info_buffer *buffer)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int dac, i;
+
+        for (dac = 0; dac < data->dacs; ++dac) {
+                snd_iprintf(buffer, "\nPCM1796 %u:", dac + 1);
+                for (i = 0; i < 5; ++i)
+                        snd_iprintf(buffer, " %02x",
+                                    data->pcm1796_regs[dac][i]);
+        }
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_cs2000_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+
+        if (data->has_cs2000) {
+                snd_iprintf(buffer, "\nCS2000:\n00:   ");
+                for (i = 1; i < 0x10; ++i)
+                        snd_iprintf(buffer, " %02x", data->cs2000_regs[i]);
+                snd_iprintf(buffer, "\n10:");
+                for (i = 0x10; i < 0x1f; ++i)
+                        snd_iprintf(buffer, " %02x", data->cs2000_regs[i]);
+                snd_iprintf(buffer, "\n");
+        }
+}
+
+static void dump_st_registers(struct oxygen *chip,
+                              struct snd_info_buffer *buffer)
+{
+        dump_pcm1796_registers(chip, buffer);
+        dump_cs2000_registers(chip, buffer);
+}
+
 static const struct oxygen_model model_xonar_d2 = {
         .longname = "Asus Virtuoso 200",
         .chip = "AV200",
@@ -979,11 +992,11 @@ static const struct oxygen_model model_xonar_d2 = {
         .cleanup = xonar_d2_cleanup,
         .suspend = xonar_d2_suspend,
         .resume = xonar_d2_resume,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_pcm1796_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
+        .dump_registers = dump_pcm1796_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_pcm179x),
         .device_config = PLAYBACK_0_TO_I2S |
@@ -991,14 +1004,18 @@ static const struct oxygen_model model_xonar_d2 = {
                          CAPTURE_0_FROM_I2S_2 |
                          CAPTURE_1_FROM_SPDIF |
                          MIDI_OUTPUT |
-                         MIDI_INPUT,
-        .dac_channels = 8,
+                         MIDI_INPUT |
+                         AC97_CD_INPUT,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 8,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .misc_flags = OXYGEN_MISC_MIDI,
         .function_flags = OXYGEN_FUNCTION_SPI |
                           OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1011,25 +1028,28 @@ static const struct oxygen_model model_xonar_hdav = {
         .suspend = xonar_hdav_suspend,
         .resume = xonar_hdav_resume,
         .pcm_hardware_filter = xonar_hdmi_pcm_hardware_filter,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_hdav_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
         .uart_input = xonar_hdmi_uart_input,
         .ac97_switch = xonar_line_mic_ac97_switch,
+        .dump_registers = dump_pcm1796_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_hdav),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_2 |
                          CAPTURE_1_FROM_SPDIF,
-        .dac_channels = 8,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 2,
         .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,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1037,27 +1057,30 @@ static const struct oxygen_model model_xonar_st = {
         .longname = "Asus Virtuoso 100",
         .chip = "AV200",
         .init = xonar_st_init,
-        .control_filter = xonar_st_control_filter,
         .mixer_init = xonar_st_mixer_init,
         .cleanup = xonar_st_cleanup,
         .suspend = xonar_st_suspend,
         .resume = xonar_st_resume,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_st_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
         .ac97_switch = xonar_line_mic_ac97_switch,
+        .dump_registers = dump_st_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_pcm179x),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
-        .dac_channels = 2,
+                         CAPTURE_0_FROM_I2S_2 |
+                         AC97_FMIC_SWITCH,
+        .dac_channels_pcm = 2,
+        .dac_channels_mixer = 2,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1083,7 +1106,8 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                         break;
                 case GPIO_DB_H6:
                         chip->model.shortname = "Xonar HDAV1.3+H6";
-                        chip->model.private_data = 1;
+                        chip->model.dac_channels_mixer = 8;
+                        chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
                         break;
                 }
                 break;
@@ -1096,8 +1120,10 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                         break;
                 case GPIO_DB_H6:
                         chip->model.shortname = "Xonar ST+H6";
-                        chip->model.dac_channels = 8;
-                        chip->model.private_data = 1;
+                        chip->model.control_filter = xonar_st_h6_control_filter;
+                        chip->model.dac_channels_pcm = 8;
+                        chip->model.dac_channels_mixer = 8;
+                        chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
                         break;
                 }
                 break;
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index b82c1cfa96f5..42d1ab136217 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -1,5 +1,5 @@
 /*
- * card driver for models with WM8776/WM8766 DACs (Xonar DS)
+ * card driver for models with WM8776/WM8766 DACs (Xonar DS/HDAV1.3 Slim)
  *
  * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
  *
@@ -22,19 +22,49 @@
  *
  * CMI8788:
  *
- * SPI 0 -> WM8766 (surround, center/LFE, back)
- * SPI 1 -> WM8776 (front, input)
+ *   SPI 0 -> WM8766 (surround, center/LFE, back)
+ *   SPI 1 -> WM8776 (front, input)
  *
- * GPIO 4 <- headphone detect
- * GPIO 6 -> route input jack to input 1/2 (1/0)
- * GPIO 7 -> enable output to speakers
- * GPIO 8 -> enable output to speakers
+ *   GPIO 4 <- headphone detect, 0 = plugged
+ *   GPIO 6 -> route input jack to mic-in (0) or line-in (1)
+ *   GPIO 7 -> enable output to front L/R speaker channels
+ *   GPIO 8 -> enable output to other speaker channels and front panel headphone
+ *
+ * WM8776:
+ *
+ *   input 1 <- line
+ *   input 2 <- mic
+ *   input 3 <- front mic
+ *   input 4 <- aux
+ */
+
+/*
+ * Xonar HDAV1.3 Slim
+ * ------------------
+ *
+ * CMI8788:
+ *
+ *   I²C <-> WM8776 (addr 0011010)
+ *
+ *   GPIO 0  -> disable HDMI output
+ *   GPIO 1  -> enable HP output
+ *   GPIO 6  -> firmware EEPROM I²C clock
+ *   GPIO 7 <-> firmware EEPROM I²C data
+ *
+ *   UART <-> HDMI controller
+ *
+ * WM8776:
+ *
+ *   input 1 <- mic
+ *   input 2 <- aux
  */
 
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <sound/control.h>
 #include <sound/core.h>
+#include <sound/info.h>
+#include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
@@ -44,7 +74,15 @@
 
 #define GPIO_DS_HP_DETECT       0x0010
 #define GPIO_DS_INPUT_ROUTE     0x0040
-#define GPIO_DS_OUTPUT_ENABLE   0x0180
+#define GPIO_DS_OUTPUT_FRONTLR  0x0080
+#define GPIO_DS_OUTPUT_ENABLE   0x0100
+
+#define GPIO_SLIM_HDMI_DISABLE  0x0001
+#define GPIO_SLIM_OUTPUT_ENABLE 0x0002
+#define GPIO_SLIM_FIRMWARE_CLK  0x0040
+#define GPIO_SLIM_FIRMWARE_DATA 0x0080
+
+#define I2C_DEVICE_WM8776       0x34    /* 001101, 0, /W=0 */
 
 #define LC_CONTROL_LIMITER      0x40000000
 #define LC_CONTROL_ALC          0x20000000
@@ -56,19 +94,38 @@ struct xonar_wm87x6 {
         struct snd_kcontrol *line_adcmux_control;
         struct snd_kcontrol *mic_adcmux_control;
         struct snd_kcontrol *lc_controls[13];
+        struct snd_jack *hp_jack;
+        struct xonar_hdmi hdmi;
 };
 
-static void wm8776_write(struct oxygen *chip,
-                         unsigned int reg, unsigned int value)
+static void wm8776_write_spi(struct oxygen *chip,
+                             unsigned int reg, unsigned int value)
 {
-        struct xonar_wm87x6 *data = chip->model_data;
-
         oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
                          OXYGEN_SPI_DATA_LENGTH_2 |
                          OXYGEN_SPI_CLOCK_160 |
                          (1 << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                          (reg << 9) | value);
+}
+
+static void wm8776_write_i2c(struct oxygen *chip,
+                             unsigned int reg, unsigned int value)
+{
+        oxygen_write_i2c(chip, I2C_DEVICE_WM8776,
+                         (reg << 1) | (value >> 8), value);
+}
+
+static void wm8776_write(struct oxygen *chip,
+                         unsigned int reg, unsigned int value)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        if ((chip->model.function_flags & OXYGEN_FUNCTION_2WIRE_SPI_MASK) ==
+            OXYGEN_FUNCTION_SPI)
+                wm8776_write_spi(chip, reg, value);
+        else
+                wm8776_write_i2c(chip, reg, value);
         if (reg < ARRAY_SIZE(data->wm8776_regs)) {
                 if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER)
                         value &= ~WM8776_UPDATE;
@@ -97,8 +154,12 @@ static void wm8766_write(struct oxygen *chip,
                          (0 << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                          (reg << 9) | value);
-        if (reg < ARRAY_SIZE(data->wm8766_regs))
+        if (reg < ARRAY_SIZE(data->wm8766_regs)) {
+                if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
+                    (reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
+                        value &= ~WM8766_UPDATE;
                 data->wm8766_regs[reg] = value;
+        }
 }
 
 static void wm8766_write_cached(struct oxygen *chip,
@@ -107,12 +168,8 @@ static void wm8766_write_cached(struct oxygen *chip,
         struct xonar_wm87x6 *data = chip->model_data;
 
         if (reg >= ARRAY_SIZE(data->wm8766_regs) ||
-            value != data->wm8766_regs[reg]) {
-                if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
-                    (reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
-                        value &= ~WM8766_UPDATE;
+            value != data->wm8766_regs[reg])
                 wm8766_write(chip, reg, value);
-        }
 }
 
 static void wm8776_registers_init(struct oxygen *chip)
@@ -141,7 +198,10 @@ static void wm8776_registers_init(struct oxygen *chip)
 
 static void wm8766_registers_init(struct oxygen *chip)
 {
+        struct xonar_wm87x6 *data = chip->model_data;
+
         wm8766_write(chip, WM8766_RESET, 0);
+        wm8766_write(chip, WM8766_DAC_CTRL, data->wm8766_regs[WM8766_DAC_CTRL]);
         wm8766_write(chip, WM8766_INT_CTRL, WM8766_FMT_LJUST | WM8766_IWL_24);
         wm8766_write(chip, WM8766_DAC_CTRL2,
                      WM8766_ZCD | (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
@@ -170,6 +230,40 @@ static void wm8776_init(struct oxygen *chip)
         wm8776_registers_init(chip);
 }
 
+static void wm8766_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        data->wm8766_regs[WM8766_DAC_CTRL] =
+                WM8766_PL_LEFT_LEFT | WM8766_PL_RIGHT_RIGHT;
+        wm8766_registers_init(chip);
+}
+
+static void xonar_ds_handle_hp_jack(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        bool hp_plugged;
+        unsigned int reg;
+
+        mutex_lock(&chip->mutex);
+
+        hp_plugged = !(oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                       GPIO_DS_HP_DETECT);
+
+        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                              hp_plugged ? 0 : GPIO_DS_OUTPUT_FRONTLR,
+                              GPIO_DS_OUTPUT_FRONTLR);
+
+        reg = data->wm8766_regs[WM8766_DAC_CTRL] & ~WM8766_MUTEALL;
+        if (hp_plugged)
+                reg |= WM8766_MUTEALL;
+        wm8766_write_cached(chip, WM8766_DAC_CTRL, reg);
+
+        snd_jack_report(data->hp_jack, hp_plugged ? SND_JACK_HEADPHONE : 0);
+
+        mutex_unlock(&chip->mutex);
+}
+
 static void xonar_ds_init(struct oxygen *chip)
 {
         struct xonar_wm87x6 *data = chip->model_data;
@@ -178,36 +272,85 @@ static void xonar_ds_init(struct oxygen *chip)
         data->generic.output_enable_bit = GPIO_DS_OUTPUT_ENABLE;
 
         wm8776_init(chip);
-        wm8766_registers_init(chip);
+        wm8766_init(chip);
 
-        oxygen_write16_masked(chip, OXYGEN_GPIO_CONTROL, GPIO_DS_INPUT_ROUTE,
-                              GPIO_DS_HP_DETECT | GPIO_DS_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_DS_INPUT_ROUTE | GPIO_DS_OUTPUT_FRONTLR);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                            GPIO_DS_HP_DETECT);
         oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DS_INPUT_ROUTE);
         oxygen_set_bits16(chip, OXYGEN_GPIO_INTERRUPT_MASK, GPIO_DS_HP_DETECT);
         chip->interrupt_mask |= OXYGEN_INT_GPIO;
 
         xonar_enable_output(chip);
 
+        snd_jack_new(chip->card, "Headphone",
+                     SND_JACK_HEADPHONE, &data->hp_jack);
+        xonar_ds_handle_hp_jack(chip);
+
         snd_component_add(chip->card, "WM8776");
         snd_component_add(chip->card, "WM8766");
 }
 
+static void xonar_hdav_slim_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        data->generic.anti_pop_delay = 300;
+        data->generic.output_enable_bit = GPIO_SLIM_OUTPUT_ENABLE;
+
+        wm8776_init(chip);
+
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_SLIM_HDMI_DISABLE |
+                          GPIO_SLIM_FIRMWARE_CLK |
+                          GPIO_SLIM_FIRMWARE_DATA);
+
+        xonar_hdmi_init(chip, &data->hdmi);
+        xonar_enable_output(chip);
+
+        snd_component_add(chip->card, "WM8776");
+}
+
 static void xonar_ds_cleanup(struct oxygen *chip)
 {
         xonar_disable_output(chip);
         wm8776_write(chip, WM8776_RESET, 0);
 }
 
+static void xonar_hdav_slim_cleanup(struct oxygen *chip)
+{
+        xonar_hdmi_cleanup(chip);
+        xonar_disable_output(chip);
+        wm8776_write(chip, WM8776_RESET, 0);
+        msleep(2);
+}
+
 static void xonar_ds_suspend(struct oxygen *chip)
 {
         xonar_ds_cleanup(chip);
 }
 
+static void xonar_hdav_slim_suspend(struct oxygen *chip)
+{
+        xonar_hdav_slim_cleanup(chip);
+}
+
 static void xonar_ds_resume(struct oxygen *chip)
 {
         wm8776_registers_init(chip);
         wm8766_registers_init(chip);
         xonar_enable_output(chip);
+        xonar_ds_handle_hp_jack(chip);
+}
+
+static void xonar_hdav_slim_resume(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        wm8776_registers_init(chip);
+        xonar_hdmi_resume(chip, &data->hdmi);
+        xonar_enable_output(chip);
 }
 
 static void wm8776_adc_hardware_filter(unsigned int channel,
@@ -224,6 +367,13 @@ static void wm8776_adc_hardware_filter(unsigned int channel,
         }
 }
 
+static void xonar_hdav_slim_hardware_filter(unsigned int channel,
+                                            struct snd_pcm_hardware *hardware)
+{
+        wm8776_adc_hardware_filter(channel, hardware);
+        xonar_hdmi_pcm_hardware_filter(channel, hardware);
+}
+
 static void set_wm87x6_dac_params(struct oxygen *chip,
                                   struct snd_pcm_hw_params *params)
 {
@@ -240,6 +390,14 @@ static void set_wm8776_adc_params(struct oxygen *chip,
         wm8776_write_cached(chip, WM8776_MSTRCTRL, reg);
 }
 
+static void set_hdav_slim_dac_params(struct oxygen *chip,
+                                     struct snd_pcm_hw_params *params)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        xonar_set_hdmi_params(chip, &data->hdmi, params);
+}
+
 static void update_wm8776_volume(struct oxygen *chip)
 {
         struct xonar_wm87x6 *data = chip->model_data;
@@ -323,12 +481,27 @@ static void update_wm87x6_mute(struct oxygen *chip)
                             (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
 }
 
-static void xonar_ds_gpio_changed(struct oxygen *chip)
+static void update_wm8766_center_lfe_mix(struct oxygen *chip, bool mixed)
 {
-        u16 bits;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int reg;
+
+        /*
+         * The WM8766 can mix left and right channels, but this setting
+         * applies to all three stereo pairs.
+         */
+        reg = data->wm8766_regs[WM8766_DAC_CTRL] &
+                ~(WM8766_PL_LEFT_MASK | WM8766_PL_RIGHT_MASK);
+        if (mixed)
+                reg |= WM8766_PL_LEFT_LRMIX | WM8766_PL_RIGHT_LRMIX;
+        else
+                reg |= WM8766_PL_LEFT_LEFT | WM8766_PL_RIGHT_RIGHT;
+        wm8766_write_cached(chip, WM8766_DAC_CTRL, reg);
+}
 
-        bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        snd_printk(KERN_INFO "HP detect: %d\n", !!(bits & GPIO_DS_HP_DETECT));
+static void xonar_ds_gpio_changed(struct oxygen *chip)
+{
+        xonar_ds_handle_hp_jack(chip);
 }
 
 static int wm8776_bit_switch_get(struct snd_kcontrol *ctl,
@@ -404,11 +577,6 @@ static int wm8776_field_enum_info(struct snd_kcontrol *ctl,
         const char *const *names;
 
         max = (ctl->private_value >> 12) & 0xf;
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = max + 1;
-        if (info->value.enumerated.item > max)
-                info->value.enumerated.item = max;
         switch ((ctl->private_value >> 24) & 0x1f) {
         case WM8776_ALCCTRL2:
                 names = hld;
@@ -432,8 +600,7 @@ static int wm8776_field_enum_info(struct snd_kcontrol *ctl,
         default:
                 return -ENXIO;
         }
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, max + 1, names);
 }
 
 static int wm8776_field_volume_info(struct snd_kcontrol *ctl,
@@ -690,13 +857,8 @@ static int wm8776_level_control_info(struct snd_kcontrol *ctl,
         static const char *const names[3] = {
                 "None", "Peak Limiter", "Automatic Level Control"
         };
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item >= 3)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+
+        return snd_ctl_enum_info(info, 1, 3, names);
 }
 
 static int wm8776_level_control_get(struct snd_kcontrol *ctl,
@@ -782,13 +944,7 @@ static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
                 "None", "High-pass Filter"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
@@ -896,7 +1052,57 @@ static const struct snd_kcontrol_new ds_controls[] = {
                 .put = wm8776_input_mux_put,
                 .private_value = 1 << 1,
         },
-        WM8776_BIT_SWITCH("Aux", WM8776_ADCMUX, 1 << 2, 0, 0),
+        WM8776_BIT_SWITCH("Front Mic Capture Switch",
+                          WM8776_ADCMUX, 1 << 2, 0, 0),
+        WM8776_BIT_SWITCH("Aux Capture Switch",
+                          WM8776_ADCMUX, 1 << 3, 0, 0),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "ADC Filter Capture Enum",
+                .info = hpf_info,
+                .get = hpf_get,
+                .put = hpf_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Level Control Capture Enum",
+                .info = wm8776_level_control_info,
+                .get = wm8776_level_control_get,
+                .put = wm8776_level_control_put,
+                .private_value = 0,
+        },
+};
+static const struct snd_kcontrol_new hdav_slim_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "HDMI Playback Switch",
+                .info = snd_ctl_boolean_mono_info,
+                .get = xonar_gpio_bit_switch_get,
+                .put = xonar_gpio_bit_switch_put,
+                .private_value = GPIO_SLIM_HDMI_DISABLE | XONAR_GPIO_BIT_INVERT,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Headphone Playback Volume",
+                .info = wm8776_hp_vol_info,
+                .get = wm8776_hp_vol_get,
+                .put = wm8776_hp_vol_put,
+                .tlv = { .p = wm8776_hp_db_scale },
+        },
+        WM8776_BIT_SWITCH("Headphone Playback Switch",
+                          WM8776_PWRDOWN, WM8776_HPPD, 1, 0),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input Capture Volume",
+                .info = wm8776_input_vol_info,
+                .get = wm8776_input_vol_get,
+                .put = wm8776_input_vol_put,
+                .tlv = { .p = wm8776_adc_db_scale },
+        },
+        WM8776_BIT_SWITCH("Mic Capture Switch",
+                          WM8776_ADCMUX, 1 << 0, 0, 0),
+        WM8776_BIT_SWITCH("Aux Capture Switch",
+                          WM8776_ADCMUX, 1 << 1, 0, 0),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "ADC Filter Capture Enum",
@@ -956,10 +1162,23 @@ static const struct snd_kcontrol_new lc_controls[] = {
                                 LC_CONTROL_ALC, wm8776_ngth_db_scale),
 };
 
-static int xonar_ds_control_filter(struct snd_kcontrol_new *template)
+static int add_lc_controls(struct oxygen *chip)
 {
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int i;
+        struct snd_kcontrol *ctl;
+        int err;
+
+        BUILD_BUG_ON(ARRAY_SIZE(lc_controls) != ARRAY_SIZE(data->lc_controls));
+        for (i = 0; i < ARRAY_SIZE(lc_controls); ++i) {
+                ctl = snd_ctl_new1(&lc_controls[i], chip);
+                if (!ctl)
+                        return -ENOMEM;
+                err = snd_ctl_add(chip->card, ctl);
+                if (err < 0)
+                        return err;
+                data->lc_controls[i] = ctl;
+        }
         return 0;
 }
 
@@ -984,45 +1203,117 @@ static int xonar_ds_mixer_init(struct oxygen *chip)
         }
         if (!data->line_adcmux_control || !data->mic_adcmux_control)
                 return -ENXIO;
-        BUILD_BUG_ON(ARRAY_SIZE(lc_controls) != ARRAY_SIZE(data->lc_controls));
-        for (i = 0; i < ARRAY_SIZE(lc_controls); ++i) {
-                ctl = snd_ctl_new1(&lc_controls[i], chip);
+
+        return add_lc_controls(chip);
+}
+
+static int xonar_hdav_slim_mixer_init(struct oxygen *chip)
+{
+        unsigned int i;
+        struct snd_kcontrol *ctl;
+        int err;
+
+        for (i = 0; i < ARRAY_SIZE(hdav_slim_controls); ++i) {
+                ctl = snd_ctl_new1(&hdav_slim_controls[i], chip);
                 if (!ctl)
                         return -ENOMEM;
                 err = snd_ctl_add(chip->card, ctl);
                 if (err < 0)
                         return err;
-                data->lc_controls[i] = ctl;
         }
-        return 0;
+
+        return add_lc_controls(chip);
+}
+
+static void dump_wm8776_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int i;
+
+        snd_iprintf(buffer, "\nWM8776:\n00:");
+        for (i = 0; i < 0x10; ++i)
+                snd_iprintf(buffer, " %03x", data->wm8776_regs[i]);
+        snd_iprintf(buffer, "\n10:");
+        for (i = 0x10; i < 0x17; ++i)
+                snd_iprintf(buffer, " %03x", data->wm8776_regs[i]);
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_wm87x6_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int i;
+
+        dump_wm8776_registers(chip, buffer);
+        snd_iprintf(buffer, "\nWM8766:\n00:");
+        for (i = 0; i < 0x10; ++i)
+                snd_iprintf(buffer, " %03x", data->wm8766_regs[i]);
+        snd_iprintf(buffer, "\n");
 }
 
 static const struct oxygen_model model_xonar_ds = {
         .shortname = "Xonar DS",
-        .longname = "Asus Virtuoso 200",
+        .longname = "Asus Virtuoso 66",
         .chip = "AV200",
         .init = xonar_ds_init,
-        .control_filter = xonar_ds_control_filter,
         .mixer_init = xonar_ds_mixer_init,
         .cleanup = xonar_ds_cleanup,
         .suspend = xonar_ds_suspend,
         .resume = xonar_ds_resume,
         .pcm_hardware_filter = wm8776_adc_hardware_filter,
-        .get_i2s_mclk = oxygen_default_i2s_mclk,
         .set_dac_params = set_wm87x6_dac_params,
         .set_adc_params = set_wm8776_adc_params,
         .update_dac_volume = update_wm87x6_volume,
         .update_dac_mute = update_wm87x6_mute,
+        .update_center_lfe_mix = update_wm8766_center_lfe_mix,
         .gpio_changed = xonar_ds_gpio_changed,
+        .dump_registers = dump_wm87x6_registers,
         .dac_tlv = wm87x6_dac_db_scale,
         .model_data_size = sizeof(struct xonar_wm87x6),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_1,
-        .dac_channels = 8,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 8,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .function_flags = OXYGEN_FUNCTION_SPI,
+        .dac_mclks = OXYGEN_MCLKS(256, 256, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+static const struct oxygen_model model_xonar_hdav_slim = {
+        .shortname = "Xonar HDAV1.3 Slim",
+        .longname = "Asus Virtuoso 200",
+        .chip = "AV200",
+        .init = xonar_hdav_slim_init,
+        .mixer_init = xonar_hdav_slim_mixer_init,
+        .cleanup = xonar_hdav_slim_cleanup,
+        .suspend = xonar_hdav_slim_suspend,
+        .resume = xonar_hdav_slim_resume,
+        .pcm_hardware_filter = xonar_hdav_slim_hardware_filter,
+        .set_dac_params = set_hdav_slim_dac_params,
+        .set_adc_params = set_wm8776_adc_params,
+        .update_dac_volume = update_wm8776_volume,
+        .update_dac_mute = update_wm8776_mute,
+        .uart_input = xonar_hdmi_uart_input,
+        .dump_registers = dump_wm8776_registers,
+        .dac_tlv = wm87x6_dac_db_scale,
+        .model_data_size = sizeof(struct xonar_wm87x6),
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         CAPTURE_0_FROM_I2S_1,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 2,
+        .dac_volume_min = 255 - 2*60,
+        .dac_volume_max = 255,
+        .function_flags = OXYGEN_FUNCTION_2WIRE,
+        .dac_mclks = OXYGEN_MCLKS(256, 256, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 256, 128),
         .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
@@ -1034,6 +1325,9 @@ int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
         case 0x838e:
                 chip->model = model_xonar_ds;
                 break;
+        case 0x835e:
+                chip->model = model_xonar_hdav_slim;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index 833e7180ad2d..304411c1fe4b 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@ -1042,11 +1042,11 @@ void pcxhr_msg_tasklet(unsigned long arg)
         int i, j;
 
         if (mgr->src_it_dsp & PCXHR_IRQ_FREQ_CHANGE)
-                snd_printdd("TASKLET : PCXHR_IRQ_FREQ_CHANGE event occured\n");
+                snd_printdd("TASKLET : PCXHR_IRQ_FREQ_CHANGE event occurred\n");
         if (mgr->src_it_dsp & PCXHR_IRQ_TIME_CODE)
-                snd_printdd("TASKLET : PCXHR_IRQ_TIME_CODE event occured\n");
+                snd_printdd("TASKLET : PCXHR_IRQ_TIME_CODE event occurred\n");
         if (mgr->src_it_dsp & PCXHR_IRQ_NOTIFY)
-                snd_printdd("TASKLET : PCXHR_IRQ_NOTIFY event occured\n");
+                snd_printdd("TASKLET : PCXHR_IRQ_NOTIFY event occurred\n");
         if (mgr->src_it_dsp & (PCXHR_IRQ_FREQ_CHANGE | PCXHR_IRQ_TIME_CODE)) {
                 /* clear events FREQ_CHANGE and TIME_CODE */
                 pcxhr_init_rmh(prmh, CMD_TEST_IT);
@@ -1055,7 +1055,7 @@ void pcxhr_msg_tasklet(unsigned long arg)
                             err, prmh->stat[0]);
         }
         if (mgr->src_it_dsp & PCXHR_IRQ_ASYNC) {
-                snd_printdd("TASKLET : PCXHR_IRQ_ASYNC event occured\n");
+                snd_printdd("TASKLET : PCXHR_IRQ_ASYNC event occurred\n");
 
                 pcxhr_init_rmh(prmh, CMD_ASYNC);
                 prmh->cmd[0] |= 1;      /* add SEL_ASYNC_EVENTS */
@@ -1233,7 +1233,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
         reg = PCXHR_INPL(mgr, PCXHR_PLX_L2PCIDB);
         PCXHR_OUTPL(mgr, PCXHR_PLX_L2PCIDB, reg);
 
-        /* timer irq occured */
+        /* timer irq occurred */
         if (reg & PCXHR_IRQ_TIMER) {
                 int timer_toggle = reg & PCXHR_IRQ_TIMER;
                 /* is a 24 bit counter */
@@ -1288,7 +1288,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
         if (reg & PCXHR_IRQ_MASK) {
                 if (reg & PCXHR_IRQ_ASYNC) {
                         /* as we didn't request any async notifications,
-                         * some kind of xrun error will probably occured
+                         * some kind of xrun error will probably occurred
                          */
                         /* better resynchronize all streams next interrupt : */
                         mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID;
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index d19dc052c391..9ff247fc8871 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -150,7 +150,7 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
 #define RME96_RCR_BITPOS_F1 28
 #define RME96_RCR_BITPOS_F2 29
 
-/* Additonal register bits */
+/* Additional register bits */
 #define RME96_AR_WSEL       (1 << 0)
 #define RME96_AR_ANALOG     (1 << 1)
 #define RME96_AR_FREQPAD_0  (1 << 2)
@@ -1527,14 +1527,14 @@ snd_rme96_free(void *private_data)
 static void
 snd_rme96_free_spdif_pcm(struct snd_pcm *pcm)
 {
-        struct rme96 *rme96 = (struct rme96 *) pcm->private_data;
+        struct rme96 *rme96 = pcm->private_data;
         rme96->spdif_pcm = NULL;
 }
 
 static void
 snd_rme96_free_adat_pcm(struct snd_pcm *pcm)
 {
-        struct rme96 *rme96 = (struct rme96 *) pcm->private_data;
+        struct rme96 *rme96 = pcm->private_data;
         rme96->adat_pcm = NULL;
 }
 
@@ -1661,7 +1661,7 @@ static void
 snd_rme96_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
         int n;
-        struct rme96 *rme96 = (struct rme96 *)entry->private_data;
+        struct rme96 *rme96 = entry->private_data;
         
         rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
 
@@ -2348,7 +2348,7 @@ snd_rme96_probe(struct pci_dev *pci,
         if (err < 0)
                 return err;
         card->private_free = snd_rme96_card_free;
-        rme96 = (struct rme96 *)card->private_data;     
+        rme96 = card->private_data;
         rme96->card = card;
         rme96->pci = pci;
         snd_card_set_dev(card, &pci->dev);
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index d6fa7bfd9aa1..2d8332416c83 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -60,6 +60,7 @@ MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
                 "{RME HDSP-9652},"
                 "{RME HDSP-9632}}");
 #ifdef HDSP_FW_LOADER
+MODULE_FIRMWARE("rpm_firmware.bin");
 MODULE_FIRMWARE("multiface_firmware.bin");
 MODULE_FIRMWARE("multiface_firmware_rev11.bin");
 MODULE_FIRMWARE("digiface_firmware.bin");
@@ -81,6 +82,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 #define H9632_SS_CHANNELS        12
 #define H9632_DS_CHANNELS        8
 #define H9632_QS_CHANNELS        4
+#define RPM_CHANNELS             6
 
 /* Write registers. These are defined as byte-offsets from the iobase value.
  */
@@ -191,6 +193,25 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
 #define HDSP_PhoneGain1           (1<<30)
 #define HDSP_QuadSpeed            (1<<31)
 
+/* RPM uses some of the registers for special purposes */
+#define HDSP_RPM_Inp12            0x04A00
+#define HDSP_RPM_Inp12_Phon_6dB   0x00800  /* Dolby */
+#define HDSP_RPM_Inp12_Phon_0dB   0x00000  /* .. */
+#define HDSP_RPM_Inp12_Phon_n6dB  0x04000  /* inp_0 */
+#define HDSP_RPM_Inp12_Line_0dB   0x04200  /* Dolby+PRO */
+#define HDSP_RPM_Inp12_Line_n6dB  0x00200  /* PRO */
+
+#define HDSP_RPM_Inp34            0x32000
+#define HDSP_RPM_Inp34_Phon_6dB   0x20000  /* SyncRef1 */
+#define HDSP_RPM_Inp34_Phon_0dB   0x00000  /* .. */
+#define HDSP_RPM_Inp34_Phon_n6dB  0x02000  /* SyncRef2 */
+#define HDSP_RPM_Inp34_Line_0dB   0x30000  /* SyncRef1+SyncRef0 */
+#define HDSP_RPM_Inp34_Line_n6dB  0x10000  /* SyncRef0 */
+
+#define HDSP_RPM_Bypass           0x01000
+
+#define HDSP_RPM_Disconnect       0x00001
+
 #define HDSP_ADGainMask       (HDSP_ADGain0|HDSP_ADGain1)
 #define HDSP_ADGainMinus10dBV  HDSP_ADGainMask
 #define HDSP_ADGainPlus4dBu   (HDSP_ADGain0)
@@ -450,7 +471,7 @@ struct hdsp {
         u32                   creg_spdif;
         u32                   creg_spdif_stream;
         int                   clock_source_locked;
-        char                 *card_name;             /* digiface/multiface */
+        char                 *card_name;         /* digiface/multiface/rpm */
         enum HDSP_IO_Type     io_type;               /* ditto, but for code use */
         unsigned short        firmware_rev;
         unsigned short        state;                 /* stores state bits */
@@ -612,6 +633,7 @@ static int hdsp_playback_to_output_key (struct hdsp *hdsp, int in, int out)
         switch (hdsp->io_type) {
         case Multiface:
         case Digiface:
+        case RPM:
         default:
                 if (hdsp->firmware_rev == 0xa)
                         return (64 * out) + (32 + (in));
@@ -629,6 +651,7 @@ static int hdsp_input_to_output_key (struct hdsp *hdsp, int in, int out)
         switch (hdsp->io_type) {
         case Multiface:
         case Digiface:
+        case RPM:
         default:
                 if (hdsp->firmware_rev == 0xa)
                         return (64 * out) + in;
@@ -655,7 +678,7 @@ 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");
+                snd_printk("Hammerfall-DSP: no IO box connected!\n");
                 hdsp->state &= ~HDSP_FirmwareLoaded;
                 return -EIO;
         }
@@ -680,7 +703,7 @@ static int hdsp_wait_for_iobox(struct hdsp *hdsp, unsigned int loops,
                 }
         }
 
-        snd_printk("Hammerfall-DSP: no Digiface or Multiface connected!\n");
+        snd_printk("Hammerfall-DSP: no IO box connected!\n");
         hdsp->state &= ~HDSP_FirmwareLoaded;
         return -EIO;
 }
@@ -752,17 +775,21 @@ static int hdsp_get_iobox_version (struct hdsp *hdsp)
                 hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
                 hdsp_write (hdsp, HDSP_fifoData, 0);
 
-                if (hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT)) {
-                        hdsp->io_type = Multiface;
-                        hdsp_write (hdsp, HDSP_control2Reg, HDSP_VERSION_BIT);
-                        hdsp_write (hdsp, HDSP_control2Reg, HDSP_S_LOAD);
-                        hdsp_fifo_wait (hdsp, 0, HDSP_SHORT_WAIT);
+                if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT)) {
+                        hdsp_write(hdsp, HDSP_control2Reg, HDSP_VERSION_BIT);
+                        hdsp_write(hdsp, HDSP_control2Reg, HDSP_S_LOAD);
+                        if (hdsp_fifo_wait(hdsp, 0, HDSP_SHORT_WAIT))
+                                hdsp->io_type = RPM;
+                        else
+                                hdsp->io_type = Multiface;
                 } else {
                         hdsp->io_type = Digiface;
                 }
         } else {
                 /* firmware was already loaded, get iobox type */
-                if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
+                if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version2)
+                        hdsp->io_type = RPM;
+                else if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
                         hdsp->io_type = Multiface;
                 else
                         hdsp->io_type = Digiface;
@@ -1184,6 +1211,7 @@ static int hdsp_set_rate(struct hdsp *hdsp, int rate, int called_internally)
                         hdsp->channel_map = channel_map_ds;
         } else {
                 switch (hdsp->io_type) {
+                case RPM:
                 case Multiface:
                         hdsp->channel_map = channel_map_mf_ss;
                         break;
@@ -3231,6 +3259,318 @@ HDSP_PRECISE_POINTER("Precise Pointer", 0),
 HDSP_USE_MIDI_TASKLET("Use Midi Tasklet", 0),
 };
 
+
+static int hdsp_rpm_input12(struct hdsp *hdsp)
+{
+        switch (hdsp->control_register & HDSP_RPM_Inp12) {
+        case HDSP_RPM_Inp12_Phon_6dB:
+                return 0;
+        case HDSP_RPM_Inp12_Phon_n6dB:
+                return 2;
+        case HDSP_RPM_Inp12_Line_0dB:
+                return 3;
+        case HDSP_RPM_Inp12_Line_n6dB:
+                return 4;
+        }
+        return 1;
+}
+
+
+static int snd_hdsp_get_rpm_input12(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdsp_rpm_input12(hdsp);
+        return 0;
+}
+
+
+static int hdsp_set_rpm_input12(struct hdsp *hdsp, int mode)
+{
+        hdsp->control_register &= ~HDSP_RPM_Inp12;
+        switch (mode) {
+        case 0:
+                hdsp->control_register |= HDSP_RPM_Inp12_Phon_6dB;
+                break;
+        case 1:
+                break;
+        case 2:
+                hdsp->control_register |= HDSP_RPM_Inp12_Phon_n6dB;
+                break;
+        case 3:
+                hdsp->control_register |= HDSP_RPM_Inp12_Line_0dB;
+                break;
+        case 4:
+                hdsp->control_register |= HDSP_RPM_Inp12_Line_n6dB;
+                break;
+        default:
+                return -1;
+        }
+
+        hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+        return 0;
+}
+
+
+static int snd_hdsp_put_rpm_input12(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        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];
+        if (val < 0)
+                val = 0;
+        if (val > 4)
+                val = 4;
+        spin_lock_irq(&hdsp->lock);
+        if (val != hdsp_rpm_input12(hdsp))
+                change = (hdsp_set_rpm_input12(hdsp, val) == 0) ? 1 : 0;
+        else
+                change = 0;
+        spin_unlock_irq(&hdsp->lock);
+        return change;
+}
+
+
+static int snd_hdsp_info_rpm_input(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {"Phono +6dB", "Phono 0dB", "Phono -6dB", "Line 0dB", "Line -6dB"};
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 5;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+
+static int hdsp_rpm_input34(struct hdsp *hdsp)
+{
+        switch (hdsp->control_register & HDSP_RPM_Inp34) {
+        case HDSP_RPM_Inp34_Phon_6dB:
+                return 0;
+        case HDSP_RPM_Inp34_Phon_n6dB:
+                return 2;
+        case HDSP_RPM_Inp34_Line_0dB:
+                return 3;
+        case HDSP_RPM_Inp34_Line_n6dB:
+                return 4;
+        }
+        return 1;
+}
+
+
+static int snd_hdsp_get_rpm_input34(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdsp_rpm_input34(hdsp);
+        return 0;
+}
+
+
+static int hdsp_set_rpm_input34(struct hdsp *hdsp, int mode)
+{
+        hdsp->control_register &= ~HDSP_RPM_Inp34;
+        switch (mode) {
+        case 0:
+                hdsp->control_register |= HDSP_RPM_Inp34_Phon_6dB;
+                break;
+        case 1:
+                break;
+        case 2:
+                hdsp->control_register |= HDSP_RPM_Inp34_Phon_n6dB;
+                break;
+        case 3:
+                hdsp->control_register |= HDSP_RPM_Inp34_Line_0dB;
+                break;
+        case 4:
+                hdsp->control_register |= HDSP_RPM_Inp34_Line_n6dB;
+                break;
+        default:
+                return -1;
+        }
+
+        hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+        return 0;
+}
+
+
+static int snd_hdsp_put_rpm_input34(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        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];
+        if (val < 0)
+                val = 0;
+        if (val > 4)
+                val = 4;
+        spin_lock_irq(&hdsp->lock);
+        if (val != hdsp_rpm_input34(hdsp))
+                change = (hdsp_set_rpm_input34(hdsp, val) == 0) ? 1 : 0;
+        else
+                change = 0;
+        spin_unlock_irq(&hdsp->lock);
+        return change;
+}
+
+
+/* RPM Bypass switch */
+static int hdsp_rpm_bypass(struct hdsp *hdsp)
+{
+        return (hdsp->control_register & HDSP_RPM_Bypass) ? 1 : 0;
+}
+
+
+static int snd_hdsp_get_rpm_bypass(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = hdsp_rpm_bypass(hdsp);
+        return 0;
+}
+
+
+static int hdsp_set_rpm_bypass(struct hdsp *hdsp, int on)
+{
+        if (on)
+                hdsp->control_register |= HDSP_RPM_Bypass;
+        else
+                hdsp->control_register &= ~HDSP_RPM_Bypass;
+        hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+        return 0;
+}
+
+
+static int snd_hdsp_put_rpm_bypass(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        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;
+        spin_lock_irq(&hdsp->lock);
+        change = (int)val != hdsp_rpm_bypass(hdsp);
+        hdsp_set_rpm_bypass(hdsp, val);
+        spin_unlock_irq(&hdsp->lock);
+        return change;
+}
+
+
+static int snd_hdsp_info_rpm_bypass(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {"On", "Off"};
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+
+/* RPM Disconnect switch */
+static int hdsp_rpm_disconnect(struct hdsp *hdsp)
+{
+        return (hdsp->control_register & HDSP_RPM_Disconnect) ? 1 : 0;
+}
+
+
+static int snd_hdsp_get_rpm_disconnect(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = hdsp_rpm_disconnect(hdsp);
+        return 0;
+}
+
+
+static int hdsp_set_rpm_disconnect(struct hdsp *hdsp, int on)
+{
+        if (on)
+                hdsp->control_register |= HDSP_RPM_Disconnect;
+        else
+                hdsp->control_register &= ~HDSP_RPM_Disconnect;
+        hdsp_write(hdsp, HDSP_controlRegister, hdsp->control_register);
+        return 0;
+}
+
+
+static int snd_hdsp_put_rpm_disconnect(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        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;
+        spin_lock_irq(&hdsp->lock);
+        change = (int)val != hdsp_rpm_disconnect(hdsp);
+        hdsp_set_rpm_disconnect(hdsp, val);
+        spin_unlock_irq(&hdsp->lock);
+        return change;
+}
+
+static int snd_hdsp_info_rpm_disconnect(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {"On", "Off"};
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static struct snd_kcontrol_new snd_hdsp_rpm_controls[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "RPM Bypass",
+                .get = snd_hdsp_get_rpm_bypass,
+                .put = snd_hdsp_put_rpm_bypass,
+                .info = snd_hdsp_info_rpm_bypass
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "RPM Disconnect",
+                .get = snd_hdsp_get_rpm_disconnect,
+                .put = snd_hdsp_put_rpm_disconnect,
+                .info = snd_hdsp_info_rpm_disconnect
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input 1/2",
+                .get = snd_hdsp_get_rpm_input12,
+                .put = snd_hdsp_put_rpm_input12,
+                .info = snd_hdsp_info_rpm_input
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Input 3/4",
+                .get = snd_hdsp_get_rpm_input34,
+                .put = snd_hdsp_put_rpm_input34,
+                .info = snd_hdsp_info_rpm_input
+        },
+        HDSP_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSP_MIXER("Mixer", 0)
+};
+
 static struct snd_kcontrol_new snd_hdsp_96xx_aeb = HDSP_AEB("Analog Extension Board", 0);
 static struct snd_kcontrol_new snd_hdsp_adat_sync_check = HDSP_ADAT_SYNC_CHECK;
 
@@ -3240,6 +3580,16 @@ static int snd_hdsp_create_controls(struct snd_card *card, struct hdsp *hdsp)
         int err;
         struct snd_kcontrol *kctl;
 
+        if (hdsp->io_type == RPM) {
+                /* RPM Bypass, Disconnect and Input switches */
+                for (idx = 0; idx < ARRAY_SIZE(snd_hdsp_rpm_controls); idx++) {
+                        err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_hdsp_rpm_controls[idx], hdsp));
+                        if (err < 0)
+                                return err;
+                }
+                return 0;
+        }
+
         for (idx = 0; idx < ARRAY_SIZE(snd_hdsp_controls); idx++) {
                 if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_hdsp_controls[idx], hdsp))) < 0)
                         return err;
@@ -3284,7 +3634,7 @@ static int snd_hdsp_create_controls(struct snd_card *card, struct hdsp *hdsp)
 static void
 snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-        struct hdsp *hdsp = (struct hdsp *) entry->private_data;
+        struct hdsp *hdsp = entry->private_data;
         unsigned int status;
         unsigned int status2;
         char *pref_sync_ref;
@@ -3459,48 +3809,102 @@ snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 
         snd_iprintf(buffer, "\n");
 
-        switch (hdsp_spdif_in(hdsp)) {
-        case HDSP_SPDIFIN_OPTICAL:
-                snd_iprintf(buffer, "IEC958 input: Optical\n");
-                break;
-        case HDSP_SPDIFIN_COAXIAL:
-                snd_iprintf(buffer, "IEC958 input: Coaxial\n");
-                break;
-        case HDSP_SPDIFIN_INTERNAL:
-                snd_iprintf(buffer, "IEC958 input: Internal\n");
-                break;
-        case HDSP_SPDIFIN_AES:
-                snd_iprintf(buffer, "IEC958 input: AES\n");
-                break;
-        default:
-                snd_iprintf(buffer, "IEC958 input: ???\n");
-                break;
+        if (hdsp->io_type != RPM) {
+                switch (hdsp_spdif_in(hdsp)) {
+                case HDSP_SPDIFIN_OPTICAL:
+                        snd_iprintf(buffer, "IEC958 input: Optical\n");
+                        break;
+                case HDSP_SPDIFIN_COAXIAL:
+                        snd_iprintf(buffer, "IEC958 input: Coaxial\n");
+                        break;
+                case HDSP_SPDIFIN_INTERNAL:
+                        snd_iprintf(buffer, "IEC958 input: Internal\n");
+                        break;
+                case HDSP_SPDIFIN_AES:
+                        snd_iprintf(buffer, "IEC958 input: AES\n");
+                        break;
+                default:
+                        snd_iprintf(buffer, "IEC958 input: ???\n");
+                        break;
+                }
         }
 
-        if (hdsp->control_register & HDSP_SPDIFOpticalOut)
-                snd_iprintf(buffer, "IEC958 output: Coaxial & ADAT1\n");
-        else
-                snd_iprintf(buffer, "IEC958 output: Coaxial only\n");
+        if (RPM == hdsp->io_type) {
+                if (hdsp->control_register & HDSP_RPM_Bypass)
+                        snd_iprintf(buffer, "RPM Bypass: disabled\n");
+                else
+                        snd_iprintf(buffer, "RPM Bypass: enabled\n");
+                if (hdsp->control_register & HDSP_RPM_Disconnect)
+                        snd_iprintf(buffer, "RPM disconnected\n");
+                else
+                        snd_iprintf(buffer, "RPM connected\n");
 
-        if (hdsp->control_register & HDSP_SPDIFProfessional)
-                snd_iprintf(buffer, "IEC958 quality: Professional\n");
-        else
-                snd_iprintf(buffer, "IEC958 quality: Consumer\n");
+                switch (hdsp->control_register & HDSP_RPM_Inp12) {
+                case HDSP_RPM_Inp12_Phon_6dB:
+                        snd_iprintf(buffer, "Input 1/2: Phono, 6dB\n");
+                        break;
+                case HDSP_RPM_Inp12_Phon_0dB:
+                        snd_iprintf(buffer, "Input 1/2: Phono, 0dB\n");
+                        break;
+                case HDSP_RPM_Inp12_Phon_n6dB:
+                        snd_iprintf(buffer, "Input 1/2: Phono, -6dB\n");
+                        break;
+                case HDSP_RPM_Inp12_Line_0dB:
+                        snd_iprintf(buffer, "Input 1/2: Line, 0dB\n");
+                        break;
+                case HDSP_RPM_Inp12_Line_n6dB:
+                        snd_iprintf(buffer, "Input 1/2: Line, -6dB\n");
+                        break;
+                default:
+                        snd_iprintf(buffer, "Input 1/2: ???\n");
+                }
 
-        if (hdsp->control_register & HDSP_SPDIFEmphasis)
-                snd_iprintf(buffer, "IEC958 emphasis: on\n");
-        else
-                snd_iprintf(buffer, "IEC958 emphasis: off\n");
+                switch (hdsp->control_register & HDSP_RPM_Inp34) {
+                case HDSP_RPM_Inp34_Phon_6dB:
+                        snd_iprintf(buffer, "Input 3/4: Phono, 6dB\n");
+                        break;
+                case HDSP_RPM_Inp34_Phon_0dB:
+                        snd_iprintf(buffer, "Input 3/4: Phono, 0dB\n");
+                        break;
+                case HDSP_RPM_Inp34_Phon_n6dB:
+                        snd_iprintf(buffer, "Input 3/4: Phono, -6dB\n");
+                        break;
+                case HDSP_RPM_Inp34_Line_0dB:
+                        snd_iprintf(buffer, "Input 3/4: Line, 0dB\n");
+                        break;
+                case HDSP_RPM_Inp34_Line_n6dB:
+                        snd_iprintf(buffer, "Input 3/4: Line, -6dB\n");
+                        break;
+                default:
+                        snd_iprintf(buffer, "Input 3/4: ???\n");
+                }
 
-        if (hdsp->control_register & HDSP_SPDIFNonAudio)
-                snd_iprintf(buffer, "IEC958 NonAudio: on\n");
-        else
-                snd_iprintf(buffer, "IEC958 NonAudio: off\n");
-        if ((x = hdsp_spdif_sample_rate (hdsp)) != 0)
-                snd_iprintf (buffer, "IEC958 sample rate: %d\n", x);
-        else
-                snd_iprintf (buffer, "IEC958 sample rate: Error flag set\n");
+        } else {
+                if (hdsp->control_register & HDSP_SPDIFOpticalOut)
+                        snd_iprintf(buffer, "IEC958 output: Coaxial & ADAT1\n");
+                else
+                        snd_iprintf(buffer, "IEC958 output: Coaxial only\n");
+
+                if (hdsp->control_register & HDSP_SPDIFProfessional)
+                        snd_iprintf(buffer, "IEC958 quality: Professional\n");
+                else
+                        snd_iprintf(buffer, "IEC958 quality: Consumer\n");
+
+                if (hdsp->control_register & HDSP_SPDIFEmphasis)
+                        snd_iprintf(buffer, "IEC958 emphasis: on\n");
+                else
+                        snd_iprintf(buffer, "IEC958 emphasis: off\n");
 
+                if (hdsp->control_register & HDSP_SPDIFNonAudio)
+                        snd_iprintf(buffer, "IEC958 NonAudio: on\n");
+                else
+                        snd_iprintf(buffer, "IEC958 NonAudio: off\n");
+                x = hdsp_spdif_sample_rate(hdsp);
+                if (x != 0)
+                        snd_iprintf(buffer, "IEC958 sample rate: %d\n", x);
+                else
+                        snd_iprintf(buffer, "IEC958 sample rate: Error flag set\n");
+        }
         snd_iprintf(buffer, "\n");
 
         /* Sync Check */
@@ -3765,7 +4169,7 @@ static irqreturn_t snd_hdsp_interrupt(int irq, void *dev_id)
                         snd_hdsp_midi_input_read (&hdsp->midi[0]);
                 }
         }
-        if (hdsp->io_type != Multiface && hdsp->io_type != H9632 && midi1 && midi1status) {
+        if (hdsp->io_type != Multiface && hdsp->io_type != RPM && hdsp->io_type != H9632 && midi1 && midi1status) {
                 if (hdsp->use_midi_tasklet) {
                         /* we disable interrupts for this input until processing is done */
                         hdsp->control_register &= ~HDSP_Midi1InterruptEnable;
@@ -4093,7 +4497,7 @@ static struct snd_pcm_hardware snd_hdsp_playback_subinfo =
                                  SNDRV_PCM_RATE_96000),
         .rate_min =             32000,
         .rate_max =             96000,
-        .channels_min =         14,
+        .channels_min =         6,
         .channels_max =         HDSP_MAX_CHANNELS,
         .buffer_bytes_max =     HDSP_CHANNEL_BUFFER_BYTES * HDSP_MAX_CHANNELS,
         .period_bytes_min =     (64 * 4) * 10,
@@ -4122,7 +4526,7 @@ static struct snd_pcm_hardware snd_hdsp_capture_subinfo =
                                  SNDRV_PCM_RATE_96000),
         .rate_min =             32000,
         .rate_max =             96000,
-        .channels_min =         14,
+        .channels_min =         5,
         .channels_max =         HDSP_MAX_CHANNELS,
         .buffer_bytes_max =     HDSP_CHANNEL_BUFFER_BYTES * HDSP_MAX_CHANNELS,
         .period_bytes_min =     (64 * 4) * 10,
@@ -4357,10 +4761,12 @@ static int snd_hdsp_playback_open(struct snd_pcm_substream *substream)
                              snd_hdsp_hw_rule_rate_out_channels, hdsp,
                              SNDRV_PCM_HW_PARAM_CHANNELS, -1);
 
-        hdsp->creg_spdif_stream = hdsp->creg_spdif;
-        hdsp->spdif_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-        snd_ctl_notify(hdsp->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                       SNDRV_CTL_EVENT_MASK_INFO, &hdsp->spdif_ctl->id);
+        if (RPM != hdsp->io_type) {
+                hdsp->creg_spdif_stream = hdsp->creg_spdif;
+                hdsp->spdif_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                snd_ctl_notify(hdsp->card, SNDRV_CTL_EVENT_MASK_VALUE |
+                        SNDRV_CTL_EVENT_MASK_INFO, &hdsp->spdif_ctl->id);
+        }
         return 0;
 }
 
@@ -4375,9 +4781,11 @@ static int snd_hdsp_playback_release(struct snd_pcm_substream *substream)
 
         spin_unlock_irq(&hdsp->lock);
 
-        hdsp->spdif_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-        snd_ctl_notify(hdsp->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                       SNDRV_CTL_EVENT_MASK_INFO, &hdsp->spdif_ctl->id);
+        if (RPM != hdsp->io_type) {
+                hdsp->spdif_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                snd_ctl_notify(hdsp->card, SNDRV_CTL_EVENT_MASK_VALUE |
+                        SNDRV_CTL_EVENT_MASK_INFO, &hdsp->spdif_ctl->id);
+        }
         return 0;
 }
 
@@ -4566,7 +4974,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 = hw->private_data;
         void __user *argp = (void __user *)arg;
         int err;
 
@@ -4616,7 +5024,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                 if (hdsp->io_type != H9632)
                     info.adatsync_sync_check = (unsigned char)hdsp_adatsync_sync_check(hdsp);
                 info.spdif_sync_check = (unsigned char)hdsp_spdif_sync_check(hdsp);
-                for (i = 0; i < ((hdsp->io_type != Multiface && hdsp->io_type != H9632) ? 3 : 1); ++i)
+                for (i = 0; i < ((hdsp->io_type != Multiface && hdsp->io_type != RPM && hdsp->io_type != H9632) ? 3 : 1); ++i)
                         info.adat_sync_check[i] = (unsigned char)hdsp_adat_sync_check(hdsp, i);
                 info.spdif_in = (unsigned char)hdsp_spdif_in(hdsp);
                 info.spdif_out = (unsigned char)hdsp_spdif_out(hdsp);
@@ -4636,6 +5044,9 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                         info.phone_gain = (unsigned char)hdsp_phone_gain(hdsp);
                         info.xlr_breakout_cable = (unsigned char)hdsp_xlr_breakout_cable(hdsp);
 
+                } else if (hdsp->io_type == RPM) {
+                        info.da_gain = (unsigned char) hdsp_rpm_input12(hdsp);
+                        info.ad_gain = (unsigned char) hdsp_rpm_input34(hdsp);
                 }
                 if (hdsp->io_type == H9632 || hdsp->io_type == H9652)
                         info.analog_extension_board = (unsigned char)hdsp_aeb(hdsp);
@@ -4844,6 +5255,14 @@ static void snd_hdsp_initialize_channels(struct hdsp *hdsp)
                 hdsp->ds_in_channels = hdsp->ds_out_channels = MULTIFACE_DS_CHANNELS;
                 break;
 
+        case RPM:
+                hdsp->card_name = "RME Hammerfall DSP + RPM";
+                hdsp->ss_in_channels = RPM_CHANNELS-1;
+                hdsp->ss_out_channels = RPM_CHANNELS;
+                hdsp->ds_in_channels = RPM_CHANNELS-1;
+                hdsp->ds_out_channels = RPM_CHANNELS;
+                break;
+
         default:
                 /* should never get here */
                 break;
@@ -4930,6 +5349,9 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp)
 
         /* caution: max length of firmware filename is 30! */
         switch (hdsp->io_type) {
+        case RPM:
+                fwfile = "rpm_firmware.bin";
+                break;
         case Multiface:
                 if (hdsp->firmware_rev == 0xa)
                         fwfile = "multiface_firmware.bin";
@@ -5100,7 +5522,9 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
                         return 0;
                 } else {
                         snd_printk(KERN_INFO "Hammerfall-DSP: Firmware already present, initializing card.\n");
-                        if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
+                        if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version2)
+                                hdsp->io_type = RPM;
+                        else if (hdsp_read(hdsp, HDSP_status2Register) & HDSP_version1)
                                 hdsp->io_type = Multiface;
                         else
                                 hdsp->io_type = Digiface;
@@ -5156,7 +5580,7 @@ static int snd_hdsp_free(struct hdsp *hdsp)
 
 static void snd_hdsp_card_free(struct snd_card *card)
 {
-        struct hdsp *hdsp = (struct hdsp *) card->private_data;
+        struct hdsp *hdsp = card->private_data;
 
         if (hdsp)
                 snd_hdsp_free(hdsp);
@@ -5182,7 +5606,7 @@ static int __devinit snd_hdsp_probe(struct pci_dev *pci,
         if (err < 0)
                 return err;
 
-        hdsp = (struct hdsp *) card->private_data;
+        hdsp = card->private_data;
         card->private_free = snd_hdsp_card_free;
         hdsp->dev = dev;
         hdsp->pci = pci;
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 0c98ef9156d8..c8e402fc3782 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -8,6 +8,21 @@
  *      Modified 2006-06-01 for AES32 support by Remy Bruno
  *                                               <remy.bruno@trinnov.com>
  *
+ *      Modified 2009-04-13 for proper metering by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-14 for native float support by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-26 fixed bug in rms metering by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-30 added hw serial number support by Florian Faber
+ *
+ *      Modified 2011-01-14 added S/PDIF input on RayDATs by Adrian Knoth
+ *
+ *      Modified 2011-01-25 variable period sizes on RayDAT/AIO by Adrian Knoth
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -35,6 +50,7 @@
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
+#include <sound/pcm_params.h>
 #include <sound/info.h>
 #include <sound/asoundef.h>
 #include <sound/rawmidi.h>
@@ -47,15 +63,6 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	  /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;         /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 
-/* Disable precise pointer at start */
-static int precise_ptr[SNDRV_CARDS];
-
-/* Send all playback to line outs */
-static int line_outs_monitor[SNDRV_CARDS];
-
-/* Enable Analog Outs on Channel 63/64 by default */
-static int enable_monitor[SNDRV_CARDS];
-
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME HDSPM interface.");
 
@@ -65,42 +72,39 @@ MODULE_PARM_DESC(id, "ID string for RME HDSPM interface.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable/disable specific HDSPM soundcards.");
 
-module_param_array(precise_ptr, bool, NULL, 0444);
-MODULE_PARM_DESC(precise_ptr, "Enable or disable precise pointer.");
-
-module_param_array(line_outs_monitor, bool, NULL, 0444);
-MODULE_PARM_DESC(line_outs_monitor,
-                 "Send playback streams to analog outs by default.");
-
-module_param_array(enable_monitor, bool, NULL, 0444);
-MODULE_PARM_DESC(enable_monitor,
-                 "Enable Analog Out on Channel 63/64 by default.");
 
 MODULE_AUTHOR
-      ("Winfried Ritsch <ritsch_AT_iem.at>, "
-       "Paul Davis <paul@linuxaudiosystems.com>, "
-       "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>, "
-       "Remy Bruno <remy.bruno@trinnov.com>");
+(
+        "Winfried Ritsch <ritsch_AT_iem.at>, "
+        "Paul Davis <paul@linuxaudiosystems.com>, "
+        "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>, "
+        "Remy Bruno <remy.bruno@trinnov.com>, "
+        "Florian Faber <faberman@linuxproaudio.org>, "
+        "Adrian Knoth <adi@drcomp.erfurt.thur.de>"
+);
 MODULE_DESCRIPTION("RME HDSPM");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
-/* --- Write registers. --- 
+/* --- Write registers. ---
   These are defined as byte-offsets from the iobase value.  */
 
+#define HDSPM_WR_SETTINGS             0
+#define HDSPM_outputBufferAddress    32
+#define HDSPM_inputBufferAddress     36
 #define HDSPM_controlRegister        64
 #define HDSPM_interruptConfirmation  96
 #define HDSPM_control2Reg            256  /* not in specs ???????? */
 #define HDSPM_freqReg                256  /* for AES32 */
-#define HDSPM_midiDataOut0           352  /* just believe in old code */
-#define HDSPM_midiDataOut1           356
+#define HDSPM_midiDataOut0           352  /* just believe in old code */
+#define HDSPM_midiDataOut1           356
 #define HDSPM_eeprom_wr              384  /* for AES32 */
 
 /* DMA enable for 64 channels, only Bit 0 is relevant */
-#define HDSPM_outputEnableBase       512  /* 512-767  input  DMA */ 
+#define HDSPM_outputEnableBase       512  /* 512-767  input  DMA */
 #define HDSPM_inputEnableBase        768  /* 768-1023 output DMA */
 
-/* 16 page addresses for each of the 64 channels DMA buffer in and out 
+/* 16 page addresses for each of the 64 channels DMA buffer in and out
    (each 64k=16*4k) Buffer must be 4k aligned (which is default i386 ????) */
 #define HDSPM_pageAddressBufferOut       8192
 #define HDSPM_pageAddressBufferIn        (HDSPM_pageAddressBufferOut+64*16*4)
@@ -119,22 +123,84 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_statusRegister2  192
 #define HDSPM_timecodeRegister 128
 
+/* AIO, RayDAT */
+#define HDSPM_RD_STATUS_0 0
+#define HDSPM_RD_STATUS_1 64
+#define HDSPM_RD_STATUS_2 128
+#define HDSPM_RD_STATUS_3 192
+
+#define HDSPM_RD_TCO           256
+#define HDSPM_RD_PLL_FREQ      512
+#define HDSPM_WR_TCO           128
+
+#define HDSPM_TCO1_TCO_lock                     0x00000001
+#define HDSPM_TCO1_WCK_Input_Range_LSB          0x00000002
+#define HDSPM_TCO1_WCK_Input_Range_MSB          0x00000004
+#define HDSPM_TCO1_LTC_Input_valid              0x00000008
+#define HDSPM_TCO1_WCK_Input_valid              0x00000010
+#define HDSPM_TCO1_Video_Input_Format_NTSC      0x00000020
+#define HDSPM_TCO1_Video_Input_Format_PAL       0x00000040
+
+#define HDSPM_TCO1_set_TC                       0x00000100
+#define HDSPM_TCO1_set_drop_frame_flag          0x00000200
+#define HDSPM_TCO1_LTC_Format_LSB               0x00000400
+#define HDSPM_TCO1_LTC_Format_MSB               0x00000800
+
+#define HDSPM_TCO2_TC_run                       0x00010000
+#define HDSPM_TCO2_WCK_IO_ratio_LSB             0x00020000
+#define HDSPM_TCO2_WCK_IO_ratio_MSB             0x00040000
+#define HDSPM_TCO2_set_num_drop_frames_LSB      0x00080000
+#define HDSPM_TCO2_set_num_drop_frames_MSB      0x00100000
+#define HDSPM_TCO2_set_jam_sync                 0x00200000
+#define HDSPM_TCO2_set_flywheel                 0x00400000
+
+#define HDSPM_TCO2_set_01_4                     0x01000000
+#define HDSPM_TCO2_set_pull_down                0x02000000
+#define HDSPM_TCO2_set_pull_up                  0x04000000
+#define HDSPM_TCO2_set_freq                     0x08000000
+#define HDSPM_TCO2_set_term_75R                 0x10000000
+#define HDSPM_TCO2_set_input_LSB                0x20000000
+#define HDSPM_TCO2_set_input_MSB                0x40000000
+#define HDSPM_TCO2_set_freq_from_app            0x80000000
+
+
+#define HDSPM_midiDataOut0    352
+#define HDSPM_midiDataOut1    356
+#define HDSPM_midiDataOut2    368
+
 #define HDSPM_midiDataIn0     360
 #define HDSPM_midiDataIn1     364
+#define HDSPM_midiDataIn2     372
+#define HDSPM_midiDataIn3     376
 
 /* status is data bytes in MIDI-FIFO (0-128) */
-#define HDSPM_midiStatusOut0  384       
-#define HDSPM_midiStatusOut1  388       
-#define HDSPM_midiStatusIn0   392       
-#define HDSPM_midiStatusIn1   396       
+#define HDSPM_midiStatusOut0  384
+#define HDSPM_midiStatusOut1  388
+#define HDSPM_midiStatusOut2  400
+
+#define HDSPM_midiStatusIn0   392
+#define HDSPM_midiStatusIn1   396
+#define HDSPM_midiStatusIn2   404
+#define HDSPM_midiStatusIn3   408
 
 
 /* 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.
 */
-#define HDSPM_MADI_peakrmsbase  4096    /* 4096-8191 2x64x32Bit Meters */
+
+#define HDSPM_MADI_INPUT_PEAK           4096
+#define HDSPM_MADI_PLAYBACK_PEAK        4352
+#define HDSPM_MADI_OUTPUT_PEAK          4608
+
+#define HDSPM_MADI_INPUT_RMS_L          6144
+#define HDSPM_MADI_PLAYBACK_RMS_L       6400
+#define HDSPM_MADI_OUTPUT_RMS_L         6656
+
+#define HDSPM_MADI_INPUT_RMS_H          7168
+#define HDSPM_MADI_PLAYBACK_RMS_H       7424
+#define HDSPM_MADI_OUTPUT_RMS_H         7680
 
 /* --- Control Register bits --------- */
 #define HDSPM_Start                (1<<0) /* start engine */
@@ -143,7 +209,9 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_Latency1             (1<<2) /* where n is defined */
 #define HDSPM_Latency2             (1<<3) /* by Latency{2,1,0} */
 
-#define HDSPM_ClockModeMaster      (1<<4) /* 1=Master, 0=Slave/Autosync */
+#define HDSPM_ClockModeMaster      (1<<4) /* 1=Master, 0=Autosync */
+#define HDSPM_c0Master          0x1    /* Master clock bit in settings
+                                          register [RayDAT, AIO] */
 
 #define HDSPM_AudioInterruptEnable (1<<5) /* what do you think ? */
 
@@ -157,7 +225,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
                                      56channelMODE=0 */ /* MADI ONLY*/
 #define HDSPM_Emphasis    (1<<10) /* Emphasis */ /* AES32 ONLY */
 
-#define HDSPM_AutoInp     (1<<11) /* Auto Input (takeover) == Safe Mode, 
+#define HDSPM_AutoInp     (1<<11) /* Auto Input (takeover) == Safe Mode,
                                      0=off, 1=on  */ /* MADI ONLY */
 #define HDSPM_Dolby       (1<<11) /* Dolby = "NonAudio" ?? */ /* AES32 ONLY */
 
@@ -166,22 +234,23 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
                                     */
 #define HDSPM_InputSelect1 (1<<15) /* should be 0 */
 
-#define HDSPM_SyncRef0     (1<<16) /* 0=WOrd, 1=MADI */
-#define HDSPM_SyncRef1     (1<<17) /* for AES32: SyncRefN codes the AES # */
 #define HDSPM_SyncRef2     (1<<13)
 #define HDSPM_SyncRef3     (1<<25)
 
 #define HDSPM_SMUX         (1<<18) /* Frame ??? */ /* MADI ONY */
-#define HDSPM_clr_tms      (1<<19) /* clear track marker, do not use 
+#define HDSPM_clr_tms      (1<<19) /* clear track marker, do not use
                                       AES additional bits in
                                       lower 5 Audiodatabits ??? */
 #define HDSPM_taxi_reset   (1<<20) /* ??? */ /* MADI ONLY ? */
 #define HDSPM_WCK48        (1<<20) /* Frame ??? = HDSPM_SMUX */ /* AES32 ONLY */
 
-#define HDSPM_Midi0InterruptEnable (1<<22)
-#define HDSPM_Midi1InterruptEnable (1<<23)
+#define HDSPM_Midi0InterruptEnable 0x0400000
+#define HDSPM_Midi1InterruptEnable 0x0800000
+#define HDSPM_Midi2InterruptEnable 0x0200000
+#define HDSPM_Midi3InterruptEnable 0x4000000
 
 #define HDSPM_LineOut (1<<24) /* Analog Out on channel 63/64 on=1, mute=0 */
+#define HDSPe_FLOAT_FORMAT         0x2000000
 
 #define HDSPM_DS_DoubleWire (1<<26) /* AES32 ONLY */
 #define HDSPM_QS_DoubleWire (1<<27) /* AES32 ONLY */
@@ -198,11 +267,18 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_InputCoaxial   (HDSPM_InputSelect0)
 #define HDSPM_SyncRefMask    (HDSPM_SyncRef0|HDSPM_SyncRef1|\
                               HDSPM_SyncRef2|HDSPM_SyncRef3)
-#define HDSPM_SyncRef_Word   0
-#define HDSPM_SyncRef_MADI   (HDSPM_SyncRef0)
 
-#define HDSPM_SYNC_FROM_WORD 0  /* Preferred sync reference */
-#define HDSPM_SYNC_FROM_MADI 1  /* choices - used by "pref_sync_ref" */
+#define HDSPM_c0_SyncRef0      0x2
+#define HDSPM_c0_SyncRef1      0x4
+#define HDSPM_c0_SyncRef2      0x8
+#define HDSPM_c0_SyncRef3      0x10
+#define HDSPM_c0_SyncRefMask   (HDSPM_c0_SyncRef0 | HDSPM_c0_SyncRef1 |\
+                                HDSPM_c0_SyncRef2 | HDSPM_c0_SyncRef3)
+
+#define HDSPM_SYNC_FROM_WORD    0       /* Preferred sync reference */
+#define HDSPM_SYNC_FROM_MADI    1       /* choices - used by "pref_sync_ref" */
+#define HDSPM_SYNC_FROM_TCO     2
+#define HDSPM_SYNC_FROM_SYNC_IN 3
 
 #define HDSPM_Frequency32KHz    HDSPM_Frequency0
 #define HDSPM_Frequency44_1KHz  HDSPM_Frequency1
@@ -216,17 +292,6 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_Frequency192KHz   (HDSPM_QuadSpeed|HDSPM_Frequency1|\
                                  HDSPM_Frequency0)
 
-/* --- for internal discrimination */
-#define HDSPM_CLOCK_SOURCE_AUTOSYNC          0  /* Sample Clock Sources */
-#define HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ    1
-#define HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ  2
-#define HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ    3
-#define HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ    4
-#define HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ  5
-#define HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ    6
-#define HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ   7
-#define HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ 8
-#define HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ   9
 
 /* Synccheck Status */
 #define HDSPM_SYNC_CHECK_NO_LOCK 0
@@ -236,14 +301,16 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 /* AutoSync References - used by "autosync_ref" control switch */
 #define HDSPM_AUTOSYNC_FROM_WORD      0
 #define HDSPM_AUTOSYNC_FROM_MADI      1
-#define HDSPM_AUTOSYNC_FROM_NONE      2
+#define HDSPM_AUTOSYNC_FROM_TCO       2
+#define HDSPM_AUTOSYNC_FROM_SYNC_IN   3
+#define HDSPM_AUTOSYNC_FROM_NONE      4
 
 /* Possible sources of MADI input */
 #define HDSPM_OPTICAL 0         /* optical   */
 #define HDSPM_COAXIAL 1         /* BNC */
 
 #define hdspm_encode_latency(x)       (((x)<<1) & HDSPM_LatencyMask)
-#define hdspm_decode_latency(x)       (((x) & HDSPM_LatencyMask)>>1)
+#define hdspm_decode_latency(x)       ((((x) & HDSPM_LatencyMask)>>1))
 
 #define hdspm_encode_in(x) (((x)&0x3)<<14)
 #define hdspm_decode_in(x) (((x)>>14)&0x3)
@@ -270,13 +337,21 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_AB_int             (1<<2) /* InputChannel Opt=0, Coax=1
                                          * (like inp0)
                                          */
+
 #define HDSPM_madiLock           (1<<3) /* MADI Locked =1, no=0 */
+#define HDSPM_madiSync          (1<<18) /* MADI is in sync */
+
+#define HDSPM_tcoLock    0x00000020 /* Optional TCO locked status FOR HDSPe MADI! */
+#define HDSPM_tcoSync    0x10000000 /* Optional TCO sync status */
+
+#define HDSPM_syncInLock 0x00010000 /* Sync In lock status FOR HDSPe MADI! */
+#define HDSPM_syncInSync 0x00020000 /* Sync In sync status FOR HDSPe MADI! */
 
 #define HDSPM_BufferPositionMask 0x000FFC0 /* Bit 6..15 : h/w buffer pointer */
-                                           /* since 64byte accurate last 6 bits 
-                                              are not used */
+                        /* since 64byte accurate, last 6 bits are not used */
+
+
 
-#define HDSPM_madiSync          (1<<18) /* MADI is in sync */
 #define HDSPM_DoubleSpeedStatus (1<<19) /* (input) card in double speed */
 
 #define HDSPM_madiFreq0         (1<<22) /* system freq 0=error */
@@ -287,8 +362,19 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_BufferID          (1<<26) /* (Double)Buffer ID toggles with
                                          * Interrupt
                                          */
-#define HDSPM_midi0IRQPending   (1<<30) /* MIDI IRQ is pending  */
-#define HDSPM_midi1IRQPending   (1<<31) /* and aktiv */
+#define HDSPM_tco_detect         0x08000000
+#define HDSPM_tco_lock           0x20000000
+
+#define HDSPM_s2_tco_detect      0x00000040
+#define HDSPM_s2_AEBO_D          0x00000080
+#define HDSPM_s2_AEBI_D          0x00000100
+
+
+#define HDSPM_midi0IRQPending    0x40000000
+#define HDSPM_midi1IRQPending    0x80000000
+#define HDSPM_midi2IRQPending    0x20000000
+#define HDSPM_midi2IRQPendingAES 0x00000020
+#define HDSPM_midi3IRQPending    0x00200000
 
 /* --- status bit helpers */
 #define HDSPM_madiFreqMask  (HDSPM_madiFreq0|HDSPM_madiFreq1|\
@@ -305,7 +391,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
 /* Status2 Register bits */ /* MADI ONLY */
 
-#define HDSPM_version0 (1<<0)   /* not realy defined but I guess */
+#define HDSPM_version0 (1<<0)   /* not really defined but I guess */
 #define HDSPM_version1 (1<<1)   /* in former cards it was ??? */
 #define HDSPM_version2 (1<<2)
 
@@ -317,7 +403,10 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_wc_freq2 (1<<7)   /* 100=64, 101=88.2, 110=96, */
 /* missing Bit   for               111=128, 1000=176.4, 1001=192 */
 
-#define HDSPM_SelSyncRef0 (1<<8)        /* Sync Source in slave mode */
+#define HDSPM_SyncRef0 0x10000  /* Sync Reference */
+#define HDSPM_SyncRef1 0x20000
+
+#define HDSPM_SelSyncRef0 (1<<8)        /* AutoSync Source */
 #define HDSPM_SelSyncRef1 (1<<9)        /* 000=word, 001=MADI, */
 #define HDSPM_SelSyncRef2 (1<<10)       /* 111=no valid signal */
 
@@ -331,11 +420,19 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_wcFreq88_2  (HDSPM_wc_freq0|HDSPM_wc_freq2)
 #define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
 
+#define HDSPM_status1_F_0 0x0400000
+#define HDSPM_status1_F_1 0x0800000
+#define HDSPM_status1_F_2 0x1000000
+#define HDSPM_status1_F_3 0x2000000
+#define HDSPM_status1_freqMask (HDSPM_status1_F_0|HDSPM_status1_F_1|HDSPM_status1_F_2|HDSPM_status1_F_3)
+
 
 #define HDSPM_SelSyncRefMask       (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
                                     HDSPM_SelSyncRef2)
 #define HDSPM_SelSyncRef_WORD      0
 #define HDSPM_SelSyncRef_MADI      (HDSPM_SelSyncRef0)
+#define HDSPM_SelSyncRef_TCO       (HDSPM_SelSyncRef1)
+#define HDSPM_SelSyncRef_SyncIn    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1)
 #define HDSPM_SelSyncRef_NVALID    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
                                     HDSPM_SelSyncRef2)
 
@@ -345,7 +442,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 /* status */
 #define HDSPM_AES32_wcLock      0x0200000
 #define HDSPM_AES32_wcFreq_bit  22
-/* (status >> HDSPM_AES32_wcFreq_bit) & 0xF gives WC frequency (cf function 
+/* (status >> HDSPM_AES32_wcFreq_bit) & 0xF gives WC frequency (cf function
   HDSPM_bit2freq */
 #define HDSPM_AES32_syncref_bit  16
 /* (status >> HDSPM_AES32_syncref_bit) & 0xF gives sync source */
@@ -398,28 +495,349 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define MADI_DS_CHANNELS       32
 #define MADI_QS_CHANNELS       16
 
+#define RAYDAT_SS_CHANNELS     36
+#define RAYDAT_DS_CHANNELS     20
+#define RAYDAT_QS_CHANNELS     12
+
+#define AIO_IN_SS_CHANNELS        14
+#define AIO_IN_DS_CHANNELS        10
+#define AIO_IN_QS_CHANNELS        8
+#define AIO_OUT_SS_CHANNELS        16
+#define AIO_OUT_DS_CHANNELS        12
+#define AIO_OUT_QS_CHANNELS        10
+
+#define AES32_CHANNELS          16
+
 /* the size of a substream (1 mono data stream) */
 #define HDSPM_CHANNEL_BUFFER_SAMPLES  (16*1024)
 #define HDSPM_CHANNEL_BUFFER_BYTES    (4*HDSPM_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, and
-   also the latency to use. 
+   also the latency to use.
    for one direction !!!
 */
 #define HDSPM_DMA_AREA_BYTES (HDSPM_MAX_CHANNELS * HDSPM_CHANNEL_BUFFER_BYTES)
 #define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
 
 /* revisions >= 230 indicate AES32 card */
-#define HDSPM_AESREVISION 230
+#define HDSPM_MADI_OLD_REV      207
+#define HDSPM_MADI_REV          210
+#define HDSPM_RAYDAT_REV        211
+#define HDSPM_AIO_REV           212
+#define HDSPM_MADIFACE_REV      213
+#define HDSPM_AES_REV           240
+#define HDSPM_AES32_REV         234
+#define HDSPM_AES32_OLD_REV     233
 
 /* speed factor modes */
 #define HDSPM_SPEED_SINGLE 0
 #define HDSPM_SPEED_DOUBLE 1
 #define HDSPM_SPEED_QUAD   2
+
 /* names for speed modes */
 static char *hdspm_speed_names[] = { "single", "double", "quad" };
 
+static char *texts_autosync_aes_tco[] = { "Word Clock",
+                                          "AES1", "AES2", "AES3", "AES4",
+                                          "AES5", "AES6", "AES7", "AES8",
+                                          "TCO" };
+static char *texts_autosync_aes[] = { "Word Clock",
+                                      "AES1", "AES2", "AES3", "AES4",
+                                      "AES5", "AES6", "AES7", "AES8" };
+static char *texts_autosync_madi_tco[] = { "Word Clock",
+                                           "MADI", "TCO", "Sync In" };
+static char *texts_autosync_madi[] = { "Word Clock",
+                                       "MADI", "Sync In" };
+
+static char *texts_autosync_raydat_tco[] = {
+        "Word Clock",
+        "ADAT 1", "ADAT 2", "ADAT 3", "ADAT 4",
+        "AES", "SPDIF", "TCO", "Sync In"
+};
+static char *texts_autosync_raydat[] = {
+        "Word Clock",
+        "ADAT 1", "ADAT 2", "ADAT 3", "ADAT 4",
+        "AES", "SPDIF", "Sync In"
+};
+static char *texts_autosync_aio_tco[] = {
+        "Word Clock",
+        "ADAT", "AES", "SPDIF", "TCO", "Sync In"
+};
+static char *texts_autosync_aio[] = { "Word Clock",
+                                      "ADAT", "AES", "SPDIF", "Sync In" };
+
+static char *texts_freq[] = {
+        "No Lock",
+        "32 kHz",
+        "44.1 kHz",
+        "48 kHz",
+        "64 kHz",
+        "88.2 kHz",
+        "96 kHz",
+        "128 kHz",
+        "176.4 kHz",
+        "192 kHz"
+};
+
+static char *texts_ports_madi[] = {
+        "MADI.1", "MADI.2", "MADI.3", "MADI.4", "MADI.5", "MADI.6",
+        "MADI.7", "MADI.8", "MADI.9", "MADI.10", "MADI.11", "MADI.12",
+        "MADI.13", "MADI.14", "MADI.15", "MADI.16", "MADI.17", "MADI.18",
+        "MADI.19", "MADI.20", "MADI.21", "MADI.22", "MADI.23", "MADI.24",
+        "MADI.25", "MADI.26", "MADI.27", "MADI.28", "MADI.29", "MADI.30",
+        "MADI.31", "MADI.32", "MADI.33", "MADI.34", "MADI.35", "MADI.36",
+        "MADI.37", "MADI.38", "MADI.39", "MADI.40", "MADI.41", "MADI.42",
+        "MADI.43", "MADI.44", "MADI.45", "MADI.46", "MADI.47", "MADI.48",
+        "MADI.49", "MADI.50", "MADI.51", "MADI.52", "MADI.53", "MADI.54",
+        "MADI.55", "MADI.56", "MADI.57", "MADI.58", "MADI.59", "MADI.60",
+        "MADI.61", "MADI.62", "MADI.63", "MADI.64",
+};
+
+
+static char *texts_ports_raydat_ss[] = {
+        "ADAT1.1", "ADAT1.2", "ADAT1.3", "ADAT1.4", "ADAT1.5", "ADAT1.6",
+        "ADAT1.7", "ADAT1.8", "ADAT2.1", "ADAT2.2", "ADAT2.3", "ADAT2.4",
+        "ADAT2.5", "ADAT2.6", "ADAT2.7", "ADAT2.8", "ADAT3.1", "ADAT3.2",
+        "ADAT3.3", "ADAT3.4", "ADAT3.5", "ADAT3.6", "ADAT3.7", "ADAT3.8",
+        "ADAT4.1", "ADAT4.2", "ADAT4.3", "ADAT4.4", "ADAT4.5", "ADAT4.6",
+        "ADAT4.7", "ADAT4.8",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+static char *texts_ports_raydat_ds[] = {
+        "ADAT1.1", "ADAT1.2", "ADAT1.3", "ADAT1.4",
+        "ADAT2.1", "ADAT2.2", "ADAT2.3", "ADAT2.4",
+        "ADAT3.1", "ADAT3.2", "ADAT3.3", "ADAT3.4",
+        "ADAT4.1", "ADAT4.2", "ADAT4.3", "ADAT4.4",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+static char *texts_ports_raydat_qs[] = {
+        "ADAT1.1", "ADAT1.2",
+        "ADAT2.1", "ADAT2.2",
+        "ADAT3.1", "ADAT3.2",
+        "ADAT4.1", "ADAT4.2",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+
+static char *texts_ports_aio_in_ss[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4", "ADAT.5", "ADAT.6",
+        "ADAT.7", "ADAT.8"
+};
+
+static char *texts_ports_aio_out_ss[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4", "ADAT.5", "ADAT.6",
+        "ADAT.7", "ADAT.8",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aio_in_ds[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4"
+};
+
+static char *texts_ports_aio_out_ds[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aio_in_qs[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4"
+};
+
+static char *texts_ports_aio_out_qs[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aes32[] = {
+        "AES.1", "AES.2", "AES.3", "AES.4", "AES.5", "AES.6", "AES.7",
+        "AES.8", "AES.9.", "AES.10", "AES.11", "AES.12", "AES.13", "AES.14",
+        "AES.15", "AES.16"
+};
+
+/* These tables map the ALSA channels 1..N to the channels that we
+   need to use in order to find the relevant channel buffer. RME
+   refers to this kind of mapping as between "the ADAT channel and
+   the DMA channel." We index it using the logical audio channel,
+   and the value is the DMA channel (i.e. channel buffer number)
+   where the data for that channel can be read/written from/to.
+*/
+
+static char channel_map_unity_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15,
+        16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31,
+        32, 33, 34, 35, 36, 37, 38, 39,
+        40, 41, 42, 43, 44, 45, 46, 47,
+        48, 49, 50, 51, 52, 53, 54, 55,
+        56, 57, 58, 59, 60, 61, 62, 63
+};
+
+static char channel_map_raydat_ss[HDSPM_MAX_CHANNELS] = {
+        4, 5, 6, 7, 8, 9, 10, 11,       /* ADAT 1 */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT 2 */
+        20, 21, 22, 23, 24, 25, 26, 27, /* ADAT 3 */
+        28, 29, 30, 31, 32, 33, 34, 35, /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_raydat_ds[HDSPM_MAX_CHANNELS] = {
+        4, 5, 6, 7,             /* ADAT 1 */
+        8, 9, 10, 11,           /* ADAT 2 */
+        12, 13, 14, 15,         /* ADAT 3 */
+        16, 17, 18, 19,         /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_raydat_qs[HDSPM_MAX_CHANNELS] = {
+        4, 5,                   /* ADAT 1 */
+        6, 7,                   /* ADAT 2 */
+        8, 9,                   /* ADAT 3 */
+        10, 11,                 /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_in_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in, */
+        10, 11,                 /* spdif in */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT in */
+        -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_out_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_in_ds[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in */
+        10, 11,                 /* spdif in */
+        12, 14, 16, 18,         /* adat in */
+        -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_out_ds[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 14, 16, 18,         /* adat out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_in_qs[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in */
+        10, 11,                 /* spdif in */
+        12, 16,                 /* adat in */
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_out_qs[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 16,                 /* adat out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aes32[HDSPM_MAX_CHANNELS] = {
+        0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
 struct hdspm_midi {
         struct hdspm *hdspm;
         int id;
@@ -430,6 +848,21 @@ struct hdspm_midi {
         struct timer_list timer;
         spinlock_t lock;
         int pending;
+        int dataIn;
+        int statusIn;
+        int dataOut;
+        int statusOut;
+        int ie;
+        int irq;
+};
+
+struct hdspm_tco {
+        int input;
+        int framerate;
+        int wordclock;
+        int samplerate;
+        int pull;
+        int term; /* 0 = off, 1 = on */
 };
 
 struct hdspm {
@@ -441,21 +874,39 @@ struct hdspm {
         char *card_name;             /* for procinfo */
         unsigned short firmware_rev; /* dont know if relevant (yes if AES32)*/
 
-        unsigned char is_aes32;    /* indicates if card is AES32 */
+        uint8_t io_type;
 
-        int precise_ptr;        /* use precise pointers, to be tested */
         int monitor_outs;       /* set up monitoring outs init flag */
 
         u32 control_register;   /* cached value */
         u32 control2_register;  /* cached value */
+        u32 settings_register;
 
-        struct hdspm_midi midi[2];
+        struct hdspm_midi midi[4];
         struct tasklet_struct midi_tasklet;
 
         size_t period_bytes;
-        unsigned char ss_channels;      /* channels of card in single speed */
-        unsigned char ds_channels;      /* Double Speed */
-        unsigned char qs_channels;      /* Quad Speed */
+        unsigned char ss_in_channels;
+        unsigned char ds_in_channels;
+        unsigned char qs_in_channels;
+        unsigned char ss_out_channels;
+        unsigned char ds_out_channels;
+        unsigned char qs_out_channels;
+
+        unsigned char max_channels_in;
+        unsigned char max_channels_out;
+
+        signed char *channel_map_in;
+        signed char *channel_map_out;
+
+        signed char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
+        signed char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
+
+        char **port_names_in;
+        char **port_names_out;
+
+        char **port_names_in_ss, **port_names_in_ds, **port_names_in_qs;
+        char **port_names_out_ss, **port_names_out_ds, **port_names_out_qs;
 
         unsigned char *playback_buffer; /* suitably aligned address */
         unsigned char *capture_buffer;  /* suitably aligned address */
@@ -468,14 +919,13 @@ struct hdspm {
         int last_internal_sample_rate;
         int system_sample_rate;
 
-        char *channel_map;      /* channel map for DS and Quadspeed */
-
         int dev;                /* Hardware vars... */
         int irq;
         unsigned long port;
         void __iomem *iobase;
 
         int irq_count;          /* for debug */
+        int midiPorts;
 
         struct snd_card *card;  /* one card */
         struct snd_pcm *pcm;            /* has one pcm */
@@ -487,28 +937,17 @@ struct hdspm {
         struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];
         /* but input to much, so not used */
         struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];
-        /* full mixer accessable over mixer ioctl or hwdep-device */
+        /* full mixer accessible over mixer ioctl or hwdep-device */
         struct hdspm_mixer *mixer;
 
-};
+        struct hdspm_tco *tco;  /* NULL if no TCO detected */
 
-/* These tables map the ALSA channels 1..N to the channels that we
-   need to use in order to find the relevant channel buffer. RME
-   refer to this kind of mapping as between "the ADAT channel and
-   the DMA channel." We index it using the logical audio channel,
-   and the value is the DMA channel (i.e. channel buffer number)
-   where the data for that channel can be read/written from/to.
-*/
+        char **texts_autosync;
+        int texts_autosync_items;
+
+        cycles_t last_interrupt;
 
-static char channel_map_madi_ss[HDSPM_MAX_CHANNELS] = {
-   0, 1, 2, 3, 4, 5, 6, 7,
-   8, 9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63
+        struct hdspm_peak_rms peak_rms;
 };
 
 
@@ -532,11 +971,11 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
 static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
                                           struct hdspm * hdspm);
 
-static inline void snd_hdspm_initialize_midi_flush(struct hdspm * hdspm);
-static int hdspm_update_simple_mixer_controls(struct hdspm * hdspm);
-static int hdspm_autosync_ref(struct hdspm * hdspm);
-static int snd_hdspm_set_defaults(struct hdspm * hdspm);
-static void hdspm_set_sgbuf(struct hdspm * hdspm,
+static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm);
+static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);
+static int hdspm_autosync_ref(struct hdspm *hdspm);
+static int snd_hdspm_set_defaults(struct hdspm *hdspm);
+static void hdspm_set_sgbuf(struct hdspm *hdspm,
                             struct snd_pcm_substream *substream,
                              unsigned int reg, int channels);
 
@@ -564,8 +1003,8 @@ static inline unsigned int hdspm_read(struct hdspm * hdspm, unsigned int reg)
         return readl(hdspm->iobase + reg);
 }
 
-/* for each output channel (chan) I have an Input (in) and Playback (pb) Fader 
-   mixer is write only on hardware so we have to cache him for read 
+/* for each output channel (chan) I have an Input (in) and Playback (pb) Fader
+   mixer is write only on hardware so we have to cache him for read
    each fader is a u32, but uses only the first 16 bit */
 
 static inline int hdspm_read_in_gain(struct hdspm * hdspm, unsigned int chan,
@@ -641,37 +1080,75 @@ static int snd_hdspm_use_is_exclusive(struct hdspm *hdspm)
 /* check for external sample rate */
 static int hdspm_external_sample_rate(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
-                unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-                unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int timecode =
-                        hdspm_read(hdspm, HDSPM_timecodeRegister);
+        unsigned int status, status2, timecode;
+        int syncref, rate = 0, rate_bits;
 
-                int syncref = hdspm_autosync_ref(hdspm);
+        switch (hdspm->io_type) {
+        case AES32:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                timecode = hdspm_read(hdspm, HDSPM_timecodeRegister);
+
+                syncref = hdspm_autosync_ref(hdspm);
 
                 if (syncref == HDSPM_AES32_AUTOSYNC_FROM_WORD &&
                                 status & HDSPM_AES32_wcLock)
-                        return HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit)
-                                              & 0xF);
+                        return HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF);
+
                 if (syncref >= HDSPM_AES32_AUTOSYNC_FROM_AES1 &&
-                        syncref <= HDSPM_AES32_AUTOSYNC_FROM_AES8 &&
-                        status2 & (HDSPM_LockAES >>
-                                  (syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1)))
-                        return HDSPM_bit2freq((timecode >>
-                          (4*(syncref-HDSPM_AES32_AUTOSYNC_FROM_AES1))) & 0xF);
+                                syncref <= HDSPM_AES32_AUTOSYNC_FROM_AES8 &&
+                                status2 & (HDSPM_LockAES >>
+                                (syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1)))
+                        return HDSPM_bit2freq((timecode >> (4*(syncref-HDSPM_AES32_AUTOSYNC_FROM_AES1))) & 0xF);
                 return 0;
-        } else {
-                unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-                unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int rate_bits;
-                int rate = 0;
+                break;
+
+        case MADIface:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+
+                if (!(status & HDSPM_madiLock)) {
+                        rate = 0;  /* no lock */
+                } else {
+                        switch (status & (HDSPM_status1_freqMask)) {
+                        case HDSPM_status1_F_0*1:
+                                rate = 32000; break;
+                        case HDSPM_status1_F_0*2:
+                                rate = 44100; break;
+                        case HDSPM_status1_F_0*3:
+                                rate = 48000; break;
+                        case HDSPM_status1_F_0*4:
+                                rate = 64000; break;
+                        case HDSPM_status1_F_0*5:
+                                rate = 88200; break;
+                        case HDSPM_status1_F_0*6:
+                                rate = 96000; break;
+                        case HDSPM_status1_F_0*7:
+                                rate = 128000; break;
+                        case HDSPM_status1_F_0*8:
+                                rate = 176400; break;
+                        case HDSPM_status1_F_0*9:
+                                rate = 192000; break;
+                        default:
+                                rate = 0; break;
+                        }
+                }
+
+                break;
+
+        case MADI:
+        case AIO:
+        case RayDAT:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                rate = 0;
 
                 /* if wordclock has synced freq and wordclock is valid */
                 if ((status2 & HDSPM_wcLock) != 0 &&
-                                (status & HDSPM_SelSyncRef0) == 0) {
+                                (status2 & HDSPM_SelSyncRef0) == 0) {
 
                         rate_bits = status2 & HDSPM_wcFreqMask;
 
+
                         switch (rate_bits) {
                         case HDSPM_wcFreq32:
                                 rate = 32000;
@@ -691,7 +1168,6 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                         case HDSPM_wcFreq96:
                                 rate = 96000;
                                 break;
-                                /* Quadspeed Bit missing ???? */
                         default:
                                 rate = 0;
                                 break;
@@ -702,10 +1178,10 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                  * word has priority to MADI
                  */
                 if (rate != 0 &&
-                    (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
+                (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
                         return rate;
 
-                /* maby a madi input (which is taken if sel sync is madi) */
+                /* maybe a madi input (which is taken if sel sync is madi) */
                 if (status & HDSPM_madiLock) {
                         rate_bits = status & HDSPM_madiFreqMask;
 
@@ -742,36 +1218,35 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                                 break;
                         }
                 }
-                return rate;
+                break;
         }
+
+        return rate;
 }
 
 /* Latency function */
-static inline void hdspm_compute_period_size(struct hdspm * hdspm)
+static inline void hdspm_compute_period_size(struct hdspm *hdspm)
 {
-        hdspm->period_bytes =
-            1 << ((hdspm_decode_latency(hdspm->control_register) + 8));
+        hdspm->period_bytes = 1 << ((hdspm_decode_latency(hdspm->control_register) + 8));
 }
 
-static snd_pcm_uframes_t hdspm_hw_pointer(struct hdspm * hdspm)
+
+static snd_pcm_uframes_t hdspm_hw_pointer(struct hdspm *hdspm)
 {
         int position;
 
         position = hdspm_read(hdspm, HDSPM_statusRegister);
 
-        if (!hdspm->precise_ptr)
-                return (position & HDSPM_BufferID) ?
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                position &= HDSPM_BufferPositionMask;
+                position /= 4; /* Bytes per sample */
+                break;
+        default:
+                position = (position & HDSPM_BufferID) ?
                         (hdspm->period_bytes / 4) : 0;
-
-        /* hwpointer comes in bytes and is 64Bytes accurate (by docu since
-           PCI Burst)
-           i have experimented that it is at most 64 Byte to much for playing 
-           so substraction of 64 byte should be ok for ALSA, but use it only
-           for application where you know what you do since if you come to
-           near with record pointer it can be a disaster */
-
-        position &= HDSPM_BufferPositionMask;
-        position = ((position - 64) % (2 * hdspm->period_bytes)) / 4;
+        }
 
         return position;
 }
@@ -805,7 +1280,7 @@ static void hdspm_silence_playback(struct hdspm *hdspm)
         }
 }
 
-static int hdspm_set_interrupt_interval(struct hdspm * s, unsigned int frames)
+static int hdspm_set_interrupt_interval(struct hdspm *s, unsigned int frames)
 {
         int n;
 
@@ -829,21 +1304,53 @@ static int hdspm_set_interrupt_interval(struct hdspm * s, unsigned int frames)
         return 0;
 }
 
+static u64 hdspm_calc_dds_value(struct hdspm *hdspm, u64 period)
+{
+        u64 freq_const;
+
+        if (period == 0)
+                return 0;
+
+        switch (hdspm->io_type) {
+        case MADI:
+        case AES32:
+                freq_const = 110069313433624ULL;
+                break;
+        case RayDAT:
+        case AIO:
+                freq_const = 104857600000000ULL;
+                break;
+        case MADIface:
+                freq_const = 131072000000000ULL;
+        }
+
+        return div_u64(freq_const, period);
+}
+
+
 static void hdspm_set_dds_value(struct hdspm *hdspm, int rate)
 {
         u64 n;
-        
+
         if (rate >= 112000)
                 rate /= 4;
         else if (rate >= 56000)
                 rate /= 2;
 
-        /* RME says n = 104857600000000, but in the windows MADI driver, I see:
-//      return 104857600000000 / rate; // 100 MHz
-        return 110100480000000 / rate; // 105 MHz
-        */         
-        /* n = 104857600000000ULL; */ /*  =  2^20 * 10^8 */
-        n = 110100480000000ULL;    /* Value checked for AES32 and MADI */
+        switch (hdspm->io_type) {
+        case MADIface:
+          n = 131072000000000ULL;  /* 125 MHz */
+          break;
+        case MADI:
+        case AES32:
+          n = 110069313433624ULL;  /* 105 MHz */
+          break;
+        case RayDAT:
+        case AIO:
+          n = 104857600000000ULL;  /* 100 MHz */
+          break;
+        }
+
         n = div_u64(n, rate);
         /* n should be less than 2^32 for being written to FREQ register */
         snd_BUG_ON(n >> 32);
@@ -864,13 +1371,13 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 
         if (!(hdspm->control_register & HDSPM_ClockModeMaster)) {
 
-                /* SLAVE --- */ 
+                /* SLAVE --- */
                 if (called_internally) {
 
-                  /* request from ctl or card initialization 
-                     just make a warning an remember setting 
-                     for future master mode switching */
-    
+                        /* request from ctl or card initialization
+                           just make a warning an remember setting
+                           for future master mode switching */
+
                         snd_printk(KERN_WARNING "HDSPM: "
                                    "Warning: device is not running "
                                    "as a clock master.\n");
@@ -907,7 +1414,7 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 
            Note that a similar but essentially insoluble problem exists for
            externally-driven rate changes. All we can do is to flag rate
-           changes in the read/write routines.  
+           changes in the read/write routines.
          */
 
         if (current_rate <= 48000)
@@ -975,16 +1482,35 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
         /* For AES32, need to set DDS value in FREQ register
            For MADI, also apparently */
         hdspm_set_dds_value(hdspm, rate);
-        
-        if (hdspm->is_aes32 && rate != current_rate)
+
+        if (AES32 == hdspm->io_type && rate != current_rate)
                 hdspm_write(hdspm, HDSPM_eeprom_wr, 0);
-        
-        /* For AES32 and for MADI (at least rev 204), channel_map needs to
-         * always be channel_map_madi_ss, whatever the sample rate */
-        hdspm->channel_map = channel_map_madi_ss;
 
         hdspm->system_sample_rate = rate;
 
+        if (rate <= 48000) {
+                hdspm->channel_map_in = hdspm->channel_map_in_ss;
+                hdspm->channel_map_out = hdspm->channel_map_out_ss;
+                hdspm->max_channels_in = hdspm->ss_in_channels;
+                hdspm->max_channels_out = hdspm->ss_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_ss;
+                hdspm->port_names_out = hdspm->port_names_out_ss;
+        } else if (rate <= 96000) {
+                hdspm->channel_map_in = hdspm->channel_map_in_ds;
+                hdspm->channel_map_out = hdspm->channel_map_out_ds;
+                hdspm->max_channels_in = hdspm->ds_in_channels;
+                hdspm->max_channels_out = hdspm->ds_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_ds;
+                hdspm->port_names_out = hdspm->port_names_out_ds;
+        } else {
+                hdspm->channel_map_in = hdspm->channel_map_in_qs;
+                hdspm->channel_map_out = hdspm->channel_map_out_qs;
+                hdspm->max_channels_in = hdspm->qs_in_channels;
+                hdspm->max_channels_out = hdspm->qs_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_qs;
+                hdspm->port_names_out = hdspm->port_names_out_qs;
+        }
+
         if (not_set != 0)
                 return -1;
 
@@ -1019,39 +1545,26 @@ static inline unsigned char snd_hdspm_midi_read_byte (struct hdspm *hdspm,
                                                       int id)
 {
         /* the hardware already does the relevant bit-mask with 0xff */
-        if (id)
-                return hdspm_read(hdspm, HDSPM_midiDataIn1);
-        else
-                return hdspm_read(hdspm, HDSPM_midiDataIn0);
+        return hdspm_read(hdspm, hdspm->midi[id].dataIn);
 }
 
 static inline void snd_hdspm_midi_write_byte (struct hdspm *hdspm, int id,
                                               int val)
 {
         /* the hardware already does the relevant bit-mask with 0xff */
-        if (id)
-                hdspm_write(hdspm, HDSPM_midiDataOut1, val);
-        else
-                hdspm_write(hdspm, HDSPM_midiDataOut0, val);
+        return hdspm_write(hdspm, hdspm->midi[id].dataOut, val);
 }
 
 static inline int snd_hdspm_midi_input_available (struct hdspm *hdspm, int id)
 {
-        if (id)
-                return (hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff);
-        else
-                return (hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff);
+        return hdspm_read(hdspm, hdspm->midi[id].statusIn) & 0xFF;
 }
 
 static inline int snd_hdspm_midi_output_possible (struct hdspm *hdspm, int id)
 {
         int fifo_bytes_used;
 
-        if (id)
-                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut1);
-        else
-                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut0);
-        fifo_bytes_used &= 0xff;
+        fifo_bytes_used = hdspm_read(hdspm, hdspm->midi[id].statusOut) & 0xFF;
 
         if (fifo_bytes_used < 128)
                 return  128 - fifo_bytes_used;
@@ -1074,7 +1587,7 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
         unsigned char buf[128];
 
         /* Output is not interrupt driven */
-                
+
         spin_lock_irqsave (&hmidi->lock, flags);
         if (hmidi->output &&
             !snd_rawmidi_transmit_empty (hmidi->output)) {
@@ -1083,11 +1596,11 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
                 if (n_pending > 0) {
                         if (n_pending > (int)sizeof (buf))
                                 n_pending = sizeof (buf);
-                
+
                         to_write = snd_rawmidi_transmit (hmidi->output, buf,
                                                          n_pending);
                         if (to_write > 0) {
-                                for (i = 0; i < to_write; ++i) 
+                                for (i = 0; i < to_write; ++i)
                                         snd_hdspm_midi_write_byte (hmidi->hdspm,
                                                                    hmidi->id,
                                                                    buf[i]);
@@ -1127,13 +1640,14 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
                 }
         }
         hmidi->pending = 0;
-        if (hmidi->id)
-                hmidi->hdspm->control_register |= HDSPM_Midi1InterruptEnable;
-        else
-                hmidi->hdspm->control_register |= HDSPM_Midi0InterruptEnable;
+        spin_unlock_irqrestore(&hmidi->lock, flags);
+
+        spin_lock_irqsave(&hmidi->hdspm->lock, flags);
+        hmidi->hdspm->control_register |= hmidi->ie;
         hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
                     hmidi->hdspm->control_register);
-        spin_unlock_irqrestore (&hmidi->lock, flags);
+        spin_unlock_irqrestore(&hmidi->hdspm->lock, flags);
+
         return snd_hdspm_midi_output_write (hmidi);
 }
 
@@ -1143,20 +1657,18 @@ snd_hdspm_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
         struct hdspm *hdspm;
         struct hdspm_midi *hmidi;
         unsigned long flags;
-        u32 ie;
 
         hmidi = substream->rmidi->private_data;
         hdspm = hmidi->hdspm;
-        ie = hmidi->id ?
-                HDSPM_Midi1InterruptEnable : HDSPM_Midi0InterruptEnable;
+
         spin_lock_irqsave (&hdspm->lock, flags);
         if (up) {
-                if (!(hdspm->control_register & ie)) {
+                if (!(hdspm->control_register & hmidi->ie)) {
                         snd_hdspm_flush_midi_input (hdspm, hmidi->id);
-                        hdspm->control_register |= ie;
+                        hdspm->control_register |= hmidi->ie;
                 }
         } else {
-                hdspm->control_register &= ~ie;
+                hdspm->control_register &= ~hmidi->ie;
         }
 
         hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
@@ -1167,14 +1679,14 @@ static void snd_hdspm_midi_output_timer(unsigned long data)
 {
         struct hdspm_midi *hmidi = (struct hdspm_midi *) data;
         unsigned long flags;
-        
+
         snd_hdspm_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) {
@@ -1288,22 +1800,103 @@ static int __devinit snd_hdspm_create_midi (struct snd_card *card,
         hdspm->midi[id].hdspm = hdspm;
         spin_lock_init (&hdspm->midi[id].lock);
 
-        sprintf (buf, "%s MIDI %d", card->shortname, id+1);
-        err = snd_rawmidi_new (card, buf, id, 1, 1, &hdspm->midi[id].rmidi);
-        if (err < 0)
-                return err;
+        if (0 == id) {
+                if (MADIface == hdspm->io_type) {
+                        /* MIDI-over-MADI on HDSPe MADIface */
+                        hdspm->midi[0].dataIn = HDSPM_midiDataIn2;
+                        hdspm->midi[0].statusIn = HDSPM_midiStatusIn2;
+                        hdspm->midi[0].dataOut = HDSPM_midiDataOut2;
+                        hdspm->midi[0].statusOut = HDSPM_midiStatusOut2;
+                        hdspm->midi[0].ie = HDSPM_Midi2InterruptEnable;
+                        hdspm->midi[0].irq = HDSPM_midi2IRQPending;
+                } else {
+                        hdspm->midi[0].dataIn = HDSPM_midiDataIn0;
+                        hdspm->midi[0].statusIn = HDSPM_midiStatusIn0;
+                        hdspm->midi[0].dataOut = HDSPM_midiDataOut0;
+                        hdspm->midi[0].statusOut = HDSPM_midiStatusOut0;
+                        hdspm->midi[0].ie = HDSPM_Midi0InterruptEnable;
+                        hdspm->midi[0].irq = HDSPM_midi0IRQPending;
+                }
+        } else if (1 == id) {
+                hdspm->midi[1].dataIn = HDSPM_midiDataIn1;
+                hdspm->midi[1].statusIn = HDSPM_midiStatusIn1;
+                hdspm->midi[1].dataOut = HDSPM_midiDataOut1;
+                hdspm->midi[1].statusOut = HDSPM_midiStatusOut1;
+                hdspm->midi[1].ie = HDSPM_Midi1InterruptEnable;
+                hdspm->midi[1].irq = HDSPM_midi1IRQPending;
+        } else if ((2 == id) && (MADI == hdspm->io_type)) {
+                /* MIDI-over-MADI on HDSPe MADI */
+                hdspm->midi[2].dataIn = HDSPM_midiDataIn2;
+                hdspm->midi[2].statusIn = HDSPM_midiStatusIn2;
+                hdspm->midi[2].dataOut = HDSPM_midiDataOut2;
+                hdspm->midi[2].statusOut = HDSPM_midiStatusOut2;
+                hdspm->midi[2].ie = HDSPM_Midi2InterruptEnable;
+                hdspm->midi[2].irq = HDSPM_midi2IRQPending;
+        } else if (2 == id) {
+                /* TCO MTC, read only */
+                hdspm->midi[2].dataIn = HDSPM_midiDataIn2;
+                hdspm->midi[2].statusIn = HDSPM_midiStatusIn2;
+                hdspm->midi[2].dataOut = -1;
+                hdspm->midi[2].statusOut = -1;
+                hdspm->midi[2].ie = HDSPM_Midi2InterruptEnable;
+                hdspm->midi[2].irq = HDSPM_midi2IRQPendingAES;
+        } else if (3 == id) {
+                /* TCO MTC on HDSPe MADI */
+                hdspm->midi[3].dataIn = HDSPM_midiDataIn3;
+                hdspm->midi[3].statusIn = HDSPM_midiStatusIn3;
+                hdspm->midi[3].dataOut = -1;
+                hdspm->midi[3].statusOut = -1;
+                hdspm->midi[3].ie = HDSPM_Midi3InterruptEnable;
+                hdspm->midi[3].irq = HDSPM_midi3IRQPending;
+        }
 
-        sprintf(hdspm->midi[id].rmidi->name, "HDSPM MIDI %d", id+1);
-        hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+        if ((id < 2) || ((2 == id) && ((MADI == hdspm->io_type) ||
+                                        (MADIface == hdspm->io_type)))) {
+                if ((id == 0) && (MADIface == hdspm->io_type)) {
+                        sprintf(buf, "%s MIDIoverMADI", card->shortname);
+                } else if ((id == 2) && (MADI == hdspm->io_type)) {
+                        sprintf(buf, "%s MIDIoverMADI", card->shortname);
+                } else {
+                        sprintf(buf, "%s MIDI %d", card->shortname, id+1);
+                }
+                err = snd_rawmidi_new(card, buf, id, 1, 1,
+                                &hdspm->midi[id].rmidi);
+                if (err < 0)
+                        return err;
 
-        snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
-                            &snd_hdspm_midi_output);
-        snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
-                            &snd_hdspm_midi_input);
+                sprintf(hdspm->midi[id].rmidi->name, "%s MIDI %d",
+                                card->id, id+1);
+                hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_OUTPUT,
+                                &snd_hdspm_midi_output);
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_INPUT,
+                                &snd_hdspm_midi_input);
+
+                hdspm->midi[id].rmidi->info_flags |=
+                        SNDRV_RAWMIDI_INFO_OUTPUT |
+                        SNDRV_RAWMIDI_INFO_INPUT |
+                        SNDRV_RAWMIDI_INFO_DUPLEX;
+        } else {
+                /* TCO MTC, read only */
+                sprintf(buf, "%s MTC %d", card->shortname, id+1);
+                err = snd_rawmidi_new(card, buf, id, 1, 1,
+                                &hdspm->midi[id].rmidi);
+                if (err < 0)
+                        return err;
+
+                sprintf(hdspm->midi[id].rmidi->name,
+                                "%s MTC %d", card->id, id+1);
+                hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_INPUT,
+                                &snd_hdspm_midi_input);
 
-        hdspm->midi[id].rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
-                SNDRV_RAWMIDI_INFO_INPUT |
-                SNDRV_RAWMIDI_INFO_DUPLEX;
+                hdspm->midi[id].rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
+        }
 
         return 0;
 }
@@ -1312,12 +1905,15 @@ static int __devinit snd_hdspm_create_midi (struct snd_card *card,
 static void hdspm_midi_tasklet(unsigned long arg)
 {
         struct hdspm *hdspm = (struct hdspm *)arg;
-        
-        if (hdspm->midi[0].pending)
-                snd_hdspm_midi_input_read (&hdspm->midi[0]);
-        if (hdspm->midi[1].pending)
-                snd_hdspm_midi_input_read (&hdspm->midi[1]);
-} 
+        int i = 0;
+
+        while (i < hdspm->midiPorts) {
+                if (hdspm->midi[i].pending)
+                        snd_hdspm_midi_input_read(&hdspm->midi[i]);
+
+                i++;
+        }
+}
 
 
 /*-----------------------------------------------------------------------------
@@ -1326,6 +1922,22 @@ static void hdspm_midi_tasklet(unsigned long arg)
 
 /* get the system sample rate which is set */
 
+
+/**
+ * Calculate the real sample rate from the
+ * current DDS value.
+ **/
+static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
+{
+        unsigned int period, rate;
+
+        period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+        rate = hdspm_calc_dds_value(hdspm, period);
+
+        return rate;
+}
+
+
 #define HDSPM_SYSTEM_SAMPLE_RATE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1340,112 +1952,274 @@ static int snd_hdspm_info_system_sample_rate(struct snd_kcontrol *kcontrol,
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
+        uinfo->value.integer.min = 27000;
+        uinfo->value.integer.max = 207000;
+        uinfo->value.integer.step = 1;
         return 0;
 }
 
+
 static int snd_hdspm_get_system_sample_rate(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_value *
                                             ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] = hdspm->system_sample_rate;
+        ucontrol->value.integer.value[0] = hdspm_get_system_sample_rate(hdspm);
+        return 0;
+}
+
+
+/**
+ * Returns the WordClock sample rate class for the given card.
+ **/
+static int hdspm_get_wc_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+                return (status >> 16) & 0xF;
+                break;
+        default:
+                break;
+        }
+
+
+        return 0;
+}
+
+
+/**
+ * Returns the TCO sample rate class for the given card.
+ **/
+static int hdspm_get_tco_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+                        return (status >> 20) & 0xF;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+
+/**
+ * Returns the SYNC_IN sample rate class for the given card.
+ **/
+static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
+                        return (status >> 12) & 0xF;
+                        break;
+                default:
+                        break;
+                }
+        }
+
         return 0;
 }
 
+
+/**
+ * Returns the sample rate class for input source <idx> for
+ * 'new style' cards like the AIO and RayDAT.
+ **/
+static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx)
+{
+        int status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
+
+        return (status >> (idx*4)) & 0xF;
+}
+
+
+
 #define HDSPM_AUTOSYNC_SAMPLE_RATE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
-  .info = snd_hdspm_info_autosync_sample_rate, \
-  .get = snd_hdspm_get_autosync_sample_rate \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+        .info = snd_hdspm_info_autosync_sample_rate, \
+        .get = snd_hdspm_get_autosync_sample_rate \
 }
 
+
 static int snd_hdspm_info_autosync_sample_rate(struct snd_kcontrol *kcontrol,
                                                struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "32000", "44100", "48000",
-                "64000", "88200", "96000",
-                "128000", "176400", "192000",
-                "None"
-        };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 10;
+
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
         strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+                        texts_freq[uinfo->value.enumerated.item]);
         return 0;
 }
 
+
 static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol,
                                               struct snd_ctl_elem_value *
                                               ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        switch (hdspm_external_sample_rate(hdspm)) {
-        case 32000:
-                ucontrol->value.enumerated.item[0] = 0;
-                break;
-        case 44100:
-                ucontrol->value.enumerated.item[0] = 1;
-                break;
-        case 48000:
-                ucontrol->value.enumerated.item[0] = 2;
-                break;
-        case 64000:
-                ucontrol->value.enumerated.item[0] = 3;
-                break;
-        case 88200:
-                ucontrol->value.enumerated.item[0] = 4;
-                break;
-        case 96000:
-                ucontrol->value.enumerated.item[0] = 5;
-                break;
-        case 128000:
-                ucontrol->value.enumerated.item[0] = 6;
-                break;
-        case 176400:
-                ucontrol->value.enumerated.item[0] = 7;
-                break;
-        case 192000:
-                ucontrol->value.enumerated.item[0] = 8;
-                break;
+        switch (hdspm->io_type) {
+        case RayDAT:
+                switch (kcontrol->private_value) {
+                case 0:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 7:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 8:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                kcontrol->private_value-1);
+                }
+
+        case AIO:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 4: /* TCO */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 5: /* SYNC_IN */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                ucontrol->id.index-1);
+                }
 
+        case AES32:
+
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 9: /* TCO */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 10: /* SYNC_IN */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default: /* AES1 to AES8 */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                kcontrol->private_value-1);
+                        break;
+
+                }
         default:
-                ucontrol->value.enumerated.item[0] = 9;
+                break;
         }
+
         return 0;
 }
 
+
 #define HDSPM_SYSTEM_CLOCK_MODE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
-  .info = snd_hdspm_info_system_clock_mode, \
-  .get = snd_hdspm_get_system_clock_mode, \
-}
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_system_clock_mode, \
+        .get = snd_hdspm_get_system_clock_mode, \
+        .put = snd_hdspm_put_system_clock_mode, \
+}
+
+
+/**
+ * Returns the system clock mode for the given card.
+ * @returns 0 - master, 1 - slave
+ **/
+static int hdspm_system_clock_mode(struct hdspm *hdspm)
+{
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (hdspm->settings_register & HDSPM_c0Master)
+                        return 0;
+                break;
+
+        default:
+                if (hdspm->control_register & HDSPM_ClockModeMaster)
+                        return 0;
+        }
 
+        return 1;
+}
 
 
-static int hdspm_system_clock_mode(struct hdspm * hdspm)
+/**
+ * Sets the system clock mode.
+ * @param mode 0 - master, 1 - slave
+ **/
+static void hdspm_set_system_clock_mode(struct hdspm *hdspm, int mode)
 {
-        /* Always reflect the hardware info, rme is never wrong !!!! */
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (0 == mode)
+                        hdspm->settings_register |= HDSPM_c0Master;
+                else
+                        hdspm->settings_register &= ~HDSPM_c0Master;
 
-        if (hdspm->control_register & HDSPM_ClockModeMaster)
-                return 0;
-        return 1;
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
+                break;
+
+        default:
+                if (0 == mode)
+                        hdspm->control_register |= HDSPM_ClockModeMaster;
+                else
+                        hdspm->control_register &= ~HDSPM_ClockModeMaster;
+
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                                hdspm->control_register);
+        }
 }
 
+
 static int snd_hdspm_info_system_clock_mode(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "Master", "Slave" };
+        static char *texts[] = { "Master", "AutoSync" };
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
@@ -1463,96 +2237,83 @@ static int snd_hdspm_get_system_clock_mode(struct snd_kcontrol *kcontrol,
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] =
-            hdspm_system_clock_mode(hdspm);
+        ucontrol->value.enumerated.item[0] = hdspm_system_clock_mode(hdspm);
         return 0;
 }
 
-#define HDSPM_CLOCK_SOURCE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .info = snd_hdspm_info_clock_source, \
-  .get = snd_hdspm_get_clock_source, \
-  .put = snd_hdspm_put_clock_source \
+static int snd_hdspm_put_system_clock_mode(struct snd_kcontrol *kcontrol,
+                                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+
+        val = ucontrol->value.enumerated.item[0];
+        if (val < 0)
+                val = 0;
+        else if (val > 1)
+                val = 1;
+
+        hdspm_set_system_clock_mode(hdspm, val);
+
+        return 0;
 }
 
+
+#define HDSPM_INTERNAL_CLOCK(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .info = snd_hdspm_info_clock_source, \
+        .get = snd_hdspm_get_clock_source, \
+        .put = snd_hdspm_put_clock_source \
+}
+
+
 static int hdspm_clock_source(struct hdspm * hdspm)
 {
-        if (hdspm->control_register & HDSPM_ClockModeMaster) {
-                switch (hdspm->system_sample_rate) {
-                case 32000:
-                        return 1;
-                case 44100:
-                        return 2;
-                case 48000:
-                        return 3;
-                case 64000:
-                        return 4;
-                case 88200:
-                        return 5;
-                case 96000:
-                        return 6;
-                case 128000:
-                        return 7;
-                case 176400:
-                        return 8;
-                case 192000:
-                        return 9;
-                default:
-                        return 3;
-                }
-        } else {
-                return 0;
+        switch (hdspm->system_sample_rate) {
+        case 32000: return 0;
+        case 44100: return 1;
+        case 48000: return 2;
+        case 64000: return 3;
+        case 88200: return 4;
+        case 96000: return 5;
+        case 128000: return 6;
+        case 176400: return 7;
+        case 192000: return 8;
         }
+
+        return -1;
 }
 
 static int hdspm_set_clock_source(struct hdspm * hdspm, int mode)
 {
         int rate;
         switch (mode) {
-
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                if (hdspm_external_sample_rate(hdspm) != 0) {
-                        hdspm->control_register &= ~HDSPM_ClockModeMaster;
-                        hdspm_write(hdspm, HDSPM_controlRegister,
-                                    hdspm->control_register);
-                        return 0;
-                }
-                return -1;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                rate = 32000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                rate = 44100;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                rate = 48000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                rate = 64000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                rate = 88200;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                rate = 96000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ:
-                rate = 128000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ:
-                rate = 176400;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ:
-                rate = 192000;
-                break;
-
+        case 0:
+                rate = 32000; break;
+        case 1:
+                rate = 44100; break;
+        case 2:
+                rate = 48000; break;
+        case 3:
+                rate = 64000; break;
+        case 4:
+                rate = 88200; break;
+        case 5:
+                rate = 96000; break;
+        case 6:
+                rate = 128000; break;
+        case 7:
+                rate = 176400; break;
+        case 8:
+                rate = 192000; break;
         default:
-                rate = 44100;
+                rate = 48000;
         }
-        hdspm->control_register |= HDSPM_ClockModeMaster;
-        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
         hdspm_set_rate(hdspm, rate, 1);
         return 0;
 }
@@ -1560,25 +2321,16 @@ static int hdspm_set_clock_source(struct hdspm * hdspm, int mode)
 static int snd_hdspm_info_clock_source(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
-        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.0 kHz", "Internal 176.4 kHz",
-                    "Internal 192.0 kHz"
-        };
-
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 10;
+        uinfo->value.enumerated.items = 9;
 
         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]);
+               texts_freq[uinfo->value.enumerated.item+1]);
 
         return 0;
 }
@@ -1615,134 +2367,301 @@ static int snd_hdspm_put_clock_source(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-#define HDSPM_PREF_SYNC_REF(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .info = snd_hdspm_info_pref_sync_ref, \
-  .get = snd_hdspm_get_pref_sync_ref, \
-  .put = snd_hdspm_put_pref_sync_ref \
-}
 
+#define HDSPM_PREF_SYNC_REF(xname, xindex) \
+{.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_pref_sync_ref, \
+        .get = snd_hdspm_get_pref_sync_ref, \
+        .put = snd_hdspm_put_pref_sync_ref \
+}
+
+
+/**
+ * Returns the current preferred sync reference setting.
+ * The semantics of the return value are depending on the
+ * card, please see the comments for clarification.
+ **/
 static int hdspm_pref_sync_ref(struct hdspm * hdspm)
 {
-        /* Notice that this looks at the requested sync source,
-           not the one actually in use.
-         */
-        if (hdspm->is_aes32) {
+        switch (hdspm->io_type) {
+        case AES32:
                 switch (hdspm->control_register & HDSPM_SyncRefMask) {
-                /* number gives AES index, except for 0 which
-                   corresponds to WordClock */
-                case 0: return 0;
-                case HDSPM_SyncRef0: return 1;
-                case HDSPM_SyncRef1: return 2;
-                case HDSPM_SyncRef1+HDSPM_SyncRef0: return 3;
-                case HDSPM_SyncRef2: return 4;
-                case HDSPM_SyncRef2+HDSPM_SyncRef0: return 5;
-                case HDSPM_SyncRef2+HDSPM_SyncRef1: return 6;
-                case HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0: return 7;
-                case HDSPM_SyncRef3: return 8;
+                case 0: return 0;  /* WC */
+                case HDSPM_SyncRef0: return 1; /* AES 1 */
+                case HDSPM_SyncRef1: return 2; /* AES 2 */
+                case HDSPM_SyncRef1+HDSPM_SyncRef0: return 3; /* AES 3 */
+                case HDSPM_SyncRef2: return 4; /* AES 4 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef0: return 5; /* AES 5 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef1: return 6; /* AES 6 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                                    return 7; /* AES 7 */
+                case HDSPM_SyncRef3: return 8; /* AES 8 */
+                case HDSPM_SyncRef3+HDSPM_SyncRef0: return 9; /* TCO */
                 }
-        } else {
-                switch (hdspm->control_register & HDSPM_SyncRefMask) {
-                case HDSPM_SyncRef_Word:
-                        return HDSPM_SYNC_FROM_WORD;
-                case HDSPM_SyncRef_MADI:
-                        return HDSPM_SYNC_FROM_MADI;
+                break;
+
+        case MADI:
+        case MADIface:
+                if (hdspm->tco) {
+                        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+                        case 0: return 0;  /* WC */
+                        case HDSPM_SyncRef0: return 1;  /* MADI */
+                        case HDSPM_SyncRef1: return 2;  /* TCO */
+                        case HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                             return 3;  /* SYNC_IN */
+                        }
+                } else {
+                        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+                        case 0: return 0;  /* WC */
+                        case HDSPM_SyncRef0: return 1;  /* MADI */
+                        case HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                             return 2;  /* SYNC_IN */
+                        }
+                }
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT 1 */
+                        case 4: return 2;  /* ADAT 2 */
+                        case 5: return 3;  /* ADAT 3 */
+                        case 6: return 4;  /* ADAT 4 */
+                        case 1: return 5;  /* AES */
+                        case 2: return 6;  /* SPDIF */
+                        case 9: return 7;  /* TCO */
+                        case 10: return 8; /* SYNC_IN */
+                        }
+                } else {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT 1 */
+                        case 4: return 2;  /* ADAT 2 */
+                        case 5: return 3;  /* ADAT 3 */
+                        case 6: return 4;  /* ADAT 4 */
+                        case 1: return 5;  /* AES */
+                        case 2: return 6;  /* SPDIF */
+                        case 10: return 7; /* SYNC_IN */
+                        }
                 }
+
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT */
+                        case 1: return 2;  /* AES */
+                        case 2: return 3;  /* SPDIF */
+                        case 9: return 4;  /* TCO */
+                        case 10: return 5; /* SYNC_IN */
+                        }
+                } else {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT */
+                        case 1: return 2;  /* AES */
+                        case 2: return 3;  /* SPDIF */
+                        case 10: return 4; /* SYNC_IN */
+                        }
+                }
+
+                break;
         }
 
-        return HDSPM_SYNC_FROM_WORD;
+        return -1;
 }
 
+
+/**
+ * Set the preferred sync reference to <pref>. The semantics
+ * of <pref> are depending on the card type, see the comments
+ * for clarification.
+ **/
 static int hdspm_set_pref_sync_ref(struct hdspm * hdspm, int pref)
 {
-        hdspm->control_register &= ~HDSPM_SyncRefMask;
+        int p = 0;
 
-        if (hdspm->is_aes32) {
+        switch (hdspm->io_type) {
+        case AES32:
+                hdspm->control_register &= ~HDSPM_SyncRefMask;
                 switch (pref) {
-                case 0:
-                       hdspm->control_register |= 0;
-                       break;
-                case 1:
-                       hdspm->control_register |= HDSPM_SyncRef0;
-                       break;
-                case 2:
-                       hdspm->control_register |= HDSPM_SyncRef1;
-                       break;
-                case 3:
-                       hdspm->control_register |= HDSPM_SyncRef1+HDSPM_SyncRef0;
-                       break;
-                case 4:
-                       hdspm->control_register |= HDSPM_SyncRef2;
-                       break;
-                case 5:
-                       hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef0;
-                       break;
-                case 6:
-                       hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef1;
-                       break;
-                case 7:
-                       hdspm->control_register |=
-                               HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
-                       break;
-                case 8:
-                       hdspm->control_register |= HDSPM_SyncRef3;
-                       break;
-                default:
-                       return -1;
-                }
-        } else {
-                switch (pref) {
-                case HDSPM_SYNC_FROM_MADI:
-                        hdspm->control_register |= HDSPM_SyncRef_MADI;
+                case 0: /* WC  */
+                        break;
+                case 1: /* AES 1 */
+                        hdspm->control_register |= HDSPM_SyncRef0;
+                        break;
+                case 2: /* AES 2 */
+                        hdspm->control_register |= HDSPM_SyncRef1;
+                        break;
+                case 3: /* AES 3 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef1+HDSPM_SyncRef0;
+                        break;
+                case 4: /* AES 4 */
+                        hdspm->control_register |= HDSPM_SyncRef2;
                         break;
-                case HDSPM_SYNC_FROM_WORD:
-                        hdspm->control_register |= HDSPM_SyncRef_Word;
+                case 5: /* AES 5 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef0;
+                        break;
+                case 6: /* AES 6 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef1;
+                        break;
+                case 7: /* AES 7 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
+                        break;
+                case 8: /* AES 8 */
+                        hdspm->control_register |= HDSPM_SyncRef3;
+                        break;
+                case 9: /* TCO */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef3+HDSPM_SyncRef0;
                         break;
                 default:
                         return -1;
                 }
+
+                break;
+
+        case MADI:
+        case MADIface:
+                hdspm->control_register &= ~HDSPM_SyncRefMask;
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: /* WC */
+                                break;
+                        case 1: /* MADI */
+                                hdspm->control_register |= HDSPM_SyncRef0;
+                                break;
+                        case 2: /* TCO */
+                                hdspm->control_register |= HDSPM_SyncRef1;
+                                break;
+                        case 3: /* SYNC_IN */
+                                hdspm->control_register |=
+                                        HDSPM_SyncRef0+HDSPM_SyncRef1;
+                                break;
+                        default:
+                                return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: /* WC */
+                                break;
+                        case 1: /* MADI */
+                                hdspm->control_register |= HDSPM_SyncRef0;
+                                break;
+                        case 2: /* SYNC_IN */
+                                hdspm->control_register |=
+                                        HDSPM_SyncRef0+HDSPM_SyncRef1;
+                                break;
+                        default:
+                                return -1;
+                        }
+                }
+
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT 1 */
+                        case 2: p = 4; break;  /* ADAT 2 */
+                        case 3: p = 5; break;  /* ADAT 3 */
+                        case 4: p = 6; break;  /* ADAT 4 */
+                        case 5: p = 1; break;  /* AES */
+                        case 6: p = 2; break;  /* SPDIF */
+                        case 7: p = 9; break;  /* TCO */
+                        case 8: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT 1 */
+                        case 2: p = 4; break;  /* ADAT 2 */
+                        case 3: p = 5; break;  /* ADAT 3 */
+                        case 4: p = 6; break;  /* ADAT 4 */
+                        case 5: p = 1; break;  /* AES */
+                        case 6: p = 2; break;  /* SPDIF */
+                        case 7: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                }
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT */
+                        case 2: p = 1; break;  /* AES */
+                        case 3: p = 2; break;  /* SPDIF */
+                        case 4: p = 9; break;  /* TCO */
+                        case 5: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT */
+                        case 2: p = 1; break;  /* AES */
+                        case 3: p = 2; break;  /* SPDIF */
+                        case 4: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                }
+                break;
         }
-        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                hdspm->settings_register &= ~HDSPM_c0_SyncRefMask;
+                hdspm->settings_register |= HDSPM_c0_SyncRef0 * p;
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
+                break;
+
+        case MADI:
+        case MADIface:
+        case AES32:
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                                hdspm->control_register);
+        }
+
         return 0;
 }
 
+
 static int snd_hdspm_info_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_info *uinfo)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        if (hdspm->is_aes32) {
-                static char *texts[] = { "Word", "AES1", "AES2", "AES3",
-                        "AES4", "AES5", "AES6", "AES7", "AES8" };
-
-                uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-                uinfo->count = 1;
-
-                uinfo->value.enumerated.items = 9;
-
-                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]);
-        } else {
-                static char *texts[] = { "Word", "MADI" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = hdspm->texts_autosync_items;
 
-                uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-                uinfo->count = 1;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
 
-                uinfo->value.enumerated.items = 2;
+        strcpy(uinfo->value.enumerated.name,
+                        hdspm->texts_autosync[uinfo->value.enumerated.item]);
 
-                if (uinfo->value.enumerated.item >=
-                    uinfo->value.enumerated.items)
-                        uinfo->value.enumerated.item =
-                                uinfo->value.enumerated.items - 1;
-                strcpy(uinfo->value.enumerated.name,
-                                texts[uinfo->value.enumerated.item]);
-        }
         return 0;
 }
 
@@ -1750,32 +2669,41 @@ static int snd_hdspm_get_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int psf = hdspm_pref_sync_ref(hdspm);
 
-        ucontrol->value.enumerated.item[0] = hdspm_pref_sync_ref(hdspm);
-        return 0;
+        if (psf >= 0) {
+                ucontrol->value.enumerated.item[0] = psf;
+                return 0;
+        }
+
+        return -1;
 }
 
 static int snd_hdspm_put_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
-        int change, max;
-        unsigned int val;
-
-        max = hdspm->is_aes32 ? 9 : 2;
+        int val, change = 0;
 
         if (!snd_hdspm_use_is_exclusive(hdspm))
                 return -EBUSY;
 
-        val = ucontrol->value.enumerated.item[0] % max;
+        val = ucontrol->value.enumerated.item[0];
+
+        if (val < 0)
+                val = 0;
+        else if (val >= hdspm->texts_autosync_items)
+                val = hdspm->texts_autosync_items-1;
 
         spin_lock_irq(&hdspm->lock);
-        change = (int) val != hdspm_pref_sync_ref(hdspm);
-        hdspm_set_pref_sync_ref(hdspm, val);
+        if (val != hdspm_pref_sync_ref(hdspm))
+                change = (0 == hdspm_set_pref_sync_ref(hdspm, val)) ? 1 : 0;
+
         spin_unlock_irq(&hdspm->lock);
         return change;
 }
 
+
 #define HDSPM_AUTOSYNC_REF(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1785,18 +2713,18 @@ static int snd_hdspm_put_pref_sync_ref(struct snd_kcontrol *kcontrol,
   .get = snd_hdspm_get_autosync_ref, \
 }
 
-static int hdspm_autosync_ref(struct hdspm * hdspm)
+static int hdspm_autosync_ref(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int syncref = (status >> HDSPM_AES32_syncref_bit) &
-                        0xF;
+                unsigned int syncref =
+                        (status >> HDSPM_AES32_syncref_bit) & 0xF;
                 if (syncref == 0)
                         return HDSPM_AES32_AUTOSYNC_FROM_WORD;
                 if (syncref <= 8)
                         return syncref;
                 return HDSPM_AES32_AUTOSYNC_FROM_NONE;
-        } else {
+        } else if (MADI == hdspm->io_type) {
                 /* This looks at the autosync selected sync reference */
                 unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
 
@@ -1805,22 +2733,27 @@ static int hdspm_autosync_ref(struct hdspm * hdspm)
                         return HDSPM_AUTOSYNC_FROM_WORD;
                 case HDSPM_SelSyncRef_MADI:
                         return HDSPM_AUTOSYNC_FROM_MADI;
+                case HDSPM_SelSyncRef_TCO:
+                        return HDSPM_AUTOSYNC_FROM_TCO;
+                case HDSPM_SelSyncRef_SyncIn:
+                        return HDSPM_AUTOSYNC_FROM_SYNC_IN;
                 case HDSPM_SelSyncRef_NVALID:
                         return HDSPM_AUTOSYNC_FROM_NONE;
                 default:
                         return 0;
                 }
 
-                return 0;
         }
+        return 0;
 }
 
+
 static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        if (hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 static char *texts[] = { "WordClock", "AES1", "AES2", "AES3",
                         "AES4", "AES5", "AES6", "AES7", "AES8", "None"};
 
@@ -1833,14 +2766,15 @@ static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
                                 texts[uinfo->value.enumerated.item]);
-        } else {
-                static char *texts[] = { "WordClock", "MADI", "None" };
+        } else if (MADI == hdspm->io_type) {
+                static char *texts[] = {"Word Clock", "MADI", "TCO",
+                        "Sync In", "None" };
 
                 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
                 uinfo->count = 1;
-                uinfo->value.enumerated.items = 3;
+                uinfo->value.enumerated.items = 5;
                 if (uinfo->value.enumerated.item >=
-                    uinfo->value.enumerated.items)
+                                uinfo->value.enumerated.items)
                         uinfo->value.enumerated.item =
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
@@ -1858,6 +2792,7 @@ static int snd_hdspm_get_autosync_ref(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+
 #define HDSPM_LINE_OUT(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1914,6 +2849,7 @@ static int snd_hdspm_put_line_out(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_TX_64(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1969,6 +2905,7 @@ static int snd_hdspm_put_tx_64(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_C_TMS(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2024,6 +2961,7 @@ static int snd_hdspm_put_c_tms(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_SAFE_MODE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2079,6 +3017,7 @@ static int snd_hdspm_put_safe_mode(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_EMPHASIS(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2134,6 +3073,7 @@ static int snd_hdspm_put_emphasis(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_DOLBY(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2189,6 +3129,7 @@ static int snd_hdspm_put_dolby(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_PROFESSIONAL(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2315,6 +3256,7 @@ static int snd_hdspm_put_input_select(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_DS_WIRE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2386,6 +3328,7 @@ static int snd_hdspm_put_ds_wire(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_QS_WIRE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2472,15 +3415,6 @@ static int snd_hdspm_put_qs_wire(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-/*           Simple Mixer
-  deprecated since to much faders ???
-  MIXER interface says output (source, destination, value)
-   where source > MAX_channels are playback channels 
-   on MADICARD 
-  - playback mixer matrix: [channelout+64] [output] [value]
-  - input(thru) mixer matrix: [channelin] [output] [value]
-  (better do 2 kontrols for separation ?)
-*/
 
 #define HDSPM_MIXER(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
@@ -2586,7 +3520,7 @@ static int snd_hdspm_put_mixer(struct snd_kcontrol *kcontrol,
 
 /* The simple mixer control(s) provide gain control for the
    basic 1:1 mappings of playback streams to output
-   streams. 
+   streams.
 */
 
 #define HDSPM_PLAYBACK_MIXER \
@@ -2604,7 +3538,7 @@ static int snd_hdspm_info_playback_mixer(struct snd_kcontrol *kcontrol,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 65536;
+        uinfo->value.integer.max = 64;
         uinfo->value.integer.step = 1;
         return 0;
 }
@@ -2614,28 +3548,17 @@ static int snd_hdspm_get_playback_mixer(struct snd_kcontrol *kcontrol,
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
         int channel;
-        int mapped_channel;
 
         channel = ucontrol->id.index - 1;
 
         if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
                 return -EINVAL;
 
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
-
         spin_lock_irq(&hdspm->lock);
         ucontrol->value.integer.value[0] =
-            hdspm_read_pb_gain(hdspm, mapped_channel, mapped_channel);
+          (hdspm_read_pb_gain(hdspm, channel, channel)*64)/UNITY_GAIN;
         spin_unlock_irq(&hdspm->lock);
 
-        /*
-        snd_printdd("get pb mixer index %d, channel %d, mapped_channel %d, "
-                    "value %d\n",
-                    ucontrol->id.index, channel, mapped_channel,
-                    ucontrol->value.integer.value[0]); 
-        */
         return 0;
 }
 
@@ -2645,7 +3568,6 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
         int change;
         int channel;
-        int mapped_channel;
         int gain;
 
         if (!snd_hdspm_use_is_exclusive(hdspm))
@@ -2656,59 +3578,60 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
                 return -EINVAL;
 
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
-
-        gain = ucontrol->value.integer.value[0];
+        gain = ucontrol->value.integer.value[0]*UNITY_GAIN/64;
 
         spin_lock_irq(&hdspm->lock);
         change =
-            gain != hdspm_read_pb_gain(hdspm, mapped_channel,
-                                       mapped_channel);
+            gain != hdspm_read_pb_gain(hdspm, channel,
+                                       channel);
         if (change)
-                hdspm_write_pb_gain(hdspm, mapped_channel, mapped_channel,
+                hdspm_write_pb_gain(hdspm, channel, channel,
                                     gain);
         spin_unlock_irq(&hdspm->lock);
         return change;
 }
 
-#define HDSPM_WC_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_wc_sync_check \
+#define HDSPM_SYNC_CHECK(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_sync_check, \
+        .get = snd_hdspm_get_sync_check \
 }
 
+
 static int snd_hdspm_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", "N/A" };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
+        uinfo->value.enumerated.items = 4;
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
+                        uinfo->value.enumerated.items - 1;
         strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+                        texts[uinfo->value.enumerated.item]);
         return 0;
 }
 
-static int hdspm_wc_sync_check(struct hdspm * hdspm)
+static int hdspm_wc_sync_check(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
-                int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                if (status & HDSPM_AES32_wcLock) {
-                        /* I don't know how to differenciate sync from lock.
-                           Doing as if sync for now */
+        int status, status2;
+
+        switch (hdspm->io_type) {
+        case AES32:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                if (status & HDSPM_wcSync)
                         return 2;
-                }
+                else if (status & HDSPM_wcLock)
+                        return 1;
                 return 0;
-        } else {
-                int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                break;
+
+        case MADI:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
                 if (status2 & HDSPM_wcLock) {
                         if (status2 & HDSPM_wcSync)
                                 return 2;
@@ -2716,29 +3639,30 @@ static int hdspm_wc_sync_check(struct hdspm * hdspm)
                                 return 1;
                 }
                 return 0;
-        }
-}
+                break;
 
-static int snd_hdspm_get_wc_sync_check(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
 
-        ucontrol->value.enumerated.item[0] = hdspm_wc_sync_check(hdspm);
-        return 0;
-}
+                if (status & 0x2000000)
+                        return 2;
+                else if (status & 0x1000000)
+                        return 1;
+                return 0;
 
+                break;
 
-#define HDSPM_MADI_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_madisync_sync_check \
+        case MADIface:
+                break;
+        }
+
+
+        return 3;
 }
 
-static int hdspm_madisync_sync_check(struct hdspm * hdspm)
+
+static int hdspm_madi_sync_check(struct hdspm *hdspm)
 {
         int status = hdspm_read(hdspm, HDSPM_statusRegister);
         if (status & HDSPM_madiLock) {
@@ -2750,89 +3674,726 @@ static int hdspm_madisync_sync_check(struct hdspm * hdspm)
         return 0;
 }
 
-static int snd_hdspm_get_madisync_sync_check(struct snd_kcontrol *kcontrol,
-                                             struct snd_ctl_elem_value *
-                                             ucontrol)
+
+static int hdspm_s1_sync_check(struct hdspm *hdspm, int idx)
 {
-        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int status, lock, sync;
+
+        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
 
-        ucontrol->value.enumerated.item[0] =
-            hdspm_madisync_sync_check(hdspm);
+        lock = (status & (0x1<<idx)) ? 1 : 0;
+        sync = (status & (0x100<<idx)) ? 1 : 0;
+
+        if (lock && sync)
+                return 2;
+        else if (lock)
+                return 1;
         return 0;
 }
 
 
-#define HDSPM_AES_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_aes_sync_check \
+static int hdspm_sync_in_sync_check(struct hdspm *hdspm)
+{
+        int status, lock = 0, sync = 0;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_RD_STATUS_3);
+                lock = (status & 0x400) ? 1 : 0;
+                sync = (status & 0x800) ? 1 : 0;
+                break;
+
+        case MADI:
+        case AES32:
+                status = hdspm_read(hdspm, HDSPM_statusRegister2);
+                lock = (status & HDSPM_syncInLock) ? 1 : 0;
+                sync = (status & HDSPM_syncInSync) ? 1 : 0;
+                break;
+
+        case MADIface:
+                break;
+        }
+
+        if (lock && sync)
+                return 2;
+        else if (lock)
+                return 1;
+
+        return 0;
 }
 
-static int hdspm_aes_sync_check(struct hdspm * hdspm, int idx)
+static int hdspm_aes_sync_check(struct hdspm *hdspm, int idx)
 {
-        int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-        if (status2 & (HDSPM_LockAES >> idx)) {
-                /* I don't know how to differenciate sync from lock.
-                   Doing as if sync for now */
+        int status2, lock, sync;
+        status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+        lock = (status2 & (0x0080 >> idx)) ? 1 : 0;
+        sync = (status2 & (0x8000 >> idx)) ? 1 : 0;
+
+        if (sync)
                 return 2;
+        else if (lock)
+                return 1;
+        return 0;
+}
+
+
+static int hdspm_tco_sync_check(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case MADI:
+                case AES32:
+                        status = hdspm_read(hdspm, HDSPM_statusRegister);
+                        if (status & HDSPM_tcoLock) {
+                                if (status & HDSPM_tcoSync)
+                                        return 2;
+                                else
+                                        return 1;
+                        }
+                        return 0;
+
+                        break;
+
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+
+                        if (status & 0x8000000)
+                                return 2; /* Sync */
+                        if (status & 0x4000000)
+                                return 1; /* Lock */
+                        return 0; /* No signal */
+                        break;
+
+                default:
+                        break;
+                }
+        }
+
+        return 3; /* N/A */
+}
+
+
+static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int val = -1;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 7: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 8: /* SYNC IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default:
+                        val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);
+                }
+
+        case AIO:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 4: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 5: /* SYNC IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default:
+                        val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);
+                }
+
+        case MADI:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 1: /* MADI */
+                        val = hdspm_madi_sync_check(hdspm); break;
+                case 2: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 3: /* SYNC_IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                }
+
+        case MADIface:
+                val = hdspm_madi_sync_check(hdspm); /* MADI */
+                break;
+
+        case AES32:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 9: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 10 /* SYNC IN */:
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default: /* AES1 to AES8 */
+                         val = hdspm_aes_sync_check(hdspm,
+                                         kcontrol->private_value-1);
+                }
+
         }
+
+        if (-1 == val)
+                val = 3;
+
+        ucontrol->value.enumerated.item[0] = val;
         return 0;
 }
 
-static int snd_hdspm_get_aes_sync_check(struct snd_kcontrol *kcontrol,
+
+
+/**
+ * TCO controls
+ **/
+static void hdspm_tco_write(struct hdspm *hdspm)
+{
+        unsigned int tc[4] = { 0, 0, 0, 0};
+
+        switch (hdspm->tco->input) {
+        case 0:
+                tc[2] |= HDSPM_TCO2_set_input_MSB;
+                break;
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_input_LSB;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->framerate) {
+        case 1:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB;
+                break;
+        case 2:
+                tc[1] |= HDSPM_TCO1_LTC_Format_MSB;
+                break;
+        case 3:
+                tc[1] |= HDSPM_TCO1_LTC_Format_MSB +
+                        HDSPM_TCO1_set_drop_frame_flag;
+                break;
+        case 4:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB +
+                        HDSPM_TCO1_LTC_Format_MSB;
+                break;
+        case 5:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB +
+                        HDSPM_TCO1_LTC_Format_MSB +
+                        HDSPM_TCO1_set_drop_frame_flag;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->wordclock) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_WCK_IO_ratio_LSB;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_WCK_IO_ratio_MSB;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->samplerate) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_freq;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_set_freq_from_app;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->pull) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_pull_up;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_set_pull_down;
+                break;
+        case 3:
+                tc[2] |= HDSPM_TCO2_set_pull_up + HDSPM_TCO2_set_01_4;
+                break;
+        case 4:
+                tc[2] |= HDSPM_TCO2_set_pull_down + HDSPM_TCO2_set_01_4;
+                break;
+        default:
+                break;
+        }
+
+        if (1 == hdspm->tco->term) {
+                tc[2] |= HDSPM_TCO2_set_term_75R;
+        }
+
+        hdspm_write(hdspm, HDSPM_WR_TCO, tc[0]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+4, tc[1]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+8, tc[2]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+12, tc[3]);
+}
+
+
+#define HDSPM_TCO_SAMPLE_RATE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_sample_rate, \
+        .get = snd_hdspm_get_tco_sample_rate, \
+        .put = snd_hdspm_put_tco_sample_rate \
+}
+
+static int snd_hdspm_info_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "44.1 kHz", "48 kHz" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->samplerate;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->samplerate != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->samplerate = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_PULL(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_pull, \
+        .get = snd_hdspm_get_tco_pull, \
+        .put = snd_hdspm_put_tco_pull \
+}
+
+static int snd_hdspm_info_tco_pull(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "0", "+ 0.1 %", "- 0.1 %", "+ 4 %", "- 4 %" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 5;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_pull(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->pull;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_pull(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->pull != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->pull = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+#define HDSPM_TCO_WCK_CONVERSION(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_wck_conversion, \
+        .get = snd_hdspm_get_tco_wck_conversion, \
+        .put = snd_hdspm_put_tco_wck_conversion \
+}
+
+static int snd_hdspm_info_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "1:1", "44.1 -> 48", "48 -> 44.1" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->wordclock;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->wordclock != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->wordclock = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_FRAME_RATE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_frame_rate, \
+        .get = snd_hdspm_get_tco_frame_rate, \
+        .put = snd_hdspm_put_tco_frame_rate \
+}
+
+static int snd_hdspm_info_tco_frame_rate(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "24 fps", "25 fps", "29.97fps",
+                "29.97 dfps", "30 fps", "30 dfps" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 6;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_frame_rate(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        int offset;
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        offset = ucontrol->id.index - 1;
-        if (offset < 0 || offset >= 8)
-                return -EINVAL;
+        ucontrol->value.enumerated.item[0] = hdspm->tco->framerate;
 
-        ucontrol->value.enumerated.item[0] =
-                hdspm_aes_sync_check(hdspm, offset);
         return 0;
 }
 
+static int snd_hdspm_put_tco_frame_rate(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
+        if (hdspm->tco->framerate != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->framerate = ucontrol->value.enumerated.item[0];
 
-        HDSPM_MIXER("Mixer", 0),
-/* 'Sample Clock Source' complies with the alsa control naming scheme */
-        HDSPM_CLOCK_SOURCE("Sample Clock Source", 0),
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
 
+
+#define HDSPM_TCO_SYNC_SOURCE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_sync_source, \
+        .get = snd_hdspm_get_tco_sync_source, \
+        .put = snd_hdspm_put_tco_sync_source \
+}
+
+static int snd_hdspm_info_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "LTC", "Video", "WCK" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->input;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->input != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->input = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_WORD_TERM(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_word_term, \
+        .get = snd_hdspm_get_tco_word_term, \
+        .put = snd_hdspm_put_tco_word_term \
+}
+
+static int snd_hdspm_info_tco_word_term(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+
+        return 0;
+}
+
+
+static int snd_hdspm_get_tco_word_term(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->term;
+
+        return 0;
+}
+
+
+static int snd_hdspm_put_tco_word_term(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->term != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->term = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+
+
+static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
         HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
         HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
         HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
         HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
-/* 'External Rate' complies with the alsa control naming scheme */
-        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
-        HDSPM_WC_SYNC_CHECK("Word Clock Lock Status", 0),
-        HDSPM_MADI_SYNC_CHECK("MADI Sync Lock Status", 0),
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("MADI SyncCheck", 1),
+        HDSPM_SYNC_CHECK("TCO SyncCHeck", 2),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 3),
         HDSPM_LINE_OUT("Line Out", 0),
         HDSPM_TX_64("TX 64 channels mode", 0),
         HDSPM_C_TMS("Clear Track Marker", 0),
         HDSPM_SAFE_MODE("Safe Mode", 0),
-        HDSPM_INPUT_SELECT("Input Select", 0),
+        HDSPM_INPUT_SELECT("Input Select", 0)
 };
 
-static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
 
+static struct snd_kcontrol_new snd_hdspm_controls_madiface[] = {
         HDSPM_MIXER("Mixer", 0),
-/* 'Sample Clock Source' complies with the alsa control naming scheme */
-        HDSPM_CLOCK_SOURCE("Sample Clock Source", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
+        HDSPM_SYNC_CHECK("MADI SyncCheck", 0),
+        HDSPM_TX_64("TX 64 channels mode", 0),
+        HDSPM_C_TMS("Clear Track Marker", 0),
+        HDSPM_SAFE_MODE("Safe Mode", 0)
+};
 
+static struct snd_kcontrol_new snd_hdspm_controls_aio[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
         HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
         HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
         HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
         HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
-/* 'External Rate' complies with the alsa control naming scheme */
         HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
-        HDSPM_WC_SYNC_CHECK("Word Clock Lock Status", 0),
-/*      HDSPM_AES_SYNC_CHECK("AES Lock Status", 0),*/ /* created in snd_hdspm_create_controls() */
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("AES SyncCheck", 1),
+        HDSPM_SYNC_CHECK("SPDIF SyncCheck", 2),
+        HDSPM_SYNC_CHECK("ADAT SyncCheck", 3),
+        HDSPM_SYNC_CHECK("TCO SyncCheck", 4),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SPDIF Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 5)
+
+                /*
+                   HDSPM_INPUT_SELECT("Input Select", 0),
+                   HDSPM_SPDIF_OPTICAL("SPDIF Out Optical", 0),
+                   HDSPM_PROFESSIONAL("SPDIF Out Professional", 0);
+                   HDSPM_SPDIF_IN("SPDIF In", 0);
+                   HDSPM_BREAKOUT_CABLE("Breakout Cable", 0);
+                   HDSPM_INPUT_LEVEL("Input Level", 0);
+                   HDSPM_OUTPUT_LEVEL("Output Level", 0);
+                   HDSPM_PHONES("Phones", 0);
+                   */
+};
+
+static struct snd_kcontrol_new snd_hdspm_controls_raydat[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("Clock Mode", 0),
+        HDSPM_PREF_SYNC_REF("Pref Sync Ref", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("AES SyncCheck", 1),
+        HDSPM_SYNC_CHECK("SPDIF SyncCheck", 2),
+        HDSPM_SYNC_CHECK("ADAT1 SyncCheck", 3),
+        HDSPM_SYNC_CHECK("ADAT2 SyncCheck", 4),
+        HDSPM_SYNC_CHECK("ADAT3 SyncCheck", 5),
+        HDSPM_SYNC_CHECK("ADAT4 SyncCheck", 6),
+        HDSPM_SYNC_CHECK("TCO SyncCheck", 7),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 8),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SPDIF Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT1 Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT2 Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT3 Frequency", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT4 Frequency", 6),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 7),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 8)
+};
+
+static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
+        HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
+        HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
+        HDSPM_SYNC_CHECK("WC Sync Check", 0),
+        HDSPM_SYNC_CHECK("AES1 Sync Check", 1),
+        HDSPM_SYNC_CHECK("AES2 Sync Check", 2),
+        HDSPM_SYNC_CHECK("AES3 Sync Check", 3),
+        HDSPM_SYNC_CHECK("AES4 Sync Check", 4),
+        HDSPM_SYNC_CHECK("AES5 Sync Check", 5),
+        HDSPM_SYNC_CHECK("AES6 Sync Check", 6),
+        HDSPM_SYNC_CHECK("AES7 Sync Check", 7),
+        HDSPM_SYNC_CHECK("AES8 Sync Check", 8),
+        HDSPM_SYNC_CHECK("TCO Sync Check", 9),
+        HDSPM_SYNC_CHECK("SYNC IN Sync Check", 10),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES1 Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES2 Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES3 Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES4 Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES5 Frequency", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES6 Frequency", 6),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES7 Frequency", 7),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES8 Frequency", 8),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 9),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 10),
         HDSPM_LINE_OUT("Line Out", 0),
         HDSPM_EMPHASIS("Emphasis", 0),
         HDSPM_DOLBY("Non Audio", 0),
@@ -2842,6 +4403,19 @@ static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
         HDSPM_QS_WIRE("Quad Speed Wire Mode", 0),
 };
 
+
+
+/* Control elements for the optional TCO module */
+static struct snd_kcontrol_new snd_hdspm_controls_tco[] = {
+        HDSPM_TCO_SAMPLE_RATE("TCO Sample Rate", 0),
+        HDSPM_TCO_PULL("TCO Pull", 0),
+        HDSPM_TCO_WCK_CONVERSION("TCO WCK Conversion", 0),
+        HDSPM_TCO_FRAME_RATE("TCO Frame Rate", 0),
+        HDSPM_TCO_SYNC_SOURCE("TCO Sync Source", 0),
+        HDSPM_TCO_WORD_TERM("TCO Word Term", 0)
+};
+
+
 static struct snd_kcontrol_new snd_hdspm_playback_mixer = HDSPM_PLAYBACK_MIXER;
 
 
@@ -2849,78 +4423,76 @@ static int hdspm_update_simple_mixer_controls(struct hdspm * hdspm)
 {
         int i;
 
-        for (i = hdspm->ds_channels; i < hdspm->ss_channels; ++i) {
+        for (i = hdspm->ds_out_channels; i < hdspm->ss_out_channels; ++i) {
                 if (hdspm->system_sample_rate > 48000) {
                         hdspm->playback_mixer_ctls[i]->vd[0].access =
-                            SNDRV_CTL_ELEM_ACCESS_INACTIVE |
-                            SNDRV_CTL_ELEM_ACCESS_READ |
-                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                                SNDRV_CTL_ELEM_ACCESS_INACTIVE |
+                                SNDRV_CTL_ELEM_ACCESS_READ |
+                                SNDRV_CTL_ELEM_ACCESS_VOLATILE;
                 } else {
                         hdspm->playback_mixer_ctls[i]->vd[0].access =
-                            SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                                SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                                SNDRV_CTL_ELEM_ACCESS_VOLATILE;
                 }
                 snd_ctl_notify(hdspm->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                               SNDRV_CTL_EVENT_MASK_INFO,
-                               &hdspm->playback_mixer_ctls[i]->id);
+                                SNDRV_CTL_EVENT_MASK_INFO,
+                                &hdspm->playback_mixer_ctls[i]->id);
         }
 
         return 0;
 }
 
 
-static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm)
+static int snd_hdspm_create_controls(struct snd_card *card,
+                                        struct hdspm *hdspm)
 {
         unsigned int idx, limit;
         int err;
         struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *list = NULL;
 
-        /* add control list first */
-        if (hdspm->is_aes32) {
-                struct snd_kcontrol_new aes_sync_ctl =
-                        HDSPM_AES_SYNC_CHECK("AES Lock Status", 0);
+        switch (hdspm->io_type) {
+        case MADI:
+                list = snd_hdspm_controls_madi;
+                limit = ARRAY_SIZE(snd_hdspm_controls_madi);
+                break;
+        case MADIface:
+                list = snd_hdspm_controls_madiface;
+                limit = ARRAY_SIZE(snd_hdspm_controls_madiface);
+                break;
+        case AIO:
+                list = snd_hdspm_controls_aio;
+                limit = ARRAY_SIZE(snd_hdspm_controls_aio);
+                break;
+        case RayDAT:
+                list = snd_hdspm_controls_raydat;
+                limit = ARRAY_SIZE(snd_hdspm_controls_raydat);
+                break;
+        case AES32:
+                list = snd_hdspm_controls_aes32;
+                limit = ARRAY_SIZE(snd_hdspm_controls_aes32);
+                break;
+        }
 
-                for (idx = 0; idx < ARRAY_SIZE(snd_hdspm_controls_aes32);
-                     idx++) {
-                        err = snd_ctl_add(card,
-                                          snd_ctl_new1(&snd_hdspm_controls_aes32[idx],
-                                                       hdspm));
-                        if (err < 0)
-                                return err;
-                }
-                for (idx = 1; idx <= 8; idx++) {
-                        aes_sync_ctl.index = idx;
-                        err = snd_ctl_add(card,
-                                          snd_ctl_new1(&aes_sync_ctl, hdspm));
-                        if (err < 0)
-                                return err;
-                }
-        } else {
-                for (idx = 0; idx < ARRAY_SIZE(snd_hdspm_controls_madi);
-                     idx++) {
+        if (NULL != list) {
+                for (idx = 0; idx < limit; idx++) {
                         err = snd_ctl_add(card,
-                                          snd_ctl_new1(&snd_hdspm_controls_madi[idx],
-                                                       hdspm));
+                                        snd_ctl_new1(&list[idx], hdspm));
                         if (err < 0)
                                 return err;
                 }
         }
 
-        /* Channel playback mixer as default control 
-           Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders,
-           thats too * big for any alsamixer they are accesible via special
-           IOCTL on hwdep and the mixer 2dimensional mixer control
-        */
 
+        /* create simple 1:1 playback mixer controls */
         snd_hdspm_playback_mixer.name = "Chn";
-        limit = HDSPM_MAX_CHANNELS;
-
-        /* The index values are one greater than the channel ID so that
-         * alsamixer will display them correctly. We want to use the index
-         * for fast lookup of the relevant channel, but if we use it at all,
-         * most ALSA software does the wrong thing with it ...
-         */
-
+        if (hdspm->system_sample_rate >= 128000) {
+                limit = hdspm->qs_out_channels;
+        } else if (hdspm->system_sample_rate >= 64000) {
+                limit = hdspm->ds_out_channels;
+        } else {
+                limit = hdspm->ss_out_channels;
+        }
         for (idx = 0; idx < limit; ++idx) {
                 snd_hdspm_playback_mixer.index = idx + 1;
                 kctl = snd_ctl_new1(&snd_hdspm_playback_mixer, hdspm);
@@ -2930,11 +4502,24 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm
                 hdspm->playback_mixer_ctls[idx] = kctl;
         }
 
+
+        if (hdspm->tco) {
+                /* add tco control elements */
+                list = snd_hdspm_controls_tco;
+                limit = ARRAY_SIZE(snd_hdspm_controls_tco);
+                for (idx = 0; idx < limit; idx++) {
+                        err = snd_ctl_add(card,
+                                        snd_ctl_new1(&list[idx], hdspm));
+                        if (err < 0)
+                                return err;
+                }
+        }
+
         return 0;
 }
 
 /*------------------------------------------------------------
-   /proc interface 
+   /proc interface
  ------------------------------------------------------------*/
 
 static void
@@ -2942,72 +4527,178 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                          struct snd_info_buffer *buffer)
 {
         struct hdspm *hdspm = entry->private_data;
-        unsigned int status;
-        unsigned int status2;
+        unsigned int status, status2, control, freq;
+
         char *pref_sync_ref;
         char *autosync_ref;
         char *system_clock_mode;
-        char *clock_source;
         char *insel;
-        char *syncref;
         int x, x2;
 
+        /* TCO stuff */
+        int a, ltc, frames, seconds, minutes, hours;
+        unsigned int period;
+        u64 freq_const = 0;
+        u32 rate;
+
         status = hdspm_read(hdspm, HDSPM_statusRegister);
         status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+        control = hdspm->control_register;
+        freq = hdspm_read(hdspm, HDSPM_timecodeRegister);
 
         snd_iprintf(buffer, "%s (Card #%d) Rev.%x Status2first3bits: %x\n",
-                    hdspm->card_name, hdspm->card->number + 1,
-                    hdspm->firmware_rev,
-                    (status2 & HDSPM_version0) |
-                    (status2 & HDSPM_version1) | (status2 &
-                                                  HDSPM_version2));
+                        hdspm->card_name, hdspm->card->number + 1,
+                        hdspm->firmware_rev,
+                        (status2 & HDSPM_version0) |
+                        (status2 & HDSPM_version1) | (status2 &
+                                HDSPM_version2));
+
+        snd_iprintf(buffer, "HW Serial: 0x%06x%06x\n",
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn1)>>8) & 0xFFFFFF,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
 
         snd_iprintf(buffer, "IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n",
-                    hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
+                        hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
 
         snd_iprintf(buffer, "--- System ---\n");
 
         snd_iprintf(buffer,
-                    "IRQ Pending: Audio=%d, MIDI0=%d, MIDI1=%d, IRQcount=%d\n",
-                    status & HDSPM_audioIRQPending,
-                    (status & HDSPM_midi0IRQPending) ? 1 : 0,
-                    (status & HDSPM_midi1IRQPending) ? 1 : 0,
-                    hdspm->irq_count);
+                "IRQ Pending: Audio=%d, MIDI0=%d, MIDI1=%d, IRQcount=%d\n",
+                status & HDSPM_audioIRQPending,
+                (status & HDSPM_midi0IRQPending) ? 1 : 0,
+                (status & HDSPM_midi1IRQPending) ? 1 : 0,
+                hdspm->irq_count);
         snd_iprintf(buffer,
-                    "HW pointer: id = %d, rawptr = %d (%d->%d) "
-                    "estimated= %ld (bytes)\n",
-                    ((status & HDSPM_BufferID) ? 1 : 0),
-                    (status & HDSPM_BufferPositionMask),
-                    (status & HDSPM_BufferPositionMask) %
-                    (2 * (int)hdspm->period_bytes),
-                    ((status & HDSPM_BufferPositionMask) - 64) %
-                    (2 * (int)hdspm->period_bytes),
-                    (long) hdspm_hw_pointer(hdspm) * 4);
+                "HW pointer: id = %d, rawptr = %d (%d->%d) "
+                "estimated= %ld (bytes)\n",
+                ((status & HDSPM_BufferID) ? 1 : 0),
+                (status & HDSPM_BufferPositionMask),
+                (status & HDSPM_BufferPositionMask) %
+                (2 * (int)hdspm->period_bytes),
+                ((status & HDSPM_BufferPositionMask) - 64) %
+                (2 * (int)hdspm->period_bytes),
+                (long) hdspm_hw_pointer(hdspm) * 4);
 
         snd_iprintf(buffer,
-                    "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
-                    hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
+                "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
+                hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
         snd_iprintf(buffer,
-                    "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
-                    "status2=0x%x\n",
-                    hdspm->control_register, hdspm->control2_register,
-                    status, status2);
+                "MIDIoverMADI FIFO: In=0x%x, Out=0x%x \n",
+                hdspm_read(hdspm, HDSPM_midiStatusIn2) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusOut2) & 0xFF);
+        snd_iprintf(buffer,
+                "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
+                "status2=0x%x\n",
+                hdspm->control_register, hdspm->control2_register,
+                status, status2);
+        if (status & HDSPM_tco_detect) {
+                snd_iprintf(buffer, "TCO module detected.\n");
+                a = hdspm_read(hdspm, HDSPM_RD_TCO+4);
+                if (a & HDSPM_TCO1_LTC_Input_valid) {
+                        snd_iprintf(buffer, "  LTC valid, ");
+                        switch (a & (HDSPM_TCO1_LTC_Format_LSB |
+                                                HDSPM_TCO1_LTC_Format_MSB)) {
+                        case 0:
+                                snd_iprintf(buffer, "24 fps, ");
+                                break;
+                        case HDSPM_TCO1_LTC_Format_LSB:
+                                snd_iprintf(buffer, "25 fps, ");
+                                break;
+                        case HDSPM_TCO1_LTC_Format_MSB:
+                                snd_iprintf(buffer, "29.97 fps, ");
+                                break;
+                        default:
+                                snd_iprintf(buffer, "30 fps, ");
+                                break;
+                        }
+                        if (a & HDSPM_TCO1_set_drop_frame_flag) {
+                                snd_iprintf(buffer, "drop frame\n");
+                        } else {
+                                snd_iprintf(buffer, "full frame\n");
+                        }
+                } else {
+                        snd_iprintf(buffer, "  no LTC\n");
+                }
+                if (a & HDSPM_TCO1_Video_Input_Format_NTSC) {
+                        snd_iprintf(buffer, "  Video: NTSC\n");
+                } else if (a & HDSPM_TCO1_Video_Input_Format_PAL) {
+                        snd_iprintf(buffer, "  Video: PAL\n");
+                } else {
+                        snd_iprintf(buffer, "  No video\n");
+                }
+                if (a & HDSPM_TCO1_TCO_lock) {
+                        snd_iprintf(buffer, "  Sync: lock\n");
+                } else {
+                        snd_iprintf(buffer, "  Sync: no lock\n");
+                }
+
+                switch (hdspm->io_type) {
+                case MADI:
+                case AES32:
+                        freq_const = 110069313433624ULL;
+                        break;
+                case RayDAT:
+                case AIO:
+                        freq_const = 104857600000000ULL;
+                        break;
+                case MADIface:
+                        break; /* no TCO possible */
+                }
+
+                period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+                snd_iprintf(buffer, "    period: %u\n", period);
+
+
+                /* rate = freq_const/period; */
+                rate = div_u64(freq_const, period);
+
+                if (control & HDSPM_QuadSpeed) {
+                        rate *= 4;
+                } else if (control & HDSPM_DoubleSpeed) {
+                        rate *= 2;
+                }
+
+                snd_iprintf(buffer, "  Frequency: %u Hz\n",
+                                (unsigned int) rate);
+
+                ltc = hdspm_read(hdspm, HDSPM_RD_TCO);
+                frames = ltc & 0xF;
+                ltc >>= 4;
+                frames += (ltc & 0x3) * 10;
+                ltc >>= 4;
+                seconds = ltc & 0xF;
+                ltc >>= 4;
+                seconds += (ltc & 0x7) * 10;
+                ltc >>= 4;
+                minutes = ltc & 0xF;
+                ltc >>= 4;
+                minutes += (ltc & 0x7) * 10;
+                ltc >>= 4;
+                hours = ltc & 0xF;
+                ltc >>= 4;
+                hours += (ltc & 0x3) * 10;
+                snd_iprintf(buffer,
+                        "  LTC In: %02d:%02d:%02d:%02d\n",
+                        hours, minutes, seconds, frames);
+
+        } else {
+                snd_iprintf(buffer, "No TCO module detected.\n");
+        }
 
         snd_iprintf(buffer, "--- Settings ---\n");
 
         x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
-                                           HDSPM_LatencyMask));
+                                                        HDSPM_LatencyMask));
 
         snd_iprintf(buffer,
-                    "Size (Latency): %d samples (2 periods of %lu bytes)\n",
-                    x, (unsigned long) hdspm->period_bytes);
+                "Size (Latency): %d samples (2 periods of %lu bytes)\n",
+                x, (unsigned long) hdspm->period_bytes);
 
-        snd_iprintf(buffer, "Line out: %s,   Precise Pointer: %s\n",
-                    (hdspm->control_register & HDSPM_LineOut) ? "on " : "off",
-                    (hdspm->precise_ptr) ? "on" : "off");
+        snd_iprintf(buffer, "Line out: %s\n",
+                (hdspm->control_register & HDSPM_LineOut) ? "on " : "off");
 
         switch (hdspm->control_register & HDSPM_InputMask) {
         case HDSPM_InputOptical:
@@ -3017,63 +4708,22 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 insel = "Coaxial";
                 break;
         default:
-                insel = "Unknown";
-        }
-
-        switch (hdspm->control_register & HDSPM_SyncRefMask) {
-        case HDSPM_SyncRef_Word:
-                syncref = "WordClock";
-                break;
-        case HDSPM_SyncRef_MADI:
-                syncref = "MADI";
-                break;
-        default:
-                syncref = "Unknown";
+                insel = "Unkown";
         }
-        snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel,
-                    syncref);
 
         snd_iprintf(buffer,
-                    "ClearTrackMarker = %s, Transmit in %s Channel Mode, "
-                    "Auto Input %s\n",
-                    (hdspm->
-                     control_register & HDSPM_clr_tms) ? "on" : "off",
-                    (hdspm->
-                     control_register & HDSPM_TX_64ch) ? "64" : "56",
-                    (hdspm->
-                     control_register & HDSPM_AutoInp) ? "on" : "off");
+                "ClearTrackMarker = %s, Transmit in %s Channel Mode, "
+                "Auto Input %s\n",
+                (hdspm->control_register & HDSPM_clr_tms) ? "on" : "off",
+                (hdspm->control_register & HDSPM_TX_64ch) ? "64" : "56",
+                (hdspm->control_register & HDSPM_AutoInp) ? "on" : "off");
+
 
-        switch (hdspm_clock_source(hdspm)) {
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                clock_source = "AutoSync";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                clock_source = "Internal 32 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                clock_source = "Internal 44.1 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                clock_source = "Internal 48 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                clock_source = "Internal 64 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                clock_source = "Internal 88.2 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                clock_source = "Internal 96 kHz";
-                break;
-        default:
-                clock_source = "Error";
-        }
-        snd_iprintf(buffer, "Sample Clock Source: %s\n", clock_source);
         if (!(hdspm->control_register & HDSPM_ClockModeMaster))
-                system_clock_mode = "Slave";
+                system_clock_mode = "AutoSync";
         else
                 system_clock_mode = "Master";
-        snd_iprintf(buffer, "System Clock Mode: %s\n", system_clock_mode);
+        snd_iprintf(buffer, "AutoSync Reference: %s\n", system_clock_mode);
 
         switch (hdspm_pref_sync_ref(hdspm)) {
         case HDSPM_SYNC_FROM_WORD:
@@ -3082,15 +4732,21 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
         case HDSPM_SYNC_FROM_MADI:
                 pref_sync_ref = "MADI Sync";
                 break;
+        case HDSPM_SYNC_FROM_TCO:
+                pref_sync_ref = "TCO";
+                break;
+        case HDSPM_SYNC_FROM_SYNC_IN:
+                pref_sync_ref = "Sync In";
+                break;
         default:
                 pref_sync_ref = "XXXX Clock";
                 break;
         }
         snd_iprintf(buffer, "Preferred Sync Reference: %s\n",
-                    pref_sync_ref);
+                        pref_sync_ref);
 
         snd_iprintf(buffer, "System Clock Frequency: %d\n",
-                    hdspm->system_sample_rate);
+                        hdspm->system_sample_rate);
 
 
         snd_iprintf(buffer, "--- Status:\n");
@@ -3099,12 +4755,18 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
         x2 = status2 & HDSPM_wcSync;
 
         snd_iprintf(buffer, "Inputs MADI=%s, WordClock=%s\n",
-                    (status & HDSPM_madiLock) ? (x ? "Sync" : "Lock") :
-                    "NoLock",
-                    (status2 & HDSPM_wcLock) ? (x2 ? "Sync" : "Lock") :
-                    "NoLock");
+                        (status & HDSPM_madiLock) ? (x ? "Sync" : "Lock") :
+                        "NoLock",
+                        (status2 & HDSPM_wcLock) ? (x2 ? "Sync" : "Lock") :
+                        "NoLock");
 
         switch (hdspm_autosync_ref(hdspm)) {
+        case HDSPM_AUTOSYNC_FROM_SYNC_IN:
+                autosync_ref = "Sync In";
+                break;
+        case HDSPM_AUTOSYNC_FROM_TCO:
+                autosync_ref = "TCO";
+                break;
         case HDSPM_AUTOSYNC_FROM_WORD:
                 autosync_ref = "Word Clock";
                 break;
@@ -3119,15 +4781,15 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 break;
         }
         snd_iprintf(buffer,
-                    "AutoSync: Reference= %s, Freq=%d (MADI = %d, Word = %d)\n",
-                    autosync_ref, hdspm_external_sample_rate(hdspm),
-                    (status & HDSPM_madiFreqMask) >> 22,
-                    (status2 & HDSPM_wcFreqMask) >> 5);
+                "AutoSync: Reference= %s, Freq=%d (MADI = %d, Word = %d)\n",
+                autosync_ref, hdspm_external_sample_rate(hdspm),
+                (status & HDSPM_madiFreqMask) >> 22,
+                (status2 & HDSPM_wcFreqMask) >> 5);
 
         snd_iprintf(buffer, "Input: %s, Mode=%s\n",
-                    (status & HDSPM_AB_int) ? "Coax" : "Optical",
-                    (status & HDSPM_RX_64ch) ? "64 channels" :
-                    "56 channels");
+                (status & HDSPM_AB_int) ? "Coax" : "Optical",
+                (status & HDSPM_RX_64ch) ? "64 channels" :
+                "56 channels");
 
         snd_iprintf(buffer, "\n");
 }
@@ -3142,8 +4804,6 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
         unsigned int timecode;
         int pref_syncref;
         char *autosync_ref;
-        char *system_clock_mode;
-        char *clock_source;
         int x;
 
         status = hdspm_read(hdspm, HDSPM_statusRegister);
@@ -3183,24 +4843,27 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                     hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
                     hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
         snd_iprintf(buffer,
-                    "Register: ctrl1=0x%x, status1=0x%x, status2=0x%x, "
-                    "timecode=0x%x\n",
-                    hdspm->control_register,
-                    status, status2, timecode);
+                    "MIDIoverMADI FIFO: In=0x%x, Out=0x%x \n",
+                    hdspm_read(hdspm, HDSPM_midiStatusIn2) & 0xFF,
+                    hdspm_read(hdspm, HDSPM_midiStatusOut2) & 0xFF);
+        snd_iprintf(buffer,
+                    "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
+                    "status2=0x%x\n",
+                    hdspm->control_register, hdspm->control2_register,
+                    status, status2);
 
         snd_iprintf(buffer, "--- Settings ---\n");
 
         x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
-                                           HDSPM_LatencyMask));
+                                HDSPM_LatencyMask));
 
         snd_iprintf(buffer,
                     "Size (Latency): %d samples (2 periods of %lu bytes)\n",
                     x, (unsigned long) hdspm->period_bytes);
 
-        snd_iprintf(buffer, "Line out: %s,   Precise Pointer: %s\n",
+        snd_iprintf(buffer, "Line out: %s\n",
                     (hdspm->
-                     control_register & HDSPM_LineOut) ? "on " : "off",
-                    (hdspm->precise_ptr) ? "on" : "off");
+                     control_register & HDSPM_LineOut) ? "on " : "off");
 
         snd_iprintf(buffer,
                     "ClearTrackMarker %s, Emphasis %s, Dolby %s\n",
@@ -3211,46 +4874,6 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                     (hdspm->
                      control_register & HDSPM_Dolby) ? "on" : "off");
 
-        switch (hdspm_clock_source(hdspm)) {
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                clock_source = "AutoSync";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                clock_source = "Internal 32 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                clock_source = "Internal 44.1 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                clock_source = "Internal 48 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                clock_source = "Internal 64 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                clock_source = "Internal 88.2 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                clock_source = "Internal 96 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ:
-                clock_source = "Internal 128 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ:
-                clock_source = "Internal 176.4 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ:
-                clock_source = "Internal 192 kHz";
-                break;
-        default:
-                clock_source = "Error";
-        }
-        snd_iprintf(buffer, "Sample Clock Source: %s\n", clock_source);
-        if (!(hdspm->control_register & HDSPM_ClockModeMaster))
-                system_clock_mode = "Slave";
-        else
-                system_clock_mode = "Master";
-        snd_iprintf(buffer, "System Clock Mode: %s\n", system_clock_mode);
 
         pref_syncref = hdspm_pref_sync_ref(hdspm);
         if (pref_syncref == 0)
@@ -3274,38 +4897,108 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
         snd_iprintf(buffer, "--- Status:\n");
 
         snd_iprintf(buffer, "Word: %s  Frequency: %d\n",
-                    (status & HDSPM_AES32_wcLock)? "Sync   " : "No Lock",
+                    (status & HDSPM_AES32_wcLock) ? "Sync   " : "No Lock",
                     HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF));
 
         for (x = 0; x < 8; x++) {
                 snd_iprintf(buffer, "AES%d: %s  Frequency: %d\n",
                             x+1,
                             (status2 & (HDSPM_LockAES >> x)) ?
-                            "Sync   ": "No Lock",
+                            "Sync   " : "No Lock",
                             HDSPM_bit2freq((timecode >> (4*x)) & 0xF));
         }
 
         switch (hdspm_autosync_ref(hdspm)) {
-        case HDSPM_AES32_AUTOSYNC_FROM_NONE: autosync_ref="None"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_WORD: autosync_ref="Word Clock"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES1: autosync_ref="AES1"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES2: autosync_ref="AES2"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES3: autosync_ref="AES3"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES4: autosync_ref="AES4"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES5: autosync_ref="AES5"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES6: autosync_ref="AES6"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES7: autosync_ref="AES7"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES8: autosync_ref="AES8"; break;
-        default: autosync_ref = "---"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_NONE:
+                autosync_ref = "None"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_WORD:
+                autosync_ref = "Word Clock"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES1:
+                autosync_ref = "AES1"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES2:
+                autosync_ref = "AES2"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES3:
+                autosync_ref = "AES3"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES4:
+                autosync_ref = "AES4"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES5:
+                autosync_ref = "AES5"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES6:
+                autosync_ref = "AES6"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES7:
+                autosync_ref = "AES7"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES8:
+                autosync_ref = "AES8"; break;
+        default:
+                autosync_ref = "---"; break;
         }
         snd_iprintf(buffer, "AutoSync ref = %s\n", autosync_ref);
 
         snd_iprintf(buffer, "\n");
 }
 
+static void
+snd_hdspm_proc_read_raydat(struct snd_info_entry *entry,
+                         struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        unsigned int status1, status2, status3, control, i;
+        unsigned int lock, sync;
+
+        status1 = hdspm_read(hdspm, HDSPM_RD_STATUS_1); /* s1 */
+        status2 = hdspm_read(hdspm, HDSPM_RD_STATUS_2); /* freq */
+        status3 = hdspm_read(hdspm, HDSPM_RD_STATUS_3); /* s2 */
+
+        control = hdspm->control_register;
+
+        snd_iprintf(buffer, "STATUS1: 0x%08x\n", status1);
+        snd_iprintf(buffer, "STATUS2: 0x%08x\n", status2);
+        snd_iprintf(buffer, "STATUS3: 0x%08x\n", status3);
+
+
+        snd_iprintf(buffer, "\n*** CLOCK MODE\n\n");
+
+        snd_iprintf(buffer, "Clock mode      : %s\n",
+                (hdspm_system_clock_mode(hdspm) == 0) ? "master" : "slave");
+        snd_iprintf(buffer, "System frequency: %d Hz\n",
+                hdspm_get_system_sample_rate(hdspm));
+
+        snd_iprintf(buffer, "\n*** INPUT STATUS\n\n");
+
+        lock = 0x1;
+        sync = 0x100;
+
+        for (i = 0; i < 8; i++) {
+                snd_iprintf(buffer, "s1_input %d: Lock %d, Sync %d, Freq %s\n",
+                                i,
+                                (status1 & lock) ? 1 : 0,
+                                (status1 & sync) ? 1 : 0,
+                                texts_freq[(status2 >> (i * 4)) & 0xF]);
+
+                lock = lock<<1;
+                sync = sync<<1;
+        }
+
+        snd_iprintf(buffer, "WC input: Lock %d, Sync %d, Freq %s\n",
+                        (status1 & 0x1000000) ? 1 : 0,
+                        (status1 & 0x2000000) ? 1 : 0,
+                        texts_freq[(status1 >> 16) & 0xF]);
+
+        snd_iprintf(buffer, "TCO input: Lock %d, Sync %d, Freq %s\n",
+                        (status1 & 0x4000000) ? 1 : 0,
+                        (status1 & 0x8000000) ? 1 : 0,
+                        texts_freq[(status1 >> 20) & 0xF]);
+
+        snd_iprintf(buffer, "SYNC IN: Lock %d, Sync %d, Freq %s\n",
+                        (status3 & 0x400) ? 1 : 0,
+                        (status3 & 0x800) ? 1 : 0,
+                        texts_freq[(status2 >> 12) & 0xF]);
+
+}
+
 #ifdef CONFIG_SND_DEBUG
 static void
-snd_hdspm_proc_read_debug(struct snd_info_entry * entry,
+snd_hdspm_proc_read_debug(struct snd_info_entry *entry,
                           struct snd_info_buffer *buffer)
 {
         struct hdspm *hdspm = entry->private_data;
@@ -3322,16 +5015,68 @@ snd_hdspm_proc_read_debug(struct snd_info_entry * entry,
 #endif
 
 
+static void snd_hdspm_proc_ports_in(struct snd_info_entry *entry,
+                          struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        int i;
+
+        snd_iprintf(buffer, "# generated by hdspm\n");
 
-static void __devinit snd_hdspm_proc_init(struct hdspm * hdspm)
+        for (i = 0; i < hdspm->max_channels_in; i++) {
+                snd_iprintf(buffer, "%d=%s\n", i+1, hdspm->port_names_in[i]);
+        }
+}
+
+static void snd_hdspm_proc_ports_out(struct snd_info_entry *entry,
+                          struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        int i;
+
+        snd_iprintf(buffer, "# generated by hdspm\n");
+
+        for (i = 0; i < hdspm->max_channels_out; i++) {
+                snd_iprintf(buffer, "%d=%s\n", i+1, hdspm->port_names_out[i]);
+        }
+}
+
+
+static void __devinit snd_hdspm_proc_init(struct hdspm *hdspm)
 {
         struct snd_info_entry *entry;
 
-        if (!snd_card_proc_new(hdspm->card, "hdspm", &entry))
-                snd_info_set_text_ops(entry, hdspm,
-                                      hdspm->is_aes32 ?
-                                      snd_hdspm_proc_read_aes32 :
-                                      snd_hdspm_proc_read_madi);
+        if (!snd_card_proc_new(hdspm->card, "hdspm", &entry)) {
+                switch (hdspm->io_type) {
+                case AES32:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_aes32);
+                        break;
+                case MADI:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_madi);
+                        break;
+                case MADIface:
+                        /* snd_info_set_text_ops(entry, hdspm,
+                         snd_hdspm_proc_read_madiface); */
+                        break;
+                case RayDAT:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_raydat);
+                        break;
+                case AIO:
+                        break;
+                }
+        }
+
+        if (!snd_card_proc_new(hdspm->card, "ports.in", &entry)) {
+                snd_info_set_text_ops(entry, hdspm, snd_hdspm_proc_ports_in);
+        }
+
+        if (!snd_card_proc_new(hdspm->card, "ports.out", &entry)) {
+                snd_info_set_text_ops(entry, hdspm, snd_hdspm_proc_ports_out);
+        }
+
 #ifdef CONFIG_SND_DEBUG
         /* debug file to read all hdspm registers */
         if (!snd_card_proc_new(hdspm->card, "debug", &entry))
@@ -3341,47 +5086,48 @@ static void __devinit snd_hdspm_proc_init(struct hdspm * hdspm)
 }
 
 /*------------------------------------------------------------
-   hdspm intitialize 
+   hdspm intitialize
  ------------------------------------------------------------*/
 
 static int snd_hdspm_set_defaults(struct hdspm * hdspm)
 {
-        unsigned int i;
-
         /* ASSUMPTION: hdspm->lock is either held, or there is no need to
            hold it (e.g. during module initialization).
-         */
+           */
 
         /* set defaults:       */
 
-        if (hdspm->is_aes32)
+        hdspm->settings_register = 0;
+
+        switch (hdspm->io_type) {
+        case MADI:
+        case MADIface:
+                hdspm->control_register =
+                        0x2 + 0x8 + 0x10 + 0x80 + 0x400 + 0x4000 + 0x1000000;
+                break;
+
+        case RayDAT:
+        case AIO:
+                hdspm->settings_register = 0x1 + 0x1000;
+                /* Magic values are: LAT_0, LAT_2, Master, freq1, tx64ch, inp_0,
+                 * line_out */
+                hdspm->control_register =
+                        0x2 + 0x8 + 0x10 + 0x80 + 0x400 + 0x4000 + 0x1000000;
+                break;
+
+        case AES32:
                 hdspm->control_register =
                         HDSPM_ClockModeMaster | /* Master Cloack Mode on */
-                        hdspm_encode_latency(7) | /* latency maximum =
-                                                   * 8192 samples
-                                                   */
+                        hdspm_encode_latency(7) | /* latency max=8192samples */
                         HDSPM_SyncRef0 |        /* AES1 is syncclock */
                         HDSPM_LineOut | /* Analog output in */
                         HDSPM_Professional;  /* Professional mode */
-        else
-                hdspm->control_register =
-                        HDSPM_ClockModeMaster | /* Master Cloack Mode on */
-                        hdspm_encode_latency(7) | /* latency maximum =
-                                                   * 8192 samples
-                                                   */
-                        HDSPM_InputCoaxial |    /* Input Coax not Optical */
-                        HDSPM_SyncRef_MADI |    /* Madi is syncclock */
-                        HDSPM_LineOut | /* Analog output in */
-                        HDSPM_TX_64ch | /* transmit in 64ch mode */
-                        HDSPM_AutoInp;  /* AutoInput chossing (takeover) */
-
-        /* ! HDSPM_Frequency0|HDSPM_Frequency1 = 44.1khz */
-        /* !  HDSPM_DoubleSpeed HDSPM_QuadSpeed = normal speed */
-        /* ! HDSPM_clr_tms = do not clear bits in track marks */
+                break;
+        }
 
         hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
 
-        if (!hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 /* No control2 register for AES32 */
 #ifdef SNDRV_BIG_ENDIAN
                 hdspm->control2_register = HDSPM_BIGENDIAN_MODE;
@@ -3397,57 +5143,59 @@ static int snd_hdspm_set_defaults(struct hdspm * hdspm)
 
         all_in_all_mixer(hdspm, 0 * UNITY_GAIN);
 
-        if (line_outs_monitor[hdspm->dev]) {
-
-                snd_printk(KERN_INFO "HDSPM: "
-                           "sending all playback streams to line outs.\n");
-
-                for (i = 0; i < HDSPM_MIXER_CHANNELS; i++) {
-                        if (hdspm_write_pb_gain(hdspm, i, i, UNITY_GAIN))
-                                return -EIO;
-                }
+        if (hdspm->io_type == AIO || hdspm->io_type == RayDAT) {
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
         }
 
         /* set a default rate so that the channel map is set up. */
-        hdspm->channel_map = channel_map_madi_ss;
-        hdspm_set_rate(hdspm, 44100, 1);
+        hdspm_set_rate(hdspm, 48000, 1);
 
         return 0;
 }
 
 
 /*------------------------------------------------------------
-   interrupt 
+   interrupt
  ------------------------------------------------------------*/
 
 static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
 {
         struct hdspm *hdspm = (struct hdspm *) dev_id;
         unsigned int status;
-        int audio;
-        int midi0;
-        int midi1;
-        unsigned int midi0status;
-        unsigned int midi1status;
-        int schedule = 0;
+        int i, audio, midi, schedule = 0;
+        /* cycles_t now; */
 
         status = hdspm_read(hdspm, HDSPM_statusRegister);
 
         audio = status & HDSPM_audioIRQPending;
-        midi0 = status & HDSPM_midi0IRQPending;
-        midi1 = status & HDSPM_midi1IRQPending;
+        midi = status & (HDSPM_midi0IRQPending | HDSPM_midi1IRQPending |
+                        HDSPM_midi2IRQPending | HDSPM_midi3IRQPending);
+
+        /* now = get_cycles(); */
+        /**
+         *   LAT_2..LAT_0 period  counter (win)  counter (mac)
+         *          6       4096   ~256053425     ~514672358
+         *          5       2048   ~128024983     ~257373821
+         *          4       1024    ~64023706     ~128718089
+         *          3        512    ~32005945      ~64385999
+         *          2        256    ~16003039      ~32260176
+         *          1        128     ~7998738      ~16194507
+         *          0         64     ~3998231       ~8191558
+         **/
+        /*
+           snd_printk(KERN_INFO "snd_hdspm_interrupt %llu @ %llx\n",
+           now-hdspm->last_interrupt, status & 0xFFC0);
+           hdspm->last_interrupt = now;
+        */
 
-        if (!audio && !midi0 && !midi1)
+        if (!audio && !midi)
                 return IRQ_NONE;
 
         hdspm_write(hdspm, HDSPM_interruptConfirmation, 0);
         hdspm->irq_count++;
 
-        midi0status = hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff;
-        midi1status = hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff;
 
         if (audio) {
-
                 if (hdspm->capture_substream)
                         snd_pcm_period_elapsed(hdspm->capture_substream);
 
@@ -3455,118 +5203,44 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
                         snd_pcm_period_elapsed(hdspm->playback_substream);
         }
 
-        if (midi0 && midi0status) {
-                /* we disable interrupts for this input until processing
-                 * is done
-                 */
-                hdspm->control_register &= ~HDSPM_Midi0InterruptEnable;
-                hdspm_write(hdspm, HDSPM_controlRegister,
-                            hdspm->control_register);
-                hdspm->midi[0].pending = 1;
-                schedule = 1;
-        }
-        if (midi1 && midi1status) {
-                /* we disable interrupts for this input until processing
-                 * is done
-                 */
-                hdspm->control_register &= ~HDSPM_Midi1InterruptEnable;
-                hdspm_write(hdspm, HDSPM_controlRegister,
-                            hdspm->control_register);
-                hdspm->midi[1].pending = 1;
-                schedule = 1;
+        if (midi) {
+                i = 0;
+                while (i < hdspm->midiPorts) {
+                        if ((hdspm_read(hdspm,
+                                hdspm->midi[i].statusIn) & 0xff) &&
+                                        (status & hdspm->midi[i].irq)) {
+                                /* we disable interrupts for this input until
+                                 * processing is done
+                                 */
+                                hdspm->control_register &= ~hdspm->midi[i].ie;
+                                hdspm_write(hdspm, HDSPM_controlRegister,
+                                                hdspm->control_register);
+                                hdspm->midi[i].pending = 1;
+                                schedule = 1;
+                        }
+
+                        i++;
+                }
+
+                if (schedule)
+                        tasklet_hi_schedule(&hdspm->midi_tasklet);
         }
-        if (schedule)
-                tasklet_schedule(&hdspm->midi_tasklet);
+
         return IRQ_HANDLED;
 }
 
 /*------------------------------------------------------------
-   pcm interface 
+   pcm interface
   ------------------------------------------------------------*/
 
 
-static snd_pcm_uframes_t snd_hdspm_hw_pointer(struct snd_pcm_substream *
-                                              substream)
+static snd_pcm_uframes_t snd_hdspm_hw_pointer(struct snd_pcm_substream
+                                              *substream)
 {
         struct hdspm *hdspm = snd_pcm_substream_chip(substream);
         return hdspm_hw_pointer(hdspm);
 }
 
-static char *hdspm_channel_buffer_location(struct hdspm * hdspm,
-                                           int stream, int channel)
-{
-        int mapped_channel;
-
-        if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
-                return NULL;
-
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return NULL;
-
-        if (stream == SNDRV_PCM_STREAM_CAPTURE)
-                return hdspm->capture_buffer +
-                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-        else
-                return hdspm->playback_buffer +
-                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-}
-
-
-/* dont know why need it ??? */
-static int snd_hdspm_playback_copy(struct snd_pcm_substream *substream,
-                                   int channel, snd_pcm_uframes_t pos,
-                                   void __user *src, snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        if (snd_BUG_ON(pos + count > HDSPM_CHANNEL_BUFFER_BYTES / 4))
-                return -EINVAL;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-
-        return copy_from_user(channel_buf + pos * 4, src, count * 4);
-}
-
-static int snd_hdspm_capture_copy(struct snd_pcm_substream *substream,
-                                  int channel, snd_pcm_uframes_t pos,
-                                  void __user *dst, snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        if (snd_BUG_ON(pos + count > HDSPM_CHANNEL_BUFFER_BYTES / 4))
-                return -EINVAL;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-        return copy_to_user(dst, channel_buf + pos * 4, count * 4);
-}
-
-static int snd_hdspm_hw_silence(struct snd_pcm_substream *substream,
-                                int channel, snd_pcm_uframes_t pos,
-                                snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-        memset(channel_buf + pos * 4, 0, count * 4);
-        return 0;
-}
 
 static int snd_hdspm_reset(struct snd_pcm_substream *substream)
 {
@@ -3589,7 +5263,7 @@ static int snd_hdspm_reset(struct snd_pcm_substream *substream)
                 snd_pcm_group_for_each_entry(s, substream) {
                         if (s == other) {
                                 oruntime->status->hw_ptr =
-                                    runtime->status->hw_ptr;
+                                        runtime->status->hw_ptr;
                                 break;
                         }
                 }
@@ -3621,19 +5295,19 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                 /* The other stream is open, and not by the same
                    task as this one. Make sure that the parameters
                    that matter are the same.
-                 */
+                   */
 
                 if (params_rate(params) != hdspm->system_sample_rate) {
                         spin_unlock_irq(&hdspm->lock);
                         _snd_pcm_hw_param_setempty(params,
-                                                   SNDRV_PCM_HW_PARAM_RATE);
+                                        SNDRV_PCM_HW_PARAM_RATE);
                         return -EBUSY;
                 }
 
                 if (params_period_size(params) != hdspm->period_bytes / 4) {
                         spin_unlock_irq(&hdspm->lock);
                         _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                                        SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
                         return -EBUSY;
                 }
 
@@ -3646,18 +5320,20 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         spin_lock_irq(&hdspm->lock);
         err = hdspm_set_rate(hdspm, params_rate(params), 0);
         if (err < 0) {
+                snd_printk(KERN_INFO "err on hdspm_set_rate: %d\n", err);
                 spin_unlock_irq(&hdspm->lock);
                 _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_RATE);
+                                SNDRV_PCM_HW_PARAM_RATE);
                 return err;
         }
         spin_unlock_irq(&hdspm->lock);
 
         err = hdspm_set_interrupt_interval(hdspm,
-                                           params_period_size(params));
+                        params_period_size(params));
         if (err < 0) {
+                snd_printk(KERN_INFO "err on hdspm_set_interrupt_interval: %d\n", err);
                 _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
                 return err;
         }
 
@@ -3667,10 +5343,13 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         /* malloc all buffer even if not enabled to get sure */
         /* Update for MADI rev 204: we need to allocate for all channels,
          * otherwise it doesn't work at 96kHz */
+
         err =
-            snd_pcm_lib_malloc_pages(substream, HDSPM_DMA_AREA_BYTES);
-        if (err < 0)
+                snd_pcm_lib_malloc_pages(substream, HDSPM_DMA_AREA_BYTES);
+        if (err < 0) {
+                snd_printk(KERN_INFO "err on snd_pcm_lib_malloc_pages: %d\n", err);
                 return err;
+        }
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 
@@ -3681,7 +5360,7 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                         snd_hdspm_enable_out(hdspm, i, 1);
 
                 hdspm->playback_buffer =
-                    (unsigned char *) substream->runtime->dma_area;
+                        (unsigned char *) substream->runtime->dma_area;
                 snd_printdd("Allocated sample buffer for playback at %p\n",
                                 hdspm->playback_buffer);
         } else {
@@ -3692,23 +5371,40 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                         snd_hdspm_enable_in(hdspm, i, 1);
 
                 hdspm->capture_buffer =
-                    (unsigned char *) substream->runtime->dma_area;
+                        (unsigned char *) substream->runtime->dma_area;
                 snd_printdd("Allocated sample buffer for capture at %p\n",
                                 hdspm->capture_buffer);
         }
+
         /*
            snd_printdd("Allocated sample buffer for %s at 0x%08X\n",
            substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
            "playback" : "capture",
            snd_pcm_sgbuf_get_addr(substream, 0));
-         */
+           */
         /*
-        snd_printdd("set_hwparams: %s %d Hz, %d channels, bs = %d\n",
-                        substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
-                          "playback" : "capture",
-                        params_rate(params), params_channels(params),
-                        params_buffer_size(params));
-        */
+           snd_printdd("set_hwparams: %s %d Hz, %d channels, bs = %d\n",
+           substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
+           "playback" : "capture",
+           params_rate(params), params_channels(params),
+           params_buffer_size(params));
+           */
+
+
+        /* Switch to native float format if requested */
+        if (SNDRV_PCM_FORMAT_FLOAT_LE == params_format(params)) {
+                if (!(hdspm->control_register & HDSPe_FLOAT_FORMAT))
+                        snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE float format.\n");
+
+                hdspm->control_register |= HDSPe_FLOAT_FORMAT;
+        } else if (SNDRV_PCM_FORMAT_S32_LE == params_format(params)) {
+                if (hdspm->control_register & HDSPe_FLOAT_FORMAT)
+                        snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE integer format.\n");
+
+                hdspm->control_register &= ~HDSPe_FLOAT_FORMAT;
+        }
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
         return 0;
 }
 
@@ -3719,14 +5415,14 @@ static int snd_hdspm_hw_free(struct snd_pcm_substream *substream)
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 
-                /* params_channels(params) should be enough, 
+                /* params_channels(params) should be enough,
                    but to get sure in case of error */
-                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                for (i = 0; i < hdspm->max_channels_out; ++i)
                         snd_hdspm_enable_out(hdspm, i, 0);
 
                 hdspm->playback_buffer = NULL;
         } else {
-                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                for (i = 0; i < hdspm->max_channels_in; ++i)
                         snd_hdspm_enable_in(hdspm, i, 0);
 
                 hdspm->capture_buffer = NULL;
@@ -3738,37 +5434,58 @@ static int snd_hdspm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
+
 static int snd_hdspm_channel_info(struct snd_pcm_substream *substream,
-                                  struct snd_pcm_channel_info * info)
+                struct snd_pcm_channel_info *info)
 {
         struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        int mapped_channel;
 
-        if (snd_BUG_ON(info->channel >= HDSPM_MAX_CHANNELS))
-                return -EINVAL;
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                if (snd_BUG_ON(info->channel >= hdspm->max_channels_out)) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel out of range (%d)\n", info->channel);
+                        return -EINVAL;
+                }
 
-        mapped_channel = hdspm->channel_map[info->channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
+                if (hdspm->channel_map_out[info->channel] < 0) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel %d mapped out\n", info->channel);
+                        return -EINVAL;
+                }
+
+                info->offset = hdspm->channel_map_out[info->channel] *
+                        HDSPM_CHANNEL_BUFFER_BYTES;
+        } else {
+                if (snd_BUG_ON(info->channel >= hdspm->max_channels_in)) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel out of range (%d)\n", info->channel);
+                        return -EINVAL;
+                }
+
+                if (hdspm->channel_map_in[info->channel] < 0) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel %d mapped out\n", info->channel);
+                        return -EINVAL;
+                }
+
+                info->offset = hdspm->channel_map_in[info->channel] *
+                        HDSPM_CHANNEL_BUFFER_BYTES;
+        }
 
-        info->offset = mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
         info->first = 0;
         info->step = 32;
         return 0;
 }
 
+
 static int snd_hdspm_ioctl(struct snd_pcm_substream *substream,
-                           unsigned int cmd, void *arg)
+                unsigned int cmd, void *arg)
 {
         switch (cmd) {
         case SNDRV_PCM_IOCTL1_RESET:
                 return snd_hdspm_reset(substream);
 
         case SNDRV_PCM_IOCTL1_CHANNEL_INFO:
-        {
-                struct snd_pcm_channel_info *info = arg;
-                return snd_hdspm_channel_info(substream, info);
-        }
+                {
+                        struct snd_pcm_channel_info *info = arg;
+                        return snd_hdspm_channel_info(substream, info);
+                }
         default:
                 break;
         }
@@ -3815,19 +5532,19 @@ static int snd_hdspm_trigger(struct snd_pcm_substream *substream, int cmd)
                 }
                 if (cmd == SNDRV_PCM_TRIGGER_START) {
                         if (!(running & (1 << SNDRV_PCM_STREAM_PLAYBACK))
-                            && substream->stream ==
-                            SNDRV_PCM_STREAM_CAPTURE)
+                                        && substream->stream ==
+                                        SNDRV_PCM_STREAM_CAPTURE)
                                 hdspm_silence_playback(hdspm);
                 } else {
                         if (running &&
-                            substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                                substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                                 hdspm_silence_playback(hdspm);
                 }
         } else {
                 if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                         hdspm_silence_playback(hdspm);
         }
-      _ok:
+_ok:
         snd_pcm_trigger_done(substream, substream);
         if (!hdspm->running && running)
                 hdspm_start_audio(hdspm);
@@ -3844,8 +5561,18 @@ static int snd_hdspm_prepare(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static unsigned int period_sizes[] =
-    { 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
+static unsigned int period_sizes_old[] = {
+        64, 128, 256, 512, 1024, 2048, 4096
+};
+
+static unsigned int period_sizes_new[] = {
+        32, 64, 128, 256, 512, 1024, 2048, 4096
+};
+
+/* RayDAT and AIO always have a buffer of 16384 samples per channel */
+static unsigned int raydat_aio_buffer_sizes[] = {
+        16384
+};
 
 static struct snd_pcm_hardware snd_hdspm_playback_subinfo = {
         .info = (SNDRV_PCM_INFO_MMAP |
@@ -3866,9 +5593,9 @@ static struct snd_pcm_hardware snd_hdspm_playback_subinfo = {
         .buffer_bytes_max =
             HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
         .period_bytes_min = (64 * 4),
-        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .period_bytes_max = (4096 * 4) * HDSPM_MAX_CHANNELS,
         .periods_min = 2,
-        .periods_max = 2,
+        .periods_max = 512,
         .fifo_size = 0
 };
 
@@ -3891,20 +5618,66 @@ static struct snd_pcm_hardware snd_hdspm_capture_subinfo = {
         .buffer_bytes_max =
             HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
         .period_bytes_min = (64 * 4),
-        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .period_bytes_max = (4096 * 4) * HDSPM_MAX_CHANNELS,
         .periods_min = 2,
-        .periods_max = 2,
+        .periods_max = 512,
         .fifo_size = 0
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = {
-        .count = ARRAY_SIZE(period_sizes),
-        .list = period_sizes,
+static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes_old = {
+        .count = ARRAY_SIZE(period_sizes_old),
+        .list = period_sizes_old,
         .mask = 0
 };
 
+static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes_new = {
+        .count = ARRAY_SIZE(period_sizes_new),
+        .list = period_sizes_new,
+        .mask = 0
+};
 
-static int snd_hdspm_hw_rule_channels_rate(struct snd_pcm_hw_params *params,
+static struct snd_pcm_hw_constraint_list hw_constraints_raydat_io_buffer = {
+        .count = ARRAY_SIZE(raydat_aio_buffer_sizes),
+        .list = raydat_aio_buffer_sizes,
+        .mask = 0
+};
+
+static int snd_hdspm_hw_rule_in_channels_rate(struct snd_pcm_hw_params *params,
+                                           struct snd_pcm_hw_rule *rule)
+{
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        struct snd_interval *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (r->min > 96000 && r->max <= 192000) {
+                struct snd_interval t = {
+                        .min = hdspm->qs_in_channels,
+                        .max = hdspm->qs_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->min > 48000 && r->max <= 96000) {
+                struct snd_interval t = {
+                        .min = hdspm->ds_in_channels,
+                        .max = hdspm->ds_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->max < 64000) {
+                struct snd_interval t = {
+                        .min = hdspm->ss_in_channels,
+                        .max = hdspm->ss_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        }
+
+        return 0;
+}
+
+static int snd_hdspm_hw_rule_out_channels_rate(struct snd_pcm_hw_params *params,
                                            struct snd_pcm_hw_rule * rule)
 {
         struct hdspm *hdspm = rule->private;
@@ -3913,25 +5686,33 @@ static int snd_hdspm_hw_rule_channels_rate(struct snd_pcm_hw_params *params,
         struct snd_interval *r =
             hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
 
-        if (r->min > 48000 && r->max <= 96000) {
+        if (r->min > 96000 && r->max <= 192000) {
                 struct snd_interval t = {
-                        .min = hdspm->ds_channels,
-                        .max = hdspm->ds_channels,
+                        .min = hdspm->qs_out_channels,
+                        .max = hdspm->qs_out_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->min > 48000 && r->max <= 96000) {
+                struct snd_interval t = {
+                        .min = hdspm->ds_out_channels,
+                        .max = hdspm->ds_out_channels,
                         .integer = 1,
                 };
                 return snd_interval_refine(c, &t);
         } else if (r->max < 64000) {
                 struct snd_interval t = {
-                        .min = hdspm->ss_channels,
-                        .max = hdspm->ss_channels,
+                        .min = hdspm->ss_out_channels,
+                        .max = hdspm->ss_out_channels,
                         .integer = 1,
                 };
                 return snd_interval_refine(c, &t);
+        } else {
         }
         return 0;
 }
 
-static int snd_hdspm_hw_rule_rate_channels(struct snd_pcm_hw_params *params,
+static int snd_hdspm_hw_rule_rate_in_channels(struct snd_pcm_hw_params *params,
                                            struct snd_pcm_hw_rule * rule)
 {
         struct hdspm *hdspm = rule->private;
@@ -3940,42 +5721,92 @@ static int snd_hdspm_hw_rule_rate_channels(struct snd_pcm_hw_params *params,
         struct snd_interval *r =
             hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
 
-        if (c->min >= hdspm->ss_channels) {
+        if (c->min >= hdspm->ss_in_channels) {
                 struct snd_interval t = {
                         .min = 32000,
                         .max = 48000,
                         .integer = 1,
                 };
                 return snd_interval_refine(r, &t);
-        } else if (c->max <= hdspm->ds_channels) {
+        } else if (c->max <= hdspm->qs_in_channels) {
+                struct snd_interval t = {
+                        .min = 128000,
+                        .max = 192000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->ds_in_channels) {
                 struct snd_interval t = {
                         .min = 64000,
                         .max = 96000,
                         .integer = 1,
                 };
+                return snd_interval_refine(r, &t);
+        }
 
+        return 0;
+}
+static int snd_hdspm_hw_rule_rate_out_channels(struct snd_pcm_hw_params *params,
+                                           struct snd_pcm_hw_rule *rule)
+{
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        struct snd_interval *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (c->min >= hdspm->ss_out_channels) {
+                struct snd_interval t = {
+                        .min = 32000,
+                        .max = 48000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->qs_out_channels) {
+                struct snd_interval t = {
+                        .min = 128000,
+                        .max = 192000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->ds_out_channels) {
+                struct snd_interval t = {
+                        .min = 64000,
+                        .max = 96000,
+                        .integer = 1,
+                };
                 return snd_interval_refine(r, &t);
         }
+
         return 0;
 }
 
-static int snd_hdspm_hw_rule_channels(struct snd_pcm_hw_params *params,
+static int snd_hdspm_hw_rule_in_channels(struct snd_pcm_hw_params *params,
                                       struct snd_pcm_hw_rule *rule)
 {
         unsigned int list[3];
         struct hdspm *hdspm = rule->private;
         struct snd_interval *c = hw_param_interval(params,
                         SNDRV_PCM_HW_PARAM_CHANNELS);
-        if (hdspm->is_aes32) {
-                list[0] = hdspm->qs_channels;
-                list[1] = hdspm->ds_channels;
-                list[2] = hdspm->ss_channels;
-                return snd_interval_list(c, 3, list, 0);
-        } else {
-                list[0] = hdspm->ds_channels;
-                list[1] = hdspm->ss_channels;
-                return snd_interval_list(c, 2, list, 0);
-        }
+
+        list[0] = hdspm->qs_in_channels;
+        list[1] = hdspm->ds_in_channels;
+        list[2] = hdspm->ss_in_channels;
+        return snd_interval_list(c, 3, list, 0);
+}
+
+static int snd_hdspm_hw_rule_out_channels(struct snd_pcm_hw_params *params,
+                                      struct snd_pcm_hw_rule *rule)
+{
+        unsigned int list[3];
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c = hw_param_interval(params,
+                        SNDRV_PCM_HW_PARAM_CHANNELS);
+
+        list[0] = hdspm->qs_out_channels;
+        list[1] = hdspm->ds_out_channels;
+        list[2] = hdspm->ss_out_channels;
+        return snd_interval_list(c, 3, list, 0);
 }
 
 
@@ -3999,6 +5830,7 @@ static int snd_hdspm_playback_open(struct snd_pcm_substream *substream)
 
         snd_pcm_set_sync(substream);
 
+
         runtime->hw = snd_hdspm_playback_subinfo;
 
         if (hdspm->capture_substream == NULL)
@@ -4011,25 +5843,41 @@ static int snd_hdspm_playback_open(struct snd_pcm_substream *substream)
 
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
 
-        snd_pcm_hw_constraint_list(runtime, 0,
-                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                                   &hw_constraints_period_sizes);
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                &hw_constraints_period_sizes_new);
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                &hw_constraints_raydat_io_buffer);
+
+                break;
+
+        default:
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                &hw_constraints_period_sizes_old);
+        }
 
-        if (hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                 &hdspm_hw_constraints_aes32_sample_rates);
         } else {
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                     snd_hdspm_hw_rule_channels, hdspm,
-                                     SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                    snd_hdspm_hw_rule_channels_rate, hdspm,
-                                    SNDRV_PCM_HW_PARAM_RATE, -1);
-
                 snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                    snd_hdspm_hw_rule_rate_channels, hdspm,
-                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                                snd_hdspm_hw_rule_rate_out_channels, hdspm,
+                                SNDRV_PCM_HW_PARAM_CHANNELS, -1);
         }
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_out_channels, hdspm,
+                        SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_out_channels_rate, hdspm,
+                        SNDRV_PCM_HW_PARAM_RATE, -1);
+
         return 0;
 }
 
@@ -4066,24 +5914,40 @@ static int snd_hdspm_capture_open(struct snd_pcm_substream *substream)
         spin_unlock_irq(&hdspm->lock);
 
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
-        snd_pcm_hw_constraint_list(runtime, 0,
-                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                                   &hw_constraints_period_sizes);
-        if (hdspm->is_aes32) {
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                     &hw_constraints_period_sizes_new);
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                     &hw_constraints_raydat_io_buffer);
+          break;
+
+        default:
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                     &hw_constraints_period_sizes_old);
+        }
+
+        if (AES32 == hdspm->io_type) {
                 snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                 &hdspm_hw_constraints_aes32_sample_rates);
         } else {
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                     snd_hdspm_hw_rule_channels, hdspm,
-                                     SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                    snd_hdspm_hw_rule_channels_rate, hdspm,
-                                    SNDRV_PCM_HW_PARAM_RATE, -1);
-
                 snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                    snd_hdspm_hw_rule_rate_channels, hdspm,
-                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                                snd_hdspm_hw_rule_rate_in_channels, hdspm,
+                                SNDRV_PCM_HW_PARAM_CHANNELS, -1);
         }
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_in_channels, hdspm,
+                        SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_in_channels_rate, hdspm,
+                        SNDRV_PCM_HW_PARAM_RATE, -1);
+
         return 0;
 }
 
@@ -4100,32 +5964,129 @@ static int snd_hdspm_capture_release(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
-                                 unsigned int cmd, unsigned long arg)
+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 inline int copy_u32_le(void __user *dest, void __iomem *src)
 {
+        u32 val = readl(src);
+        return copy_to_user(dest, &val, 4);
+}
+
+static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
+                unsigned int cmd, unsigned long __user arg)
+{
+        void __user *argp = (void __user *)arg;
         struct hdspm *hdspm = hw->private_data;
         struct hdspm_mixer_ioctl mixer;
-        struct hdspm_config_info info;
+        struct hdspm_config info;
+        struct hdspm_status status;
         struct hdspm_version hdspm_version;
-        struct hdspm_peak_rms_ioctl rms;
+        struct hdspm_peak_rms *levels;
+        struct hdspm_ltc ltc;
+        unsigned int statusregister;
+        long unsigned int s;
+        int i = 0;
 
         switch (cmd) {
 
         case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS:
-                if (copy_from_user(&rms, (void __user *)arg, sizeof(rms)))
+                levels = &hdspm->peak_rms;
+                for (i = 0; i < HDSPM_MAX_CHANNELS; i++) {
+                        levels->input_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_INPUT_PEAK + i*4);
+                        levels->playback_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_PLAYBACK_PEAK + i*4);
+                        levels->output_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_OUTPUT_PEAK + i*4);
+
+                        levels->input_rms[i] =
+                                ((uint64_t) readl(hdspm->iobase +
+                                        HDSPM_MADI_INPUT_RMS_H + i*4) << 32) |
+                                (uint64_t) readl(hdspm->iobase +
+                                                HDSPM_MADI_INPUT_RMS_L + i*4);
+                        levels->playback_rms[i] =
+                                ((uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_PLAYBACK_RMS_H+i*4) << 32) |
+                                (uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_PLAYBACK_RMS_L + i*4);
+                        levels->output_rms[i] =
+                                ((uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_OUTPUT_RMS_H + i*4) << 32) |
+                                (uint64_t)readl(hdspm->iobase +
+                                                HDSPM_MADI_OUTPUT_RMS_L + i*4);
+                }
+
+                if (hdspm->system_sample_rate > 96000) {
+                        levels->speed = qs;
+                } else if (hdspm->system_sample_rate > 48000) {
+                        levels->speed = ds;
+                } else {
+                        levels->speed = ss;
+                }
+                levels->status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+                s = copy_to_user(argp, levels, sizeof(struct hdspm_peak_rms));
+                if (0 != s) {
+                        /* snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu
+                         [Levels]\n", sizeof(struct hdspm_peak_rms), s);
+                         */
                         return -EFAULT;
-                /* maybe there is a chance to memorymap in future
-                 * so dont touch just copy
-                 */
-                if(copy_to_user_fromio((void __user *)rms.peak,
-                                       hdspm->iobase+HDSPM_MADI_peakrmsbase,
-                                       sizeof(struct hdspm_peak_rms)) != 0 )
+                }
+                break;
+
+        case SNDRV_HDSPM_IOCTL_GET_LTC:
+                ltc.ltc = hdspm_read(hdspm, HDSPM_RD_TCO);
+                i = hdspm_read(hdspm, HDSPM_RD_TCO + 4);
+                if (i & HDSPM_TCO1_LTC_Input_valid) {
+                        switch (i & (HDSPM_TCO1_LTC_Format_LSB |
+                                HDSPM_TCO1_LTC_Format_MSB)) {
+                        case 0:
+                                ltc.format = fps_24;
+                                break;
+                        case HDSPM_TCO1_LTC_Format_LSB:
+                                ltc.format = fps_25;
+                                break;
+                        case HDSPM_TCO1_LTC_Format_MSB:
+                                ltc.format = fps_2997;
+                                break;
+                        default:
+                                ltc.format = 30;
+                                break;
+                        }
+                        if (i & HDSPM_TCO1_set_drop_frame_flag) {
+                                ltc.frame = drop_frame;
+                        } else {
+                                ltc.frame = full_frame;
+                        }
+                } else {
+                        ltc.format = format_invalid;
+                        ltc.frame = frame_invalid;
+                }
+                if (i & HDSPM_TCO1_Video_Input_Format_NTSC) {
+                        ltc.input_format = ntsc;
+                } else if (i & HDSPM_TCO1_Video_Input_Format_PAL) {
+                        ltc.input_format = pal;
+                } else {
+                        ltc.input_format = no_video;
+                }
+
+                s = copy_to_user(argp, &ltc, sizeof(struct hdspm_ltc));
+                if (0 != s) {
+                        /*
+                         snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu [LTC]\n", sizeof(struct hdspm_ltc), s); */
                         return -EFAULT;
+                }
 
                 break;
-                
 
-        case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:
+        case SNDRV_HDSPM_IOCTL_GET_CONFIG:
 
                 memset(&info, 0, sizeof(info));
                 spin_lock_irq(&hdspm->lock);
@@ -4134,7 +6095,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
 
                 info.system_sample_rate = hdspm->system_sample_rate;
                 info.autosync_sample_rate =
-                    hdspm_external_sample_rate(hdspm);
+                        hdspm_external_sample_rate(hdspm);
                 info.system_clock_mode = hdspm_system_clock_mode(hdspm);
                 info.clock_source = hdspm_clock_source(hdspm);
                 info.autosync_ref = hdspm_autosync_ref(hdspm);
@@ -4145,10 +6106,58 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                         return -EFAULT;
                 break;
 
+        case SNDRV_HDSPM_IOCTL_GET_STATUS:
+                status.card_type = hdspm->io_type;
+
+                status.autosync_source = hdspm_autosync_ref(hdspm);
+
+                status.card_clock = 110069313433624ULL;
+                status.master_period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+
+                switch (hdspm->io_type) {
+                case MADI:
+                case MADIface:
+                        status.card_specific.madi.sync_wc =
+                                hdspm_wc_sync_check(hdspm);
+                        status.card_specific.madi.sync_madi =
+                                hdspm_madi_sync_check(hdspm);
+                        status.card_specific.madi.sync_tco =
+                                hdspm_tco_sync_check(hdspm);
+                        status.card_specific.madi.sync_in =
+                                hdspm_sync_in_sync_check(hdspm);
+
+                        statusregister =
+                                hdspm_read(hdspm, HDSPM_statusRegister);
+                        status.card_specific.madi.madi_input =
+                                (statusregister & HDSPM_AB_int) ? 1 : 0;
+                        status.card_specific.madi.channel_format =
+                                (statusregister & HDSPM_TX_64ch) ? 1 : 0;
+                        /* TODO: Mac driver sets it when f_s>48kHz */
+                        status.card_specific.madi.frame_format = 0;
+
+                default:
+                        break;
+                }
+
+                if (copy_to_user((void __user *) arg, &status, sizeof(status)))
+                        return -EFAULT;
+
+
+                break;
+
         case SNDRV_HDSPM_IOCTL_GET_VERSION:
+                hdspm_version.card_type = hdspm->io_type;
+                strncpy(hdspm_version.cardname, hdspm->card_name,
+                                sizeof(hdspm_version.cardname));
+                hdspm_version.serial = (hdspm_read(hdspm,
+                                        HDSPM_midiStatusIn0)>>8) & 0xFFFFFF;
                 hdspm_version.firmware_rev = hdspm->firmware_rev;
+                hdspm_version.addons = 0;
+                if (hdspm->tco)
+                        hdspm_version.addons |= HDSPM_ADDON_TCO;
+
                 if (copy_to_user((void __user *) arg, &hdspm_version,
-                                 sizeof(hdspm_version)))
+                                        sizeof(hdspm_version)))
                         return -EFAULT;
                 break;
 
@@ -4156,7 +6165,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                 if (copy_from_user(&mixer, (void __user *)arg, sizeof(mixer)))
                         return -EFAULT;
                 if (copy_to_user((void __user *)mixer.mixer, hdspm->mixer,
-                                 sizeof(struct hdspm_mixer)))
+                                        sizeof(struct hdspm_mixer)))
                         return -EFAULT;
                 break;
 
@@ -4175,8 +6184,6 @@ static struct snd_pcm_ops snd_hdspm_playback_ops = {
         .prepare = snd_hdspm_prepare,
         .trigger = snd_hdspm_trigger,
         .pointer = snd_hdspm_hw_pointer,
-        .copy = snd_hdspm_playback_copy,
-        .silence = snd_hdspm_hw_silence,
         .page = snd_pcm_sgbuf_ops_page,
 };
 
@@ -4189,7 +6196,6 @@ static struct snd_pcm_ops snd_hdspm_capture_ops = {
         .prepare = snd_hdspm_prepare,
         .trigger = snd_hdspm_trigger,
         .pointer = snd_hdspm_hw_pointer,
-        .copy = snd_hdspm_capture_copy,
         .page = snd_pcm_sgbuf_ops_page,
 };
 
@@ -4207,16 +6213,18 @@ 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;
 }
 
 
 /*------------------------------------------------------------
-   memory interface 
+   memory interface
  ------------------------------------------------------------*/
-static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
+static int __devinit snd_hdspm_preallocate_memory(struct hdspm *hdspm)
 {
         int err;
         struct snd_pcm *pcm;
@@ -4228,7 +6236,7 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
 
         err =
              snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                   SNDRV_DMA_TYPE_DEV_SG,
+                                                   SNDRV_DMA_TYPE_DEV_SG,
                                                    snd_dma_pci_data(hdspm->pci),
                                                    wanted,
                                                    wanted);
@@ -4242,19 +6250,23 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
         return 0;
 }
 
-static void hdspm_set_sgbuf(struct hdspm * hdspm,
+
+static void hdspm_set_sgbuf(struct hdspm *hdspm,
                             struct snd_pcm_substream *substream,
                              unsigned int reg, int channels)
 {
         int i;
+
+        /* continuous memory segment */
         for (i = 0; i < (channels * 16); i++)
                 hdspm_write(hdspm, reg + 4 * i,
-                            snd_pcm_sgbuf_get_addr(substream, 4096 * i));
+                                snd_pcm_sgbuf_get_addr(substream, 4096 * i));
 }
 
+
 /* ------------- ALSA Devices ---------------------------- */
 static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
-                                          struct hdspm * hdspm)
+                                          struct hdspm *hdspm)
 {
         struct snd_pcm *pcm;
         int err;
@@ -4283,27 +6295,30 @@ static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
 
 static inline void snd_hdspm_initialize_midi_flush(struct hdspm * hdspm)
 {
-        snd_hdspm_flush_midi_input(hdspm, 0);
-        snd_hdspm_flush_midi_input(hdspm, 1);
+        int i;
+
+        for (i = 0; i < hdspm->midiPorts; i++)
+                snd_hdspm_flush_midi_input(hdspm, i);
 }
 
 static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
                                                    struct hdspm * hdspm)
 {
-        int err;
+        int err, i;
 
         snd_printdd("Create card...\n");
         err = snd_hdspm_create_pcm(card, hdspm);
         if (err < 0)
                 return err;
 
-        err = snd_hdspm_create_midi(card, hdspm, 0);
-        if (err < 0)
-                return err;
-
-        err = snd_hdspm_create_midi(card, hdspm, 1);
-        if (err < 0)
-                return err;
+        i = 0;
+        while (i < hdspm->midiPorts) {
+                err = snd_hdspm_create_midi(card, hdspm, i);
+                if (err < 0) {
+                        return err;
+                }
+                i++;
+        }
 
         err = snd_hdspm_create_controls(card, hdspm);
         if (err < 0)
@@ -4346,37 +6361,56 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
 }
 
 static int __devinit snd_hdspm_create(struct snd_card *card,
-                                      struct hdspm *hdspm,
-                                      int precise_ptr, int enable_monitor)
-{
+                struct hdspm *hdspm) {
+
         struct pci_dev *pci = hdspm->pci;
         int err;
         unsigned long io_extent;
 
         hdspm->irq = -1;
-
-        spin_lock_init(&hdspm->midi[0].lock);
-        spin_lock_init(&hdspm->midi[1].lock);
-
         hdspm->card = card;
 
         spin_lock_init(&hdspm->lock);
 
-        tasklet_init(&hdspm->midi_tasklet,
-                     hdspm_midi_tasklet, (unsigned long) hdspm);
-
         pci_read_config_word(hdspm->pci,
-                             PCI_CLASS_REVISION, &hdspm->firmware_rev);
-
-        hdspm->is_aes32 = (hdspm->firmware_rev >= HDSPM_AESREVISION);
+                        PCI_CLASS_REVISION, &hdspm->firmware_rev);
 
         strcpy(card->mixername, "Xilinx FPGA");
-        if (hdspm->is_aes32) {
-                strcpy(card->driver, "HDSPAES32");
-                hdspm->card_name = "RME HDSPM AES32";
-        } else {
-                strcpy(card->driver, "HDSPM");
-                hdspm->card_name = "RME HDSPM MADI";
+        strcpy(card->driver, "HDSPM");
+
+        switch (hdspm->firmware_rev) {
+        case HDSPM_MADI_REV:
+        case HDSPM_MADI_OLD_REV:
+                hdspm->io_type = MADI;
+                hdspm->card_name = "RME MADI";
+                hdspm->midiPorts = 3;
+                break;
+        case HDSPM_RAYDAT_REV:
+                hdspm->io_type = RayDAT;
+                hdspm->card_name = "RME RayDAT";
+                hdspm->midiPorts = 2;
+                break;
+        case HDSPM_AIO_REV:
+                hdspm->io_type = AIO;
+                hdspm->card_name = "RME AIO";
+                hdspm->midiPorts = 1;
+                break;
+        case HDSPM_MADIFACE_REV:
+                hdspm->io_type = MADIface;
+                hdspm->card_name = "RME MADIface";
+                hdspm->midiPorts = 1;
+                break;
+        case HDSPM_AES_REV:
+        case HDSPM_AES32_REV:
+        case HDSPM_AES32_OLD_REV:
+                hdspm->io_type = AES32;
+                hdspm->card_name = "RME AES32";
+                hdspm->midiPorts = 2;
+                break;
+        default:
+                snd_printk(KERN_ERR "HDSPM: unknown firmware revision %x\n",
+                                hdspm->firmware_rev);
+                return -ENODEV;
         }
 
         err = pci_enable_device(pci);
@@ -4393,22 +6427,21 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         io_extent = pci_resource_len(pci, 0);
 
         snd_printdd("grabbed memory region 0x%lx-0x%lx\n",
-                   hdspm->port, hdspm->port + io_extent - 1);
-
+                        hdspm->port, hdspm->port + io_extent - 1);
 
         hdspm->iobase = ioremap_nocache(hdspm->port, io_extent);
         if (!hdspm->iobase) {
                 snd_printk(KERN_ERR "HDSPM: "
-                           "unable to remap region 0x%lx-0x%lx\n",
-                           hdspm->port, hdspm->port + io_extent - 1);
+                                "unable to remap region 0x%lx-0x%lx\n",
+                                hdspm->port, hdspm->port + io_extent - 1);
                 return -EBUSY;
         }
         snd_printdd("remapped region (0x%lx) 0x%lx-0x%lx\n",
-                   (unsigned long)hdspm->iobase, hdspm->port,
-                   hdspm->port + io_extent - 1);
+                        (unsigned long)hdspm->iobase, hdspm->port,
+                        hdspm->port + io_extent - 1);
 
         if (request_irq(pci->irq, snd_hdspm_interrupt,
-                        IRQF_SHARED, "hdspm", hdspm)) {
+                                IRQF_SHARED, "hdspm", hdspm)) {
                 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
@@ -4416,23 +6449,219 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         snd_printdd("use IRQ %d\n", pci->irq);
 
         hdspm->irq = pci->irq;
-        hdspm->precise_ptr = precise_ptr;
-
-        hdspm->monitor_outs = enable_monitor;
 
         snd_printdd("kmalloc Mixer memory of %zd Bytes\n",
-                   sizeof(struct hdspm_mixer));
+                        sizeof(struct hdspm_mixer));
         hdspm->mixer = kzalloc(sizeof(struct hdspm_mixer), GFP_KERNEL);
         if (!hdspm->mixer) {
                 snd_printk(KERN_ERR "HDSPM: "
-                           "unable to kmalloc Mixer memory of %d Bytes\n",
-                           (int)sizeof(struct hdspm_mixer));
+                                "unable to kmalloc Mixer memory of %d Bytes\n",
+                                (int)sizeof(struct hdspm_mixer));
                 return err;
         }
 
-        hdspm->ss_channels = MADI_SS_CHANNELS;
-        hdspm->ds_channels = MADI_DS_CHANNELS;
-        hdspm->qs_channels = MADI_QS_CHANNELS;
+        hdspm->port_names_in = NULL;
+        hdspm->port_names_out = NULL;
+
+        switch (hdspm->io_type) {
+        case AES32:
+                hdspm->ss_in_channels = hdspm->ss_out_channels = AES32_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels = AES32_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels = AES32_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_aes32;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_aes32;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_aes32;
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_aes32;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_aes32;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_aes32;
+
+                hdspm->max_channels_out = hdspm->max_channels_in =
+                        AES32_CHANNELS;
+                hdspm->port_names_in = hdspm->port_names_out =
+                        texts_ports_aes32;
+                hdspm->channel_map_in = hdspm->channel_map_out =
+                        channel_map_aes32;
+
+                break;
+
+        case MADI:
+        case MADIface:
+                hdspm->ss_in_channels = hdspm->ss_out_channels =
+                        MADI_SS_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels =
+                        MADI_DS_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels =
+                        MADI_QS_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_unity_ss;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_unity_ss;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_unity_ss;
+
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_madi;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_madi;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_madi;
+                break;
+
+        case AIO:
+                if (0 == (hdspm_read(hdspm, HDSPM_statusRegister2) & HDSPM_s2_AEBI_D)) {
+                        snd_printk(KERN_INFO "HDSPM: AEB input board found, but not supported\n");
+                }
+
+                hdspm->ss_in_channels = AIO_IN_SS_CHANNELS;
+                hdspm->ds_in_channels = AIO_IN_DS_CHANNELS;
+                hdspm->qs_in_channels = AIO_IN_QS_CHANNELS;
+                hdspm->ss_out_channels = AIO_OUT_SS_CHANNELS;
+                hdspm->ds_out_channels = AIO_OUT_DS_CHANNELS;
+                hdspm->qs_out_channels = AIO_OUT_QS_CHANNELS;
+
+                hdspm->channel_map_out_ss = channel_map_aio_out_ss;
+                hdspm->channel_map_out_ds = channel_map_aio_out_ds;
+                hdspm->channel_map_out_qs = channel_map_aio_out_qs;
+
+                hdspm->channel_map_in_ss = channel_map_aio_in_ss;
+                hdspm->channel_map_in_ds = channel_map_aio_in_ds;
+                hdspm->channel_map_in_qs = channel_map_aio_in_qs;
+
+                hdspm->port_names_in_ss = texts_ports_aio_in_ss;
+                hdspm->port_names_out_ss = texts_ports_aio_out_ss;
+                hdspm->port_names_in_ds = texts_ports_aio_in_ds;
+                hdspm->port_names_out_ds = texts_ports_aio_out_ds;
+                hdspm->port_names_in_qs = texts_ports_aio_in_qs;
+                hdspm->port_names_out_qs = texts_ports_aio_out_qs;
+
+                break;
+
+        case RayDAT:
+                hdspm->ss_in_channels = hdspm->ss_out_channels =
+                        RAYDAT_SS_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels =
+                        RAYDAT_DS_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels =
+                        RAYDAT_QS_CHANNELS;
+
+                hdspm->max_channels_in = RAYDAT_SS_CHANNELS;
+                hdspm->max_channels_out = RAYDAT_SS_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_raydat_ss;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_raydat_ds;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_raydat_qs;
+                hdspm->channel_map_in = hdspm->channel_map_out =
+                        channel_map_raydat_ss;
+
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_raydat_ss;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_raydat_ds;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_raydat_qs;
+
+
+                break;
+
+        }
+
+        /* TCO detection */
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (hdspm_read(hdspm, HDSPM_statusRegister2) &
+                                HDSPM_s2_tco_detect) {
+                        hdspm->midiPorts++;
+                        hdspm->tco = kzalloc(sizeof(struct hdspm_tco),
+                                        GFP_KERNEL);
+                        if (NULL != hdspm->tco) {
+                                hdspm_tco_write(hdspm);
+                        }
+                        snd_printk(KERN_INFO "HDSPM: AIO/RayDAT TCO module found\n");
+                } else {
+                        hdspm->tco = NULL;
+                }
+                break;
+
+        case MADI:
+                if (hdspm_read(hdspm, HDSPM_statusRegister) & HDSPM_tco_detect) {
+                        hdspm->midiPorts++;
+                        hdspm->tco = kzalloc(sizeof(struct hdspm_tco),
+                                        GFP_KERNEL);
+                        if (NULL != hdspm->tco) {
+                                hdspm_tco_write(hdspm);
+                        }
+                        snd_printk(KERN_INFO "HDSPM: MADI TCO module found\n");
+                } else {
+                        hdspm->tco = NULL;
+                }
+                break;
+
+        default:
+                hdspm->tco = NULL;
+        }
+
+        /* texts */
+        switch (hdspm->io_type) {
+        case AES32:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_aes_tco;
+                        hdspm->texts_autosync_items = 10;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_aes;
+                        hdspm->texts_autosync_items = 9;
+                }
+                break;
+
+        case MADI:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_madi_tco;
+                        hdspm->texts_autosync_items = 4;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_madi;
+                        hdspm->texts_autosync_items = 3;
+                }
+                break;
+
+        case MADIface:
+
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_raydat_tco;
+                        hdspm->texts_autosync_items = 9;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_raydat;
+                        hdspm->texts_autosync_items = 8;
+                }
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_aio_tco;
+                        hdspm->texts_autosync_items = 6;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_aio;
+                        hdspm->texts_autosync_items = 5;
+                }
+                break;
+
+        }
+
+        tasklet_init(&hdspm->midi_tasklet,
+                        hdspm_midi_tasklet, (unsigned long) hdspm);
 
         snd_printdd("create alsa devices.\n");
         err = snd_hdspm_create_alsa_devices(card, hdspm);
@@ -4444,6 +6673,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         return 0;
 }
 
+
 static int snd_hdspm_free(struct hdspm * hdspm)
 {
 
@@ -4452,7 +6682,8 @@ static int snd_hdspm_free(struct hdspm * hdspm)
                 /* stop th audio, and cancel all interrupts */
                 hdspm->control_register &=
                     ~(HDSPM_Start | HDSPM_AudioInterruptEnable |
-                      HDSPM_Midi0InterruptEnable | HDSPM_Midi1InterruptEnable);
+                      HDSPM_Midi0InterruptEnable | HDSPM_Midi1InterruptEnable |
+                      HDSPM_Midi2InterruptEnable | HDSPM_Midi3InterruptEnable);
                 hdspm_write(hdspm, HDSPM_controlRegister,
                             hdspm->control_register);
         }
@@ -4472,6 +6703,7 @@ static int snd_hdspm_free(struct hdspm * hdspm)
         return 0;
 }
 
+
 static void snd_hdspm_card_free(struct snd_card *card)
 {
         struct hdspm *hdspm = card->private_data;
@@ -4480,6 +6712,7 @@ static void snd_hdspm_card_free(struct snd_card *card)
                 snd_hdspm_free(hdspm);
 }
 
+
 static int __devinit snd_hdspm_probe(struct pci_dev *pci,
                                      const struct pci_device_id *pci_id)
 {
@@ -4496,7 +6729,7 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
         }
 
         err = snd_card_create(index[dev], id[dev],
-                              THIS_MODULE, sizeof(struct hdspm), &card);
+                        THIS_MODULE, sizeof(struct hdspm), &card);
         if (err < 0)
                 return err;
 
@@ -4507,16 +6740,25 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
 
         snd_card_set_dev(card, &pci->dev);
 
-        err = snd_hdspm_create(card, hdspm, precise_ptr[dev],
-                               enable_monitor[dev]);
+        err = snd_hdspm_create(card, hdspm);
         if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
-        strcpy(card->shortname, "HDSPM MADI");
-        sprintf(card->longname, "%s at 0x%lx, irq %d", hdspm->card_name,
-                hdspm->port, hdspm->irq);
+        if (hdspm->io_type != MADIface) {
+                sprintf(card->shortname, "%s_%x",
+                        hdspm->card_name,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
+                sprintf(card->longname, "%s S/N 0x%x at 0x%lx, irq %d",
+                        hdspm->card_name,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF,
+                        hdspm->port, hdspm->irq);
+        } else {
+                sprintf(card->shortname, "%s", hdspm->card_name);
+                sprintf(card->longname, "%s at 0x%lx, irq %d",
+                                hdspm->card_name, hdspm->port, hdspm->irq);
+        }
 
         err = snd_card_register(card);
         if (err < 0) {
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 1b8f6742b5fa..2b5c7a95ae1f 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -308,7 +308,7 @@ static irqreturn_t sis_interrupt(int irq, void *dev)
         u32 intr, status;
 
         /* We only use the DMA interrupts, and we don't enable any other
-         * source of interrupts. But, it is possible to see an interupt
+         * source of interrupts. But, it is possible to see an interrupt
          * status that didn't actually interrupt us, so eliminate anything
          * we're not expecting to avoid falsely claiming an IRQ, and an
          * ensuing endless loop.
@@ -773,7 +773,7 @@ static void sis_prepare_timing_voice(struct voice *voice,
                 vperiod = 0;
         }
 
-        /* The interrupt handler implements the timing syncronization, so
+        /* The interrupt handler implements the timing synchronization, so
          * setup its state.
          */
         timing->flags |= VOICE_SYNC_TIMING;
@@ -1139,7 +1139,7 @@ static int sis_chip_init(struct sis7019 *sis)
          */
         outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR);
 
-        /* Reset the syncronization groups for all of the channels
+        /* Reset the synchronization groups for all of the channels
          * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc.
          * we'll need to change how we handle these. Until then, we just
          * assign sub-mixer 0 to all playback channels, and avoid any
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 5518371db13f..c94c051ad0c8 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1389,15 +1389,9 @@ static struct snd_kcontrol_new snd_ymfpci_spdif_stream __devinitdata =
 
 static int snd_ymfpci_drec_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *info)
 {
-        static char *texts[3] = {"AC'97", "IEC958", "ZV Port"};
-
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item > 2)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, texts[info->value.enumerated.item]);
-        return 0;
+        static const char *const texts[3] = {"AC'97", "IEC958", "ZV Port"};
+
+        return snd_ctl_enum_info(info, 1, 3, texts);
 }
 
 static int snd_ymfpci_drec_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *value)