370 files changed, 11183 insertions, 5968 deletions

diff --git a/CREDITS b/CREDITS
index b90b4cac6e16..08feda2667d0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1933,7 +1933,7 @@ M: seasons@makosteszta.sote.hu
 D: Original author of software suspend
 
 N: Jaroslav Kysela
-E: perex@suse.cz
+E: perex@perex.cz
 W: http://www.perex.cz
 D: Original Author and Maintainer for HP 10/100 Mbit Network Adapters
 D: ISA PnP
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 241e26c4ff92..4b48c2e82c3c 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -365,13 +365,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-cmipci
   -----------------
 
-    Module for C-Media CMI8338 and 8738 PCI sound cards.
+    Module for C-Media CMI8338/8738/8768/8770 PCI sound cards.
 
-    mpu_port    - 0x300,0x310,0x320,0x330 = legacy port,
-                  1 = integrated PCI port,
+    mpu_port    - port address of MIDI interface (8338 only):
+                  0x300,0x310,0x320,0x330 = legacy port,
                   0 = disable (default)
-    fm_port     - 0x388 = legacy port,
-                  1 = integrated PCI port (default),
+    fm_port     - port address of OPL-3 FM synthesizer (8x38 only):
+                  0x388 = legacy port,
+                  1 = integrated PCI port (default on 8738),
                   0 = disable
     soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)
                   (default = 1)
@@ -768,6 +769,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     single_cmd  - Use single immediate commands to communicate with
                 codecs (for debugging only)
     enable_msi  - Enable Message Signaled Interrupt (MSI) (default = off)
+    power_save  - Automatic power-saving timtout (in second, 0 =
+                disable)
+    power_save_controller - Reset HD-audio controller in power-saving mode
+                (default = on)
 
     This module supports one card and autoprobe.
 
@@ -828,6 +833,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
         ALC268
           3stack        3-stack model
+          toshiba       Toshiba A205
+          acer          Acer laptops
           auto          auto-config reading BIOS (default)
 
         ALC662
@@ -842,7 +849,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           3stack-dig    3-jack with SPDIF I/O
           6stack-dig    6-jack digital with SPDIF I/O
           arima         Arima W820Di1
+          targa         Targa T8, MSI-1049 T8
+          asus-a7j      ASUS A7J
+          asus-a7m      ASUS A7M
           macpro        MacPro support
+          mbp3          Macbook Pro rev3
           imac24        iMac 24'' with jack detection
           w2jc          ASUS W2JC
           auto          auto-config reading BIOS (default)
@@ -854,6 +865,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
           6stack-dig-demo  6-jack digital for Intel demo board
           acer          Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
+          acer-aspire   Acer Aspire 9810
           medion        Medion Laptops
           medion-md2    Medion MD2
           targa-dig     Targa/MSI
@@ -862,6 +874,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           lenovo-101e   Lenovo 101E
           lenovo-nb0763 Lenovo NB0763
           lenovo-ms7195-dig Lenovo MS7195
+          haier-w66     Haier W66
           6stack-hp     HP machines with 6stack (Nettle boards)
           3stack-hp     HP machines with 3stack (Lucknow, Samba boards)
           auto          auto-config reading BIOS (default)
@@ -885,6 +898,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
           lenovo        Lenovo 3000 C200
           dallas        Dallas laptops
+          hp            HP TX1000
           auto          auto-config reading BIOS (default)
 
         CMI9880
@@ -920,6 +934,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           3stack        3-stack, shared surrounds
           laptop        2-channel only (FSC V2060, Samsung M50)
           laptop-eapd   2-channel with EAPD (Samsung R65, ASUS A6J)
+          laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100)
           ultra         2-channel with EAPD (Samsung Ultra tablet PC)
 
         AD1988
@@ -945,14 +960,30 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                         can be adjusted.  Appearing only when compiled with
                         $CONFIG_SND_DEBUG=y
 
-        STAC9200/9205/9254
+        STAC9200
           ref           Reference board
+          dell-d21      Dell (unknown)
+          dell-d22      Dell (unknown)
+          dell-d23      Dell (unknown)
+          dell-m21      Dell Inspiron 630m, Dell Inspiron 640m
+          dell-m22      Dell Latitude D620, Dell Latitude D820
+          dell-m23      Dell XPS M1710, Dell Precision M90
+          dell-m24      Dell Latitude 120L
+          dell-m25      Dell Inspiron E1505n
+          dell-m26      Dell Inspiron 1501
+          dell-m27      Dell Inspiron E1705/9400
+          gateway       Gateway laptops with EAPD control
+
+        STAC9205/9254
+          ref           Reference board
+          dell-m42      Dell (unknown)
+          dell-m43      Dell Precision
+          dell-m44      Dell Inspiron
 
         STAC9220/9221
           ref           Reference board
           3stack        D945 3stack
           5stack        D945 5stack + SPDIF
-          dell          Dell XPS M1210
           intel-mac-v1  Intel Mac Type 1
           intel-mac-v2  Intel Mac Type 2
           intel-mac-v3  Intel Mac Type 3
@@ -964,6 +995,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           macbook-pro   Intel Mac Book Pro 2nd generation (eq. type 3)
           imac-intel    Intel iMac (eq. type 2)
           imac-intel-20 Intel iMac (newer version) (eq. type 3)
+          dell-d81      Dell (unknown)
+          dell-d82      Dell (unknown)
+          dell-m81      Dell (unknown)
+          dell-m82      Dell XPS M1210
 
         STAC9202/9250/9251
           ref           Reference board, base config
@@ -975,6 +1010,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
           ref           Reference board
           3stack        D965 3stack
           5stack        D965 5stack + SPDIF
+          dell-3stack   Dell Dimension E520
 
         STAC9872
           vaio          Setup for VAIO FE550G/SZ110
@@ -989,6 +1025,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
     ML (see the section "Links and Addresses").
 
+    power_save and power_save_controller options are for power-saving
+    mode.  See powersave.txt for details.
+
     Note 2: If you get click noises on output, try the module option
             position_fix=1 or 2.  position_fix=1 will use the SD_LPIB
             register value without FIFO size correction as the current
@@ -1349,7 +1388,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     port        - port number or -1 (disable)
     irq         - IRQ number or -1 (disable)
     pnp         - PnP detection - 0 = disable, 1 = enable (default)
-    uart_enter  - Issue UART_ENTER command at open - bool, default = on
 
     This module supports multiple devices and PnP.
     
@@ -1630,6 +1668,21 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     
     The power-management is supported.
 
+  Module snd-sc6000
+  -----------------
+
+    Module for Gallant SC-6000 soundcard.
+
+    port        - Port # (0x220 or 0x240)
+    mss_port    - MSS Port # (0x530 or 0xe80)
+    irq         - IRQ # (5,7,9,10,11)
+    mpu_irq     - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq
+    dma         - DMA # (1,3,0)
+
+    This module supports multiple cards.
+
+    This card is also known as Audio Excel DSP 16 or Zoltrix AV302.
+
   Module snd-sgalaxy
   ------------------
 
@@ -1650,9 +1703,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     Module for ENSONIQ SoundScape PnP cards.
 
     port        - Port # (PnP setup)
+    wss_port    - WSS Port # (PnP setup)
     irq         - IRQ # (PnP setup)
     mpu_irq     - MPU-401 IRQ # (PnP setup)
     dma         - DMA # (PnP setup)
+    dma2        - 2nd DMA # (PnP setup, -1 to disable)
 
     This module supports multiple cards.  ISA PnP must be enabled.
     You need sscape_ctl tool in alsa-tools package for loading
@@ -1697,8 +1752,52 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     dma2            - DMA2 # for CS4232 PCM interface.
     isapnp          - ISA PnP detection - 0 = disable, 1 = enable (default)
 
+    The below are options for wavefront_synth features:
+    wf_raw          - Assume that we need to boot the OS (default:no)
+        If yes, then during driver loading, the state of the board is
+        ignored, and we reset the board and load the firmware anyway.
+    fx_raw          - Assume that the FX process needs help (default:yes)
+        If false, we'll leave the FX processor in whatever state it is
+        when the driver is loaded.  The default is to download the
+        microprogram and associated coefficients to set it up for
+        "default" operation, whatever that means.
+    debug_default   - Debug parameters for card initialization
+    wait_usecs      - How long to wait without sleeping, usecs
+                      (default:150)
+        This magic number seems to give pretty optimal throughput
+        based on my limited experimentation. 
+        If you want to play around with it and find a better value, be
+        my guest. Remember, the idea is to get a number that causes us
+        to just busy wait for as many WaveFront commands as possible,
+        without coming up with a number so large that we hog the whole
+        CPU. 
+        Specifically, with this number, out of about 134,000 status
+        waits, only about 250 result in a sleep. 
+    sleep_interval  - How long to sleep when waiting for reply
+                      (default: 100)
+    sleep_tries     - How many times to try sleeping during a wait
+                      (default: 50)
+    ospath          - Pathname to processed ICS2115 OS firmware
+                      (default:wavefront.os)
+        The path name of the ISC2115 OS firmware.  In the recent
+        version, it's handled via firmware loader framework, so it
+        must be installed in the proper path, typically,
+        /lib/firmware.
+    reset_time      - How long to wait for a reset to take effect
+                      (default:2)
+    ramcheck_time   - How many seconds to wait for the RAM test
+                      (default:20)
+    osrun_time      - How many seconds to wait for the ICS2115 OS
+                      (default:10)
+
     This module supports multiple cards and ISA PnP.
 
+    Note: the firmware file "wavefront.os" was located in the earlier
+          version in /etc.  Now it's loaded via firmware loader, and
+          must be in the proper firmware path, such as /lib/firmware.
+          Copy (or symlink) the file appropriately if you get an error
+          regarding firmware downloading after upgrading the kernel.
+
   Module snd-sonicvibes
   ---------------------
 
diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 4b2b15387056..16935c8561f7 100644
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -1,5 +1,5 @@
-              Brief Notes on C-Media 8738/8338 Driver
-              =======================================
+         Brief Notes on C-Media 8338/8738/8768/8770 Driver
+         =================================================
 
                    Takashi Iwai <tiwai@suse.de>
 
@@ -209,10 +209,13 @@ In addition to the standard SB mixer, CM8x38 provides more functions.
 MIDI CONTROLLER
 ---------------
 
-The MPU401-UART interface is disabled as default.  You need to set
-module option "mpu_port" with a valid I/O port address to enable the
-MIDI support.  The valid I/O ports are 0x300, 0x310, 0x320 and 0x330.
-Choose the value which doesn't conflict with other cards.
+With CMI8338 chips, the MPU401-UART interface is disabled as default.
+You need to set the module option "mpu_port" to a valid I/O port address
+to enable MIDI support.  Valid I/O ports are 0x300, 0x310, 0x320 and
+0x330.  Choose a value that doesn't conflict with other cards.
+
+With CMI8738 and newer chips, the MIDI interface is enabled by default
+and the driver automatically chooses a port address.
 
 There is _no_ hardware wavetable function on this chip (except for
 OPL3 synth below).
@@ -230,6 +233,8 @@ Set "fm_port" module option for more cards.
 The output quality of FM OPL/3 is, however, very weird.
 I don't know why..
 
+CMI8768 and newer chips do not have the FM synth.
+
 
 Joystick and Modem
 ------------------
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 74d3a35b59bc..2c3fc3cb3b6b 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -18,8 +18,8 @@
       </affiliation>
      </author>
 
-     <date>November 17, 2005</date>
-     <edition>0.3.6</edition>
+     <date>September 10, 2007</date>
+     <edition>0.3.7</edition>
 
     <abstract>
       <para>
@@ -405,8 +405,9 @@
   /* definition of the chip-specific record */
   struct mychip {
           struct snd_card *card;
-          // rest of implementation will be in the section
-          // "PCI Resource Managements"
+          /* rest of implementation will be in the section
+           * "PCI Resource Managements"
+           */
   };
 
   /* chip-specific destructor
@@ -414,7 +415,7 @@
    */
   static int snd_mychip_free(struct mychip *chip)
   {
-          .... // will be implemented later...
+          .... /* will be implemented later... */
   }
 
   /* component-destructor
@@ -440,8 +441,9 @@
 
           *rchip = NULL;
 
-          // check PCI availability here
-          // (see "PCI Resource Managements")
+          /* check PCI availability here
+           * (see "PCI Resource Managements")
+           */
           ....
 
           /* allocate a chip-specific data with zero filled */
@@ -451,12 +453,13 @@
 
           chip->card = card;
 
-          // rest of initialization here; will be implemented
-          // later, see "PCI Resource Managements"
+          /* rest of initialization here; will be implemented
+           * later, see "PCI Resource Managements"
+           */
           ....
 
-          if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
-                                    chip, &ops)) < 0) {
+          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+          if (err < 0) {
                   snd_mychip_free(chip);
                   return err;
           }
@@ -490,7 +493,8 @@
                   return -ENOMEM;
 
           /* (3) */
-          if ((err = snd_mychip_create(card, pci, &chip)) < 0) {
+          err = snd_mychip_create(card, pci, &chip);
+          if (err < 0) {
                   snd_card_free(card);
                   return err;
           }
@@ -502,10 +506,11 @@
                   card->shortname, chip->ioport, chip->irq);
 
           /* (5) */
-          .... // implemented later
+          .... /* implemented later */
 
           /* (6) */
-          if ((err = snd_card_register(card)) < 0) {
+          err = snd_card_register(card);
+          if (err < 0) {
                   snd_card_free(card);
                   return err;
           }
@@ -605,7 +610,8 @@
 <![CDATA[
   struct mychip *chip;
   ....
-  if ((err = snd_mychip_create(card, pci, &chip)) < 0) {
+  err = snd_mychip_create(card, pci, &chip);
+  if (err < 0) {
           snd_card_free(card);
           return err;
   }
@@ -666,7 +672,8 @@
           <informalexample>
             <programlisting>
 <![CDATA[
-  if ((err = snd_card_register(card)) < 0) {
+  err = snd_card_register(card);
+  if (err < 0) {
           snd_card_free(card);
           return err;
   }
@@ -1091,7 +1098,7 @@
   static int snd_mychip_free(struct mychip *chip)
   {
           /* disable hardware here if any */
-          .... // (not implemented in this document)
+          .... /* (not implemented in this document) */
 
           /* release the irq */
           if (chip->irq >= 0)
@@ -1119,7 +1126,8 @@
           *rchip = NULL;
 
           /* initialize the PCI entry */
-          if ((err = pci_enable_device(pci)) < 0)
+          err = pci_enable_device(pci);
+          if (err < 0)
                   return err;
           /* check PCI availability (28bit DMA) */
           if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
@@ -1141,7 +1149,8 @@
           chip->irq = -1;
 
           /* (1) PCI resource allocation */
-          if ((err = pci_request_regions(pci, "My Chip")) < 0) {
+          err = pci_request_regions(pci, "My Chip");
+          if (err < 0) {
                   kfree(chip);
                   pci_disable_device(pci);
                   return err;
@@ -1156,10 +1165,10 @@
           chip->irq = pci->irq;
 
           /* (2) initialization of the chip hardware */
-          .... //   (not implemented in this document)
+          .... /*   (not implemented in this document) */
 
-          if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
-                                    chip, &ops)) < 0) {
+          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+          if (err < 0) {
                   snd_mychip_free(chip);
                   return err;
           }
@@ -1233,7 +1242,8 @@
         <informalexample>
           <programlisting>
 <![CDATA[
-  if ((err = pci_enable_device(pci)) < 0)
+  err = pci_enable_device(pci);
+  if (err < 0)
           return err;
   if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
       pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
@@ -1294,7 +1304,8 @@
         <informalexample>
           <programlisting>
 <![CDATA[
-  if ((err = pci_request_regions(pci, "My Chip")) < 0) { 
+  err = pci_request_regions(pci, "My Chip");
+  if (err < 0) { 
           kfree(chip);
           pci_disable_device(pci);
           return err;
@@ -1322,7 +1333,7 @@
           <programlisting>
 <![CDATA[
   if (request_irq(pci->irq, snd_mychip_interrupt,
-                  IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {
+                  IRQF_SHARED, "My Chip", chip)) {
           printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
           snd_mychip_free(chip);
           return -EBUSY;
@@ -1773,7 +1784,8 @@
           struct snd_pcm_runtime *runtime = substream->runtime;
 
           runtime->hw = snd_mychip_playback_hw;
-          // more hardware-initialization will be done here
+          /* more hardware-initialization will be done here */
+          ....
           return 0;
   }
 
@@ -1781,7 +1793,8 @@
   static int snd_mychip_playback_close(struct snd_pcm_substream *substream)
   {
           struct mychip *chip = snd_pcm_substream_chip(substream);
-          // the hardware-specific codes will be here
+          /* the hardware-specific codes will be here */
+          ....
           return 0;
 
   }
@@ -1793,7 +1806,8 @@
           struct snd_pcm_runtime *runtime = substream->runtime;
 
           runtime->hw = snd_mychip_capture_hw;
-          // more hardware-initialization will be done here
+          /* more hardware-initialization will be done here */
+          ....
           return 0;
   }
 
@@ -1801,7 +1815,8 @@
   static int snd_mychip_capture_close(struct snd_pcm_substream *substream)
   {
           struct mychip *chip = snd_pcm_substream_chip(substream);
-          // the hardware-specific codes will be here
+          /* the hardware-specific codes will be here */
+          ....
           return 0;
 
   }
@@ -1844,10 +1859,12 @@
   {
           switch (cmd) {
           case SNDRV_PCM_TRIGGER_START:
-                  // do something to start the PCM engine
+                  /* do something to start the PCM engine */
+                  ....
                   break;
           case SNDRV_PCM_TRIGGER_STOP:
-                  // do something to stop the PCM engine
+                  /* do something to stop the PCM engine */
+                  ....
                   break;
           default:
                   return -EINVAL;
@@ -1900,8 +1917,8 @@
           struct snd_pcm *pcm;
           int err;
 
-          if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1,
-                                 &pcm)) < 0) 
+          err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1, &pcm);
+          if (err < 0) 
                   return err;
           pcm->private_data = chip;
           strcpy(pcm->name, "My Chip");
@@ -1939,8 +1956,8 @@
           struct snd_pcm *pcm;
           int err;
 
-          if ((err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1,
-                                 &pcm)) < 0) 
+          err = snd_pcm_new(chip->card, "My Chip", 0, 1, 1, &pcm);
+          if (err < 0) 
                   return err;
           pcm->private_data = chip;
           strcpy(pcm->name, "My Chip");
@@ -2097,7 +2114,7 @@
           struct mychip *chip = snd_pcm_chip(pcm);
           /* free your own data */
           kfree(chip->my_private_pcm_data);
-          // do what you like else
+          /* do what you like else */
           ....
   }
 
@@ -2884,10 +2901,10 @@ struct _snd_pcm_runtime {
 <![CDATA[
   switch (cmd) {
   case SNDRV_PCM_TRIGGER_START:
-          // do something to start the PCM engine
+          /* do something to start the PCM engine */
           break;
   case SNDRV_PCM_TRIGGER_STOP:
-          // do something to stop the PCM engine
+          /* do something to stop the PCM engine */
           break;
   default:
           return -EINVAL;
@@ -3071,7 +3088,7 @@ struct _snd_pcm_runtime {
                   spin_unlock(&chip->lock);
                   snd_pcm_period_elapsed(chip->substream);
                   spin_lock(&chip->lock);
-                  // acknowledge the interrupt if necessary
+                  /* acknowledge the interrupt if necessary */
           }
           ....
           spin_unlock(&chip->lock);
@@ -3134,7 +3151,7 @@ struct _snd_pcm_runtime {
                           snd_pcm_period_elapsed(substream);
                           spin_lock(&chip->lock);
                   }
-                  // acknowledge the interrupt if necessary
+                  /* acknowledge the interrupt if necessary */
           }
           ....
           spin_unlock(&chip->lock);
@@ -3456,6 +3473,13 @@ struct _snd_pcm_runtime {
       </para>
 
       <para>
+      The <structfield>tlv</structfield> field can be used to provide
+      metadata about the control; see the
+      <link linkend="control-interface-tlv">
+      <citetitle>Metadata</citetitle></link> subsection.
+      </para>
+
+      <para>
         The other three are
         <link linkend="control-interface-callbacks"><citetitle>
         callback functions</citetitle></link>.
@@ -3604,7 +3628,7 @@ struct _snd_pcm_runtime {
             <title>Example of info callback</title>
             <programlisting>
 <![CDATA[
-  static int snd_myctl_info(struct snd_kcontrol *kcontrol,
+  static int snd_myctl_mono_info(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_info *uinfo)
   {
           uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -3639,7 +3663,7 @@ struct _snd_pcm_runtime {
           <informalexample>
             <programlisting>
 <![CDATA[
-  static int snd_myctl_info(struct snd_kcontrol *kcontrol,
+  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_info *uinfo)
   {
           static char *texts[4] = {
@@ -3658,6 +3682,16 @@ struct _snd_pcm_runtime {
             </programlisting>
           </informalexample>
         </para>
+
+        <para>
+          Some common info callbacks are prepared for easy use:
+        <function>snd_ctl_boolean_mono_info()</function> and
+        <function>snd_ctl_boolean_stereo_info()</function>.
+        Obviously, the former is an info callback for a mono channel
+        boolean item, just like <function>snd_myctl_mono_info</function>
+        above, and the latter is for a stereo channel boolean item.
+        </para>
+
       </section>
 
       <section id="control-interface-callbacks-get">
@@ -3794,7 +3828,8 @@ struct _snd_pcm_runtime {
         <informalexample>
           <programlisting>
 <![CDATA[
-  if ((err = snd_ctl_add(card, snd_ctl_new1(&my_control, chip))) < 0)
+  err = snd_ctl_add(card, snd_ctl_new1(&my_control, chip));
+  if (err < 0)
           return err;
 ]]>
           </programlisting>
@@ -3843,6 +3878,56 @@ struct _snd_pcm_runtime {
       </para>
     </section>
 
+    <section id="control-interface-tlv">
+      <title>Metadata</title>
+      <para>
+      To provide information about the dB values of a mixer control, use
+      on of the <constant>DECLARE_TLV_xxx</constant> macros from
+      <filename>&lt;sound/tlv.h&gt;</filename> to define a variable
+      containing this information, set the<structfield>tlv.p
+      </structfield> field to point to this variable, and include the
+      <constant>SNDRV_CTL_ELEM_ACCESS_TLV_READ</constant> flag in the
+      <structfield>access</structfield> field; like this:
+      <informalexample>
+        <programlisting>
+<![CDATA[
+  static DECLARE_TLV_DB_SCALE(db_scale_my_control, -4050, 150, 0);
+
+  static struct snd_kcontrol_new my_control __devinitdata = {
+          ...
+          .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                    SNDRV_CTL_ELEM_ACCESS_TLV_READ,
+          ...
+          .tlv.p = db_scale_my_control,
+  };
+]]>
+        </programlisting>
+      </informalexample>
+      </para>
+
+      <para>
+      The <function>DECLARE_TLV_DB_SCALE</function> macro defines
+      information about a mixer control where each step in the control's
+      value changes the dB value by a constant dB amount.
+      The first parameter is the name of the variable to be defined.
+      The second parameter is the minimum value, in units of 0.01 dB.
+      The third parameter is the step size, in units of 0.01 dB.
+      Set the fourth parameter to 1 if the minimum value actually mutes
+      the control.
+      </para>
+
+      <para>
+      The <function>DECLARE_TLV_DB_LINEAR</function> macro defines
+      information about a mixer control where the control's value affects
+      the output linearly.
+      The first parameter is the name of the variable to be defined.
+      The second parameter is the minimum value, in units of 0.01 dB.
+      The third parameter is the maximum value, in units of 0.01 dB.
+      If the minimum value mutes the control, set the second parameter to
+      <constant>TLV_DB_GAIN_MUTE</constant>.
+      </para>
+    </section>
+
   </chapter>
 
 
@@ -3880,7 +3965,7 @@ struct _snd_pcm_runtime {
   {
           struct mychip *chip = ac97->private_data;
           ....
-          // read a register value here from the codec
+          /* read a register value here from the codec */
           return the_register_value;
   }
 
@@ -3889,7 +3974,7 @@ struct _snd_pcm_runtime {
   {
           struct mychip *chip = ac97->private_data;
           ....
-          // write the given register value to the codec
+          /* write the given register value to the codec */
   }
 
   static int snd_mychip_ac97(struct mychip *chip)
@@ -3902,7 +3987,8 @@ struct _snd_pcm_runtime {
                   .read = snd_mychip_ac97_read,
           };
 
-          if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus)) < 0)
+          err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus);
+          if (err < 0)
                   return err;
           memset(&ac97, 0, sizeof(ac97));
           ac97.private_data = chip;
@@ -4447,10 +4533,10 @@ struct _snd_pcm_runtime {
         <informalexample>
           <programlisting>
 <![CDATA[
-  struct list_head *list;
   struct snd_rawmidi_substream *substream;
-  list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
-          substream = list_entry(list, struct snd_rawmidi_substream, list);
+  list_for_each_entry(substream,
+                      &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams,
+                      list {
           sprintf(substream->name, "My MIDI Port %d", substream->number + 1);
   }
   /* same for SNDRV_RAWMIDI_STREAM_INPUT */
diff --git a/Documentation/sound/alsa/OSS-Emulation.txt b/Documentation/sound/alsa/OSS-Emulation.txt
index bfa0c9aacb4b..022aaeb0e9dd 100644
--- a/Documentation/sound/alsa/OSS-Emulation.txt
+++ b/Documentation/sound/alsa/OSS-Emulation.txt
@@ -303,10 +303,3 @@ ICE1712 supports only the unconventional format, interleaved
 the buffer as the conventional (mono or 2-channels, 8 or 16bit) format
 on OSS.
 
-USB devices
------------
-Some USB devices support only 24bit format packed in 3bytes.  This
-format is not supported by OSS and no conversion is provided by kernel
-OSS emulation.  You can use the user-space OSS emulation via libaoss
-instead.
-
diff --git a/Documentation/sound/alsa/hda_codec.txt b/Documentation/sound/alsa/hda_codec.txt
index 4eaae2a45534..8e1b02526698 100644
--- a/Documentation/sound/alsa/hda_codec.txt
+++ b/Documentation/sound/alsa/hda_codec.txt
@@ -49,6 +49,9 @@ struct hda_bus_ops {
                        unsigned int verb, unsigned int parm);
         unsigned int (*get_response)(struct hda_codec *codec);
         void (*private_free)(struct hda_bus *);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        void (*pm_notify)(struct hda_codec *codec);
+#endif
 };
 
 The command callback is called when the codec module needs to send a
@@ -56,9 +59,16 @@ VERB to the controller.  It's always a single command.
 The get_response callback is called when the codec requires the answer
 for the last command.  These two callbacks are mandatory and have to
 be given.
-The last, private_free callback, is optional.  It's called in the
+The third, private_free callback, is optional.  It's called in the
 destructor to release any necessary data in the lowlevel driver.
 
+The pm_notify callback is available only with
+CONFIG_SND_HDA_POWER_SAVE kconfig.  It's called when the codec needs
+to power up or may power down.  The controller should check the all
+belonging codecs on the bus whether they are actually powered off
+(check codec->power_on), and optionally the driver may power down the
+contoller side, too.
+
 The bus instance is created via snd_hda_bus_new().  You need to pass
 the card instance, the template, and the pointer to store the
 resultant bus instance.
@@ -86,10 +96,8 @@ resultant codec instance (can be NULL if not needed).
 The codec is stored in a linked list of bus instance.  You can follow
 the codec list like:
 
-        struct list_head *p;
         struct hda_codec *codec;
-        list_for_each(p, &bus->codec_list) {
-                codec = list_entry(p, struct hda_codec, list);
+        list_for_each_entry(codec, &bus->codec_list, list) {
                 ...
         }
 
@@ -100,10 +108,15 @@ initialization sequence is called when the controls are built later.
 Codec Access
 ============
 
-To access codec, use snd_codec_read() and snd_codec_write().
+To access codec, use snd_hda_codec_read() and snd_hda_codec_write().
 snd_hda_param_read() is for reading parameters.
 For writing a sequence of verbs, use snd_hda_sequence_write().
 
+There are variants of cached read/write, snd_hda_codec_write_cache(),
+snd_hda_sequence_write_cache().  These are used for recording the
+register states for the power-mangement resume.  When no PM is needed,
+these are equivalent with non-cached version.
+
 To retrieve the number of sub nodes connected to the given node, use
 snd_hda_get_sub_nodes().  The connection list can be obtained via
 snd_hda_get_connections() call.
@@ -239,6 +252,10 @@ set the codec->patch_ops field.  This is defined as below:
                 int (*suspend)(struct hda_codec *codec, pm_message_t state);
                 int (*resume)(struct hda_codec *codec);
         #endif
+        #ifdef CONFIG_SND_HDA_POWER_SAVE
+                int (*check_power_status)(struct hda_codec *codec,
+                                          hda_nid_t nid);
+        #endif
         };
 
 The build_controls callback is called from snd_hda_build_controls().
@@ -251,6 +268,18 @@ The unsol_event callback is called when an unsolicited event is
 received.
 
 The suspend and resume callbacks are for power management.
+They can be NULL if no special sequence is required.  When the resume
+callback is NULL, the driver calls the init callback and resumes the
+registers from the cache.  If other handling is needed, you'd need to
+write your own resume callback.  There, the amp values can be resumed
+via
+        void snd_hda_codec_resume_amp(struct hda_codec *codec);
+and the other codec registers via
+        void snd_hda_codec_resume_cache(struct hda_codec *codec);
+
+The check_power_status callback is called when the amp value of the
+given widget NID is changed.  The codec code can turn on/off the power
+appropriately from this information.
 
 Each entry can be NULL if not necessary to be called.
 
@@ -267,8 +296,7 @@ Digital I/O
 ===========
 
 Call snd_hda_create_spdif_out_ctls() from the patch to create controls
-related with SPDIF out.  In the patch resume callback, call
-snd_hda_resume_spdif().
+related with SPDIF out.
 
 
 Helper Functions
@@ -284,12 +312,7 @@ as a module parameter, and PCI subsystem IDs.  If the matching entry
 is found, it returns the config field value.
 
 snd_hda_add_new_ctls() can be used to create and add control entries.
-Pass the zero-terminated array of struct snd_kcontrol_new.  The same array
-can be passed to snd_hda_resume_ctls() for resume.
-Note that this will call control->put callback of these entries.  So,
-put callback should check codec->in_resume and force to restore the
-given value if it's non-zero even if the value is identical with the
-cached value.
+Pass the zero-terminated array of struct snd_kcontrol_new
 
 Macros HDA_CODEC_VOLUME(), HDA_CODEC_MUTE() and their variables can be
 used for the entry of struct snd_kcontrol_new.
diff --git a/Documentation/sound/alsa/powersave.txt b/Documentation/sound/alsa/powersave.txt
new file mode 100644
index 000000000000..9657e8099228
--- /dev/null
+++ b/Documentation/sound/alsa/powersave.txt
@@ -0,0 +1,41 @@
+Notes on Power-Saving Mode
+==========================
+
+AC97 and HD-audio drivers have the automatic power-saving mode.
+This feature is enabled via Kconfig CONFIG_SND_AC97_POWER_SAVE
+and CONFIG_SND_HDA_POWER_SAVE options, respectively.
+
+With the automatic power-saving, the driver turns off the codec power
+appropriately when no operation is required.  When no applications use
+the device and/or no analog loopback is set, the power disablement is
+done fully or partially.  It'll save a certain power consumption, thus
+good for laptops (even for desktops).
+
+The time-out for automatic power-off can be specified via power_save
+module option of snd-ac97-codec and snd-hda-intel modules.  Specify
+the time-out value in seconds.  0 means to disable the automatic
+power-saving.  The default value of timeout is given via
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT and
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT Kconfig options.  Setting this to 1
+(the minimum value) isn't recommended because many applications try to
+reopen the device frequently.  10 would be a good choice for normal
+operations.
+
+The power_save option is exported as writable.  This means you can
+adjust the value via sysfs on the fly.  For example, to turn on the
+automatic power-save mode with 10 seconds, write to
+/sys/modules/snd_ac97_codec/parameters/power_save (usually as root):
+
+        # echo 10 > /sys/modules/snd_ac97_codec/parameters/power_save
+
+
+Note that you might hear click noise/pop when changing the power
+state.  Also, it often takes certain time to wake up from the
+power-down to the active state.  These are often hardly to fix, so
+don't report extra bug reports unless you have a fix patch ;-)
+
+For HD-audio interface, there is another module option,
+power_save_controller.  This enables/disables the power-save mode of
+the controller side.  Setting this on may reduce a bit more power
+consumption, but might result in longer wake-up time and click noise.
+Try to turn it off when you experience such a thing too often.
diff --git a/MAINTAINERS b/MAINTAINERS
index c7355e7f09ff..1315cca8fc5f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1769,7 +1769,7 @@ S:	Maintained
 
 HP100:  Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 S:      Maintained
 
 HPET:   High Precision Event Timers driver (hpet.c)
@@ -2132,7 +2132,7 @@ S:	Maintained
 
 ISAPNP
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 S:      Maintained
 
 ISDN SUBSYSTEM
@@ -3523,7 +3523,7 @@ S:	Maintained
 
 SOUND
 P:      Jaroslav Kysela
-M:      perex@suse.cz
+M:      perex@perex.cz
 L:      alsa-devel@alsa-project.org (subscribers-only)
 S:      Maintained
 
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 90c36c5705c3..141dadf7cf1b 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -7,7 +7,7 @@
  *    (c) 2005,2006 Ricardo Cerqueira <v4l@cerqueira.org>
  *    (c) 2005 Mauro Carvalho Chehab <mchehab@infradead.org>
  *    Based on a dummy cx88 module by Gerd Knorr <kraxel@bytesex.org>
- *    Based on dummy.c by Jaroslav Kysela <perex@suse.cz>
+ *    Based on dummy.c by Jaroslav Kysela <perex@perex.cz>
  *
  *  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
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index e4fde17e2841..49421d1cd3a5 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -8,7 +8,7 @@
 ** Extended for new busmaster capable chipsets by
 ** Siegfried "Frieder" Loeffler (dg1sek) <floeff@mathematik.uni-stuttgart.de>
 **
-** Maintained by: Jaroslav Kysela <perex@suse.cz>
+** Maintained by: Jaroslav Kysela <perex@perex.cz>
 **
 ** This driver has only been tested with
 ** -- HP J2585B 10/100 Mbit/s PCI Busmaster
@@ -2951,7 +2951,7 @@ static struct pci_driver hp100_pci_driver = {
  */
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, "
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, "
               "Siegfried \"Frieder\" Loeffler (dg1sek) <floeff@mathematik.uni-stuttgart.de>");
 MODULE_DESCRIPTION("HP CASCADE Architecture Driver for 100VG-AnyLan Network Adapters");
 
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index a0cfb75bbb8d..e0ee28a88da3 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -1,7 +1,7 @@
 /*
  * interface.c - contains everything related to the user interface
  *
- * Some code, especially possible resource dumping is based on isapnp_proc.c (c) Jaroslav Kysela <perex@suse.cz>
+ * Some code, especially possible resource dumping is based on isapnp_proc.c (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2002 Adam Belay <ambx1@neo.rr.com>
  */
 
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index b035d60a1dcc..2c925b7cd93e 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1,6 +1,6 @@
 /*
  *  ISA Plug & Play support
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@ static int isapnp_rdp;		/* Read Data Port */
 static int isapnp_reset = 1;    /* reset all PnP cards (deactivate) */
 static int isapnp_verbose = 1;  /* verbose mode */
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Generic ISA Plug & Play support");
 module_param(isapnp_disable, int, 0);
 MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable");
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 560ccb640816..2b8266c3d40f 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -1,6 +1,6 @@
 /*
  *  ISA Plug & Play support
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 0826287eef53..ea3eac2404ca 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -1,7 +1,7 @@
 /*
  * manager.c - Resource Management, Conflict Resolution, Activation and Disabling of Devices
  *
- * based on isapnp.c resource management (c) Jaroslav Kysela <perex@suse.cz>
+ * based on isapnp.c resource management (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2003 Adam Belay <ambx1@neo.rr.com>
  */
 
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index ef1286900db3..087fed18628f 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -1,7 +1,7 @@
 /*
  * resource.c - Contains functions for registering and analyzing resource information
  *
- * based on isapnp.c resource management (c) Jaroslav Kysela <perex@suse.cz>
+ * based on isapnp.c resource management (c) Jaroslav Kysela <perex@perex.cz>
  * Copyright 2003 Adam Belay <ambx1@neo.rr.com>
  */
 
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index a271b67a8e2d..88c81403eb3f 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -120,6 +120,7 @@
 #define I2C_DRIVERID_WM8753     91      /* Wolfson WM8753 audio codec */
 #define I2C_DRIVERID_LM4857     92      /* LM4857 Audio Amplifier */
 #define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
+#define I2C_DRIVERID_CS4270     94      /* Cirrus Logic 4270 audio codec */
 
 #define I2C_DRIVERID_I2CDEV     900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
diff --git a/include/linux/spi/at73c213.h b/include/linux/spi/at73c213.h
new file mode 100644
index 000000000000..0f20a70e5eb4
--- /dev/null
+++ b/include/linux/spi/at73c213.h
@@ -0,0 +1,25 @@
+/*
+ * Board-specific data used to set up AT73c213 audio DAC driver.
+ */
+
+#ifndef __LINUX_SPI_AT73C213_H
+#define __LINUX_SPI_AT73C213_H
+
+/**
+ * at73c213_board_info - how the external DAC is wired to the device.
+ *
+ * @ssc_id: SSC platform_driver id the DAC shall use to stream the audio.
+ * @dac_clk: the external clock used to provide master clock to the DAC.
+ * @shortname: a short discription for the DAC, seen by userspace tools.
+ *
+ * This struct contains the configuration of the hardware connection to the
+ * external DAC. The DAC needs a master clock and a I2S audio stream. It also
+ * provides a name which is used to identify it in userspace tools.
+ */
+struct at73c213_board_info {
+        int             ssc_id;
+        struct clk      *dac_clk;
+        char            shortname[32];
+};
+
+#endif /* __LINUX_SPI_AT73C213_H */
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 246ac23534bd..01480581f825 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -2,7 +2,7 @@
 #define __SOUND_AC97_CODEC_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.1
@@ -345,9 +345,9 @@
 #define AC97_ALC650_GPIO_STATUS         0x78
 #define AC97_ALC650_CLOCK               0x7a
 
-/* specific - Yamaha YMF753 */
-#define AC97_YMF753_DIT_CTRL2   0x66    /* DIT Control 2 */
-#define AC97_YMF753_3D_MODE_SEL 0x68    /* 3D Mode Select */
+/* specific - Yamaha YMF7x3 */
+#define AC97_YMF7X3_DIT_CTRL    0x66    /* DIT Control (YMF743) / 2 (YMF753) */
+#define AC97_YMF7X3_3D_MODE_SEL 0x68    /* 3D Mode Select */
 
 /* specific - C-Media */
 #define AC97_CM9738_VENDOR_CTRL 0x5a
diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index b2c3f00a9b35..d04f9e78c7c1 100644
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -2,7 +2,7 @@
 #define __SOUND_AD1848_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Definitions for AD1847/AD1848/CS4248 chips
  *
  *
@@ -27,7 +27,7 @@
 
 /* IO ports */
 
-#define AD1848P( codec, x ) ( (chip) -> port + c_d_c_AD1848##x )
+#define AD1848P( chip, x ) ( (chip) -> port + c_d_c_AD1848##x )
 
 #define c_d_c_AD1848REGSEL      0
 #define c_d_c_AD1848REG         1
@@ -154,7 +154,6 @@ struct snd_ad1848 {
 #endif
 
         spinlock_t reg_lock;
-        struct mutex open_mutex;
 };
 
 /* exported functions */
diff --git a/include/sound/ainstr_gf1.h b/include/sound/ainstr_gf1.h
index 47726fe0f46d..b62b665c69c6 100644
--- a/include/sound/ainstr_gf1.h
+++ b/include/sound/ainstr_gf1.h
@@ -2,7 +2,7 @@
  *  Advanced Linux Sound Architecture
  *
  *  GF1 (GUS) Patch Instrument Format
- *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/ainstr_iw.h b/include/sound/ainstr_iw.h
index 251feaf1b388..11bd25082600 100644
--- a/include/sound/ainstr_iw.h
+++ b/include/sound/ainstr_iw.h
@@ -2,7 +2,7 @@
  *  Advanced Linux Sound Architecture
  *
  *  InterWave FFFF Instrument Format
- *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/ainstr_simple.h b/include/sound/ainstr_simple.h
index 5eead12e58ae..da08e7287557 100644
--- a/include/sound/ainstr_simple.h
+++ b/include/sound/ainstr_simple.h
@@ -2,7 +2,7 @@
  *  Advanced Linux Sound Architecture
  *
  *  Simple (MOD player) Instrument Format
- *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-99 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index d647dae912b9..4e80d3fe7381 100644
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -3,7 +3,7 @@
 
 /*
  *  Routines for Asahi Kasei AK4114
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/ak4117.h b/include/sound/ak4117.h
index d650d52e3d29..1e8178171baf 100644
--- a/include/sound/ak4117.h
+++ b/include/sound/ak4117.h
@@ -3,7 +3,7 @@
 
 /*
  *  Routines for Asahi Kasei AK4117
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/ak4531_codec.h b/include/sound/ak4531_codec.h
index fb30faab43a8..575296cf7987 100644
--- a/include/sound/ak4531_codec.h
+++ b/include/sound/ak4531_codec.h
@@ -2,7 +2,7 @@
 #define __SOUND_AK4531_CODEC_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.1
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index fd0a6c46f497..891cf1aea8b1 100644
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -5,7 +5,7 @@
  *   ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4381
  *   AD and DA converters
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/asequencer.h b/include/sound/asequencer.h
index 3f2f4042a20d..64daccbe8b29 100644
--- a/include/sound/asequencer.h
+++ b/include/sound/asequencer.h
@@ -1,7 +1,7 @@
 /*
  *  Main header file for the ALSA sequencer
  *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
- *            (c) 1998-1999 by Jaroslav Kysela <perex@suse.cz>
+ *            (c) 1998-1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/asound.h b/include/sound/asound.h
index c1621c650a9a..af9d11d315e9 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -1,6 +1,6 @@
 /*
  *  Advanced Linux Sound Architecture - ALSA - Driver
- *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
  *                             Abramo Bagnara <abramo@alsa-project.org>
  *
  *
@@ -92,6 +92,7 @@ enum {
         SNDRV_HWDEP_IFACE_USX2Y_PCM,    /* Tascam US122, US224 & US428 rawusb pcm */
         SNDRV_HWDEP_IFACE_PCXHR,        /* Digigram PCXHR */
         SNDRV_HWDEP_IFACE_SB_RC,        /* SB Extigy/Audigy2NX remote control */
+        SNDRV_HWDEP_IFACE_HDA,          /* HD-audio */
 
         /* Don't forget to change the following: */
         SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_SB_RC
diff --git a/include/sound/asound_fm.h b/include/sound/asound_fm.h
index 956fdc23c595..8fbcab7cc73b 100644
--- a/include/sound/asound_fm.h
+++ b/include/sound/asound_fm.h
@@ -5,7 +5,7 @@
  *  Advanced Linux Sound Architecture - ALSA
  *
  *  Interface file between ALSA driver & user space
- *  Copyright (c) 1994-98 by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) 1994-98 by Jaroslav Kysela <perex@perex.cz>,
  *                           4Front Technologies
  *
  *  Direct FM control
diff --git a/include/sound/asoundef.h b/include/sound/asoundef.h
index 58c9ef3d1825..024ce62f7d16 100644
--- a/include/sound/asoundef.h
+++ b/include/sound/asoundef.h
@@ -3,7 +3,7 @@
 
 /*
  *  Advanced Linux Sound Architecture - ALSA - Driver
- *  Copyright (c) 1994-2000 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-2000 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/control.h b/include/sound/control.h
index 72e759f619b1..e79baa63912f 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -3,7 +3,7 @@
 
 /*
  *  Header file for control interface
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -161,4 +161,12 @@ static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id
         return dst_id;
 }
 
+/*
+ * Frequently used control callbacks
+ */
+int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_info *uinfo);
+int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_info *uinfo);
+
 #endif  /* __SOUND_CONTROL_H */
diff --git a/include/sound/core.h b/include/sound/core.h
index 4b9e609975ab..6954836487ed 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -3,7 +3,7 @@
 
 /*
  *  Main header file for the ALSA driver
- *  Copyright (c) 1994-2001 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-2001 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h
new file mode 100644
index 000000000000..f1490265c9b8
--- /dev/null
+++ b/include/sound/cs4231-regs.h
@@ -0,0 +1,180 @@
+#ifndef __SOUND_CS4231_REGS_H
+#define __SOUND_CS4231_REGS_H
+
+/*
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *  Definitions for CS4231 & InterWave chips & compatible chips registers
+ *
+ *
+ *   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
+ *
+ */
+
+/* IO ports */
+
+#define CS4231P(x)              (c_d_c_CS4231##x)
+
+#define c_d_c_CS4231REGSEL      0
+#define c_d_c_CS4231REG         1
+#define c_d_c_CS4231STATUS      2
+#define c_d_c_CS4231PIO         3
+
+/* codec registers */
+
+#define CS4231_LEFT_INPUT       0x00    /* left input control */
+#define CS4231_RIGHT_INPUT      0x01    /* right input control */
+#define CS4231_AUX1_LEFT_INPUT  0x02    /* left AUX1 input control */
+#define CS4231_AUX1_RIGHT_INPUT 0x03    /* right AUX1 input control */
+#define CS4231_AUX2_LEFT_INPUT  0x04    /* left AUX2 input control */
+#define CS4231_AUX2_RIGHT_INPUT 0x05    /* right AUX2 input control */
+#define CS4231_LEFT_OUTPUT      0x06    /* left output control register */
+#define CS4231_RIGHT_OUTPUT     0x07    /* right output control register */
+#define CS4231_PLAYBK_FORMAT    0x08    /* clock and data format - playback - bits 7-0 MCE */
+#define CS4231_IFACE_CTRL       0x09    /* interface control - bits 7-2 MCE */
+#define CS4231_PIN_CTRL         0x0a    /* pin control */
+#define CS4231_TEST_INIT        0x0b    /* test and initialization */
+#define CS4231_MISC_INFO        0x0c    /* miscellaneaous information */
+#define CS4231_LOOPBACK         0x0d    /* loopback control */
+#define CS4231_PLY_UPR_CNT      0x0e    /* playback upper base count */
+#define CS4231_PLY_LWR_CNT      0x0f    /* playback lower base count */
+#define CS4231_ALT_FEATURE_1    0x10    /* alternate #1 feature enable */
+#define AD1845_AF1_MIC_LEFT     0x10    /* alternate #1 feature + MIC left */
+#define CS4231_ALT_FEATURE_2    0x11    /* alternate #2 feature enable */
+#define AD1845_AF2_MIC_RIGHT    0x11    /* alternate #2 feature + MIC right */
+#define CS4231_LEFT_LINE_IN     0x12    /* left line input control */
+#define CS4231_RIGHT_LINE_IN    0x13    /* right line input control */
+#define CS4231_TIMER_LOW        0x14    /* timer low byte */
+#define CS4231_TIMER_HIGH       0x15    /* timer high byte */
+#define CS4231_LEFT_MIC_INPUT   0x16    /* left MIC input control register (InterWave only) */
+#define AD1845_UPR_FREQ_SEL     0x16    /* upper byte of frequency select */
+#define CS4231_RIGHT_MIC_INPUT  0x17    /* right MIC input control register (InterWave only) */
+#define AD1845_LWR_FREQ_SEL     0x17    /* lower byte of frequency select */
+#define CS4236_EXT_REG          0x17    /* extended register access */
+#define CS4231_IRQ_STATUS       0x18    /* irq status register */
+#define CS4231_LINE_LEFT_OUTPUT 0x19    /* left line output control register (InterWave only) */
+#define CS4231_VERSION          0x19    /* CS4231(A) - version values */
+#define CS4231_MONO_CTRL        0x1a    /* mono input/output control */
+#define CS4231_LINE_RIGHT_OUTPUT 0x1b   /* right line output control register (InterWave only) */
+#define AD1845_PWR_DOWN         0x1b    /* power down control */
+#define CS4235_LEFT_MASTER      0x1b    /* left master output control */
+#define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
+#define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
+#define AD1845_CLOCK            0x1d    /* crystal clock select and total power down */
+#define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
+#define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
+#define CS4231_REC_LWR_CNT      0x1f    /* record lower count */
+
+/* definitions for codec register select port - CODECP( REGSEL ) */
+
+#define CS4231_INIT             0x80    /* CODEC is initializing */
+#define CS4231_MCE              0x40    /* mode change enable */
+#define CS4231_TRD              0x20    /* transfer request disable */
+
+/* definitions for codec status register - CODECP( STATUS ) */
+
+#define CS4231_GLOBALIRQ        0x01    /* IRQ is active */
+
+/* definitions for codec irq status */
+
+#define CS4231_PLAYBACK_IRQ     0x10
+#define CS4231_RECORD_IRQ       0x20
+#define CS4231_TIMER_IRQ        0x40
+#define CS4231_ALL_IRQS         0x70
+#define CS4231_REC_UNDERRUN     0x08
+#define CS4231_REC_OVERRUN      0x04
+#define CS4231_PLY_OVERRUN      0x02
+#define CS4231_PLY_UNDERRUN     0x01
+
+/* definitions for CS4231_LEFT_INPUT and CS4231_RIGHT_INPUT registers */
+
+#define CS4231_ENABLE_MIC_GAIN  0x20
+
+#define CS4231_MIXS_LINE        0x00
+#define CS4231_MIXS_AUX1        0x40
+#define CS4231_MIXS_MIC         0x80
+#define CS4231_MIXS_ALL         0xc0
+
+/* definitions for clock and data format register - CS4231_PLAYBK_FORMAT */
+
+#define CS4231_LINEAR_8         0x00    /* 8-bit unsigned data */
+#define CS4231_ALAW_8           0x60    /* 8-bit A-law companded */
+#define CS4231_ULAW_8           0x20    /* 8-bit U-law companded */
+#define CS4231_LINEAR_16        0x40    /* 16-bit twos complement data - little endian */
+#define CS4231_LINEAR_16_BIG    0xc0    /* 16-bit twos complement data - big endian */
+#define CS4231_ADPCM_16         0xa0    /* 16-bit ADPCM */
+#define CS4231_STEREO           0x10    /* stereo mode */
+/* bits 3-1 define frequency divisor */
+#define CS4231_XTAL1            0x00    /* 24.576 crystal */
+#define CS4231_XTAL2            0x01    /* 16.9344 crystal */
+
+/* definitions for interface control register - CS4231_IFACE_CTRL */
+
+#define CS4231_RECORD_PIO       0x80    /* record PIO enable */
+#define CS4231_PLAYBACK_PIO     0x40    /* playback PIO enable */
+#define CS4231_CALIB_MODE       0x18    /* calibration mode bits */
+#define CS4231_AUTOCALIB        0x08    /* auto calibrate */
+#define CS4231_SINGLE_DMA       0x04    /* use single DMA channel */
+#define CS4231_RECORD_ENABLE    0x02    /* record enable */
+#define CS4231_PLAYBACK_ENABLE  0x01    /* playback enable */
+
+/* definitions for pin control register - CS4231_PIN_CTRL */
+
+#define CS4231_IRQ_ENABLE       0x02    /* enable IRQ */
+#define CS4231_XCTL1            0x40    /* external control #1 */
+#define CS4231_XCTL0            0x80    /* external control #0 */
+
+/* definitions for test and init register - CS4231_TEST_INIT */
+
+#define CS4231_CALIB_IN_PROGRESS 0x20   /* auto calibrate in progress */
+#define CS4231_DMA_REQUEST      0x10    /* DMA request in progress */
+
+/* definitions for misc control register - CS4231_MISC_INFO */
+
+#define CS4231_MODE2            0x40    /* MODE 2 */
+#define CS4231_IW_MODE3         0x6c    /* MODE 3 - InterWave enhanced mode */
+#define CS4231_4236_MODE3       0xe0    /* MODE 3 - CS4236+ enhanced mode */
+
+/* definitions for alternate feature 1 register - CS4231_ALT_FEATURE_1 */
+
+#define CS4231_DACZ             0x01    /* zero DAC when underrun */
+#define CS4231_TIMER_ENABLE     0x40    /* codec timer enable */
+#define CS4231_OLB              0x80    /* output level bit */
+
+/* definitions for Extended Registers - CS4236+ */
+
+#define CS4236_REG(i23val)      (((i23val << 2) & 0x10) | ((i23val >> 4) & 0x0f))
+#define CS4236_I23VAL(reg)      ((((reg)&0xf) << 4) | (((reg)&0x10) >> 2) | 0x8)
+
+#define CS4236_LEFT_LINE        0x08    /* left LINE alternate volume */
+#define CS4236_RIGHT_LINE       0x18    /* right LINE alternate volume */
+#define CS4236_LEFT_MIC         0x28    /* left MIC volume */
+#define CS4236_RIGHT_MIC        0x38    /* right MIC volume */
+#define CS4236_LEFT_MIX_CTRL    0x48    /* synthesis and left input mixer control */
+#define CS4236_RIGHT_MIX_CTRL   0x58    /* right input mixer control */
+#define CS4236_LEFT_FM          0x68    /* left FM volume */
+#define CS4236_RIGHT_FM         0x78    /* right FM volume */
+#define CS4236_LEFT_DSP         0x88    /* left DSP serial port volume */
+#define CS4236_RIGHT_DSP        0x98    /* right DSP serial port volume */
+#define CS4236_RIGHT_LOOPBACK   0xa8    /* right loopback monitor volume */
+#define CS4236_DAC_MUTE         0xb8    /* DAC mute and IFSE enable */
+#define CS4236_ADC_RATE         0xc8    /* indenpendent ADC sample frequency */
+#define CS4236_DAC_RATE         0xd8    /* indenpendent DAC sample frequency */
+#define CS4236_LEFT_MASTER      0xe8    /* left master digital audio volume */
+#define CS4236_RIGHT_MASTER     0xf8    /* right master digital audio volume */
+#define CS4236_LEFT_WAVE        0x0c    /* left wavetable serial port volume */
+#define CS4236_RIGHT_WAVE       0x1c    /* right wavetable serial port volume */
+#define CS4236_VERSION          0x9c    /* chip version and ID */
+
+#endif /* __SOUND_CS4231_REGS_H */
diff --git a/include/sound/cs4231.h b/include/sound/cs4231.h
index ab51ce1ba9a5..66055d702aa3 100644
--- a/include/sound/cs4231.h
+++ b/include/sound/cs4231.h
@@ -2,7 +2,7 @@
 #define __SOUND_CS4231_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Definitions for CS4231 & InterWave chips & compatible chips
  *
  *
@@ -26,160 +26,7 @@
 #include "pcm.h"
 #include "timer.h"
 
-/* IO ports */
-
-#define CS4231P(x)              (c_d_c_CS4231##x)
-
-#define c_d_c_CS4231REGSEL      0
-#define c_d_c_CS4231REG         1
-#define c_d_c_CS4231STATUS      2
-#define c_d_c_CS4231PIO         3
-
-/* codec registers */
-
-#define CS4231_LEFT_INPUT       0x00    /* left input control */
-#define CS4231_RIGHT_INPUT      0x01    /* right input control */
-#define CS4231_AUX1_LEFT_INPUT  0x02    /* left AUX1 input control */
-#define CS4231_AUX1_RIGHT_INPUT 0x03    /* right AUX1 input control */
-#define CS4231_AUX2_LEFT_INPUT  0x04    /* left AUX2 input control */
-#define CS4231_AUX2_RIGHT_INPUT 0x05    /* right AUX2 input control */
-#define CS4231_LEFT_OUTPUT      0x06    /* left output control register */
-#define CS4231_RIGHT_OUTPUT     0x07    /* right output control register */
-#define CS4231_PLAYBK_FORMAT    0x08    /* clock and data format - playback - bits 7-0 MCE */
-#define CS4231_IFACE_CTRL       0x09    /* interface control - bits 7-2 MCE */
-#define CS4231_PIN_CTRL         0x0a    /* pin control */
-#define CS4231_TEST_INIT        0x0b    /* test and initialization */
-#define CS4231_MISC_INFO        0x0c    /* miscellaneaous information */
-#define CS4231_LOOPBACK         0x0d    /* loopback control */
-#define CS4231_PLY_UPR_CNT      0x0e    /* playback upper base count */
-#define CS4231_PLY_LWR_CNT      0x0f    /* playback lower base count */
-#define CS4231_ALT_FEATURE_1    0x10    /* alternate #1 feature enable */
-#define AD1845_AF1_MIC_LEFT     0x10    /* alternate #1 feature + MIC left */
-#define CS4231_ALT_FEATURE_2    0x11    /* alternate #2 feature enable */
-#define AD1845_AF2_MIC_RIGHT    0x11    /* alternate #2 feature + MIC right */
-#define CS4231_LEFT_LINE_IN     0x12    /* left line input control */
-#define CS4231_RIGHT_LINE_IN    0x13    /* right line input control */
-#define CS4231_TIMER_LOW        0x14    /* timer low byte */
-#define CS4231_TIMER_HIGH       0x15    /* timer high byte */
-#define CS4231_LEFT_MIC_INPUT   0x16    /* left MIC input control register (InterWave only) */
-#define AD1845_UPR_FREQ_SEL     0x16    /* upper byte of frequency select */
-#define CS4231_RIGHT_MIC_INPUT  0x17    /* right MIC input control register (InterWave only) */
-#define AD1845_LWR_FREQ_SEL     0x17    /* lower byte of frequency select */
-#define CS4236_EXT_REG          0x17    /* extended register access */
-#define CS4231_IRQ_STATUS       0x18    /* irq status register */
-#define CS4231_LINE_LEFT_OUTPUT 0x19    /* left line output control register (InterWave only) */
-#define CS4231_VERSION          0x19    /* CS4231(A) - version values */
-#define CS4231_MONO_CTRL        0x1a    /* mono input/output control */
-#define CS4231_LINE_RIGHT_OUTPUT 0x1b   /* right line output control register (InterWave only) */
-#define AD1845_PWR_DOWN         0x1b    /* power down control */
-#define CS4235_LEFT_MASTER      0x1b    /* left master output control */
-#define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
-#define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
-#define AD1845_CLOCK            0x1d    /* crystal clock select and total power down */
-#define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
-#define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
-#define CS4231_REC_LWR_CNT      0x1f    /* record lower count */
-
-/* definitions for codec register select port - CODECP( REGSEL ) */
-
-#define CS4231_INIT             0x80    /* CODEC is initializing */
-#define CS4231_MCE              0x40    /* mode change enable */
-#define CS4231_TRD              0x20    /* transfer request disable */
-
-/* definitions for codec status register - CODECP( STATUS ) */
-
-#define CS4231_GLOBALIRQ        0x01    /* IRQ is active */
-
-/* definitions for codec irq status */
-
-#define CS4231_PLAYBACK_IRQ     0x10
-#define CS4231_RECORD_IRQ       0x20
-#define CS4231_TIMER_IRQ        0x40
-#define CS4231_ALL_IRQS         0x70
-#define CS4231_REC_UNDERRUN     0x08
-#define CS4231_REC_OVERRUN      0x04
-#define CS4231_PLY_OVERRUN      0x02
-#define CS4231_PLY_UNDERRUN     0x01
-
-/* definitions for CS4231_LEFT_INPUT and CS4231_RIGHT_INPUT registers */
-
-#define CS4231_ENABLE_MIC_GAIN  0x20
-
-#define CS4231_MIXS_LINE        0x00
-#define CS4231_MIXS_AUX1        0x40
-#define CS4231_MIXS_MIC         0x80
-#define CS4231_MIXS_ALL         0xc0
-
-/* definitions for clock and data format register - CS4231_PLAYBK_FORMAT */
-
-#define CS4231_LINEAR_8         0x00    /* 8-bit unsigned data */
-#define CS4231_ALAW_8           0x60    /* 8-bit A-law companded */
-#define CS4231_ULAW_8           0x20    /* 8-bit U-law companded */
-#define CS4231_LINEAR_16        0x40    /* 16-bit twos complement data - little endian */
-#define CS4231_LINEAR_16_BIG    0xc0    /* 16-bit twos complement data - big endian */
-#define CS4231_ADPCM_16         0xa0    /* 16-bit ADPCM */
-#define CS4231_STEREO           0x10    /* stereo mode */
-/* bits 3-1 define frequency divisor */
-#define CS4231_XTAL1            0x00    /* 24.576 crystal */
-#define CS4231_XTAL2            0x01    /* 16.9344 crystal */
-
-/* definitions for interface control register - CS4231_IFACE_CTRL */
-
-#define CS4231_RECORD_PIO       0x80    /* record PIO enable */
-#define CS4231_PLAYBACK_PIO     0x40    /* playback PIO enable */
-#define CS4231_CALIB_MODE       0x18    /* calibration mode bits */
-#define CS4231_AUTOCALIB        0x08    /* auto calibrate */
-#define CS4231_SINGLE_DMA       0x04    /* use single DMA channel */
-#define CS4231_RECORD_ENABLE    0x02    /* record enable */
-#define CS4231_PLAYBACK_ENABLE  0x01    /* playback enable */
-
-/* definitions for pin control register - CS4231_PIN_CTRL */
-
-#define CS4231_IRQ_ENABLE       0x02    /* enable IRQ */
-#define CS4231_XCTL1            0x40    /* external control #1 */
-#define CS4231_XCTL0            0x80    /* external control #0 */
-
-/* definitions for test and init register - CS4231_TEST_INIT */
-
-#define CS4231_CALIB_IN_PROGRESS 0x20   /* auto calibrate in progress */
-#define CS4231_DMA_REQUEST      0x10    /* DMA request in progress */
-
-/* definitions for misc control register - CS4231_MISC_INFO */
-
-#define CS4231_MODE2            0x40    /* MODE 2 */
-#define CS4231_IW_MODE3         0x6c    /* MODE 3 - InterWave enhanced mode */
-#define CS4231_4236_MODE3       0xe0    /* MODE 3 - CS4236+ enhanced mode */
-
-/* definitions for alternate feature 1 register - CS4231_ALT_FEATURE_1 */
-
-#define CS4231_DACZ             0x01    /* zero DAC when underrun */
-#define CS4231_TIMER_ENABLE     0x40    /* codec timer enable */
-#define CS4231_OLB              0x80    /* output level bit */
-
-/* definitions for Extended Registers - CS4236+ */
-
-#define CS4236_REG(i23val)      (((i23val << 2) & 0x10) | ((i23val >> 4) & 0x0f))
-#define CS4236_I23VAL(reg)      ((((reg)&0xf) << 4) | (((reg)&0x10) >> 2) | 0x8)
-
-#define CS4236_LEFT_LINE        0x08    /* left LINE alternate volume */
-#define CS4236_RIGHT_LINE       0x18    /* right LINE alternate volume */
-#define CS4236_LEFT_MIC         0x28    /* left MIC volume */
-#define CS4236_RIGHT_MIC        0x38    /* right MIC volume */
-#define CS4236_LEFT_MIX_CTRL    0x48    /* synthesis and left input mixer control */
-#define CS4236_RIGHT_MIX_CTRL   0x58    /* right input mixer control */
-#define CS4236_LEFT_FM          0x68    /* left FM volume */
-#define CS4236_RIGHT_FM         0x78    /* right FM volume */
-#define CS4236_LEFT_DSP         0x88    /* left DSP serial port volume */
-#define CS4236_RIGHT_DSP        0x98    /* right DSP serial port volume */
-#define CS4236_RIGHT_LOOPBACK   0xa8    /* right loopback monitor volume */
-#define CS4236_DAC_MUTE         0xb8    /* DAC mute and IFSE enable */
-#define CS4236_ADC_RATE         0xc8    /* indenpendent ADC sample frequency */
-#define CS4236_DAC_RATE         0xd8    /* indenpendent DAC sample frequency */
-#define CS4236_LEFT_MASTER      0xe8    /* left master digital audio volume */
-#define CS4236_RIGHT_MASTER     0xf8    /* right master digital audio volume */
-#define CS4236_LEFT_WAVE        0x0c    /* left wavetable serial port volume */
-#define CS4236_RIGHT_WAVE       0x1c    /* right wavetable serial port volume */
-#define CS4236_VERSION          0x9c    /* chip version and ID */
+#include "cs4231-regs.h"
 
 /* defines for codec.mode */
 
@@ -210,7 +57,7 @@
 #define CS4231_HW_CS4239        0x0404  /* CS4239 - Crystal Clear (tm) stereo enhancement */
 /* compatible, but clones */
 #define CS4231_HW_INTERWAVE     0x1000  /* InterWave chip */
-#define CS4231_HW_OPL3SA2       0x1001  /* OPL3-SA2 chip */
+#define CS4231_HW_OPL3SA2       0x1101  /* OPL3-SA2 chip, similar to cs4231 */
 
 /* defines for codec.hwshare */
 #define CS4231_HWSHARE_IRQ      (1<<0)
diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 353910ce9755..6b40ee60f4c5 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -2,7 +2,7 @@
 #define __SOUND_CS46XX_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Cirrus Logic, Inc.
  *  Definitions for Cirrus Logic CS46xx chips
  *
diff --git a/include/sound/cs46xx_dsp_scb_types.h b/include/sound/cs46xx_dsp_scb_types.h
index 9cb6c7d09567..080857ad0ca2 100644
--- a/include/sound/cs46xx_dsp_scb_types.h
+++ b/include/sound/cs46xx_dsp_scb_types.h
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h
index d9da9e59cf37..7c44667e79a6 100644
--- a/include/sound/cs46xx_dsp_spos.h
+++ b/include/sound/cs46xx_dsp_spos.h
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/cs46xx_dsp_task_types.h b/include/sound/cs46xx_dsp_task_types.h
index b3076c487de6..5cf920bfda27 100644
--- a/include/sound/cs46xx_dsp_task_types.h
+++ b/include/sound/cs46xx_dsp_task_types.h
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/cs8403.h b/include/sound/cs8403.h
index c6c3f9f0da78..3a8c174a4209 100644
--- a/include/sound/cs8403.h
+++ b/include/sound/cs8403.h
@@ -3,7 +3,7 @@
 
 /*
  *  Routines for Cirrus Logic CS8403/CS8404A IEC958 (S/PDIF) Transmitter
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Takashi Iwai <tiwai@suse.de>
  *
  *
diff --git a/include/sound/cs8427.h b/include/sound/cs8427.h
index 97fd9acf8028..f862cfff5f6a 100644
--- a/include/sound/cs8427.h
+++ b/include/sound/cs8427.h
@@ -3,7 +3,7 @@
 
 /*
  *  Routines for Cirrus Logic CS8427
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 3c522e59a33c..5ccb6c5feecb 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -3,7 +3,7 @@
 
 /*
  *  Main header file for the ALSA driver
- *  Copyright (c) 1994-2000 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1994-2000 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 529d0a564367..441aa06dcd6f 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -2,7 +2,7 @@
 #define __SOUND_EMU10K1_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Creative Labs, Inc.
  *  Definitions for EMU10K1 (SB Live!) chips
  *
@@ -1408,8 +1408,6 @@ struct snd_emu10k1_fx8010 {
         struct snd_emu10k1_fx8010_irq *irq_handlers;
 };
 
-#define emu10k1_gpr_ctl(n) list_entry(n, struct snd_emu10k1_fx8010_ctl, list)
-
 struct snd_emu10k1_midi {
         struct snd_emu10k1 *emu;
         struct snd_rawmidi *rmidi;
@@ -1456,6 +1454,9 @@ struct snd_emu1010 {
         unsigned int adc_pads; /* bit mask */
         unsigned int dac_pads; /* bit mask */
         unsigned int internal_clock; /* 44100 or 48000 */
+        unsigned int optical_in; /* 0:SPDIF, 1:ADAT */
+        unsigned int optical_out; /* 0:SPDIF, 1:ADAT */
+        struct task_struct *firmware_thread;
 };
 
 struct snd_emu10k1 {
@@ -1599,9 +1600,9 @@ unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, unsigned int reg,
 void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data);
 int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data);
 int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, u32 reg, u32 value);
-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value);
-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value);
-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src);
+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value);
+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value);
+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src);
 unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc);
 void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb);
 void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb);
@@ -1746,6 +1747,8 @@ int snd_emu10k1_fx8010_unregister_irq_handler(struct snd_emu10k1 *emu,
 #define A_FXBUS2(x)     (0x80 + (x))    /* x = 0x00 - 0x1f extra outs used for EFX capture -> A_FXWC2 */
 #define A_EMU32OUTH(x)  (0xa0 + (x))    /* x = 0x00 - 0x0f "EMU32_OUT_10 - _1F" - ??? */
 #define A_EMU32OUTL(x)  (0xb0 + (x))    /* x = 0x00 - 0x0f "EMU32_OUT_1 - _F" - ??? */
+#define A3_EMU32IN(x)   (0x160 + (x))   /* x = 0x00 - 0x3f "EMU32_IN_00 - _3F" - Only when .device = 0x0008 */
+#define A3_EMU32OUT(x)  (0x1E0 + (x))   /* x = 0x00 - 0x0f "EMU32_OUT_00 - _3F" - Only when .device = 0x0008 */
 #define A_GPR(x)        (A_FXGPREGBASE + (x))
 
 /* cc_reg constants */
diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index fc1c47dae3da..10fcf1465810 100644
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -3,7 +3,7 @@
 
 /*
  *  Header file for ES488/ES1688
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/gus.h b/include/sound/gus.h
index c49ea57db8cc..e5433d8b78bc 100644
--- a/include/sound/gus.h
+++ b/include/sound/gus.h
@@ -3,7 +3,7 @@
 
 /*
  *  Global structures used for GUS part of ALSA driver
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/hda_hwdep.h b/include/sound/hda_hwdep.h
new file mode 100644
index 000000000000..1c0034e87f22
--- /dev/null
+++ b/include/sound/hda_hwdep.h
@@ -0,0 +1,44 @@
+/*
+ * HWDEP Interface for HD-audio codec
+ *
+ * Copyright (c) 2007 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This driver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#ifndef __SOUND_HDA_HWDEP_H
+#define __SOUND_HDA_HWDEP_H
+
+#define HDA_HWDEP_VERSION       ((1 << 16) | (0 << 8) | (0 << 0)) /* 1.0.0 */
+
+/* verb */
+#define HDA_REG_NID_SHIFT       24
+#define HDA_REG_VERB_SHIFT      8
+#define HDA_REG_VAL_SHIFT       0
+#define HDA_VERB(nid,verb,param)        ((nid)<<24 | (verb)<<8 | (param))
+
+struct hda_verb_ioctl {
+        u32 verb;       /* HDA_VERB() */
+        u32 res;        /* response */
+};
+
+/*
+ * ioctls
+ */
+#define HDA_IOCTL_PVERSION              _IOR('H', 0x10, int)
+#define HDA_IOCTL_VERB_WRITE            _IOWR('H', 0x11, struct hda_verb_ioctl)
+#define HDA_IOCTL_GET_WCAP              _IOWR('H', 0x12, struct hda_verb_ioctl)
+
+#endif
diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h
index c3c854d99c28..81990b2bcc98 100644
--- a/include/sound/hdspm.h
+++ b/include/sound/hdspm.h
@@ -1,4 +1,4 @@
-#ifndef __SOUND_HDSPM_H         /* -*- linux-c -*- */
+#ifndef __SOUND_HDSPM_H
 #define __SOUND_HDSPM_H
 /*
  *   Copyright (C) 2003 Winfried Ritsch (IEM)
@@ -61,7 +61,8 @@ struct hdspm_peak_rms_ioctl {
 };
 
 /* use indirect access due to the limit of ioctl bit size */
-#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, struct hdspm_peak_rms_ioctl)
+#define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS \
+        _IOR('H', 0x40, struct hdspm_peak_rms_ioctl)
 
 /* ------------ CONFIG block IOCTL ---------------------- */
 
@@ -79,7 +80,8 @@ struct hdspm_config_info {
         unsigned int analog_out;
 };
 
-#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, struct hdspm_config_info)
+#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO \
+        _IOR('H', 0x41, struct hdspm_config_info)
 
 
 /* get Soundcard Version */
@@ -93,10 +95,14 @@ struct hdspm_version {
 
 /* ------------- get Matrix Mixer IOCTL --------------- */
 
-/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte = 32768 Bytes */
+/* MADI mixer: 64inputs+64playback in 64outputs = 8192 => *4Byte =
+ * 32768 Bytes
+ */
 
 /* organisation is 64 channelfader in a continous memory block */
-/* equivalent to hardware definition, maybe for future feature of mmap of them */
+/* equivalent to hardware definition, maybe for future feature of mmap of
+ * them
+ */
 /* each of 64 outputs has 64 infader and 64 outfader: 
    Ins to Outs mixer[out].in[in], Outstreams to Outs mixer[out].pb[pb] */
 
diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index 94c387b5d724..d9eea013c753 100644
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -3,7 +3,7 @@
 
 /*
  *  Hardware dependent layer 
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/info.h b/include/sound/info.h
index 97ffc4fb9969..fecbb1ffd540 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -3,7 +3,7 @@
 
 /*
  *  Header file for info interface
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/initval.h b/include/sound/initval.h
index e85b90750a59..1daa6dff8297 100644
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -3,7 +3,7 @@
 
 /*
  *  Init values for soundcard modules
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 83489c3abbaf..ae2921d9ddcc 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Takashi Iwai <tiwai@suse.de>
  * 
  *  Generic memory allocators
diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h
index 197b9e3d612b..51fbcb4a277a 100644
--- a/include/sound/mixer_oss.h
+++ b/include/sound/mixer_oss.h
@@ -3,7 +3,7 @@
 
 /*
  *  OSS MIXER API
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index d5c1396c4c9e..d45218b44dfe 100644
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -3,7 +3,7 @@
 
 /*
  *  Header file for MPU-401 and compatible cards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,6 @@
 #define MPU401_INFO_INTEGRATED  (1 << 2)        /* integrated h/w port */
 #define MPU401_INFO_MMIO        (1 << 3)        /* MMIO access */
 #define MPU401_INFO_TX_IRQ      (1 << 4)        /* independent TX irq */
-#define MPU401_INFO_UART_ONLY   (1 << 5)        /* No ENTER_UART cmd needed */
 
 #define MPU401_MODE_BIT_INPUT           0
 #define MPU401_MODE_BIT_OUTPUT          1
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index 82fdb0930720..1d14b3f82393 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -4,7 +4,7 @@
 /*
  * Definitions of the OPL-3 registers.
  *
- * Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ * Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                  Hannu Savolainen 1993-1996
  *
  *
diff --git a/include/sound/pcm-indirect.h b/include/sound/pcm-indirect.h
index 7003d7702e26..1df7acaaa535 100644
--- a/include/sound/pcm-indirect.h
+++ b/include/sound/pcm-indirect.h
@@ -2,7 +2,7 @@
  * Helper functions for indirect PCM data transfer
  *
  *  Copyright (c) by Takashi Iwai <tiwai@suse.de>
- *                   Jaroslav Kysela <perex@suse.cz>
+ *                   Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 73334e0f823f..5e9cc460075e 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -3,7 +3,7 @@
 
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Abramo Bagnara <abramo@alsa-project.org>
  *
  *
@@ -301,8 +301,8 @@ struct snd_pcm_runtime {
         union snd_pcm_sync_id sync;     /* hardware synchronization ID */
 
         /* -- mmap -- */
-        volatile struct snd_pcm_mmap_status *status;
-        volatile struct snd_pcm_mmap_control *control;
+        struct snd_pcm_mmap_status *status;
+        struct snd_pcm_mmap_control *control;
 
         /* -- locking / scheduling -- */
         wait_queue_head_t sleep;
@@ -791,13 +791,13 @@ static inline struct snd_interval *hw_param_interval(struct snd_pcm_hw_params *p
 static inline const struct snd_mask *hw_param_mask_c(const struct snd_pcm_hw_params *params,
                                              snd_pcm_hw_param_t var)
 {
-        return (const struct snd_mask *)hw_param_mask((struct snd_pcm_hw_params*) params, var);
+        return &params->masks[var - SNDRV_PCM_HW_PARAM_FIRST_MASK];
 }
 
 static inline const struct snd_interval *hw_param_interval_c(const struct snd_pcm_hw_params *params,
                                                      snd_pcm_hw_param_t var)
 {
-        return (const struct snd_interval *)hw_param_interval((struct snd_pcm_hw_params*) params, var);
+        return &params->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];
 }
 
 #define params_access(p) snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_ACCESS))
@@ -922,7 +922,10 @@ snd_pcm_sframes_t snd_pcm_lib_writev(struct snd_pcm_substream *substream,
 snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream,
                                     void __user **bufs, snd_pcm_uframes_t frames);
 
+extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;
+
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);
+unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
 
 static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,
                                               struct snd_dma_buffer *bufp)
diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index 1cd4f64cdf31..cc4e226f35fd 100644
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -3,7 +3,7 @@
 
 /*
  *  Digital Audio (PCM) - OSS compatibility abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 7dbcd10fa215..b550a416d075 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -3,7 +3,7 @@
 
 /*
  *  Abstract layer for MIDI v1.0 stream
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/sb.h b/include/sound/sb.h
index 3ad854b397d2..d0c9ed3546c8 100644
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
@@ -3,7 +3,7 @@
 
 /*
  *  Header file for SoundBlaster cards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/seq_instr.h b/include/sound/seq_instr.h
index f2db03bfd74e..93b0c51df5b0 100644
--- a/include/sound/seq_instr.h
+++ b/include/sound/seq_instr.h
@@ -3,7 +3,7 @@
 
 /*
  *  Main kernel header file for the ALSA sequencer
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/seq_midi_event.h b/include/sound/seq_midi_event.h
index dd789e7cdb20..5efab8b29c57 100644
--- a/include/sound/seq_midi_event.h
+++ b/include/sound/seq_midi_event.h
@@ -5,7 +5,7 @@
  *  MIDI byte <-> sequencer event coder
  *
  *  Copyright (C) 1998,99 Takashi Iwai <tiwai@suse.de>,
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h
index 8d5aea76d7c3..d888433a3096 100644
--- a/include/sound/seq_virmidi.h
+++ b/include/sound/seq_virmidi.h
@@ -4,7 +4,7 @@
 /*
  *  Virtual Raw MIDI client on Sequencer
  *  Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>,
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/soc.h b/include/sound/soc.h
index db6edba8ef08..f47ef1f75f18 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -201,8 +201,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
-int snd_soc_info_bool_ext(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo);
+#define snd_soc_info_bool_ext           snd_ctl_boolean_mono
 int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index b5067d3c2387..e8eeb3a1ed29 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -4,7 +4,7 @@
 /*
  *   ALSA driver for TEA5757/5759 Philips AM/FM tuner chips
  *
- *      Copyright (c) 2004 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/include/sound/timer.h b/include/sound/timer.h
index d42c083db1da..7990469a44ce 100644
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -3,7 +3,7 @@
 
 /*
  *  Timer abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Abramo Bagnara <abramo@alsa-project.org>
  *
  *
diff --git a/include/sound/tlv.h b/include/sound/tlv.h
index d93a96b91875..d136ea2181ed 100644
--- a/include/sound/tlv.h
+++ b/include/sound/tlv.h
@@ -3,7 +3,7 @@
 
 /*
  *  Advanced Linux Sound Architecture - ALSA - Driver
- *  Copyright (c) 2006 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 2006 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/include/sound/version.h b/include/sound/version.h
index 6bbcfefd2c38..8d4a8dd89237 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by alsa/ksync script.  */
-#define CONFIG_SND_VERSION "1.0.14"
-#define CONFIG_SND_DATE " (Fri Jul 20 09:12:58 2007 UTC)"
+#define CONFIG_SND_VERSION "1.0.15"
+#define CONFIG_SND_DATE " (Tue Oct 16 14:57:44 2007 UTC)"
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index 203d2b45b788..05ead6698434 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -2,7 +2,7 @@
 #define __SOUND_YMFPCI_H
 
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Definitions for Yahama YMF724/740/744/754 chips
  *
  *
diff --git a/sound/Kconfig b/sound/Kconfig
index e48b9b37d228..b2a2db47aff5 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -63,6 +63,10 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+if SPI
+source "sound/spi/Kconfig"
+endif
+
 source "sound/mips/Kconfig"
 
 source "sound/sh/Kconfig"
diff --git a/sound/Makefile b/sound/Makefile
index 3ead922bd9c6..c76d70716fa5 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -5,7 +5,8 @@ obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
-obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
+obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
+        sparc/ spi/ parisc/ pcmcia/ mips/ soc/
 obj-$(CONFIG_SND_AOA) += aoa/
 
 # This one must be compilable even if sound is configured out
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index 028852374f21..71e3f9360658 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -297,15 +297,7 @@ static struct snd_kcontrol_new capture_source_control = {
         .put = onyx_snd_capture_source_put,
 };
 
-static int onyx_snd_mute_info(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define onyx_snd_mute_info      snd_ctl_boolean_stereo_info
 
 static int onyx_snd_mute_get(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
@@ -359,15 +351,7 @@ static struct snd_kcontrol_new mute_control = {
 };
 
 
-static int onyx_snd_single_bit_info(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define onyx_snd_single_bit_info        snd_ctl_boolean_mono_info
 
 #define FLAG_POLARITY_INVERT    1
 #define FLAG_SPDIFLOCK          2
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 2f771f57c76f..70c341684794 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -272,15 +272,7 @@ static struct snd_kcontrol_new volume_control = {
         .put = tas_snd_vol_put,
 };
 
-static int tas_snd_mute_info(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define tas_snd_mute_info       snd_ctl_boolean_stereo_info
 
 static int tas_snd_mute_get(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
@@ -431,15 +423,7 @@ static struct snd_kcontrol_new drc_range_control = {
         .put = tas_snd_drc_range_put,
 };
 
-static int tas_snd_drc_switch_info(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define tas_snd_drc_switch_info         snd_ctl_boolean_mono_info
 
 static int tas_snd_drc_switch_get(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
@@ -743,6 +727,7 @@ static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock
         return 0;
 }
 
+#ifdef CONFIG_PM
 /* we are controlled via i2c and assume that is always up
  * If that wasn't the case, we'd have to suspend once
  * our i2c device is suspended, and then take note of that! */
@@ -768,7 +753,6 @@ static int tas_resume(struct tas *tas)
         return 0;
 }
 
-#ifdef CONFIG_PM
 static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
 {
         return tas_suspend(cii->codec_data);
@@ -778,7 +762,10 @@ static int _tas_resume(struct codec_info_item *cii)
 {
         return tas_resume(cii->codec_data);
 }
-#endif
+#else /* CONFIG_PM */
+#define _tas_suspend    NULL
+#define _tas_resume     NULL
+#endif /* CONFIG_PM */
 
 static struct codec_info tas_codec_info = {
         .transfers = tas_transfers,
@@ -791,10 +778,8 @@ static struct codec_info tas_codec_info = {
         .owner = THIS_MODULE,
         .usable = tas_usable,
         .switch_clock = tas_switch_clock,
-#ifdef CONFIG_PM
         .suspend = _tas_suspend,
         .resume = _tas_resume,
-#endif
 };
 
 static int tas_init_codec(struct aoa_codec *codec)
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 98806283d1b2..8b2ba99d7f8a 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -582,15 +582,7 @@ static int layouts_list_items;
  * make the fabric handle all the card stuff, etc... */
 static struct layout_dev *layout_device;
 
-static int control_info(struct snd_kcontrol *kcontrol,
-                        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define control_info    snd_ctl_boolean_mono_info
 
 #define AMP_CONTROL(n, description)                                     \
 static int n##_control_get(struct snd_kcontrol *kcontrol,               \
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index e7ed868fa7c0..81c64b09d359 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -79,12 +79,6 @@
 #include <asm/mach-types.h>
 #include <asm/dma.h>
 
-#ifdef CONFIG_H3600_HAL
-#include <asm/semaphore.h>
-#include <asm/uaccess.h>
-#include <asm/arch/h3600_hal.h>
-#endif
-
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
@@ -100,9 +94,6 @@
  * We use DMA stuff from 2.4.18-rmk3-hh24 here to be able to compile this
  * module for Familiar 0.6.1
  */
-#ifdef CONFIG_H3600_HAL
-#define HH_VERSION 1
-#endif
 
 /* {{{ Type definitions */
 
@@ -238,11 +229,8 @@ static void sa11xx_uda1341_set_samplerate(struct sa11xx_uda1341 *sa11xx_uda1341,
                 rate = 8000;
 
         /* Set the external clock generator */
-#ifdef CONFIG_H3600_HAL
-        h3600_audio_clock(rate);
-#else   
+        
         sa11xx_uda1341_set_audio_clock(rate);
-#endif
 
         /* Select the clock divisor */
         switch (rate) {
@@ -307,13 +295,10 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
         local_irq_restore(flags);
 
         /* Enable the audio power */
-#ifdef CONFIG_H3600_HAL
-        h3600_audio_power(AUDIO_RATE_DEFAULT);
-#else
+
         clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_CODEC_NRESET);
         set_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
         set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
-#endif
  
         /* Wait for the UDA1341 to wake up */
         mdelay(1); //FIXME - was removed by Perex - Why?
@@ -331,21 +316,13 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
         /* make the left and right channels unswapped (flip the WS latch) */
         Ser4SSDR = 0;
 
-#ifdef CONFIG_H3600_HAL
-        h3600_audio_mute(0);
-#else   
-        clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);        
-#endif     
+        clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
 }
 
 static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
 {
         /* mute on */
-#ifdef CONFIG_H3600_HAL
-        h3600_audio_mute(1);
-#else   
         set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
-#endif
         
         /* disable the audio power and all signals leading to the audio chip */
         l3_close(sa11xx_uda1341->uda1341);
@@ -354,13 +331,9 @@ static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
 
         /* power off and mute off */
         /* FIXME - is muting off necesary??? */
-#ifdef CONFIG_H3600_HAL
-        h3600_audio_power(0);
-        h3600_audio_mute(0);
-#else   
+
         clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
         clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
-#endif  
 }
 
 /* }}} */
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 5a01c76d02e8..267039a97bd5 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -1,20 +1,17 @@
 #
 # Makefile for ALSA
-# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-objs     := sound.o init.o memory.o info.o control.o misc.o device.o
-ifeq ($(CONFIG_ISA_DMA_API),y)
-snd-objs     += isadma.o
-endif
-ifeq ($(CONFIG_SND_OSSEMUL),y)
-snd-objs     += sound_oss.o info_oss.o
-endif
+snd-y     := sound.o init.o memory.o info.o control.o misc.o device.o
+snd-$(CONFIG_ISA_DMA_API) += isadma.o
+snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
 
 snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
                 pcm_memory.o
 
-snd-page-alloc-objs := memalloc.o sgbuf.o
+snd-page-alloc-y := memalloc.o
+snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o
 
 snd-rawmidi-objs  := rawmidi.o
 snd-timer-objs    := timer.o
diff --git a/sound/core/control.c b/sound/core/control.c
index 1f1ab9c1b668..4c3aa8e10378 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for driver control interface
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -716,8 +716,6 @@ int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *control)
         return result;
 }
 
-EXPORT_SYMBOL(snd_ctl_elem_read);
-
 static int snd_ctl_elem_read_user(struct snd_card *card,
                                   struct snd_ctl_elem_value __user *_control)
 {
@@ -781,8 +779,6 @@ int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,
         return result;
 }
 
-EXPORT_SYMBOL(snd_ctl_elem_write);
-
 static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
                                    struct snd_ctl_elem_value __user *_control)
 {
@@ -1486,3 +1482,30 @@ int snd_ctl_create(struct snd_card *card)
         snd_assert(card != NULL, return -ENXIO);
         return snd_device_new(card, SNDRV_DEV_CONTROL, card, &ops);
 }
+
+/*
+ * Frequently used control callbacks
+ */
+int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+EXPORT_SYMBOL(snd_ctl_boolean_mono_info);
+
+int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);
diff --git a/sound/core/device.c b/sound/core/device.c
index 5858b02b0b1d..ea1a0621eefb 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -1,6 +1,6 @@
 /*
  *  Device management routines
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 51ad95b7c894..bfd9d182b8a3 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -1,6 +1,6 @@
 /*
  *  Hardware dependent layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include <sound/hwdep.h>
 #include <sound/info.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Hardware dependent layer");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/info.c b/sound/core/info.c
index bf6dbf99528b..1ffd29bb4cd0 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -1,6 +1,6 @@
 /*
  *  Information interface for ALSA driver
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index a444bfe2cf74..435c9399f7a9 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -1,6 +1,6 @@
 /*
  *  Information interface for ALSA driver
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/init.c b/sound/core/init.c
index f2fe35737186..2cb7099eb1e1 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -1,6 +1,6 @@
 /*
  *  Initialization routines
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/isadma.c b/sound/core/isadma.c
index d52398727f0a..eb173cef4f05 100644
--- a/sound/core/isadma.c
+++ b/sound/core/isadma.c
@@ -1,6 +1,6 @@
 /*
  *  ISA DMA support functions
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 9b5656d8bcca..9b4992eab479 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Takashi Iwai <tiwai@suse.de>
  * 
  *  Generic memory allocators
@@ -38,7 +38,7 @@
 #endif
 
 
-MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Memory allocator for ALSA system.");
 MODULE_LICENSE("GPL");
 
@@ -206,6 +206,7 @@ void snd_free_pages(void *ptr, size_t size)
  *
  */
 
+#ifdef CONFIG_HAS_DMA
 /* allocate the coherent DMA pages */
 static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma)
 {
@@ -239,6 +240,7 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
         dec_snd_pages(pg);
         dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
 }
+#endif /* CONFIG_HAS_DMA */
 
 #ifdef CONFIG_SBUS
 
@@ -312,12 +314,14 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                 dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
                 break;
 #endif
+#ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
                 break;
         case SNDRV_DMA_TYPE_DEV_SG:
                 snd_malloc_sgbuf_pages(device, size, dmab, NULL);
                 break;
+#endif
         default:
                 printk(KERN_ERR "snd-malloc: invalid device type %d\n", type);
                 dmab->area = NULL;
@@ -383,12 +387,14 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
                 snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
                 break;
 #endif
+#ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
                 break;
         case SNDRV_DMA_TYPE_DEV_SG:
                 snd_free_sgbuf_pages(dmab);
                 break;
+#endif
         default:
                 printk(KERN_ERR "snd-malloc: invalid device type %d\n", dmab->dev.type);
         }
diff --git a/sound/core/memory.c b/sound/core/memory.c
index 93537ab7c2ac..25b0f056563e 100644
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  * 
  *  Misc memory accessors
  *
diff --git a/sound/core/misc.c b/sound/core/misc.c
index f78cd000e88d..6cabab8cc537 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -1,6 +1,6 @@
 /*
  *  Misc and compatibility things
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/oss/Makefile b/sound/core/oss/Makefile
index e6d5a045ba27..10a79453245f 100644
--- a/sound/core/oss/Makefile
+++ b/sound/core/oss/Makefile
@@ -1,12 +1,13 @@
 #
 # Makefile for ALSA
-# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-mixer-oss-objs := mixer_oss.o
 
-snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
-                    io.o copy.o linear.o mulaw.o route.o rate.o
+snd-pcm-oss-y := pcm_oss.o
+snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \
+        io.o copy.o linear.o mulaw.o route.o rate.o
 
 obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o
 obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o
diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c
index 6658facc5cda..d6a04c2d5a75 100644
--- a/sound/core/oss/copy.c
+++ b/sound/core/oss/copy.c
@@ -20,9 +20,6 @@
  */
 
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -88,5 +85,3 @@ int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug,
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c
index b6e7ce30e5a3..3ece39fc48db 100644
--- a/sound/core/oss/io.c
+++ b/sound/core/oss/io.c
@@ -1,6 +1,6 @@
 /*
  *  PCM I/O Plug-In Interface
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -20,9 +20,6 @@
  */
   
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -135,5 +132,3 @@ int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug,
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 5b1bcdc64779..06f96a3e86f6 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -1,6 +1,6 @@
 /*
  *  Linear conversion Plug-In
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>,
  *                        Abramo Bagnara <abramo@alsa-project.org>
  *
  *
@@ -21,9 +21,6 @@
  */
 
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -34,19 +31,34 @@
  */
  
 struct linear_priv {
-        int conv;
+        int cvt_endian;         /* need endian conversion? */
+        unsigned int src_ofs;   /* byte offset in source format */
+        unsigned int dst_ofs;   /* byte soffset in destination format */
+        unsigned int copy_ofs;  /* byte offset in temporary u32 data */
+        unsigned int dst_bytes;         /* byte size of destination format */
+        unsigned int copy_bytes;        /* bytes to copy per conversion */
+        unsigned int flip; /* MSB flip for signeness, done after endian conv */
 };
 
+static inline void do_convert(struct linear_priv *data,
+                              unsigned char *dst, unsigned char *src)
+{
+        unsigned int tmp = 0;
+        unsigned char *p = (unsigned char *)&tmp;
+
+        memcpy(p + data->copy_ofs, src + data->src_ofs, data->copy_bytes);
+        if (data->cvt_endian)
+                tmp = swab32(tmp);
+        tmp ^= data->flip;
+        memcpy(dst, p + data->dst_ofs, data->dst_bytes);
+}
+
 static void convert(struct snd_pcm_plugin *plugin,
                     const struct snd_pcm_plugin_channel *src_channels,
                     struct snd_pcm_plugin_channel *dst_channels,
                     snd_pcm_uframes_t frames)
 {
-#define CONV_LABELS
-#include "plugin_ops.h"
-#undef CONV_LABELS
         struct linear_priv *data = (struct linear_priv *)plugin->extra_data;
-        void *conv = conv_labels[data->conv];
         int channel;
         int nchannels = plugin->src_format.channels;
         for (channel = 0; channel < nchannels; ++channel) {
@@ -67,11 +79,7 @@ static void convert(struct snd_pcm_plugin *plugin,
                 dst_step = dst_channels[channel].area.step / 8;
                 frames1 = frames;
                 while (frames1-- > 0) {
-                        goto *conv;
-#define CONV_END after
-#include "plugin_ops.h"
-#undef CONV_END
-                after:
+                        do_convert(data, dst, src);
                         src += src_step;
                         dst += dst_step;
                 }
@@ -106,29 +114,36 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
         return frames;
 }
 
-static int conv_index(int src_format, int dst_format)
+static void init_data(struct linear_priv *data, int src_format, int dst_format)
 {
-        int src_endian, dst_endian, sign, src_width, dst_width;
-
-        sign = (snd_pcm_format_signed(src_format) !=
-                snd_pcm_format_signed(dst_format));
-#ifdef SNDRV_LITTLE_ENDIAN
-        src_endian = snd_pcm_format_big_endian(src_format);
-        dst_endian = snd_pcm_format_big_endian(dst_format);
-#else
-        src_endian = snd_pcm_format_little_endian(src_format);
-        dst_endian = snd_pcm_format_little_endian(dst_format);
-#endif
-
-        if (src_endian < 0)
-                src_endian = 0;
-        if (dst_endian < 0)
-                dst_endian = 0;
-
-        src_width = snd_pcm_format_width(src_format) / 8 - 1;
-        dst_width = snd_pcm_format_width(dst_format) / 8 - 1;
-
-        return src_width * 32 + src_endian * 16 + sign * 8 + dst_width * 2 + dst_endian;
+        int src_le, dst_le, src_bytes, dst_bytes;
+
+        src_bytes = snd_pcm_format_width(src_format) / 8;
+        dst_bytes = snd_pcm_format_width(dst_format) / 8;
+        src_le = snd_pcm_format_little_endian(src_format) > 0;
+        dst_le = snd_pcm_format_little_endian(dst_format) > 0;
+
+        data->dst_bytes = dst_bytes;
+        data->cvt_endian = src_le != dst_le;
+        data->copy_bytes = src_bytes < dst_bytes ? src_bytes : dst_bytes;
+        if (src_le) {
+                data->copy_ofs = 4 - data->copy_bytes;
+                data->src_ofs = src_bytes - data->copy_bytes;
+        } else
+                data->src_ofs = snd_pcm_format_physical_width(src_format) / 8 -
+                        src_bytes;
+        if (dst_le)
+                data->dst_ofs = 4 - data->dst_bytes;
+        else
+                data->dst_ofs = snd_pcm_format_physical_width(dst_format) / 8 -
+                        dst_bytes;
+        if (snd_pcm_format_signed(src_format) !=
+            snd_pcm_format_signed(dst_format)) {
+                if (dst_le)
+                        data->flip = cpu_to_le32(0x80000000);
+                else
+                        data->flip = cpu_to_be32(0x80000000);
+        }
 }
 
 int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
@@ -154,10 +169,8 @@ int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
         if (err < 0)
                 return err;
         data = (struct linear_priv *)plugin->extra_data;
-        data->conv = conv_index(src_format->format, dst_format->format);
+        init_data(data, src_format->format, dst_format->format);
         plugin->transfer = linear_transfer;
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index fccad8f0a6bb..3ace4a5680ba 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1,6 +1,6 @@
 /*
  *  OSS emulation layer for the mixer interface
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 
 #define OSS_ALSAEMULVER         _SIOR ('M', 249, int)
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Mixer OSS emulation for ALSA.");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MIXER);
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c
index 2eb18807e6d0..848db82529ed 100644
--- a/sound/core/oss/mulaw.c
+++ b/sound/core/oss/mulaw.c
@@ -1,6 +1,6 @@
 /*
  *  Mu-Law conversion Plug-In Interface
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *                        Uros Bizjak <uros@kss-loka.si>
  *
  *  Based on reference implementation by Sun Microsystems, Inc.
@@ -22,9 +22,6 @@
  */
   
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -149,19 +146,32 @@ typedef void (*mulaw_f)(struct snd_pcm_plugin *plugin,
 
 struct mulaw_priv {
         mulaw_f func;
-        int conv;
+        int cvt_endian;                 /* need endian conversion? */
+        unsigned int native_ofs;        /* byte offset in native format */
+        unsigned int copy_ofs;          /* byte offset in s16 format */
+        unsigned int native_bytes;      /* byte size of the native format */
+        unsigned int copy_bytes;        /* bytes to copy per conversion */
+        u16 flip; /* MSB flip for signedness, done after endian conversion */
 };
 
+static inline void cvt_s16_to_native(struct mulaw_priv *data,
+                                     unsigned char *dst, u16 sample)
+{
+        sample ^= data->flip;
+        if (data->cvt_endian)
+                sample = swab16(sample);
+        if (data->native_bytes > data->copy_bytes)
+                memset(dst, 0, data->native_bytes);
+        memcpy(dst + data->native_ofs, (char *)&sample + data->copy_ofs,
+               data->copy_bytes);
+}
+
 static void mulaw_decode(struct snd_pcm_plugin *plugin,
                         const struct snd_pcm_plugin_channel *src_channels,
                         struct snd_pcm_plugin_channel *dst_channels,
                         snd_pcm_uframes_t frames)
 {
-#define PUT_S16_LABELS
-#include "plugin_ops.h"
-#undef PUT_S16_LABELS
         struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
-        void *put = put_s16_labels[data->conv];
         int channel;
         int nchannels = plugin->src_format.channels;
         for (channel = 0; channel < nchannels; ++channel) {
@@ -183,30 +193,33 @@ static void mulaw_decode(struct snd_pcm_plugin *plugin,
                 frames1 = frames;
                 while (frames1-- > 0) {
                         signed short sample = ulaw2linear(*src);
-                        goto *put;
-#define PUT_S16_END after
-#include "plugin_ops.h"
-#undef PUT_S16_END
-                after:
+                        cvt_s16_to_native(data, dst, sample);
                         src += src_step;
                         dst += dst_step;
                 }
         }
 }
 
+static inline signed short cvt_native_to_s16(struct mulaw_priv *data,
+                                             unsigned char *src)
+{
+        u16 sample = 0;
+        memcpy((char *)&sample + data->copy_ofs, src + data->native_ofs,
+               data->copy_bytes);
+        if (data->cvt_endian)
+                sample = swab16(sample);
+        sample ^= data->flip;
+        return (signed short)sample;
+}
+
 static void mulaw_encode(struct snd_pcm_plugin *plugin,
                         const struct snd_pcm_plugin_channel *src_channels,
                         struct snd_pcm_plugin_channel *dst_channels,
                         snd_pcm_uframes_t frames)
 {
-#define GET_S16_LABELS
-#include "plugin_ops.h"
-#undef GET_S16_LABELS
         struct mulaw_priv *data = (struct mulaw_priv *)plugin->extra_data;
-        void *get = get_s16_labels[data->conv];
         int channel;
         int nchannels = plugin->src_format.channels;
-        signed short sample = 0;
         for (channel = 0; channel < nchannels; ++channel) {
                 char *src;
                 char *dst;
@@ -225,11 +238,7 @@ static void mulaw_encode(struct snd_pcm_plugin *plugin,
                 dst_step = dst_channels[channel].area.step / 8;
                 frames1 = frames;
                 while (frames1-- > 0) {
-                        goto *get;
-#define GET_S16_END after
-#include "plugin_ops.h"
-#undef GET_S16_END
-                after:
+                        signed short sample = cvt_native_to_s16(data, src);
                         *dst = linear2ulaw(sample);
                         src += src_step;
                         dst += dst_step;
@@ -265,23 +274,25 @@ static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin,
         return frames;
 }
 
-static int getput_index(int format)
+static void init_data(struct mulaw_priv *data, int format)
 {
-        int sign, width, endian;
-        sign = !snd_pcm_format_signed(format);
-        width = snd_pcm_format_width(format) / 8 - 1;
-        if (width < 0 || width > 3) {
-                snd_printk(KERN_ERR "snd-pcm-oss: invalid format %d\n", format);
-                width = 0;
-        }
 #ifdef SNDRV_LITTLE_ENDIAN
-        endian = snd_pcm_format_big_endian(format);
+        data->cvt_endian = snd_pcm_format_big_endian(format) > 0;
 #else
-        endian = snd_pcm_format_little_endian(format);
+        data->cvt_endian = snd_pcm_format_little_endian(format) > 0;
 #endif
-        if (endian < 0)
-                endian = 0;
-        return width * 4 + endian * 2 + sign;
+        if (!snd_pcm_format_signed(format))
+                data->flip = 0x8000;
+        data->native_bytes = snd_pcm_format_physical_width(format) / 8;
+        data->copy_bytes = data->native_bytes < 2 ? 1 : 2;
+        if (snd_pcm_format_little_endian(format)) {
+                data->native_ofs = data->native_bytes - data->copy_bytes;
+                data->copy_ofs = 2 - data->copy_bytes;
+        } else {
+                /* S24 in 4bytes need an 1 byte offset */
+                data->native_ofs = data->native_bytes -
+                        snd_pcm_format_width(format) / 8;
+        }
 }
 
 int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,
@@ -322,11 +333,8 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,
                 return err;
         data = (struct mulaw_priv *)plugin->extra_data;
         data->func = func;
-        data->conv = getput_index(format->format);
-        snd_assert(data->conv >= 0 && data->conv < 4*2*2, return -EINVAL);
+        init_data(data, format->format);
         plugin->transfer = mulaw_transfer;
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index fc11572c48cf..d0c4ceb9f0b4 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer / OSS compatible
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -48,7 +48,7 @@ static int dsp_map[SNDRV_CARDS];
 static int adsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
 static int nonblock_open = 1;
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Abramo Bagnara <abramo@alsa-project.org>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Abramo Bagnara <abramo@alsa-project.org>");
 MODULE_DESCRIPTION("PCM OSS emulation for ALSA.");
 MODULE_LICENSE("GPL");
 module_param_array(dsp_map, int, NULL, 0444);
@@ -633,6 +633,22 @@ static long snd_pcm_alsa_frames(struct snd_pcm_substream *substream, long bytes)
         return bytes_to_frames(runtime, (buffer_size * bytes) / runtime->oss.buffer_bytes);
 }
 
+/* define extended formats in the recent OSS versions (if any) */
+/* linear formats */
+#define AFMT_S32_LE      0x00001000
+#define AFMT_S32_BE      0x00002000
+#define AFMT_S24_LE      0x00008000
+#define AFMT_S24_BE      0x00010000
+#define AFMT_S24_PACKED  0x00040000
+
+/* other supported formats */
+#define AFMT_FLOAT       0x00004000
+#define AFMT_SPDIF_RAW   0x00020000
+
+/* unsupported formats */
+#define AFMT_AC3         0x00000400
+#define AFMT_VORBIS      0x00000800
+
 static int snd_pcm_oss_format_from(int format)
 {
         switch (format) {
@@ -646,6 +662,13 @@ static int snd_pcm_oss_format_from(int format)
         case AFMT_U16_LE:       return SNDRV_PCM_FORMAT_U16_LE;
         case AFMT_U16_BE:       return SNDRV_PCM_FORMAT_U16_BE;
         case AFMT_MPEG:         return SNDRV_PCM_FORMAT_MPEG;
+        case AFMT_S32_LE:       return SNDRV_PCM_FORMAT_S32_LE;
+        case AFMT_S32_BE:       return SNDRV_PCM_FORMAT_S32_BE;
+        case AFMT_S24_LE:       return SNDRV_PCM_FORMAT_S24_LE;
+        case AFMT_S24_BE:       return SNDRV_PCM_FORMAT_S24_BE;
+        case AFMT_S24_PACKED:   return SNDRV_PCM_FORMAT_S24_3LE;
+        case AFMT_FLOAT:        return SNDRV_PCM_FORMAT_FLOAT;
+        case AFMT_SPDIF_RAW:    return SNDRV_PCM_FORMAT_IEC958_SUBFRAME;
         default:                return SNDRV_PCM_FORMAT_U8;
         }
 }
@@ -663,6 +686,13 @@ static int snd_pcm_oss_format_to(int format)
         case SNDRV_PCM_FORMAT_U16_LE:   return AFMT_U16_LE;
         case SNDRV_PCM_FORMAT_U16_BE:   return AFMT_U16_BE;
         case SNDRV_PCM_FORMAT_MPEG:             return AFMT_MPEG;
+        case SNDRV_PCM_FORMAT_S32_LE:   return AFMT_S32_LE;
+        case SNDRV_PCM_FORMAT_S32_BE:   return AFMT_S32_BE;
+        case SNDRV_PCM_FORMAT_S24_LE:   return AFMT_S24_LE;
+        case SNDRV_PCM_FORMAT_S24_BE:   return AFMT_S24_BE;
+        case SNDRV_PCM_FORMAT_S24_3LE:  return AFMT_S24_PACKED;
+        case SNDRV_PCM_FORMAT_FLOAT:    return AFMT_FLOAT;
+        case SNDRV_PCM_FORMAT_IEC958_SUBFRAME: return AFMT_SPDIF_RAW;
         default:                        return -EINVAL;
         }
 }
@@ -1725,7 +1755,10 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file)
                 return AFMT_MU_LAW | AFMT_U8 |
                        AFMT_S16_LE | AFMT_S16_BE |
                        AFMT_S8 | AFMT_U16_LE |
-                       AFMT_U16_BE;
+                       AFMT_U16_BE |
+                        AFMT_S32_LE | AFMT_S32_BE |
+                        AFMT_S24_LE | AFMT_S24_LE |
+                        AFMT_S24_PACKED;
         params = kmalloc(sizeof(*params), GFP_KERNEL);
         if (!params)
                 return -ENOMEM;
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 0e67dd280a5d..14095a927a1b 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -1,6 +1,6 @@
 /*
  *  PCM Plug-In shared (kernel/library) code
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
  *
  *
@@ -25,9 +25,6 @@
 #endif
 
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/vmalloc.h>
@@ -267,6 +264,8 @@ static int snd_pcm_plug_formats(struct snd_mask *mask, int format)
                        SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
                        SNDRV_PCM_FMTBIT_U24_LE | SNDRV_PCM_FMTBIT_S24_LE |
                        SNDRV_PCM_FMTBIT_U24_BE | SNDRV_PCM_FMTBIT_S24_BE |
+                       SNDRV_PCM_FMTBIT_U24_3LE | SNDRV_PCM_FMTBIT_S24_3LE |
+                       SNDRV_PCM_FMTBIT_U24_3BE | SNDRV_PCM_FMTBIT_S24_3BE |
                        SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |
                        SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE);
         snd_mask_set(&formats, SNDRV_PCM_FORMAT_MU_LAW);
@@ -283,6 +282,10 @@ static int preferred_formats[] = {
         SNDRV_PCM_FORMAT_S16_BE,
         SNDRV_PCM_FORMAT_U16_LE,
         SNDRV_PCM_FORMAT_U16_BE,
+        SNDRV_PCM_FORMAT_S24_3LE,
+        SNDRV_PCM_FORMAT_S24_3BE,
+        SNDRV_PCM_FORMAT_U24_3LE,
+        SNDRV_PCM_FORMAT_U24_3BE,
         SNDRV_PCM_FORMAT_S24_LE,
         SNDRV_PCM_FORMAT_S24_BE,
         SNDRV_PCM_FORMAT_U24_LE,
@@ -297,41 +300,37 @@ static int preferred_formats[] = {
 
 int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask)
 {
+        int i;
+
         if (snd_mask_test(format_mask, format))
                 return format;
         if (! snd_pcm_plug_formats(format_mask, format))
                 return -EINVAL;
         if (snd_pcm_format_linear(format)) {
-                int width = snd_pcm_format_width(format);
-                int unsignd = snd_pcm_format_unsigned(format);
-                int big = snd_pcm_format_big_endian(format);
-                int format1;
-                int wid, width1=width;
-                int dwidth1 = 8;
-                for (wid = 0; wid < 4; ++wid) {
-                        int end, big1 = big;
-                        for (end = 0; end < 2; ++end) {
-                                int sgn, unsignd1 = unsignd;
-                                for (sgn = 0; sgn < 2; ++sgn) {
-                                        format1 = snd_pcm_build_linear_format(width1, unsignd1, big1);
-                                        if (format1 >= 0 &&
-                                            snd_mask_test(format_mask, format1))
-                                                goto _found;
-                                        unsignd1 = !unsignd1;
-                                }
-                                big1 = !big1;
-                        }
-                        if (width1 == 32) {
-                                dwidth1 = -dwidth1;
-                                width1 = width;
+                unsigned int width = snd_pcm_format_width(format);
+                int unsignd = snd_pcm_format_unsigned(format) > 0;
+                int big = snd_pcm_format_big_endian(format) > 0;
+                unsigned int badness, best = -1;
+                int best_format = -1;
+                for (i = 0; i < ARRAY_SIZE(preferred_formats); i++) {
+                        int f = preferred_formats[i];
+                        unsigned int w;
+                        if (!snd_mask_test(format_mask, f))
+                                continue;
+                        w = snd_pcm_format_width(f);
+                        if (w >= width)
+                                badness = w - width;
+                        else
+                                badness = width - w + 32;
+                        badness += snd_pcm_format_unsigned(f) != unsignd;
+                        badness += snd_pcm_format_big_endian(f) != big;
+                        if (badness < best) {
+                                best_format = f;
+                                best = badness;
                         }
-                        width1 += dwidth1;
                 }
-                return -EINVAL;
-        _found:
-                return format1;
+                return best_format >= 0 ? best_format : -EINVAL;
         } else {
-                unsigned int i;
                 switch (format) {
                 case SNDRV_PCM_FORMAT_MU_LAW:
                         for (i = 0; i < ARRAY_SIZE(preferred_formats); ++i) {
@@ -740,5 +739,3 @@ int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_area, size_t src_of
         }
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h
index 3be91b3d5377..ca2f4c39be46 100644
--- a/sound/core/oss/pcm_plugin.h
+++ b/sound/core/oss/pcm_plugin.h
@@ -3,7 +3,7 @@
 
 /*
  *  Digital Audio (Plugin interface) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/oss/plugin_ops.h b/sound/core/oss/plugin_ops.h
deleted file mode 100644
index 1f5bde4631f1..000000000000
--- a/sound/core/oss/plugin_ops.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- *  Plugin sample operators with fast switch
- *  Copyright (c) 2000 by Jaroslav Kysela <perex@suse.cz>
- *
- *
- *   This library is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library 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 Library General Public License for more details.
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this library; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-
-#define as_u8(ptr) (*(u_int8_t*)(ptr))
-#define as_u16(ptr) (*(u_int16_t*)(ptr))
-#define as_u32(ptr) (*(u_int32_t*)(ptr))
-#define as_u64(ptr) (*(u_int64_t*)(ptr))
-#define as_s8(ptr) (*(int8_t*)(ptr))
-#define as_s16(ptr) (*(int16_t*)(ptr))
-#define as_s32(ptr) (*(int32_t*)(ptr))
-#define as_s64(ptr) (*(int64_t*)(ptr))
-
-#ifdef COPY_LABELS
-static void *copy_labels[4] = {
-        &&copy_8,
-        &&copy_16,
-        &&copy_32,
-        &&copy_64
-};
-#endif
-
-#ifdef COPY_END
-while(0) {
-copy_8: as_s8(dst) = as_s8(src); goto COPY_END;
-copy_16: as_s16(dst) = as_s16(src); goto COPY_END;
-copy_32: as_s32(dst) = as_s32(src); goto COPY_END;
-copy_64: as_s64(dst) = as_s64(src); goto COPY_END;
-}
-#endif
-
-#ifdef CONV_LABELS
-/* src_wid src_endswap sign_toggle dst_wid dst_endswap */
-static void *conv_labels[4 * 2 * 2 * 4 * 2] = {
-        &&conv_xxx1_xxx1,        /*  8h ->  8h */
-        &&conv_xxx1_xxx1,        /*  8h ->  8s */
-        &&conv_xxx1_xx10,        /*  8h -> 16h */
-        &&conv_xxx1_xx01,        /*  8h -> 16s */
-        &&conv_xxx1_x100,        /*  8h -> 24h */
-        &&conv_xxx1_001x,        /*  8h -> 24s */
-        &&conv_xxx1_1000,        /*  8h -> 32h */
-        &&conv_xxx1_0001,        /*  8h -> 32s */
-        &&conv_xxx1_xxx9,        /*  8h ^>  8h */
-        &&conv_xxx1_xxx9,        /*  8h ^>  8s */
-        &&conv_xxx1_xx90,        /*  8h ^> 16h */
-        &&conv_xxx1_xx09,        /*  8h ^> 16s */
-        &&conv_xxx1_x900,        /*  8h ^> 24h */
-        &&conv_xxx1_009x,        /*  8h ^> 24s */
-        &&conv_xxx1_9000,        /*  8h ^> 32h */
-        &&conv_xxx1_0009,        /*  8h ^> 32s */
-        &&conv_xxx1_xxx1,        /*  8s ->  8h */
-        &&conv_xxx1_xxx1,        /*  8s ->  8s */
-        &&conv_xxx1_xx10,        /*  8s -> 16h */
-        &&conv_xxx1_xx01,        /*  8s -> 16s */
-        &&conv_xxx1_x100,        /*  8s -> 24h */
-        &&conv_xxx1_001x,        /*  8s -> 24s */
-        &&conv_xxx1_1000,        /*  8s -> 32h */
-        &&conv_xxx1_0001,        /*  8s -> 32s */
-        &&conv_xxx1_xxx9,        /*  8s ^>  8h */
-        &&conv_xxx1_xxx9,        /*  8s ^>  8s */
-        &&conv_xxx1_xx90,        /*  8s ^> 16h */
-        &&conv_xxx1_xx09,        /*  8s ^> 16s */
-        &&conv_xxx1_x900,        /*  8s ^> 24h */
-        &&conv_xxx1_009x,        /*  8s ^> 24s */
-        &&conv_xxx1_9000,        /*  8s ^> 32h */
-        &&conv_xxx1_0009,        /*  8s ^> 32s */
-        &&conv_xx12_xxx1,        /* 16h ->  8h */
-        &&conv_xx12_xxx1,        /* 16h ->  8s */
-        &&conv_xx12_xx12,        /* 16h -> 16h */
-        &&conv_xx12_xx21,        /* 16h -> 16s */
-        &&conv_xx12_x120,        /* 16h -> 24h */
-        &&conv_xx12_021x,        /* 16h -> 24s */
-        &&conv_xx12_1200,        /* 16h -> 32h */
-        &&conv_xx12_0021,        /* 16h -> 32s */
-        &&conv_xx12_xxx9,        /* 16h ^>  8h */
-        &&conv_xx12_xxx9,        /* 16h ^>  8s */
-        &&conv_xx12_xx92,        /* 16h ^> 16h */
-        &&conv_xx12_xx29,        /* 16h ^> 16s */
-        &&conv_xx12_x920,        /* 16h ^> 24h */
-        &&conv_xx12_029x,        /* 16h ^> 24s */
-        &&conv_xx12_9200,        /* 16h ^> 32h */
-        &&conv_xx12_0029,        /* 16h ^> 32s */
-        &&conv_xx12_xxx2,        /* 16s ->  8h */
-        &&conv_xx12_xxx2,        /* 16s ->  8s */
-        &&conv_xx12_xx21,        /* 16s -> 16h */
-        &&conv_xx12_xx12,        /* 16s -> 16s */
-        &&conv_xx12_x210,        /* 16s -> 24h */
-        &&conv_xx12_012x,        /* 16s -> 24s */
-        &&conv_xx12_2100,        /* 16s -> 32h */
-        &&conv_xx12_0012,        /* 16s -> 32s */
-        &&conv_xx12_xxxA,        /* 16s ^>  8h */
-        &&conv_xx12_xxxA,        /* 16s ^>  8s */
-        &&conv_xx12_xxA1,        /* 16s ^> 16h */
-        &&conv_xx12_xx1A,        /* 16s ^> 16s */
-        &&conv_xx12_xA10,        /* 16s ^> 24h */
-        &&conv_xx12_01Ax,        /* 16s ^> 24s */
-        &&conv_xx12_A100,        /* 16s ^> 32h */
-        &&conv_xx12_001A,        /* 16s ^> 32s */
-        &&conv_x123_xxx1,        /* 24h ->  8h */
-        &&conv_x123_xxx1,        /* 24h ->  8s */
-        &&conv_x123_xx12,        /* 24h -> 16h */
-        &&conv_x123_xx21,        /* 24h -> 16s */
-        &&conv_x123_x123,        /* 24h -> 24h */
-        &&conv_x123_321x,        /* 24h -> 24s */
-        &&conv_x123_1230,        /* 24h -> 32h */
-        &&conv_x123_0321,        /* 24h -> 32s */
-        &&conv_x123_xxx9,        /* 24h ^>  8h */
-        &&conv_x123_xxx9,        /* 24h ^>  8s */
-        &&conv_x123_xx92,        /* 24h ^> 16h */
-        &&conv_x123_xx29,        /* 24h ^> 16s */
-        &&conv_x123_x923,        /* 24h ^> 24h */
-        &&conv_x123_329x,        /* 24h ^> 24s */
-        &&conv_x123_9230,        /* 24h ^> 32h */
-        &&conv_x123_0329,        /* 24h ^> 32s */
-        &&conv_123x_xxx3,        /* 24s ->  8h */
-        &&conv_123x_xxx3,        /* 24s ->  8s */
-        &&conv_123x_xx32,        /* 24s -> 16h */
-        &&conv_123x_xx23,        /* 24s -> 16s */
-        &&conv_123x_x321,        /* 24s -> 24h */
-        &&conv_123x_123x,        /* 24s -> 24s */
-        &&conv_123x_3210,        /* 24s -> 32h */
-        &&conv_123x_0123,        /* 24s -> 32s */
-        &&conv_123x_xxxB,        /* 24s ^>  8h */
-        &&conv_123x_xxxB,        /* 24s ^>  8s */
-        &&conv_123x_xxB2,        /* 24s ^> 16h */
-        &&conv_123x_xx2B,        /* 24s ^> 16s */
-        &&conv_123x_xB21,        /* 24s ^> 24h */
-        &&conv_123x_12Bx,        /* 24s ^> 24s */
-        &&conv_123x_B210,        /* 24s ^> 32h */
-        &&conv_123x_012B,        /* 24s ^> 32s */
-        &&conv_1234_xxx1,        /* 32h ->  8h */
-        &&conv_1234_xxx1,        /* 32h ->  8s */
-        &&conv_1234_xx12,        /* 32h -> 16h */
-        &&conv_1234_xx21,        /* 32h -> 16s */
-        &&conv_1234_x123,        /* 32h -> 24h */
-        &&conv_1234_321x,        /* 32h -> 24s */
-        &&conv_1234_1234,        /* 32h -> 32h */
-        &&conv_1234_4321,        /* 32h -> 32s */
-        &&conv_1234_xxx9,        /* 32h ^>  8h */
-        &&conv_1234_xxx9,        /* 32h ^>  8s */
-        &&conv_1234_xx92,        /* 32h ^> 16h */
-        &&conv_1234_xx29,        /* 32h ^> 16s */
-        &&conv_1234_x923,        /* 32h ^> 24h */
-        &&conv_1234_329x,        /* 32h ^> 24s */
-        &&conv_1234_9234,        /* 32h ^> 32h */
-        &&conv_1234_4329,        /* 32h ^> 32s */
-        &&conv_1234_xxx4,        /* 32s ->  8h */
-        &&conv_1234_xxx4,        /* 32s ->  8s */
-        &&conv_1234_xx43,        /* 32s -> 16h */
-        &&conv_1234_xx34,        /* 32s -> 16s */
-        &&conv_1234_x432,        /* 32s -> 24h */
-        &&conv_1234_234x,        /* 32s -> 24s */
-        &&conv_1234_4321,        /* 32s -> 32h */
-        &&conv_1234_1234,        /* 32s -> 32s */
-        &&conv_1234_xxxC,        /* 32s ^>  8h */
-        &&conv_1234_xxxC,        /* 32s ^>  8s */
-        &&conv_1234_xxC3,        /* 32s ^> 16h */
-        &&conv_1234_xx3C,        /* 32s ^> 16s */
-        &&conv_1234_xC32,        /* 32s ^> 24h */
-        &&conv_1234_23Cx,        /* 32s ^> 24s */
-        &&conv_1234_C321,        /* 32s ^> 32h */
-        &&conv_1234_123C,        /* 32s ^> 32s */
-};
-#endif
-
-#ifdef CONV_END
-while(0) {
-conv_xxx1_xxx1: as_u8(dst) = as_u8(src); goto CONV_END;
-conv_xxx1_xx10: as_u16(dst) = (u_int16_t)as_u8(src) << 8; goto CONV_END;
-conv_xxx1_xx01: as_u16(dst) = (u_int16_t)as_u8(src); goto CONV_END;
-conv_xxx1_x100: as_u32(dst) = (u_int32_t)as_u8(src) << 16; goto CONV_END;
-conv_xxx1_001x: as_u32(dst) = (u_int32_t)as_u8(src) << 8; goto CONV_END;
-conv_xxx1_1000: as_u32(dst) = (u_int32_t)as_u8(src) << 24; goto CONV_END;
-conv_xxx1_0001: as_u32(dst) = (u_int32_t)as_u8(src); goto CONV_END;
-conv_xxx1_xxx9: as_u8(dst) = as_u8(src) ^ 0x80; goto CONV_END;
-conv_xxx1_xx90: as_u16(dst) = (u_int16_t)(as_u8(src) ^ 0x80) << 8; goto CONV_END;
-conv_xxx1_xx09: as_u16(dst) = (u_int16_t)(as_u8(src) ^ 0x80); goto CONV_END;
-conv_xxx1_x900: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 16; goto CONV_END;
-conv_xxx1_009x: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 8; goto CONV_END;
-conv_xxx1_9000: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80) << 24; goto CONV_END;
-conv_xxx1_0009: as_u32(dst) = (u_int32_t)(as_u8(src) ^ 0x80); goto CONV_END;
-conv_xx12_xxx1: as_u8(dst) = as_u16(src) >> 8; goto CONV_END;
-conv_xx12_xx12: as_u16(dst) = as_u16(src); goto CONV_END;
-conv_xx12_xx21: as_u16(dst) = swab16(as_u16(src)); goto CONV_END;
-conv_xx12_x120: as_u32(dst) = (u_int32_t)as_u16(src) << 8; goto CONV_END;
-conv_xx12_021x: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 8; goto CONV_END;
-conv_xx12_1200: as_u32(dst) = (u_int32_t)as_u16(src) << 16; goto CONV_END;
-conv_xx12_0021: as_u32(dst) = (u_int32_t)swab16(as_u16(src)); goto CONV_END;
-conv_xx12_xxx9: as_u8(dst) = (as_u16(src) >> 8) ^ 0x80; goto CONV_END;
-conv_xx12_xx92: as_u16(dst) = as_u16(src) ^ 0x8000; goto CONV_END;
-conv_xx12_xx29: as_u16(dst) = swab16(as_u16(src)) ^ 0x80; goto CONV_END;
-conv_xx12_x920: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x8000) << 8; goto CONV_END;
-conv_xx12_029x: as_u32(dst) = (u_int32_t)(swab16(as_u16(src)) ^ 0x80) << 8; goto CONV_END;
-conv_xx12_9200: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x8000) << 16; goto CONV_END;
-conv_xx12_0029: as_u32(dst) = (u_int32_t)(swab16(as_u16(src)) ^ 0x80); goto CONV_END;
-conv_xx12_xxx2: as_u8(dst) = as_u16(src) & 0xff; goto CONV_END;
-conv_xx12_x210: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 8; goto CONV_END;
-conv_xx12_012x: as_u32(dst) = (u_int32_t)as_u16(src) << 8; goto CONV_END;
-conv_xx12_2100: as_u32(dst) = (u_int32_t)swab16(as_u16(src)) << 16; goto CONV_END;
-conv_xx12_0012: as_u32(dst) = (u_int32_t)as_u16(src); goto CONV_END; 
-conv_xx12_xxxA: as_u8(dst) = (as_u16(src) ^ 0x80) & 0xff; goto CONV_END;
-conv_xx12_xxA1: as_u16(dst) = swab16(as_u16(src) ^ 0x80); goto CONV_END;
-conv_xx12_xx1A: as_u16(dst) = as_u16(src) ^ 0x80; goto CONV_END;
-conv_xx12_xA10: as_u32(dst) = (u_int32_t)swab16(as_u16(src) ^ 0x80) << 8; goto CONV_END;
-conv_xx12_01Ax: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x80) << 8; goto CONV_END;
-conv_xx12_A100: as_u32(dst) = (u_int32_t)swab16(as_u16(src) ^ 0x80) << 16; goto CONV_END;
-conv_xx12_001A: as_u32(dst) = (u_int32_t)(as_u16(src) ^ 0x80); goto CONV_END;
-conv_x123_xxx1: as_u8(dst) = as_u32(src) >> 16; goto CONV_END;
-conv_x123_xx12: as_u16(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_x123_xx21: as_u16(dst) = swab16(as_u32(src) >> 8); goto CONV_END;
-conv_x123_x123: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_x123_321x: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_x123_1230: as_u32(dst) = as_u32(src) << 8; goto CONV_END;
-conv_x123_0321: as_u32(dst) = swab32(as_u32(src)) >> 8; goto CONV_END;
-conv_x123_xxx9: as_u8(dst) = (as_u32(src) >> 16) ^ 0x80; goto CONV_END;
-conv_x123_xx92: as_u16(dst) = (as_u32(src) >> 8) ^ 0x8000; goto CONV_END;
-conv_x123_xx29: as_u16(dst) = swab16(as_u32(src) >> 8) ^ 0x80; goto CONV_END;
-conv_x123_x923: as_u32(dst) = as_u32(src) ^ 0x800000; goto CONV_END;
-conv_x123_329x: as_u32(dst) = swab32(as_u32(src)) ^ 0x8000; goto CONV_END;
-conv_x123_9230: as_u32(dst) = (as_u32(src) ^ 0x800000) << 8; goto CONV_END;
-conv_x123_0329: as_u32(dst) = (swab32(as_u32(src)) >> 8) ^ 0x80; goto CONV_END;
-conv_123x_xxx3: as_u8(dst) = (as_u32(src) >> 8) & 0xff; goto CONV_END;
-conv_123x_xx32: as_u16(dst) = swab16(as_u32(src) >> 8); goto CONV_END;
-conv_123x_xx23: as_u16(dst) = (as_u32(src) >> 8) & 0xffff; goto CONV_END;
-conv_123x_x321: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_123x_123x: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_123x_3210: as_u32(dst) = swab32(as_u32(src)) << 8; goto CONV_END;
-conv_123x_0123: as_u32(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_123x_xxxB: as_u8(dst) = ((as_u32(src) >> 8) & 0xff) ^ 0x80; goto CONV_END;
-conv_123x_xxB2: as_u16(dst) = swab16((as_u32(src) >> 8) ^ 0x80); goto CONV_END;
-conv_123x_xx2B: as_u16(dst) = ((as_u32(src) >> 8) & 0xffff) ^ 0x80; goto CONV_END;
-conv_123x_xB21: as_u32(dst) = swab32(as_u32(src)) ^ 0x800000; goto CONV_END;
-conv_123x_12Bx: as_u32(dst) = as_u32(src) ^ 0x8000; goto CONV_END;
-conv_123x_B210: as_u32(dst) = swab32(as_u32(src) ^ 0x8000) << 8; goto CONV_END;
-conv_123x_012B: as_u32(dst) = (as_u32(src) >> 8) ^ 0x80; goto CONV_END;
-conv_1234_xxx1: as_u8(dst) = as_u32(src) >> 24; goto CONV_END;
-conv_1234_xx12: as_u16(dst) = as_u32(src) >> 16; goto CONV_END;
-conv_1234_xx21: as_u16(dst) = swab16(as_u32(src) >> 16); goto CONV_END;
-conv_1234_x123: as_u32(dst) = as_u32(src) >> 8; goto CONV_END;
-conv_1234_321x: as_u32(dst) = swab32(as_u32(src)) << 8; goto CONV_END;
-conv_1234_1234: as_u32(dst) = as_u32(src); goto CONV_END;
-conv_1234_4321: as_u32(dst) = swab32(as_u32(src)); goto CONV_END;
-conv_1234_xxx9: as_u8(dst) = (as_u32(src) >> 24) ^ 0x80; goto CONV_END;
-conv_1234_xx92: as_u16(dst) = (as_u32(src) >> 16) ^ 0x8000; goto CONV_END;
-conv_1234_xx29: as_u16(dst) = swab16(as_u32(src) >> 16) ^ 0x80; goto CONV_END;
-conv_1234_x923: as_u32(dst) = (as_u32(src) >> 8) ^ 0x800000; goto CONV_END;
-conv_1234_329x: as_u32(dst) = (swab32(as_u32(src)) ^ 0x80) << 8; goto CONV_END;
-conv_1234_9234: as_u32(dst) = as_u32(src) ^ 0x80000000; goto CONV_END;
-conv_1234_4329: as_u32(dst) = swab32(as_u32(src)) ^ 0x80; goto CONV_END;
-conv_1234_xxx4: as_u8(dst) = as_u32(src) & 0xff; goto CONV_END;
-conv_1234_xx43: as_u16(dst) = swab16(as_u32(src)); goto CONV_END;
-conv_1234_xx34: as_u16(dst) = as_u32(src) & 0xffff; goto CONV_END;
-conv_1234_x432: as_u32(dst) = swab32(as_u32(src)) >> 8; goto CONV_END;
-conv_1234_234x: as_u32(dst) = as_u32(src) << 8; goto CONV_END;
-conv_1234_xxxC: as_u8(dst) = (as_u32(src) & 0xff) ^ 0x80; goto CONV_END;
-conv_1234_xxC3: as_u16(dst) = swab16(as_u32(src) ^ 0x80); goto CONV_END;
-conv_1234_xx3C: as_u16(dst) = (as_u32(src) & 0xffff) ^ 0x80; goto CONV_END;
-conv_1234_xC32: as_u32(dst) = (swab32(as_u32(src)) >> 8) ^ 0x800000; goto CONV_END;
-conv_1234_23Cx: as_u32(dst) = (as_u32(src) ^ 0x80) << 8; goto CONV_END;
-conv_1234_C321: as_u32(dst) = swab32(as_u32(src) ^ 0x80); goto CONV_END;
-conv_1234_123C: as_u32(dst) = as_u32(src) ^ 0x80; goto CONV_END;
-}
-#endif
-
-#ifdef GET_S16_LABELS
-/* src_wid src_endswap unsigned */
-static void *get_s16_labels[4 * 2 * 2] = {
-        &&get_s16_xxx1_xx10,     /*  8h -> 16h */
-        &&get_s16_xxx1_xx90,     /*  8h ^> 16h */
-        &&get_s16_xxx1_xx10,     /*  8s -> 16h */
-        &&get_s16_xxx1_xx90,     /*  8s ^> 16h */
-        &&get_s16_xx12_xx12,     /* 16h -> 16h */
-        &&get_s16_xx12_xx92,     /* 16h ^> 16h */
-        &&get_s16_xx12_xx21,     /* 16s -> 16h */
-        &&get_s16_xx12_xxA1,     /* 16s ^> 16h */
-        &&get_s16_x123_xx12,     /* 24h -> 16h */
-        &&get_s16_x123_xx92,     /* 24h ^> 16h */
-        &&get_s16_123x_xx32,     /* 24s -> 16h */
-        &&get_s16_123x_xxB2,     /* 24s ^> 16h */
-        &&get_s16_1234_xx12,     /* 32h -> 16h */
-        &&get_s16_1234_xx92,     /* 32h ^> 16h */
-        &&get_s16_1234_xx43,     /* 32s -> 16h */
-        &&get_s16_1234_xxC3,     /* 32s ^> 16h */
-};
-#endif
-
-#ifdef GET_S16_END
-while(0) {
-get_s16_xxx1_xx10: sample = (u_int16_t)as_u8(src) << 8; goto GET_S16_END;
-get_s16_xxx1_xx90: sample = (u_int16_t)(as_u8(src) ^ 0x80) << 8; goto GET_S16_END;
-get_s16_xx12_xx12: sample = as_u16(src); goto GET_S16_END;
-get_s16_xx12_xx92: sample = as_u16(src) ^ 0x8000; goto GET_S16_END;
-get_s16_xx12_xx21: sample = swab16(as_u16(src)); goto GET_S16_END;
-get_s16_xx12_xxA1: sample = swab16(as_u16(src) ^ 0x80); goto GET_S16_END;
-get_s16_x123_xx12: sample = as_u32(src) >> 8; goto GET_S16_END;
-get_s16_x123_xx92: sample = (as_u32(src) >> 8) ^ 0x8000; goto GET_S16_END;
-get_s16_123x_xx32: sample = swab16(as_u32(src) >> 8); goto GET_S16_END;
-get_s16_123x_xxB2: sample = swab16((as_u32(src) >> 8) ^ 0x8000); goto GET_S16_END;
-get_s16_1234_xx12: sample = as_u32(src) >> 16; goto GET_S16_END;
-get_s16_1234_xx92: sample = (as_u32(src) >> 16) ^ 0x8000; goto GET_S16_END;
-get_s16_1234_xx43: sample = swab16(as_u32(src)); goto GET_S16_END;
-get_s16_1234_xxC3: sample = swab16(as_u32(src) ^ 0x80); goto GET_S16_END;
-}
-#endif
-
-#ifdef PUT_S16_LABELS
-/* dst_wid dst_endswap unsigned */
-static void *put_s16_labels[4 * 2 * 2] = {
-        &&put_s16_xx12_xxx1,     /* 16h ->  8h */
-        &&put_s16_xx12_xxx9,     /* 16h ^>  8h */
-        &&put_s16_xx12_xxx1,     /* 16h ->  8s */
-        &&put_s16_xx12_xxx9,     /* 16h ^>  8s */
-        &&put_s16_xx12_xx12,     /* 16h -> 16h */
-        &&put_s16_xx12_xx92,     /* 16h ^> 16h */
-        &&put_s16_xx12_xx21,     /* 16h -> 16s */
-        &&put_s16_xx12_xx29,     /* 16h ^> 16s */
-        &&put_s16_xx12_x120,     /* 16h -> 24h */
-        &&put_s16_xx12_x920,     /* 16h ^> 24h */
-        &&put_s16_xx12_021x,     /* 16h -> 24s */
-        &&put_s16_xx12_029x,     /* 16h ^> 24s */
-        &&put_s16_xx12_1200,     /* 16h -> 32h */
-        &&put_s16_xx12_9200,     /* 16h ^> 32h */
-        &&put_s16_xx12_0021,     /* 16h -> 32s */
-        &&put_s16_xx12_0029,     /* 16h ^> 32s */
-};
-#endif
-
-#ifdef PUT_S16_END
-while (0) {
-put_s16_xx12_xxx1: as_u8(dst) = sample >> 8; goto PUT_S16_END;
-put_s16_xx12_xxx9: as_u8(dst) = (sample >> 8) ^ 0x80; goto PUT_S16_END;
-put_s16_xx12_xx12: as_u16(dst) = sample; goto PUT_S16_END;
-put_s16_xx12_xx92: as_u16(dst) = sample ^ 0x8000; goto PUT_S16_END;
-put_s16_xx12_xx21: as_u16(dst) = swab16(sample); goto PUT_S16_END;
-put_s16_xx12_xx29: as_u16(dst) = swab16(sample) ^ 0x80; goto PUT_S16_END;
-put_s16_xx12_x120: as_u32(dst) = (u_int32_t)sample << 8; goto PUT_S16_END;
-put_s16_xx12_x920: as_u32(dst) = (u_int32_t)(sample ^ 0x8000) << 8; goto PUT_S16_END;
-put_s16_xx12_021x: as_u32(dst) = (u_int32_t)swab16(sample) << 8; goto PUT_S16_END;
-put_s16_xx12_029x: as_u32(dst) = (u_int32_t)(swab16(sample) ^ 0x80) << 8; goto PUT_S16_END;
-put_s16_xx12_1200: as_u32(dst) = (u_int32_t)sample << 16; goto PUT_S16_END;
-put_s16_xx12_9200: as_u32(dst) = (u_int32_t)(sample ^ 0x8000) << 16; goto PUT_S16_END;
-put_s16_xx12_0021: as_u32(dst) = (u_int32_t)swab16(sample); goto PUT_S16_END;
-put_s16_xx12_0029: as_u32(dst) = (u_int32_t)swab16(sample) ^ 0x80; goto PUT_S16_END;
-}
-#endif
-
-#undef as_u8
-#undef as_u16
-#undef as_u32
-#undef as_s8
-#undef as_s16
-#undef as_s32
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 18d8a0f4e816..9eb267913c38 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -1,6 +1,6 @@
 /*
  *  Rate conversion Plug-In
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -20,9 +20,6 @@
  */
   
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/time.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -340,5 +337,3 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index 46917dc0196b..de3ffdeaf7e3 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -20,9 +20,6 @@
  */
 
 #include <sound/driver.h>
-
-#ifdef CONFIG_SND_PCM_OSS_PLUGINS
-
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <sound/core.h>
@@ -108,5 +105,3 @@ int snd_pcm_plugin_build_route(struct snd_pcm_substream *plug,
         *r_plugin = plugin;
         return 0;
 }
-
-#endif
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 2743414fc8fa..cf9b9493d41d 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <sound/control.h>
 #include <sound/info.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Abramo Bagnara <abramo@alsa-project.org>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Abramo Bagnara <abramo@alsa-project.org>");
 MODULE_DESCRIPTION("Midlevel PCM code for ALSA.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 9fefcaa2c324..806f1fba5446 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Abramo Bagnara <abramo@alsa-project.org>
  *
  *
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index 95b1b2f0b1e2..a13e38cfd2c6 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 0019c59a779d..dd9aa51d8c82 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -1,6 +1,6 @@
 /*
  *  PCM Interface - misc routines
- *  Copyright (c) 1998 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1998 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -422,38 +422,6 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
 
 EXPORT_SYMBOL(snd_pcm_format_set_silence);
 
-/* [width][unsigned][bigendian] */
-static int linear_formats[4][2][2] = {
-        {{ SNDRV_PCM_FORMAT_S8, SNDRV_PCM_FORMAT_S8},
-         { SNDRV_PCM_FORMAT_U8, SNDRV_PCM_FORMAT_U8}},
-        {{SNDRV_PCM_FORMAT_S16_LE, SNDRV_PCM_FORMAT_S16_BE},
-         {SNDRV_PCM_FORMAT_U16_LE, SNDRV_PCM_FORMAT_U16_BE}},
-        {{SNDRV_PCM_FORMAT_S24_LE, SNDRV_PCM_FORMAT_S24_BE},
-         {SNDRV_PCM_FORMAT_U24_LE, SNDRV_PCM_FORMAT_U24_BE}},
-        {{SNDRV_PCM_FORMAT_S32_LE, SNDRV_PCM_FORMAT_S32_BE},
-         {SNDRV_PCM_FORMAT_U32_LE, SNDRV_PCM_FORMAT_U32_BE}}
-};
-
-/**
- * snd_pcm_build_linear_format - return the suitable linear format for the given condition
- * @width: the bit-width
- * @unsignd: 1 if unsigned, 0 if signed.
- * @big_endian: 1 if big-endian, 0 if little-endian
- *
- * Returns the suitable linear format for the given condition.
- */
-snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian)
-{
-        if (width & 7)
-                return SND_PCM_FORMAT_UNKNOWN;
-        width = (width / 8) - 1;
-        if (width < 0 || width >= 4)
-                return SND_PCM_FORMAT_UNKNOWN;
-        return linear_formats[width][!!unsignd][!!big_endian];
-}
-
-EXPORT_SYMBOL(snd_pcm_build_linear_format);
-
 /**
  * snd_pcm_limit_hw_rates - determine rate_min/rate_max fields
  * @runtime: the runtime instance
@@ -465,21 +433,16 @@ EXPORT_SYMBOL(snd_pcm_build_linear_format);
  */
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
 {
-        static unsigned rates[] = {
-                /* ATTENTION: these values depend on the definition in pcm.h! */
-                5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
-                64000, 88200, 96000, 176400, 192000
-        };
         int i;
-        for (i = 0; i < (int)ARRAY_SIZE(rates); i++) {
+        for (i = 0; i < (int)snd_pcm_known_rates.count; i++) {
                 if (runtime->hw.rates & (1 << i)) {
-                        runtime->hw.rate_min = rates[i];
+                        runtime->hw.rate_min = snd_pcm_known_rates.list[i];
                         break;
                 }
         }
-        for (i = (int)ARRAY_SIZE(rates) - 1; i >= 0; i--) {
+        for (i = (int)snd_pcm_known_rates.count - 1; i >= 0; i--) {
                 if (runtime->hw.rates & (1 << i)) {
-                        runtime->hw.rate_max = rates[i];
+                        runtime->hw.rate_max = snd_pcm_known_rates.list[i];
                         break;
                 }
         }
@@ -487,3 +450,21 @@ int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
 }
 
 EXPORT_SYMBOL(snd_pcm_limit_hw_rates);
+
+/**
+ * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit
+ * @rate: the sample rate to convert
+ *
+ * Returns the SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or
+ * SNDRV_PCM_RATE_KNOT for an unknown rate.
+ */
+unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)
+{
+        unsigned int i;
+
+        for (i = 0; i < snd_pcm_known_rates.count; i++)
+                if (snd_pcm_known_rates.list[i] == rate)
+                        return 1u << i;
+        return SNDRV_PCM_RATE_KNOT;
+}
+EXPORT_SYMBOL(snd_pcm_rate_to_rate_bit);
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 59b29cd482ae..fb3dde4db045 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -1787,12 +1787,18 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,
 static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,
                                  48000, 64000, 88200, 96000, 176400, 192000 };
 
+const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {
+        .count = ARRAY_SIZE(rates),
+        .list = rates,
+};
+
 static int snd_pcm_hw_rule_rate(struct snd_pcm_hw_params *params,
                                 struct snd_pcm_hw_rule *rule)
 {
         struct snd_pcm_hardware *hw = rule->private;
         return snd_interval_list(hw_param_interval(params, rule->var),
-                                 ARRAY_SIZE(rates), rates, hw->rates);
+                                 snd_pcm_known_rates.count,
+                                 snd_pcm_known_rates.list, hw->rates);
 }               
 
 static int snd_pcm_hw_rule_buffer_bytes_max(struct snd_pcm_hw_params *params,
diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c
index d94ed16d21ea..23aa9a27e215 100644
--- a/sound/core/pcm_timer.c
+++ b/sound/core/pcm_timer.c
@@ -1,6 +1,6 @@
 /*
  *  Digital Audio (PCM) abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index e470c3c7d611..b8e700b94e59 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1,6 +1,6 @@
 /*
  *  Abstract layer for MIDI v1.0 stream
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -30,14 +30,13 @@
 #include <linux/mutex.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
-#include <linux/wait.h>
 #include <sound/rawmidi.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/minors.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Midlevel RawMidi code for ALSA.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index 402e2b4a34c6..ceef14afee30 100644
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
 #
 
 obj-$(CONFIG_SND) += instr/
diff --git a/sound/core/seq/instr/Makefile b/sound/core/seq/instr/Makefile
index 69138f30a293..608960364813 100644
--- a/sound/core/seq/instr/Makefile
+++ b/sound/core/seq/instr/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ainstr-fm-objs := ainstr_fm.o
diff --git a/sound/core/seq/instr/ainstr_gf1.c b/sound/core/seq/instr/ainstr_gf1.c
index c640e1cf854d..49400262b1eb 100644
--- a/sound/core/seq/instr/ainstr_gf1.c
+++ b/sound/core/seq/instr/ainstr_gf1.c
@@ -1,6 +1,6 @@
 /*
  *   GF1 (GUS) Patch - Instrument routines
- *   Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *   Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -26,7 +26,7 @@
 #include <sound/initval.h>
 #include <asm/uaccess.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture GF1 (GUS) Patch support.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/seq/instr/ainstr_iw.c b/sound/core/seq/instr/ainstr_iw.c
index 5367baee2d08..6c40eb73fa9f 100644
--- a/sound/core/seq/instr/ainstr_iw.c
+++ b/sound/core/seq/instr/ainstr_iw.c
@@ -1,6 +1,6 @@
 /*
  *   IWFFFF - AMD InterWave (tm) - Instrument routines
- *   Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *   Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -26,7 +26,7 @@
 #include <sound/initval.h>
 #include <asm/uaccess.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture IWFFFF support.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/seq/instr/ainstr_simple.c b/sound/core/seq/instr/ainstr_simple.c
index ac717bef9d77..78f68bee24fe 100644
--- a/sound/core/seq/instr/ainstr_simple.c
+++ b/sound/core/seq/instr/ainstr_simple.c
@@ -1,6 +1,6 @@
 /*
  *   Simple (MOD player) - Instrument routines
- *   Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *   Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -26,7 +26,7 @@
 #include <sound/initval.h>
 #include <asm/uaccess.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture Simple Instrument support.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/seq/oss/Makefile b/sound/core/seq/oss/Makefile
index a37ddedf7107..b38406b8463c 100644
--- a/sound/core/seq/oss/Makefile
+++ b/sound/core/seq/oss/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-seq-oss-objs  := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
index ca5a2ed4d7c3..d0d721c22eac 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -176,29 +176,29 @@ snd_seq_oss_open(struct file *file, int level)
         int i, rc;
         struct seq_oss_devinfo *dp;
 
-        if ((dp = kzalloc(sizeof(*dp), GFP_KERNEL)) == NULL) {
+        dp = kzalloc(sizeof(*dp), GFP_KERNEL);
+        if (!dp) {
                 snd_printk(KERN_ERR "can't malloc device info\n");
                 return -ENOMEM;
         }
         debug_printk(("oss_open: dp = %p\n", dp));
 
+        dp->cseq = system_client;
+        dp->port = -1;
+        dp->queue = -1;
+
         for (i = 0; i < SNDRV_SEQ_OSS_MAX_CLIENTS; i++) {
                 if (client_table[i] == NULL)
                         break;
         }
+
+        dp->index = i;
         if (i >= SNDRV_SEQ_OSS_MAX_CLIENTS) {
                 snd_printk(KERN_ERR "too many applications\n");
-                kfree(dp);
-                return -ENOMEM;
+                rc = -ENOMEM;
+                goto _error;
         }
 
-        dp->index = i;
-        dp->cseq = system_client;
-        dp->port = -1;
-        dp->queue = -1;
-        dp->readq = NULL;
-        dp->writeq = NULL;
-
         /* look up synth and midi devices */
         snd_seq_oss_synth_setup(dp);
         snd_seq_oss_midi_setup(dp);
@@ -211,14 +211,16 @@ snd_seq_oss_open(struct file *file, int level)
 
         /* create port */
         debug_printk(("create new port\n"));
-        if ((rc = create_port(dp)) < 0) {
+        rc = create_port(dp);
+        if (rc < 0) {
                 snd_printk(KERN_ERR "can't create port\n");
                 goto _error;
         }
 
         /* allocate queue */
         debug_printk(("allocate queue\n"));
-        if ((rc = alloc_seq_queue(dp)) < 0)
+        rc = alloc_seq_queue(dp);
+        if (rc < 0)
                 goto _error;
 
         /* set address */
@@ -235,7 +237,8 @@ snd_seq_oss_open(struct file *file, int level)
         /* initialize read queue */
         debug_printk(("initialize read queue\n"));
         if (is_read_mode(dp->file_mode)) {
-                if ((dp->readq = snd_seq_oss_readq_new(dp, maxqlen)) == NULL) {
+                dp->readq = snd_seq_oss_readq_new(dp, maxqlen);
+                if (!dp->readq) {
                         rc = -ENOMEM;
                         goto _error;
                 }
@@ -245,7 +248,7 @@ snd_seq_oss_open(struct file *file, int level)
         debug_printk(("initialize write queue\n"));
         if (is_write_mode(dp->file_mode)) {
                 dp->writeq = snd_seq_oss_writeq_new(dp, maxqlen);
-                if (dp->writeq == NULL) {
+                if (!dp->writeq) {
                         rc = -ENOMEM;
                         goto _error;
                 }
@@ -253,7 +256,8 @@ snd_seq_oss_open(struct file *file, int level)
 
         /* initialize timer */
         debug_printk(("initialize timer\n"));
-        if ((dp->timer = snd_seq_oss_timer_new(dp)) == NULL) {
+        dp->timer = snd_seq_oss_timer_new(dp);
+        if (!dp->timer) {
                 snd_printk(KERN_ERR "can't alloc timer\n");
                 rc = -ENOMEM;
                 goto _error;
@@ -276,11 +280,13 @@ snd_seq_oss_open(struct file *file, int level)
         return 0;
 
  _error:
+        snd_seq_oss_writeq_delete(dp->writeq);
+        snd_seq_oss_readq_delete(dp->readq);
         snd_seq_oss_synth_cleanup(dp);
         snd_seq_oss_midi_cleanup(dp);
-        i = dp->queue;
         delete_port(dp);
-        delete_seq_queue(i);
+        delete_seq_queue(dp->queue);
+        kfree(dp);
 
         return rc;
 }
diff --git a/sound/core/seq/oss/seq_oss_writeq.c b/sound/core/seq/oss/seq_oss_writeq.c
index 5c8495601a38..217424858191 100644
--- a/sound/core/seq/oss/seq_oss_writeq.c
+++ b/sound/core/seq/oss/seq_oss_writeq.c
@@ -63,8 +63,10 @@ snd_seq_oss_writeq_new(struct seq_oss_devinfo *dp, int maxlen)
 void
 snd_seq_oss_writeq_delete(struct seq_oss_writeq *q)
 {
-        snd_seq_oss_writeq_clear(q);    /* to be sure */
-        kfree(q);
+        if (q) {
+                snd_seq_oss_writeq_clear(q);    /* to be sure */
+                kfree(q);
+        }
 }
 
 
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c
index 2f0d8773ac6b..1878208a8026 100644
--- a/sound/core/seq/seq.c
+++ b/sound/core/seq/seq.c
@@ -53,7 +53,7 @@ int seq_default_timer_device =
 int seq_default_timer_subdevice = 0;
 int seq_default_timer_resolution = 0;   /* Hz */
 
-MODULE_AUTHOR("Frank van de Pol <fvdpol@coil.demon.nl>, Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Frank van de Pol <fvdpol@coil.demon.nl>, Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer.");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index b31b5282a2c8..2e3fa25ab19f 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1,7 +1,7 @@
 /*
  *  ALSA sequencer Client Manager
  *  Copyright (c) 1998-2001 by Frank van de Pol <fvdpol@coil.demon.nl>
- *                             Jaroslav Kysela <perex@suse.cz>
+ *                             Jaroslav Kysela <perex@perex.cz>
  *                             Takashi Iwai <tiwai@suse.de>
  *
  *
diff --git a/sound/core/seq/seq_instr.c b/sound/core/seq/seq_instr.c
index 5efe6523a589..9a6fd56c9109 100644
--- a/sound/core/seq/seq_instr.c
+++ b/sound/core/seq/seq_instr.c
@@ -1,6 +1,6 @@
 /*
  *   Generic Instrument routines for ALSA sequencer
- *   Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *   Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -26,7 +26,7 @@
 #include <sound/seq_instr.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer instrument library.");
 MODULE_LICENSE("GPL");
 
@@ -109,7 +109,7 @@ void snd_seq_instr_list_free(struct snd_seq_kinstr_list **list_ptr)
                         spin_lock_irqsave(&list->lock, flags);
                         while (instr->use) {
                                 spin_unlock_irqrestore(&list->lock, flags);
-                                schedule_timeout(1);
+                                schedule_timeout_uninterruptible(1);
                                 spin_lock_irqsave(&list->lock, flags);
                         }                               
                         spin_unlock_irqrestore(&list->lock, flags);
@@ -198,8 +198,10 @@ int snd_seq_instr_list_free_cond(struct snd_seq_kinstr_list *list,
                 while (flist) {
                         instr = flist;
                         flist = instr->next;
-                        while (instr->use)
-                                schedule_timeout(1);
+                        while (instr->use) {
+                                schedule_timeout_uninterruptible(1);
+                                barrier();
+                        }
                         if (snd_seq_instr_free(instr, atomic)<0)
                                 snd_printk(KERN_WARNING "instrument free problem\n");
                         instr = next;
@@ -555,7 +557,7 @@ static int instr_free(struct snd_seq_kinstr_ops *ops,
                                            SNDRV_SEQ_INSTR_NOTIFY_REMOVE);
                 while (instr->use) {
                         spin_unlock_irqrestore(&list->lock, flags);
-                        schedule_timeout(1);
+                        schedule_timeout_uninterruptible(1);
                         spin_lock_irqsave(&list->lock, flags);
                 }                               
                 spin_unlock_irqrestore(&list->lock, flags);
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index a3dc5e01e9f2..a72a1945bf8a 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -1,7 +1,7 @@
 /*
  *  ALSA sequencer Memory Manager
  *  Copyright (c) 1998 by Frank van de Pol <fvdpol@coil.demon.nl>
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *                2000 by Takashi Iwai <tiwai@suse.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 1daa5b069c79..5929aaf1df9d 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -1,7 +1,7 @@
 /*
  *   Generic MIDI synth driver for ALSA sequencer
  *   Copyright (c) 1998 by Frank van de Pol <fvdpol@coil.demon.nl>
- *                         Jaroslav Kysela <perex@suse.cz>
+ *                         Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -40,7 +40,7 @@ Possible options for midisynth module:
 #include <sound/seq_midi_event.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Frank van de Pol <fvdpol@coil.demon.nl>, Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Frank van de Pol <fvdpol@coil.demon.nl>, Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer MIDI synth.");
 MODULE_LICENSE("GPL");
 static int output_buffer_size = PAGE_SIZE;
diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c
index 5ff80b776906..b6820a5a73fc 100644
--- a/sound/core/seq/seq_midi_event.c
+++ b/sound/core/seq/seq_midi_event.c
@@ -2,7 +2,7 @@
  *  MIDI byte <-> sequencer event coder
  *
  *  Copyright (C) 1998,99 Takashi Iwai <tiwai@suse.de>,
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -28,14 +28,13 @@
 #include <sound/seq_midi_event.h>
 #include <sound/asoundef.h>
 
-MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("MIDI byte <-> sequencer event coder");
 MODULE_LICENSE("GPL");
 
-/* queue type */
-/* from 0 to 7 are normal commands (note off, on, etc.) */
-#define ST_NOTEOFF      0
-#define ST_NOTEON       1
+/* event type, index into status_event[] */
+/* from 0 to 6 are normal commands (note off, on, etc.) for 0x9?-0xe? */
+#define ST_INVALID      7
 #define ST_SPECIAL      8
 #define ST_SYSEX        ST_SPECIAL
 /* from 8 to 15 are events for 0xf0-0xf7 */
@@ -65,32 +64,33 @@ static struct status_event_list {
         void (*encode)(struct snd_midi_event *dev, struct snd_seq_event *ev);
         void (*decode)(struct snd_seq_event *ev, unsigned char *buf);
 } status_event[] = {
-        /* 0x80 - 0xf0 */
-        {SNDRV_SEQ_EVENT_NOTEOFF,       2, note_event, note_decode},
-        {SNDRV_SEQ_EVENT_NOTEON,        2, note_event, note_decode},
-        {SNDRV_SEQ_EVENT_KEYPRESS,      2, note_event, note_decode},
-        {SNDRV_SEQ_EVENT_CONTROLLER,    2, two_param_ctrl_event, two_param_decode},
-        {SNDRV_SEQ_EVENT_PGMCHANGE,     1, one_param_ctrl_event, one_param_decode},
-        {SNDRV_SEQ_EVENT_CHANPRESS,     1, one_param_ctrl_event, one_param_decode},
-        {SNDRV_SEQ_EVENT_PITCHBEND,     2, pitchbend_ctrl_event, pitchbend_decode},
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xf0 */
+        /* 0x80 - 0xef */
+        {SNDRV_SEQ_EVENT_NOTEOFF,        2, note_event, note_decode},
+        {SNDRV_SEQ_EVENT_NOTEON,         2, note_event, note_decode},
+        {SNDRV_SEQ_EVENT_KEYPRESS,       2, note_event, note_decode},
+        {SNDRV_SEQ_EVENT_CONTROLLER,     2, two_param_ctrl_event, two_param_decode},
+        {SNDRV_SEQ_EVENT_PGMCHANGE,      1, one_param_ctrl_event, one_param_decode},
+        {SNDRV_SEQ_EVENT_CHANPRESS,      1, one_param_ctrl_event, one_param_decode},
+        {SNDRV_SEQ_EVENT_PITCHBEND,      2, pitchbend_ctrl_event, pitchbend_decode},
+        /* invalid */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL},
         /* 0xf0 - 0xff */
-        {SNDRV_SEQ_EVENT_SYSEX,         1, NULL, NULL}, /* sysex: 0xf0 */
-        {SNDRV_SEQ_EVENT_QFRAME,        1, one_param_event, one_param_decode}, /* 0xf1 */
-        {SNDRV_SEQ_EVENT_SONGPOS,       2, songpos_event, songpos_decode}, /* 0xf2 */
-        {SNDRV_SEQ_EVENT_SONGSEL,       1, one_param_event, one_param_decode}, /* 0xf3 */
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xf4 */
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xf5 */
-        {SNDRV_SEQ_EVENT_TUNE_REQUEST,  0, NULL, NULL}, /* 0xf6 */
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xf7 */
-        {SNDRV_SEQ_EVENT_CLOCK,         0, NULL, NULL}, /* 0xf8 */
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xf9 */
-        {SNDRV_SEQ_EVENT_START,         0, NULL, NULL}, /* 0xfa */
-        {SNDRV_SEQ_EVENT_CONTINUE,      0, NULL, NULL}, /* 0xfb */
-        {SNDRV_SEQ_EVENT_STOP,          0, NULL, NULL}, /* 0xfc */
-        {SNDRV_SEQ_EVENT_NONE,          0, NULL, NULL}, /* 0xfd */
-        {SNDRV_SEQ_EVENT_SENSING,       0, NULL, NULL}, /* 0xfe */
-        {SNDRV_SEQ_EVENT_RESET,         0, NULL, NULL}, /* 0xff */
+        {SNDRV_SEQ_EVENT_SYSEX,          1, NULL, NULL}, /* sysex: 0xf0 */
+        {SNDRV_SEQ_EVENT_QFRAME,         1, one_param_event, one_param_decode}, /* 0xf1 */
+        {SNDRV_SEQ_EVENT_SONGPOS,        2, songpos_event, songpos_decode}, /* 0xf2 */
+        {SNDRV_SEQ_EVENT_SONGSEL,        1, one_param_event, one_param_decode}, /* 0xf3 */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL}, /* 0xf4 */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL}, /* 0xf5 */
+        {SNDRV_SEQ_EVENT_TUNE_REQUEST,   0, NULL, NULL}, /* 0xf6 */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL}, /* 0xf7 */
+        {SNDRV_SEQ_EVENT_CLOCK,          0, NULL, NULL}, /* 0xf8 */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL}, /* 0xf9 */
+        {SNDRV_SEQ_EVENT_START,          0, NULL, NULL}, /* 0xfa */
+        {SNDRV_SEQ_EVENT_CONTINUE,       0, NULL, NULL}, /* 0xfb */
+        {SNDRV_SEQ_EVENT_STOP,           0, NULL, NULL}, /* 0xfc */
+        {SNDRV_SEQ_EVENT_NONE,          -1, NULL, NULL}, /* 0xfd */
+        {SNDRV_SEQ_EVENT_SENSING,        0, NULL, NULL}, /* 0xfe */
+        {SNDRV_SEQ_EVENT_RESET,          0, NULL, NULL}, /* 0xff */
 };
 
 static int extra_decode_ctrl14(struct snd_midi_event *dev, unsigned char *buf, int len,
@@ -129,6 +129,7 @@ int snd_midi_event_new(int bufsize, struct snd_midi_event **rdev)
         }
         dev->bufsize = bufsize;
         dev->lastcmd = 0xff;
+        dev->type = ST_INVALID;
         spin_lock_init(&dev->lock);
         *rdev = dev;
         return 0;
@@ -149,7 +150,7 @@ static inline void reset_encode(struct snd_midi_event *dev)
 {
         dev->read = 0;
         dev->qlen = 0;
-        dev->type = 0;
+        dev->type = ST_INVALID;
 }
 
 void snd_midi_event_reset_encode(struct snd_midi_event *dev)
@@ -251,29 +252,31 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,
                 ev->type = status_event[ST_SPECIAL + c - 0xf0].event;
                 ev->flags &= ~SNDRV_SEQ_EVENT_LENGTH_MASK;
                 ev->flags |= SNDRV_SEQ_EVENT_LENGTH_FIXED;
-                return 1;
+                return ev->type != SNDRV_SEQ_EVENT_NONE;
         }
 
         spin_lock_irqsave(&dev->lock, flags);
-        if (dev->qlen > 0) {
-                /* rest of command */
-                dev->buf[dev->read++] = c;
-                if (dev->type != ST_SYSEX)
-                        dev->qlen--;
-        } else {
+        if ((c & 0x80) &&
+            (c != MIDI_CMD_COMMON_SYSEX_END || dev->type != ST_SYSEX)) {
                 /* new command */
+                dev->buf[0] = c;
+                if ((c & 0xf0) == 0xf0) /* system messages */
+                        dev->type = (c & 0x0f) + ST_SPECIAL;
+                else
+                        dev->type = (c >> 4) & 0x07;
                 dev->read = 1;
-                if (c & 0x80) {
-                        dev->buf[0] = c;
-                        if ((c & 0xf0) == 0xf0) /* special events */
-                                dev->type = (c & 0x0f) + ST_SPECIAL;
-                        else
-                                dev->type = (c >> 4) & 0x07;
-                        dev->qlen = status_event[dev->type].qlen;
-                } else {
-                        /* process this byte as argument */
+                dev->qlen = status_event[dev->type].qlen;
+        } else {
+                if (dev->qlen > 0) {
+                        /* rest of command */
                         dev->buf[dev->read++] = c;
+                        if (dev->type != ST_SYSEX)
+                                dev->qlen--;
+                } else {
+                        /* running status */
+                        dev->buf[1] = c;
                         dev->qlen = status_event[dev->type].qlen - 1;
+                        dev->read = 2;
                 }
         }
         if (dev->qlen == 0) {
@@ -282,6 +285,8 @@ int snd_midi_event_encode_byte(struct snd_midi_event *dev, int c,
                 ev->flags |= SNDRV_SEQ_EVENT_LENGTH_FIXED;
                 if (status_event[dev->type].encode) /* set data values */
                         status_event[dev->type].encode(dev, ev);
+                if (dev->type >= ST_SPECIAL)
+                        dev->type = ST_INVALID;
                 rc = 1;
         } else  if (dev->type == ST_SYSEX) {
                 if (c == MIDI_CMD_COMMON_SYSEX_END ||
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index eefd1cf872b4..b6e23ad12ab9 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA sequencer Ports
  *   Copyright (c) 1998 by Frank van de Pol <fvdpol@coil.demon.nl>
- *                         Jaroslav Kysela <perex@suse.cz>
+ *                         Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c
index b4b9a132cb16..8716352afc81 100644
--- a/sound/core/seq/seq_timer.c
+++ b/sound/core/seq/seq_timer.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA sequencer Timer
  *   Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
- *                              Jaroslav Kysela <perex@suse.cz>
+ *                              Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 8dc7a3b32b98..7b486c4d70db 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -1,6 +1,6 @@
 /*
  *  Advanced Linux Sound Architecture
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@ EXPORT_SYMBOL(snd_major);
 
 static int cards_limit = 1;
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture driver for soundcards.");
 MODULE_LICENSE("GPL");
 module_param(major, int, 0444);
@@ -266,6 +266,14 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
         snd_minors[minor] = preg;
         preg->dev = device_create(sound_class, device, MKDEV(major, minor),
                                   "%s", name);
+        if (IS_ERR(preg->dev)) {
+                snd_minors[minor] = NULL;
+                mutex_unlock(&sound_mutex);
+                minor = PTR_ERR(preg->dev);
+                kfree(preg);
+                return minor;
+        }
+
         if (preg->dev)
                 dev_set_drvdata(preg->dev, private_data);
 
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 4566df41912a..dc73313b733a 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -1,6 +1,6 @@
 /*
  *  Advanced Linux Sound Architecture
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/core/timer.c b/sound/core/timer.c
index f2bbacedd567..e7dc56ca4b97 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1,6 +1,6 @@
 /*
  *  Timers abstract layer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@
 #endif
 
 static int timer_limit = DEFAULT_TIMER_LIMIT;
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Takashi Iwai <tiwai@suse.de>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ALSA timer interface");
 MODULE_LICENSE("GPL");
 module_param(timer_limit, int, 0444);
diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index 04112642611a..80aeff5ccdea 100644
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-dummy-objs := dummy.o
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 4360ae9de19c..e008f3c58eac 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -1,6 +1,6 @@
 /*
  *  Dummy soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -34,7 +34,7 @@
 #include <sound/rawmidi.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Dummy soundcard (/dev/null)");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");
@@ -510,15 +510,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_dummy, -4500, 30, 0);
   .get = snd_dummy_capsrc_get, .put = snd_dummy_capsrc_put, \
   .private_value = addr }
 
-static int snd_dummy_capsrc_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_dummy_capsrc_info   snd_ctl_boolean_stereo_info
  
 static int snd_dummy_capsrc_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/drivers/mpu401/Makefile b/sound/drivers/mpu401/Makefile
index 3fe185d19ae5..918f83f34c11 100644
--- a/sound/drivers/mpu401/Makefile
+++ b/sound/drivers/mpu401/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-mpu401-objs := mpu401.o
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 67c6e9745418..1fc95dadde1d 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for generic MPU-401 boards (UART mode only)
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) 2004 by Castet Matthieu <castet.matthieu@free.fr>
  *
  *
@@ -30,7 +30,7 @@
 #include <sound/mpu401.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("MPU-401 UART");
 MODULE_LICENSE("GPL");
 
@@ -70,6 +70,9 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
         struct snd_card *card;
         int err;
 
+        if (!uart_enter[dev])
+                snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
+
         *rcard = NULL;
         card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
         if (card == NULL)
@@ -83,8 +86,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
                 strcat(card->longname, "polled");
         }
 
-        err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev],
-                                  uart_enter[dev] ? 0 : MPU401_INFO_UART_ONLY,
+        err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,
                                   irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                   NULL);
         if (err < 0) {
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 85aedc348e2d..3306ecd49243 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of MPU-401 in UART mode
  *
  *  MPU-401 supports UART mode which is not capable generate transmit
@@ -39,7 +39,7 @@
 #include <sound/core.h>
 #include <sound/mpu401.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of MPU-401 in UART mode");
 MODULE_LICENSE("GPL");
 
@@ -270,8 +270,7 @@ static int snd_mpu401_do_reset(struct snd_mpu401 *mpu)
 {
         if (snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1))
                 return -EIO;
-        if (!(mpu->info_flags & MPU401_INFO_UART_ONLY) &&
-            snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1))
+        if (snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 0))
                 return -EIO;
         return 0;
 }
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 2025db5947ae..911c159bb3d3 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -440,15 +440,7 @@ static void mts64_write_midi(struct mts64 *mts, u8 c,
  *********************************************************************/
 
 /* SMPTE Switch */
-static int snd_mts64_ctl_smpte_switch_info(struct snd_kcontrol *kctl,
-                                           struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_mts64_ctl_smpte_switch_info         snd_ctl_boolean_mono_info
 
 static int snd_mts64_ctl_smpte_switch_get(struct snd_kcontrol* kctl,
                                           struct snd_ctl_elem_value *uctl)
diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile
index 12059785b5cb..19767a6a5c54 100644
--- a/sound/drivers/opl3/Makefile
+++ b/sound/drivers/opl3/Makefile
@@ -1,13 +1,11 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-opl3-lib-objs := opl3_lib.o opl3_synth.o
-snd-opl3-synth-objs := opl3_seq.o opl3_midi.o opl3_drums.o
-ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
-snd-opl3-synth-objs += opl3_oss.o
-endif
+snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o
+snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o
 
 #
 # this function returns:
diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index 87fe376f38f0..a2b9ce060295 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Hannu Savolainen 1993-1996,
  *                   Rob Hooft
  *                   
@@ -31,7 +31,7 @@
 #include <linux/ioport.h>
 #include <sound/minors.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Hannu Savolainen 1993-1996, Rob Hooft");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Hannu Savolainen 1993-1996, Rob Hooft");
 MODULE_DESCRIPTION("Routines for control of AdLib FM cards (OPL2/OPL3/OPL4 chips)");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/drivers/opl4/Makefile b/sound/drivers/opl4/Makefile
index 141aacbaf315..d178b39ffa60 100644
--- a/sound/drivers/opl4/Makefile
+++ b/sound/drivers/opl4/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index d3e6a20edd38..65de3a755ddb 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -1,6 +1,6 @@
 /*
  *   serial.c
- *   Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *   Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                    Isaku Yamahata <yamahata@private.email.ne.jp>,
  *                    George Hansper <ghansper@apana.org.au>,
  *                    Hannu Savolainen
diff --git a/sound/drivers/vx/Makefile b/sound/drivers/vx/Makefile
index 269bd8544a5d..9a168a3c1560 100644
--- a/sound/drivers/vx/Makefile
+++ b/sound/drivers/vx/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-vx-lib-objs := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o
diff --git a/sound/drivers/vx/vx_mixer.c b/sound/drivers/vx/vx_mixer.c
index f63152a6a223..b8fcd79a7e11 100644
--- a/sound/drivers/vx/vx_mixer.c
+++ b/sound/drivers/vx/vx_mixer.c
@@ -647,14 +647,7 @@ static int vx_audio_monitor_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
         return 0;
 }
 
-static int vx_audio_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define vx_audio_sw_info        snd_ctl_boolean_stereo_info
 
 static int vx_audio_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -865,14 +858,7 @@ static int vx_peak_meter_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
         return 0;
 }
 
-static int vx_saturation_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define vx_saturation_info      snd_ctl_boolean_stereo_info
 
 static int vx_saturation_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile
index 45902d48c89c..37970666a453 100644
--- a/sound/i2c/Makefile
+++ b/sound/i2c/Makefile
@@ -1,15 +1,13 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-i2c-objs := i2c.o
 snd-cs8427-objs := cs8427.o
 snd-tea6330t-objs := tea6330t.o
 
-ifeq ($(subst m,y,$(CONFIG_L3)),y)
-  obj-$(CONFIG_L3) += l3/
-endif
+obj-$(CONFIG_L3) += l3/
 
 obj-$(CONFIG_SND) += other/
 
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index 64388cb8d6e5..744366b72345 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -1,7 +1,7 @@
 /*
  *  Routines for control of the CS8427 via i2c bus
  *  IEC958 (S/PDIF) receiver & transmitter by Cirrus Logic
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 static void snd_cs8427_reset(struct snd_i2c_device *cs8427);
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("IEC958 (S/PDIF) receiver & transmitter by Cirrus Logic");
 MODULE_LICENSE("GPL");
 
@@ -229,6 +229,12 @@ int snd_cs8427_create(struct snd_i2c_bus *bus,
         snd_i2c_lock(bus);
         err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);
         if (err != CS8427_VER8427A) {
+                /* give second chance */
+                snd_printk(KERN_WARNING "invalid CS8427 signature 0x%x: "
+                           "let me try again...\n", err);
+                err = snd_cs8427_reg_read(device, CS8427_REG_ID_AND_VER);
+        }
+        if (err != CS8427_VER8427A) {
                 snd_i2c_unlock(bus);
                 snd_printk(KERN_ERR "unable to find CS8427 signature "
                            "(expected 0x%x, read 0x%x),\n",
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c
index b60fb1892828..1e58a963b2a7 100644
--- a/sound/i2c/i2c.c
+++ b/sound/i2c/i2c.c
@@ -2,7 +2,7 @@
  *   Generic i2c interface for ALSA
  *
  *   (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
- *   Modified for the ALSA driver by Jaroslav Kysela <perex@suse.cz>
+ *   Modified for the ALSA driver by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -28,7 +28,7 @@
 #include <sound/core.h>
 #include <sound/i2c.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Generic i2c interface for ALSA");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/i2c/other/Makefile b/sound/i2c/other/Makefile
index 77a8a7c75dd9..703d954238f4 100644
--- a/sound/i2c/other/Makefile
+++ b/sound/i2c/other/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ak4114-objs := ak4114.o
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 1efb973137a6..facde46f957a 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -1,7 +1,7 @@
 /*
  *  Routines for control of the AK4114 via I2C and 4-wire serial interface
  *  IEC958 (S/PDIF) receiver by Asahi Kasei
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <sound/ak4114.h>
 #include <sound/asoundef.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("AK4114 IEC958 (S/PDIF) receiver by Asahi Kasei");
 MODULE_LICENSE("GPL");
 
@@ -200,15 +200,7 @@ static int snd_ak4114_in_error_get(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int snd_ak4114_in_bit_info(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ak4114_in_bit_info          snd_ctl_boolean_mono_info
 
 static int snd_ak4114_in_bit_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c
index c022f29da2f7..ee1585aec99b 100644
--- a/sound/i2c/other/ak4117.c
+++ b/sound/i2c/other/ak4117.c
@@ -1,7 +1,7 @@
 /*
  *  Routines for control of the AK4117 via 4-wire serial interface
  *  IEC958 (S/PDIF) receiver by Asahi Kasei
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <sound/ak4117.h>
 #include <sound/asoundef.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("AK4117 IEC958 (S/PDIF) receiver by Asahi Kasei");
 MODULE_LICENSE("GPL");
 
@@ -181,15 +181,7 @@ static int snd_ak4117_in_error_get(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int snd_ak4117_in_bit_info(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ak4117_in_bit_info          snd_ctl_boolean_mono_info
 
 static int snd_ak4117_in_bit_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c
index fd335159f849..de03f689fa2e 100644
--- a/sound/i2c/other/ak4xxx-adda.c
+++ b/sound/i2c/other/ak4xxx-adda.c
@@ -2,7 +2,7 @@
  *   ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4358 / AK4381
  *   AD and DA converters
  *
- *      Copyright (c) 2000-2004 Jaroslav Kysela <perex@suse.cz>,
+ *      Copyright (c) 2000-2004 Jaroslav Kysela <perex@perex.cz>,
  *                              Takashi Iwai <tiwai@suse.de>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include <sound/tlv.h>
 #include <sound/ak4xxx-adda.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Takashi Iwai <tiwai@suse.de>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("Routines for control of AK452x / AK43xx  AD/DA converters");
 MODULE_LICENSE("GPL");
 
@@ -463,15 +463,7 @@ static int snd_akm4xxx_deemphasis_put(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-static int ak4xxx_switch_info(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define ak4xxx_switch_info      snd_ctl_boolean_mono_info
 
 static int ak4xxx_switch_get(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c
index e91cc3b44de5..00c83d8b32b1 100644
--- a/sound/i2c/other/pt2258.c
+++ b/sound/i2c/other/pt2258.c
@@ -140,15 +140,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol,
         return -EIO;
 }
 
-static int pt2258_switch_info(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define pt2258_switch_info      snd_ctl_boolean_mono_info
 
 static int pt2258_switch_get(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 4c2fd14c1056..fe31bb5cffb8 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA driver for TEA5757/5759 Philips AM/FM radio tuner chips
  *
- *      Copyright (c) 2004 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 #include <sound/core.h>
 #include <sound/tea575x-tuner.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
index ae5b1e3a68ce..9bab744af0ef 100644
--- a/sound/i2c/tea6330t.c
+++ b/sound/i2c/tea6330t.c
@@ -1,7 +1,7 @@
 /*
  *  Routines for control of the TEA6330T circuit via i2c bus
  *  Sound fader control circuit for car radios by Philips Semiconductors
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #include <sound/control.h>
 #include <sound/tea6330t.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of the TEA6330T circuit via i2c bus");
 MODULE_LICENSE("GPL");
 
@@ -142,15 +142,7 @@ static int snd_tea6330t_put_master_volume(struct snd_kcontrol *kcontrol,
   .info = snd_tea6330t_info_master_switch, \
   .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch }
 
-static int snd_tea6330t_info_master_switch(struct snd_kcontrol *kcontrol,
-                                           struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_tea6330t_info_master_switch         snd_ctl_boolean_stereo_info
 
 static int snd_tea6330t_get_master_switch(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index ea5084abe60f..2639a6ab8f2e 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -191,6 +191,19 @@ config SND_ES18XX
           To compile this driver as a module, choose M here: the module
           will be called snd-es18xx.
 
+config SND_SC6000
+        tristate "Gallant SC-6000, Audio Excel DSP 16"
+        depends on SND && HAS_IOPORT
+        select SND_AD1848_LIB
+        select SND_OPL3_LIB
+        select SND_MPU401_UART
+        help
+          Say Y here to include support for Gallant SC-6000 card and clones:
+          Audio Excel DSP 16 and Zoltrix AV302.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-sc6000.
+
 config SND_GUS_SYNTH
         tristate
 
@@ -414,7 +427,7 @@ config SND_SSCAPE
 config SND_WAVEFRONT
         tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
         depends on SND
-        select FW_LOADER if !SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+        select FW_LOADER
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_CS4231_LIB
@@ -430,8 +443,9 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
         depends on SND_WAVEFRONT
         default y
         help
-          Say Y here to include the static firmware built in the kernel
-          for the Wavefront driver.  If you choose N here, you need to
-          install the firmware files from the alsa-firmware package.
+          Say Y here to include the static firmware for FX DSP built in
+          the kernel for the Wavefront driver.  If you choose N here,
+          you need to install the firmware files from the
+          alsa-firmware package.
 
 endmenu
diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index bb317ccc170f..c0ce7db2a1b5 100644
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-adlib-objs := adlib.o
@@ -10,6 +10,7 @@ snd-cmi8330-objs := cmi8330.o
 snd-dt019x-objs := dt019x.o
 snd-es18xx-objs := es18xx.o
 snd-opl3sa2-objs := opl3sa2.o
+snd-sc6000-objs := sc6000.o
 snd-sgalaxy-objs := sgalaxy.o
 snd-sscape-objs := sscape.o
 
@@ -21,6 +22,7 @@ obj-$(CONFIG_SND_CMI8330) += snd-cmi8330.o
 obj-$(CONFIG_SND_DT019X) += snd-dt019x.o
 obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o
 obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
+obj-$(CONFIG_SND_SC6000) += snd-sc6000.o
 obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
 obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o
 
diff --git a/sound/isa/ad1816a/Makefile b/sound/isa/ad1816a/Makefile
index 90e00e842e49..487ab23860e3 100644
--- a/sound/isa/ad1816a/Makefile
+++ b/sound/isa/ad1816a/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ad1816a-objs := ad1816a.o ad1816a_lib.o
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index ec9209cd5177..cf18fe4617a1 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -453,7 +453,6 @@ static int snd_ad1816a_playback_open(struct snd_pcm_substream *substream)
 
         if ((error = snd_ad1816a_open(chip, AD1816A_MODE_PLAYBACK)) < 0)
                 return error;
-        snd_pcm_set_sync(substream);
         runtime->hw = snd_ad1816a_playback;
         snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.buffer_bytes_max);
         snd_pcm_limit_isa_dma_size(chip->dma1, &runtime->hw.period_bytes_max);
@@ -469,7 +468,6 @@ static int snd_ad1816a_capture_open(struct snd_pcm_substream *substream)
 
         if ((error = snd_ad1816a_open(chip, AD1816A_MODE_CAPTURE)) < 0)
                 return error;
-        snd_pcm_set_sync(substream);
         runtime->hw = snd_ad1816a_capture;
         snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.buffer_bytes_max);
         snd_pcm_limit_isa_dma_size(chip->dma2, &runtime->hw.period_bytes_max);
diff --git a/sound/isa/ad1848/Makefile b/sound/isa/ad1848/Makefile
index 45d59998aa69..ae23331e9200 100644
--- a/sound/isa/ad1848/Makefile
+++ b/sound/isa/ad1848/Makefile
@@ -1,15 +1,12 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ad1848-lib-objs := ad1848_lib.o
 snd-ad1848-objs := ad1848.o
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_CMI8330) += snd-ad1848-lib.o
-obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o
-obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o
+obj-$(CONFIG_SND_AD1848) += snd-ad1848.o
+obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
 
-obj-m := $(sort $(obj-m))
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index d09a7fa86545..a4710b5e214c 100644
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -1,8 +1,8 @@
 /*
  *  Generic driver for AD1848/AD1847/CS4248 chips (0.1 Alpha)
  *  Copyright (c) by Tugrul Galatali <galatalt@stuy.edu>,
- *                   Jaroslav Kysela <perex@suse.cz>
- *  Based on card-4232.c by Jaroslav Kysela <perex@suse.cz>
+ *                   Jaroslav Kysela <perex@perex.cz>
+ *  Based on card-4232.c by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
 #define DEV_NAME "ad1848"
 
 MODULE_DESCRIPTION(CRD_NAME);
-MODULE_AUTHOR("Tugrul Galatali <galatalt@stuy.edu>, Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Tugrul Galatali <galatalt@stuy.edu>, Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1848},"
                 "{Analog Devices,AD1847},"
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 1bc2e3fd5721..a901cd1ee692 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of AD1848/AD1847/CS4248
  *
  *
@@ -35,7 +35,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of AD1848/AD1847/CS4248");
 MODULE_LICENSE("GPL");
 
@@ -70,7 +70,7 @@ static unsigned int rates[14] = {
 };
 
 static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
-        .count = 14,
+        .count = ARRAY_SIZE(rates),
         .list = rates,
         .mask = 0,
 };
@@ -99,24 +99,32 @@ static unsigned char snd_ad1848_original_image[16] =
  *  Basic I/O functions
  */
 
-void snd_ad1848_out(struct snd_ad1848 *chip,
-                           unsigned char reg,
-                           unsigned char value)
+static void snd_ad1848_wait(struct snd_ad1848 *chip)
 {
         int timeout;
 
-        for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
+        for (timeout = 250; timeout > 0; timeout--) {
+                if ((inb(AD1848P(chip, REGSEL)) & AD1848_INIT) == 0)
+                        break;
                 udelay(100);
+        }
+}
+
+void snd_ad1848_out(struct snd_ad1848 *chip,
+                           unsigned char reg,
+                           unsigned char value)
+{
+        snd_ad1848_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
-                snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
+                snd_printk(KERN_WARNING "auto calibration time out - "
+                           "reg = 0x%x, value = 0x%x\n", reg, value);
 #endif
         outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
         outb(chip->image[reg] = value, AD1848P(chip, REG));
         mb();
-#if 0
-        printk("codec out - reg 0x%x = 0x%x\n", chip->mce_bit | reg, value);
-#endif
+        snd_printdd("codec out - reg 0x%x = 0x%x\n",
+                        chip->mce_bit | reg, value);
 }
 
 EXPORT_SYMBOL(snd_ad1848_out);
@@ -124,10 +132,7 @@ EXPORT_SYMBOL(snd_ad1848_out);
 static void snd_ad1848_dout(struct snd_ad1848 *chip,
                             unsigned char reg, unsigned char value)
 {
-        int timeout;
-
-        for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
-                udelay(100);
+        snd_ad1848_wait(chip);
         outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
         outb(value, AD1848P(chip, REG));
         mb();
@@ -135,13 +140,11 @@ static void snd_ad1848_dout(struct snd_ad1848 *chip,
 
 static unsigned char snd_ad1848_in(struct snd_ad1848 *chip, unsigned char reg)
 {
-        int timeout;
-
-        for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
-                udelay(100);
+        snd_ad1848_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
-                snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x\n", reg);
+                snd_printk(KERN_WARNING "auto calibration time out - "
+                           "reg = 0x%x\n", reg);
 #endif
         outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
         mb();
@@ -183,8 +186,7 @@ static void snd_ad1848_mce_up(struct snd_ad1848 *chip)
         unsigned long flags;
         int timeout;
 
-        for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
-                udelay(100);
+        snd_ad1848_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
                 snd_printk(KERN_WARNING "mce_up - auto calibration time out (0)\n");
@@ -201,9 +203,8 @@ static void snd_ad1848_mce_up(struct snd_ad1848 *chip)
 
 static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
 {
-        unsigned long flags;
-        int timeout;
-        signed long time;
+        unsigned long flags, timeout;
+        int reg;
 
         spin_lock_irqsave(&chip->reg_lock, flags);
         for (timeout = 5; timeout > 0; timeout--)
@@ -211,61 +212,48 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
         /* end of cleanup sequence */
         for (timeout = 12000; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
                 udelay(100);
-#if 0
-        printk("(1) timeout = %i\n", timeout);
-#endif
+
+        snd_printdd("(1) timeout = %d\n", timeout);
+
 #ifdef CONFIG_SND_DEBUG
         if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
                 snd_printk(KERN_WARNING "mce_down [0x%lx] - auto calibration time out (0)\n", AD1848P(chip, REGSEL));
 #endif
+
         chip->mce_bit &= ~AD1848_MCE;
-        timeout = inb(AD1848P(chip, REGSEL));
-        outb(chip->mce_bit | (timeout & 0x1f), AD1848P(chip, REGSEL));
-        if (timeout == 0x80)
+        reg = inb(AD1848P(chip, REGSEL));
+        outb(chip->mce_bit | (reg & 0x1f), AD1848P(chip, REGSEL));
+        if (reg == 0x80)
                 snd_printk(KERN_WARNING "mce_down [0x%lx]: serious init problem - codec still busy\n", chip->port);
-        if ((timeout & AD1848_MCE) == 0) {
+        if ((reg & AD1848_MCE) == 0) {
                 spin_unlock_irqrestore(&chip->reg_lock, flags);
                 return;
         }
-        /* calibration process */
 
-        for (timeout = 500; timeout > 0 && (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) == 0; timeout--);
-        if ((snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) == 0) {
-                snd_printd("mce_down - auto calibration time out (1)\n");
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
-                return;
-        }
-#if 0
-        printk("(2) timeout = %i, jiffies = %li\n", timeout, jiffies);
-#endif
-        time = HZ / 4;
-        while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) {
+        /*
+         * Wait for auto-calibration (AC) process to finish, i.e. ACI to go low.
+         * It may take up to 5 sample periods (at most 907 us @ 5.5125 kHz) for
+         * the process to _start_, so it is important to wait at least that long
+         * before checking.  Otherwise we might think AC has finished when it
+         * has in fact not begun.  It could take 128 (no AC) or 384 (AC) cycles
+         * for ACI to drop.  This gives a wait of at most 70 ms with a more
+         * typical value of 3-9 ms.
+         */
+        timeout = jiffies + msecs_to_jiffies(250);
+        do {
                 spin_unlock_irqrestore(&chip->reg_lock, flags);
-                if (time <= 0) {
-                        snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
-                        return;
-                }
-                time = schedule_timeout(time);
+                msleep(1);
                 spin_lock_irqsave(&chip->reg_lock, flags);
-        }
-#if 0
-        printk("(3) jiffies = %li\n", jiffies);
-#endif
-        time = HZ / 10;
-        while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) {
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
-                if (time <= 0) {
-                        snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
-                        return;
-                }
-                time = schedule_timeout(time);
-                spin_lock_irqsave(&chip->reg_lock, flags);
-        }
+                reg = snd_ad1848_in(chip, AD1848_TEST_INIT) &
+                      AD1848_CALIB_IN_PROGRESS;
+        } while (reg && time_before(jiffies, timeout));
         spin_unlock_irqrestore(&chip->reg_lock, flags);
-#if 0
-        printk("(4) jiffies = %li\n", jiffies);
-        snd_printk("mce_down - exit = 0x%x\n", inb(AD1848P(chip, REGSEL)));
-#endif
+        if (reg)
+                snd_printk(KERN_ERR
+                           "mce_down - auto calibration time out (2)\n");
+
+        snd_printdd("(4) jiffies = %lu\n", jiffies);
+        snd_printd("mce_down - exit = 0x%x\n", inb(AD1848P(chip, REGSEL)));
 }
 
 static unsigned int snd_ad1848_get_count(unsigned char format,
@@ -319,11 +307,11 @@ static unsigned char snd_ad1848_get_rate(unsigned int rate)
 {
         int i;
 
-        for (i = 0; i < 14; i++)
+        for (i = 0; i < ARRAY_SIZE(rates); i++)
                 if (rate == rates[i])
                         return freq_bits[i];
         snd_BUG();
-        return freq_bits[13];
+        return freq_bits[ARRAY_SIZE(rates) - 1];
 }
 
 static int snd_ad1848_ioctl(struct snd_pcm_substream *substream,
@@ -390,11 +378,9 @@ static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
 {
         unsigned long flags;
 
-        mutex_lock(&chip->open_mutex);
-        if (chip->mode & AD1848_MODE_OPEN) {
-                mutex_unlock(&chip->open_mutex);
+        if (chip->mode & AD1848_MODE_OPEN)
                 return -EAGAIN;
-        }
+
         snd_ad1848_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
@@ -435,7 +421,6 @@ static int snd_ad1848_open(struct snd_ad1848 *chip, unsigned int mode)
         spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         chip->mode = mode;
-        mutex_unlock(&chip->open_mutex);
 
         return 0;
 }
@@ -444,11 +429,8 @@ static void snd_ad1848_close(struct snd_ad1848 *chip)
 {
         unsigned long flags;
 
-        mutex_lock(&chip->open_mutex);
-        if (!chip->mode) {
-                mutex_unlock(&chip->open_mutex);
+        if (!chip->mode)
                 return;
-        }
         /* disable IRQ */
         spin_lock_irqsave(&chip->reg_lock, flags);
         outb(0, AD1848P(chip, STATUS)); /* clear IRQ */
@@ -474,7 +456,6 @@ static void snd_ad1848_close(struct snd_ad1848 *chip)
         spin_unlock_irqrestore(&chip->reg_lock, flags);
 
         chip->mode = 0;
-        mutex_unlock(&chip->open_mutex);
 }
 
 /*
@@ -892,7 +873,6 @@ int snd_ad1848_create(struct snd_card *card,
         if (chip == NULL)
                 return -ENOMEM;
         spin_lock_init(&chip->reg_lock);
-        mutex_init(&chip->open_mutex);
         chip->card = card;
         chip->port = port;
         chip->irq = -1;
diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 2fb4f7409d7c..5067ee001933 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-cs4231-lib-objs := cs4231_lib.o
@@ -10,17 +10,8 @@ snd-cs4232-objs := cs4232.o
 snd-cs4236-objs := cs4236.o
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_OPL3SA2) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_CS4231) += snd-cs4231.o snd-cs4231-lib.o
-obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4231-lib.o
-obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o snd-cs4231-lib.o
-obj-$(CONFIG_SND_GUSMAX) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_INTERWAVE) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
-obj-$(CONFIG_SND_SSCAPE) += snd-cs4231-lib.o
+obj-$(CONFIG_SND_CS4231_LIB) += snd-cs4231-lib.o
+obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
+obj-$(CONFIG_SND_CS4232) += snd-cs4232.o
+obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o
 
-obj-m := $(sort $(obj-m))
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index ac4041134150..13db6842eaaa 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -1,6 +1,6 @@
 /*
  *  Generic driver for CS4231 chips
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Originally the CS4232/CS4232A driver, modified for use on CS4231 by
  *  Tugrul Galatali <galatalt@stuy.edu>
  *
@@ -36,7 +36,7 @@
 #define DEV_NAME "cs4231"
 
 MODULE_DESCRIPTION(CRD_NAME);
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Crystal Semiconductors,CS4231}}");
 
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index 914d77b61b0c..a5eb9659b519 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of CS4231(A)/CS4232/InterWave & compatible chips
  *
  *  Bugs:
@@ -39,7 +39,7 @@
 #include <asm/dma.h>
 #include <asm/irq.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of CS4231(A)/CS4232/InterWave & compatible chips");
 MODULE_LICENSE("GPL");
 
@@ -74,7 +74,7 @@ static unsigned int rates[14] = {
 };
 
 static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
-        .count = 14,
+        .count = ARRAY_SIZE(rates),
         .list = rates,
         .mask = 0,
 };
@@ -134,29 +134,31 @@ static inline u8 cs4231_inb(struct snd_cs4231 *chip, u8 offset)
         return inb(chip->port + offset);
 }
 
-static void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg,
-                            unsigned char mask, unsigned char value)
+static void snd_cs4231_wait(struct snd_cs4231 *chip)
 {
         int timeout;
-        unsigned char tmp;
 
         for (timeout = 250;
              timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
              timeout--)
                 udelay(100);
+}
+
+static void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg,
+                            unsigned char mask, unsigned char value)
+{
+        unsigned char tmp = (chip->image[reg] & mask) | value;
+
+        snd_cs4231_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT)
                 snd_printk("outm: auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
 #endif
-        if (chip->calibrate_mute) {
-                chip->image[reg] &= mask;
-                chip->image[reg] |= value;
-        } else {
+        chip->image[reg] = tmp;
+        if (!chip->calibrate_mute) {
                 cs4231_outb(chip, CS4231P(REGSEL), chip->mce_bit | reg);
-                mb();
-                tmp = (chip->image[reg] & mask) | value;
+                wmb();
                 cs4231_outb(chip, CS4231P(REG), tmp);
-                chip->image[reg] = tmp;
                 mb();
         }
 }
@@ -176,12 +178,7 @@ static void snd_cs4231_dout(struct snd_cs4231 *chip, unsigned char reg, unsigned
 
 void snd_cs4231_out(struct snd_cs4231 *chip, unsigned char reg, unsigned char value)
 {
-        int timeout;
-
-        for (timeout = 250;
-             timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
+        snd_cs4231_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT)
                 snd_printk("out: auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
@@ -190,19 +187,13 @@ void snd_cs4231_out(struct snd_cs4231 *chip, unsigned char reg, unsigned char va
         cs4231_outb(chip, CS4231P(REG), value);
         chip->image[reg] = value;
         mb();
-#if 0
-        printk("codec out - reg 0x%x = 0x%x\n", chip->mce_bit | reg, value);
-#endif
+        snd_printdd("codec out - reg 0x%x = 0x%x\n",
+                        chip->mce_bit | reg, value);
 }
 
 unsigned char snd_cs4231_in(struct snd_cs4231 *chip, unsigned char reg)
 {
-        int timeout;
-
-        for (timeout = 250;
-             timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
+        snd_cs4231_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT)
                 snd_printk("in: auto calibration time out - reg = 0x%x\n", reg);
@@ -304,8 +295,7 @@ void snd_cs4231_mce_up(struct snd_cs4231 *chip)
         unsigned long flags;
         int timeout;
 
-        for (timeout = 250; timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT); timeout--)
-                udelay(100);
+        snd_cs4231_wait(chip);
 #ifdef CONFIG_SND_DEBUG
         if (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT)
                 snd_printk("mce_up - auto calibration time out (0)\n");
@@ -323,12 +313,11 @@ void snd_cs4231_mce_up(struct snd_cs4231 *chip)
 void snd_cs4231_mce_down(struct snd_cs4231 *chip)
 {
         unsigned long flags;
+        unsigned long end_time;
         int timeout;
 
         snd_cs4231_busy_wait(chip);
-#if 0
-        printk("(1) timeout = %i\n", timeout);
-#endif
+
 #ifdef CONFIG_SND_DEBUG
         if (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT)
                 snd_printk("mce_down [0x%lx] - auto calibration time out (0)\n", (long)CS4231P(REGSEL));
@@ -346,42 +335,42 @@ void snd_cs4231_mce_down(struct snd_cs4231 *chip)
         }
         snd_cs4231_busy_wait(chip);
 
-        /* calibration process */
+        /*
+         * Wait for (possible -- during init auto-calibration may not be set)
+         * calibration process to start. Needs upto 5 sample periods on AD1848
+         * which at the slowest possible rate of 5.5125 kHz means 907 us.
+         */
+        msleep(1);
 
-        for (timeout = 500; timeout > 0 && (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0; timeout--)
-                udelay(10);
-        if ((snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0) {
-                snd_printd("cs4231_mce_down - auto calibration time out (1)\n");
-                return;
-        }
-#if 0
-        printk("(2) timeout = %i, jiffies = %li\n", timeout, jiffies);
-#endif
-        /* in 10 ms increments, check condition, up to 250 ms */
-        timeout = 25;
-        while (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) {
-                if (--timeout < 0) {
-                        snd_printk("mce_down - auto calibration time out (2)\n");
+        snd_printdd("(1) jiffies = %lu\n", jiffies);
+
+        /* check condition up to 250 ms */
+        end_time = jiffies + msecs_to_jiffies(250);
+        while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
+                CS4231_CALIB_IN_PROGRESS) {
+
+                if (time_after(jiffies, end_time)) {
+                        snd_printk(KERN_ERR "mce_down - "
+                                        "auto calibration time out (2)\n");
                         return;
                 }
-                msleep(10);
+                msleep(1);
         }
-#if 0
-        printk("(3) jiffies = %li\n", jiffies);
-#endif
-        /* in 10 ms increments, check condition, up to 100 ms */
-        timeout = 10;
+
+        snd_printdd("(2) jiffies = %lu\n", jiffies);
+
+        /* check condition up to 100 ms */
+        end_time = jiffies + msecs_to_jiffies(100);
         while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) {
-                if (--timeout < 0) {
+                if (time_after(jiffies, end_time)) {
                         snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
                         return;
                 }
-                msleep(10);
+                msleep(1);
         }
-#if 0
-        printk("(4) jiffies = %li\n", jiffies);
-        snd_printk("mce_down - exit = 0x%x\n", cs4231_inb(chip, CS4231P(REGSEL)));
-#endif
+
+        snd_printdd("(3) jiffies = %lu\n", jiffies);
+        snd_printd("mce_down - exit = 0x%x\n", cs4231_inb(chip, CS4231P(REGSEL)));
 }
 
 static unsigned int snd_cs4231_get_count(unsigned char format, unsigned int size)
@@ -459,11 +448,11 @@ static unsigned char snd_cs4231_get_rate(unsigned int rate)
 {
         int i;
 
-        for (i = 0; i < 14; i++)
+        for (i = 0; i < ARRAY_SIZE(rates); i++)
                 if (rate == rates[i])
                         return freq_bits[i];
         // snd_BUG();
-        return freq_bits[13];
+        return freq_bits[ARRAY_SIZE(rates) - 1];
 }
 
 static unsigned char snd_cs4231_get_format(struct snd_cs4231 *chip,
@@ -555,6 +544,8 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip,
                         snd_cs4231_out(chip, CS4231_PLAYBK_FORMAT, chip->image[CS4231_PLAYBK_FORMAT] = pdfr);
                 }
                 spin_unlock_irqrestore(&chip->reg_lock, flags);
+                if (chip->hardware == CS4231_HW_OPL3SA2)
+                        udelay(100);    /* this seems to help */
                 snd_cs4231_mce_down(chip);
         }
         snd_cs4231_calibrate_mute(chip, 0);
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 1a14f33b6ab0..5784b43f4123 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for generic CS4232/CS4235/CS4236/CS4236B/CS4237B/CS4238B/CS4239 chips
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #include <sound/opl3.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 #ifdef CS4232
 MODULE_DESCRIPTION("Cirrus Logic CS4232");
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 7a5a6c71f5e4..6bd064470d4c 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of CS4235/4236B/4237B/4238B/4239 chips
  *
  *  Note:
@@ -89,7 +89,7 @@
 #include <sound/cs4231.h>
 #include <sound/asoundef.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of CS4235/4236B/4237B/4238B/4239 chips");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/isa/es1688/Makefile b/sound/isa/es1688/Makefile
index 501c8bf903af..aee1e4ddb22a 100644
--- a/sound/isa/es1688/Makefile
+++ b/sound/isa/es1688/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-es1688-lib-objs := es1688_lib.o
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index edc398712e8b..74bbc92f2e7c 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for generic ESS AudioDrive ESx688 soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,7 @@
 #define DEV_NAME "es1688"
 
 MODULE_DESCRIPTION(CRD_NAME);
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{ESS,ES688 PnP AudioDrive,pnp:ESS0100},"
                 "{ESS,ES1688 PnP AudioDrive,pnp:ESS0102},"
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index a2ab99f2ac35..5c26d495daa8 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of ESS ES1688/688/488 chip
  *
  *
@@ -32,7 +32,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ESS ESx688 lowlevel module");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index f7732bf90be3..4a7367a8ff9d 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1071,14 +1071,7 @@ static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
         return (snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val) || retVal;
 }
 
-static int snd_es18xx_info_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es18xx_info_spatializer_enable      snd_ctl_boolean_mono_info
 
 static int snd_es18xx_get_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1120,14 +1113,7 @@ static int snd_es18xx_get_hw_volume(struct snd_kcontrol *kcontrol, struct snd_ct
         return 0;
 }
 
-static int snd_es18xx_info_hw_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es18xx_info_hw_switch       snd_ctl_boolean_stereo_info
 
 static int snd_es18xx_get_hw_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2042,6 +2028,7 @@ static int pnpc_registered;
 
 static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {
         { .id = "ESS1869" },
+        { .id = "ESS1879" },
         { .id = "" }            /* end */
 };
 
diff --git a/sound/isa/gus/Makefile b/sound/isa/gus/Makefile
index bae5dbd6c8e5..df3d59f25f5e 100644
--- a/sound/isa/gus/Makefile
+++ b/sound/isa/gus/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-gus-lib-objs := gus_main.o \
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index 44ee5d3674a1..fc905141e8a5 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for GF1 DMA control
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_dram.c b/sound/isa/gus/gus_dram.c
index f22fe7967fcc..9eaa932f6efe 100644
--- a/sound/isa/gus/gus_dram.c
+++ b/sound/isa/gus/gus_dram.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  DRAM access routines
  *
  *
diff --git a/sound/isa/gus/gus_instr.c b/sound/isa/gus/gus_instr.c
index d0c38e1856ef..bf137ea72329 100644
--- a/sound/isa/gus/gus_instr.c
+++ b/sound/isa/gus/gus_instr.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards - Synthesizer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_io.c b/sound/isa/gus/gus_io.c
index 9b1fe292de4d..3d4f899285ef 100644
--- a/sound/isa/gus/gus_io.c
+++ b/sound/isa/gus/gus_io.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  I/O routines for GF1/InterWave synthesizer chips
  *
  *
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index 537d3cfe41f3..cd9a6f1c99e6 100644
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -1,6 +1,6 @@
 /*
  *  Routine for IRQ handling from GF1/InterWave chip
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -45,11 +45,13 @@ __again:
         // snd_printk("IRQ: status = 0x%x\n", status);
         if (status & 0x02) {
                 STAT_ADD(gus->gf1.interrupt_stat_midi_in);
-                gus->gf1.interrupt_handler_midi_in(gus);
+                if (gus->gf1.interrupt_handler_midi_in)
+                        gus->gf1.interrupt_handler_midi_in(gus);
         }
         if (status & 0x01) {
                 STAT_ADD(gus->gf1.interrupt_stat_midi_out);
-                gus->gf1.interrupt_handler_midi_out(gus);
+                if (gus->gf1.interrupt_handler_midi_out)
+                        gus->gf1.interrupt_handler_midi_out(gus);
         }
         if (status & (0x20 | 0x40)) {
                 unsigned int already, _current_;
@@ -85,20 +87,24 @@ __again:
         }
         if (status & 0x04) {
                 STAT_ADD(gus->gf1.interrupt_stat_timer1);
-                gus->gf1.interrupt_handler_timer1(gus);
+                if (gus->gf1.interrupt_handler_timer1)
+                        gus->gf1.interrupt_handler_timer1(gus);
         }
         if (status & 0x08) {
                 STAT_ADD(gus->gf1.interrupt_stat_timer2);
-                gus->gf1.interrupt_handler_timer2(gus);
+                if (gus->gf1.interrupt_handler_timer2)
+                        gus->gf1.interrupt_handler_timer2(gus);
         }
         if (status & 0x80) {
                 if (snd_gf1_i_look8(gus, SNDRV_GF1_GB_DRAM_DMA_CONTROL) & 0x40) {
                         STAT_ADD(gus->gf1.interrupt_stat_dma_write);
-                        gus->gf1.interrupt_handler_dma_write(gus);
+                        if (gus->gf1.interrupt_handler_dma_write)
+                                gus->gf1.interrupt_handler_dma_write(gus);
                 }
                 if (snd_gf1_i_look8(gus, SNDRV_GF1_GB_REC_DMA_CONTROL) & 0x40) {
                         STAT_ADD(gus->gf1.interrupt_stat_dma_read);
-                        gus->gf1.interrupt_handler_dma_read(gus);
+                        if (gus->gf1.interrupt_handler_dma_read)
+                                gus->gf1.interrupt_handler_dma_read(gus);
                 }
         }
         if (--loop > 0)
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 8ced5e81b9a7..b14d5d6d9a32 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards");
 MODULE_LICENSE("GPL");
 
@@ -154,6 +154,14 @@ int snd_gus_create(struct snd_card *card,
         gus = kzalloc(sizeof(*gus), GFP_KERNEL);
         if (gus == NULL)
                 return -ENOMEM;
+        spin_lock_init(&gus->reg_lock);
+        spin_lock_init(&gus->voice_alloc);
+        spin_lock_init(&gus->active_voice_lock);
+        spin_lock_init(&gus->event_lock);
+        spin_lock_init(&gus->dma_lock);
+        spin_lock_init(&gus->pcm_volume_level_lock);
+        spin_lock_init(&gus->uart_cmd_lock);
+        mutex_init(&gus->dma_mutex);
         gus->gf1.irq = -1;
         gus->gf1.dma1 = -1;
         gus->gf1.dma2 = -1;
@@ -218,14 +226,6 @@ int snd_gus_create(struct snd_card *card,
         gus->gf1.pcm_channels = pcm_channels;
         gus->gf1.volume_ramp = 25;
         gus->gf1.smooth_pan = 1;
-        spin_lock_init(&gus->reg_lock);
-        spin_lock_init(&gus->voice_alloc);
-        spin_lock_init(&gus->active_voice_lock);
-        spin_lock_init(&gus->event_lock);
-        spin_lock_init(&gus->dma_lock);
-        spin_lock_init(&gus->pcm_volume_level_lock);
-        spin_lock_init(&gus->uart_cmd_lock);
-        mutex_init(&gus->dma_mutex);
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, gus, &ops)) < 0) {
                 snd_gus_free(gus);
                 return err;
@@ -398,7 +398,7 @@ static int snd_gus_check_version(struct snd_gus_card * gus)
                                 gus->ess_flag = 1;
                         } else {
                                 snd_printk(KERN_ERR "unknown GF1 revision number at 0x%lx - 0x%x (0x%x)\n", gus->gf1.port, rev, val);
-                                snd_printk(KERN_ERR "  please - report to <perex@suse.cz>\n");
+                                snd_printk(KERN_ERR "  please - report to <perex@perex.cz>\n");
                         }
                 }
         }
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index 7107753b85b5..bcf4656853c4 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  GUS's memory allocation routines / bottom layer
  *
  *
diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c
index 80f0a83818b2..f69a44728ebf 100644
--- a/sound/isa/gus/gus_mem_proc.c
+++ b/sound/isa/gus/gus_mem_proc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  GUS's memory access via proc filesystem
  *
  *
diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c
index acc25a297200..a96253e16654 100644
--- a/sound/isa/gus/gus_mixer.c
+++ b/sound/isa/gus/gus_mixer.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of ICS 2101 chip and "mixer" in GF1 chip
  *
  *
@@ -36,14 +36,7 @@
   .get = snd_gf1_get_single, .put = snd_gf1_put_single, \
   .private_value = shift | (invert << 8) }
 
-static int snd_gf1_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_gf1_info_single     snd_ctl_boolean_mono_info
 
 static int snd_gf1_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index c7f95e7aa018..a7971f5ffe63 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of GF1 chip (PCM things)
  *
  *  InterWave chips supports interleaved DMA, but this feature isn't used in
diff --git a/sound/isa/gus/gus_reset.c b/sound/isa/gus/gus_reset.c
index b263655c4116..20cfdb87f84a 100644
--- a/sound/isa/gus/gus_reset.c
+++ b/sound/isa/gus/gus_reset.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_sample.c b/sound/isa/gus/gus_sample.c
index 9e0c55ab25b2..cba0829a7106 100644
--- a/sound/isa/gus/gus_sample.c
+++ b/sound/isa/gus/gus_sample.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards - Sample support
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_simple.c b/sound/isa/gus/gus_simple.c
index dcad6ed0198c..39d121e2c8c4 100644
--- a/sound/isa/gus/gus_simple.c
+++ b/sound/isa/gus/gus_simple.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards - Simple instrument handlers
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_synth.c b/sound/isa/gus/gus_synth.c
index 3e4d4d6edd8b..2c2051782aa2 100644
--- a/sound/isa/gus/gus_synth.c
+++ b/sound/isa/gus/gus_synth.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards - Synthesizer
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #include <sound/gus.h>
 #include <sound/seq_device.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards - Synthesizer");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/isa/gus/gus_tables.h b/sound/isa/gus/gus_tables.h
index 4adf098d3269..42a4ca0d622b 100644
--- a/sound/isa/gus/gus_tables.h
+++ b/sound/isa/gus/gus_tables.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gus_timer.c b/sound/isa/gus/gus_timer.c
index a43b662f17c7..99eac573c414 100644
--- a/sound/isa/gus/gus_timer.c
+++ b/sound/isa/gus/gus_timer.c
@@ -1,6 +1,6 @@
 /*
  *  Routines for Gravis UltraSound soundcards - Timers
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *  GUS have similar timers as AdLib (OPL2/OPL3 chips).
  *
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c
index 654290a8b21c..e6fd9b01c492 100644
--- a/sound/isa/gus/gus_uart.c
+++ b/sound/isa/gus/gus_uart.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for the GF1 MIDI interface - like UART 6850
  *
  *
diff --git a/sound/isa/gus/gus_volume.c b/sound/isa/gus/gus_volume.c
index dbbc0a6d7659..71a67744a14b 100644
--- a/sound/isa/gus/gus_volume.c
+++ b/sound/isa/gus/gus_volume.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 8f23f433d491..29e422b00b58 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Gravis UltraSound Classic soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 #define DEV_NAME "gusclassic"
 
 MODULE_DESCRIPTION(CRD_NAME);
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Classic}}");
 
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 0aeaa6cf6cf0..fc59536c918e 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Gravis UltraSound Extreme soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
 #define DEV_NAME "gusextreme"
 
 MODULE_DESCRIPTION(CRD_NAME);
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound Extreme}}");
 
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index 708783d4351f..4922f5da08f9 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Gravis UltraSound MAX soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Gravis UltraSound MAX");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Gravis,UltraSound MAX}}");
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 0220cdbe1a2a..2091c50b2e3e 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for AMD InterWave soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
 #define SNDRV_LEGACY_FIND_FREE_DMA
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 #ifndef SNDRV_STB
 MODULE_DESCRIPTION("AMD InterWave");
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index e70db32991d9..59af9ab7191f 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Yamaha OPL3-SA[2,3] soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 
 #include <asm/io.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Yamaha OPL3SA2+");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF719E-S},"
@@ -253,6 +253,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_opl3sa2 *chip)
                 /* 0x03 - YM715B */
                 /* 0x04 - YM719 - OPL-SA4? */
                 /* 0x05 - OPL3-SA3 - Libretto 100 */
+                /* 0x07 - unknown - Neomagic MagicWave 3D */
                 break;
         }
         str[0] = chip->version + '0';
diff --git a/sound/isa/opti9xx/Makefile b/sound/isa/opti9xx/Makefile
index 0e41bfd5a403..b4d894db257a 100644
--- a/sound/isa/opti9xx/Makefile
+++ b/sound/isa/opti9xx/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-opti92x-ad1848-objs := opti92x-ad1848.o
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index cd29b30b362e..d295936611f8 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -242,14 +242,7 @@ static int aci_setvalue(struct snd_miro * miro, unsigned char index, int value)
  *  MIXER part
  */
 
-static int snd_miro_info_capture(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-
-        return 0;
-}
+#define snd_miro_info_capture   snd_ctl_boolean_mono_info
 
 static int snd_miro_get_capture(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
@@ -344,14 +337,7 @@ static int snd_miro_put_preamp(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-static int snd_miro_info_amp(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-
-        return 0;
-}
+#define snd_miro_info_amp       snd_ctl_boolean_mono_info
 
 static int snd_miro_get_amp(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 049d479ce2b3..ee1a824d8fc0 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -501,6 +501,16 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip)
                         (chip->hardware == OPTi9XX_HW_82C930 ? 0x00 : 0x04),
                         0x34);
                 snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x20, 0xbf);
+                /* 
+                 * The BTC 1817DW has QS1000 wavetable which is connected
+                 * to the serial digital input of the OPTI931.
+                 */
+                snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(21), 0x82, 0xff);
+                /* 
+                 * This bit sets OPTI931 to automaticaly select FM
+                 * or digital input signal.
+                 */
+                snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01);
                 break;
 #endif  /* OPTi93X */
 
@@ -1732,11 +1742,11 @@ static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
 
 #ifdef OPTi93X
         port = pnp_port_start(pdev, 0) - 4;
-        fm_port = pnp_port_start(pdev, 1);
+        fm_port = pnp_port_start(pdev, 1) + 8;
 #else
         if (pid->driver_data != 0x0924)
                 port = pnp_port_start(pdev, 1);
-        fm_port = pnp_port_start(pdev, 2);
+        fm_port = pnp_port_start(pdev, 2) + 8;
 #endif  /* OPTi93X */
         irq = pnp_irq(pdev, 0);
         dma1 = pnp_dma(pdev, 0);
diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile
index 556e66928029..c9d1c986d70e 100644
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-sb-common-objs := sb_common.o sb_mixer.o
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 658179e86142..4eea84cfd4f4 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *     and (c) 1999 Steve Ratcliffe <steve@parabola.demon.co.uk>
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
  *
diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
index 3d72742b342f..0c7905c85b76 100644
--- a/sound/isa/sb/emu8000_synth.c
+++ b/sound/isa/sb/emu8000_synth.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *     and (c) 1999 Steve Ratcliffe <steve@parabola.demon.co.uk>
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
  *
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index c4ba24bfd27c..e7f9edd92626 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for SoundBlaster 16/AWE32/AWE64 soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@
 #define PFX "sb16: "
 #endif
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_LICENSE("GPL");
 #ifndef SNDRV_SBAWE
 MODULE_DESCRIPTION("Sound Blaster 16");
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index b279f2308aef..3682059787ab 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -979,14 +979,7 @@ static int snd_sb_csp_restart(struct snd_sb_csp * p)
  * QSound mixer control for PCM
  */
 
-static int snd_sb_qsound_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_sb_qsound_switch_info       snd_ctl_boolean_mono_info
 
 static int snd_sb_qsound_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 5d4d3aafe2d5..c06754f7ee5d 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of 16-bit SoundBlaster cards and clones
  *  Note: This is very ugly hardware which uses one 8-bit DMA channel and
  *        second 16-bit DMA channel. Unfortunately 8-bit DMA channel can't
@@ -45,7 +45,7 @@
 #include <sound/control.h>
 #include <sound/info.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of 16-bit SoundBlaster cards and clones");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index a1b3786b391e..f933aef7d8a9 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for SoundBlaster 1.0/2.0/Pro soundcards and compatible
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include <sound/opl3.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Sound Blaster 1.0/2.0/Pro");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index aea9e5ec7b36..bee894b3f5c7 100644
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Uros Bizjak <uros@kss-loka.si>
  *
  *  Routines for control of 8-bit SoundBlaster cards and clones
@@ -38,7 +38,7 @@
 #include <sound/core.h>
 #include <sound/sb.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Uros Bizjak <uros@kss-loka.si>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Uros Bizjak <uros@kss-loka.si>");
 MODULE_DESCRIPTION("Routines for control of 8-bit SoundBlaster cards and clones");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c
index 0b67edd7ac6e..e56e5633411c 100644
--- a/sound/isa/sb/sb8_midi.c
+++ b/sound/isa/sb/sb8_midi.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of SoundBlaster cards - MIDI interface
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index efa9d5c2558a..176193c05101 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Uros Bizjak <uros@kss-loka.si>
  *
  *  Lowlevel routines for control of Sound Blaster cards
@@ -33,7 +33,7 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ALSA lowlevel driver for Sound Blaster cards");
 MODULE_LICENSE("GPL");
 
@@ -234,7 +234,9 @@ int snd_sbdsp_create(struct snd_card *card,
         chip->dma16 = -1;
         chip->port = port;
         
-        if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
+        if (request_irq(irq, irq_handler,
+                        (hardware == SB_HW_ALS4000 ||
+                         hardware == SB_HW_CS5530) ?
                         IRQF_SHARED : IRQF_DISABLED,
                         "SoundBlaster", (void *) chip)) {
                 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 3d4befcff28e..03241cd5aaef 100644
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for Sound Blaster mixer control
  *
  *
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
new file mode 100644
index 000000000000..94daf8399994
--- /dev/null
+++ b/sound/isa/sc6000.c
@@ -0,0 +1,656 @@
+/*
+ *  Driver for Gallant SC-6000 soundcard. This card is also known as
+ *  Audio Excel DSP 16 or Zoltrix AV302.
+ *  These cards use CompuMedia ASC-9308 chip + AD1848 codec.
+ *
+ *  Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl>
+ *
+ *  I don't have documentation for this card. I used the driver
+ *  for OSS/Free included in the kernel source as reference.
+ *
+ *  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 <sound/driver.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/isa.h>
+#include <linux/io.h>
+#include <asm/dma.h>
+#include <sound/core.h>
+#include <sound/ad1848.h>
+#include <sound/opl3.h>
+#include <sound/mpu401.h>
+#include <sound/control.h>
+#define SNDRV_LEGACY_FIND_FREE_IRQ
+#define SNDRV_LEGACY_FIND_FREE_DMA
+#include <sound/initval.h>
+
+MODULE_AUTHOR("Krzysztof Helt");
+MODULE_DESCRIPTION("Gallant SC-6000");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{Gallant, SC-6000},"
+                        "{AudioExcel, Audio Excel DSP 16},"
+                        "{Zoltrix, AV302}}");
+
+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;  /* Enable this card */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220, 0x240 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 5, 7, 9, 10, 11 */
+static long mss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x530, 0xe80 */
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+                                                /* 0x300, 0x310, 0x320, 0x330 */
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;    /* 5, 7, 9, 10, 0 */
+static int dma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;        /* 0, 1, 3 */
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for sc-6000 based soundcard.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for sc-6000 based soundcard.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable sc-6000 based soundcard.");
+module_param_array(port, long, NULL, 0444);
+MODULE_PARM_DESC(port, "Port # for sc-6000 driver.");
+module_param_array(mss_port, long, NULL, 0444);
+MODULE_PARM_DESC(mss_port, "MSS Port # for sc-6000 driver.");
+module_param_array(mpu_port, long, NULL, 0444);
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for sc-6000 driver.");
+module_param_array(irq, int, NULL, 0444);
+MODULE_PARM_DESC(irq, "IRQ # for sc-6000 driver.");
+module_param_array(mpu_irq, int, NULL, 0444);
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for sc-6000 driver.");
+module_param_array(dma, int, NULL, 0444);
+MODULE_PARM_DESC(dma, "DMA # for sc-6000 driver.");
+
+/*
+ * Commands of SC6000's DSP (SBPRO+special).
+ * Some of them are COMMAND_xx, in the future they may change.
+ */
+#define WRITE_MDIRQ_CFG 0x50    /* Set M&I&DRQ mask (the real config)   */
+#define COMMAND_52      0x52    /*                                      */
+#define READ_HARD_CFG   0x58    /* Read Hardware Config (I/O base etc)  */
+#define COMMAND_5C      0x5c    /*                                      */
+#define COMMAND_60      0x60    /*                                      */
+#define COMMAND_66      0x66    /*                                      */
+#define COMMAND_6C      0x6c    /*                                      */
+#define COMMAND_6E      0x6e    /*                                      */
+#define COMMAND_88      0x88    /* Unknown command                      */
+#define DSP_INIT_MSS    0x8c    /* Enable Microsoft Sound System mode   */
+#define COMMAND_C5      0xc5    /*                                      */
+#define GET_DSP_VERSION 0xe1    /* Get DSP Version                      */
+#define GET_DSP_COPYRIGHT 0xe3  /* Get DSP Copyright                    */
+
+/*
+ * Offsets of SC6000 DSP I/O ports. The offset is added to base I/O port
+ * to have the actual I/O port.
+ * Register permissions are:
+ * (wo) == Write Only
+ * (ro) == Read  Only
+ * (w-) == Write
+ * (r-) == Read
+ */
+#define DSP_RESET       0x06    /* offset of DSP RESET          (wo) */
+#define DSP_READ        0x0a    /* offset of DSP READ           (ro) */
+#define DSP_WRITE       0x0c    /* offset of DSP WRITE          (w-) */
+#define DSP_COMMAND     0x0c    /* offset of DSP COMMAND        (w-) */
+#define DSP_STATUS      0x0c    /* offset of DSP STATUS         (r-) */
+#define DSP_DATAVAIL    0x0e    /* offset of DSP DATA AVAILABLE (ro) */
+
+#define PFX "sc6000: "
+#define DRV_NAME "SC-6000"
+
+/* hardware dependent functions */
+
+/*
+ * sc6000_irq_to_softcfg - Decode irq number into cfg code.
+ */
+static __devinit unsigned char sc6000_irq_to_softcfg(int irq)
+{
+        unsigned char val = 0;
+
+        switch (irq) {
+        case 5:
+                val = 0x28;
+                break;
+        case 7:
+                val = 0x8;
+                break;
+        case 9:
+                val = 0x10;
+                break;
+        case 10:
+                val = 0x18;
+                break;
+        case 11:
+                val = 0x20;
+                break;
+        default:
+                break;
+        }
+        return val;
+}
+
+/*
+ * sc6000_dma_to_softcfg - Decode dma number into cfg code.
+ */
+static __devinit unsigned char sc6000_dma_to_softcfg(int dma)
+{
+        unsigned char val = 0;
+
+        switch (dma) {
+        case 0:
+                val = 1;
+                break;
+        case 1:
+                val = 2;
+                break;
+        case 3:
+                val = 3;
+                break;
+        default:
+                break;
+        }
+        return val;
+}
+
+/*
+ * sc6000_mpu_irq_to_softcfg - Decode MPU-401 irq number into cfg code.
+ */
+static __devinit unsigned char sc6000_mpu_irq_to_softcfg(int mpu_irq)
+{
+        unsigned char val = 0;
+
+        switch (mpu_irq) {
+        case 5:
+                val = 4;
+                break;
+        case 7:
+                val = 0x44;
+                break;
+        case 9:
+                val = 0x84;
+                break;
+        case 10:
+                val = 0xc4;
+                break;
+        default:
+                break;
+        }
+        return val;
+}
+
+static __devinit int sc6000_wait_data(char __iomem *vport)
+{
+        int loop = 1000;
+        unsigned char val = 0;
+
+        do {
+                val = ioread8(vport + DSP_DATAVAIL);
+                if (val & 0x80)
+                        return 0;
+                cpu_relax();
+        } while (loop--);
+
+        return -EAGAIN;
+}
+
+static __devinit int sc6000_read(char __iomem *vport)
+{
+        if (sc6000_wait_data(vport))
+                return -EBUSY;
+
+        return ioread8(vport + DSP_READ);
+
+}
+
+static __devinit int sc6000_write(char __iomem *vport, int cmd)
+{
+        unsigned char val;
+        int loop = 500000;
+
+        do {
+                val = ioread8(vport + DSP_STATUS);
+                /*
+                 * DSP ready to receive data if bit 7 of val == 0
+                 */
+                if (!(val & 0x80)) {
+                        iowrite8(cmd, vport + DSP_COMMAND);
+                        return 0;
+                }
+                cpu_relax();
+        } while (loop--);
+
+        snd_printk(KERN_ERR "DSP Command (0x%x) timeout.\n", cmd);
+
+        return -EIO;
+}
+
+static int __devinit sc6000_dsp_get_answer(char __iomem *vport, int command,
+                                           char *data, int data_len)
+{
+        int len = 0;
+
+        if (sc6000_write(vport, command)) {
+                snd_printk(KERN_ERR "CMD 0x%x: failed!\n", command);
+                return -EIO;
+        }
+
+        do {
+                int val = sc6000_read(vport);
+
+                if (val < 0)
+                        break;
+
+                data[len++] = val;
+
+        } while (len < data_len);
+
+        /*
+         * If no more data available, return to the caller, no error if len>0.
+         * We have no other way to know when the string is finished.
+         */
+        return len ? len : -EIO;
+}
+
+static int __devinit sc6000_dsp_reset(char __iomem *vport)
+{
+        iowrite8(1, vport + DSP_RESET);
+        udelay(10);
+        iowrite8(0, vport + DSP_RESET);
+        udelay(20);
+        if (sc6000_read(vport) == 0xaa)
+                return 0;
+        return -ENODEV;
+}
+
+/* detection and initialization */
+static int __devinit sc6000_cfg_write(char __iomem *vport,
+                                      unsigned char softcfg)
+{
+
+        if (sc6000_write(vport, WRITE_MDIRQ_CFG)) {
+                snd_printk(KERN_ERR "CMD 0x%x: failed!\n", WRITE_MDIRQ_CFG);
+                return -EIO;
+        }
+        if (sc6000_write(vport, softcfg)) {
+                snd_printk(KERN_ERR "sc6000_cfg_write: failed!\n");
+                return -EIO;
+        }
+        return 0;
+}
+
+static int __devinit sc6000_setup_board(char __iomem *vport, int config)
+{
+        int loop = 10;
+
+        do {
+                if (sc6000_write(vport, COMMAND_88)) {
+                        snd_printk(KERN_ERR "CMD 0x%x: failed!\n",
+                                   COMMAND_88);
+                        return -EIO;
+                }
+        } while ((sc6000_wait_data(vport) < 0) && loop--);
+
+        if (sc6000_read(vport) < 0) {
+                snd_printk(KERN_ERR "sc6000_read after CMD 0x%x: failed\n",
+                           COMMAND_88);
+                return -EIO;
+        }
+
+        if (sc6000_cfg_write(vport, config))
+                return -ENODEV;
+
+        return 0;
+}
+
+static int __devinit sc6000_init_mss(char __iomem *vport, int config,
+                                     char __iomem *vmss_port, int mss_config)
+{
+        if (sc6000_write(vport, DSP_INIT_MSS)) {
+                snd_printk(KERN_ERR "sc6000_init_mss [0x%x]: failed!\n",
+                           DSP_INIT_MSS);
+                return -EIO;
+        }
+
+        msleep(10);
+
+        if (sc6000_cfg_write(vport, config))
+                return -EIO;
+
+        iowrite8(mss_config, vmss_port);
+
+        return 0;
+}
+
+static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma,
+                                        char __iomem *vmss_port, int mpu_irq)
+{
+        char answer[15];
+        char version[2];
+        int mss_config = sc6000_irq_to_softcfg(irq) |
+                         sc6000_dma_to_softcfg(dma);
+        int config = mss_config |
+                     sc6000_mpu_irq_to_softcfg(mpu_irq);
+        int err;
+
+        err = sc6000_dsp_reset(vport);
+        if (err < 0) {
+                snd_printk(KERN_ERR "sc6000_dsp_reset: failed!\n");
+                return err;
+        }
+
+        memset(answer, 0, sizeof(answer));
+        err = sc6000_dsp_get_answer(vport, GET_DSP_COPYRIGHT, answer, 15);
+        if (err <= 0) {
+                snd_printk(KERN_ERR "sc6000_dsp_copyright: failed!\n");
+                return -ENODEV;
+        }
+        /*
+         * My SC-6000 card return "SC-6000" in DSPCopyright, so
+         * if we have something different, we have to be warned.
+         * Mine returns "SC-6000A " - KH
+         */
+        if (strncmp("SC-6000", answer, 7))
+                snd_printk(KERN_WARNING "Warning: non SC-6000 audio card!\n");
+
+        if (sc6000_dsp_get_answer(vport, GET_DSP_VERSION, version, 2) < 2) {
+                snd_printk(KERN_ERR "sc6000_dsp_version: failed!\n");
+                return -ENODEV;
+        }
+        printk(KERN_INFO PFX "Detected model: %s, DSP version %d.%d\n",
+                answer, version[0], version[1]);
+
+        /*
+         * 0x0A == (IRQ 7, DMA 1, MIRQ 0)
+         */
+        err = sc6000_cfg_write(vport, 0x0a);
+        if (err < 0) {
+                snd_printk(KERN_ERR "sc6000_cfg_write: failed!\n");
+                return -EFAULT;
+        }
+
+        err = sc6000_setup_board(vport, config);
+        if (err < 0) {
+                snd_printk(KERN_ERR "sc6000_setup_board: failed!\n");
+                return -ENODEV;
+        }
+
+        err = sc6000_init_mss(vport, config, vmss_port, mss_config);
+        if (err < 0) {
+                snd_printk(KERN_ERR "Can not initialize"
+                           "Microsoft Sound System mode.\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static int __devinit snd_sc6000_mixer(struct snd_ad1848 *chip)
+{
+        struct snd_card *card = chip->card;
+        struct snd_ctl_elem_id id1, id2;
+        int err;
+
+        memset(&id1, 0, sizeof(id1));
+        memset(&id2, 0, sizeof(id2));
+        id1.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        /* reassign AUX0 to FM */
+        strcpy(id1.name, "Aux Playback Switch");
+        strcpy(id2.name, "FM Playback Switch");
+        err = snd_ctl_rename_id(card, &id1, &id2);
+        if (err < 0)
+                return err;
+        strcpy(id1.name, "Aux Playback Volume");
+        strcpy(id2.name, "FM Playback Volume");
+        err = snd_ctl_rename_id(card, &id1, &id2);
+        if (err < 0)
+                return err;
+        /* reassign AUX1 to CD */
+        strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;
+        strcpy(id2.name, "CD Playback Switch");
+        err = snd_ctl_rename_id(card, &id1, &id2);
+        if (err < 0)
+                return err;
+        strcpy(id1.name, "Aux Playback Volume");
+        strcpy(id2.name, "CD Playback Volume");
+        err = snd_ctl_rename_id(card, &id1, &id2);
+        if (err < 0)
+                return err;
+        return 0;
+}
+
+static int __devinit snd_sc6000_match(struct device *devptr, unsigned int dev)
+{
+        if (!enable[dev])
+                return 0;
+        if (port[dev] == SNDRV_AUTO_PORT) {
+                printk(KERN_ERR PFX "specify IO port\n");
+                return 0;
+        }
+        if (mss_port[dev] == SNDRV_AUTO_PORT) {
+                printk(KERN_ERR PFX "specify MSS port\n");
+                return 0;
+        }
+        if (port[dev] != 0x220 && port[dev] != 0x240) {
+                printk(KERN_ERR PFX "Port must be 0x220 or 0x240\n");
+                return 0;
+        }
+        if (mss_port[dev] != 0x530 && mss_port[dev] != 0xe80) {
+                printk(KERN_ERR PFX "MSS port must be 0x530 or 0xe80\n");
+                return 0;
+        }
+        if (irq[dev] != SNDRV_AUTO_IRQ && !sc6000_irq_to_softcfg(irq[dev])) {
+                printk(KERN_ERR PFX "invalid IRQ %d\n", irq[dev]);
+                return 0;
+        }
+        if (dma[dev] != SNDRV_AUTO_DMA && !sc6000_dma_to_softcfg(dma[dev])) {
+                printk(KERN_ERR PFX "invalid DMA %d\n", dma[dev]);
+                return 0;
+        }
+        if (mpu_port[dev] != SNDRV_AUTO_PORT &&
+            (mpu_port[dev] & ~0x30L) != 0x300) {
+                printk(KERN_ERR PFX "invalid MPU-401 port %lx\n",
+                        mpu_port[dev]);
+                return 0;
+        }
+        if (mpu_port[dev] != SNDRV_AUTO_PORT &&
+            mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] != 0 &&
+            !sc6000_mpu_irq_to_softcfg(mpu_irq[dev])) {
+                printk(KERN_ERR PFX "invalid MPU-401 IRQ %d\n", mpu_irq[dev]);
+                return 0;
+        }
+        return 1;
+}
+
+static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
+{
+        static int possible_irqs[] = { 5, 7, 9, 10, 11, -1 };
+        static int possible_dmas[] = { 1, 3, 0, -1 };
+        int err;
+        int xirq = irq[dev];
+        int xdma = dma[dev];
+        struct snd_card *card;
+        struct snd_ad1848 *chip;
+        struct snd_opl3 *opl3;
+        char __iomem *vport;
+        char __iomem *vmss_port;
+
+
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        if (!card)
+                return -ENOMEM;
+
+        if (xirq == SNDRV_AUTO_IRQ) {
+                xirq = snd_legacy_find_free_irq(possible_irqs);
+                if (xirq < 0) {
+                        snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
+                        err = -EBUSY;
+                        goto err_exit;
+                }
+        }
+
+        if (xdma == SNDRV_AUTO_DMA) {
+                xdma = snd_legacy_find_free_dma(possible_dmas);
+                if (xdma < 0) {
+                        snd_printk(KERN_ERR PFX "unable to find a free DMA\n");
+                        err = -EBUSY;
+                        goto err_exit;
+                }
+        }
+
+        if (!request_region(port[dev], 0x10, DRV_NAME)) {
+                snd_printk(KERN_ERR PFX
+                           "I/O port region is already in use.\n");
+                err = -EBUSY;
+                goto err_exit;
+        }
+        vport = devm_ioport_map(devptr, port[dev], 0x10);
+        if (!vport) {
+                snd_printk(KERN_ERR PFX
+                           "I/O port cannot be iomaped.\n");
+                err = -EBUSY;
+                goto err_unmap1;
+        }
+
+        /* to make it marked as used */
+        if (!request_region(mss_port[dev], 4, DRV_NAME)) {
+                snd_printk(KERN_ERR PFX
+                           "SC-6000 port I/O port region is already in use.\n");
+                err = -EBUSY;
+                goto err_unmap1;
+        }
+        vmss_port = devm_ioport_map(devptr, mss_port[dev], 4);
+        if (!vport) {
+                snd_printk(KERN_ERR PFX
+                           "MSS port I/O cannot be iomaped.\n");
+                err = -EBUSY;
+                goto err_unmap2;
+        }
+
+        snd_printd("Initializing BASE[0x%lx] IRQ[%d] DMA[%d] MIRQ[%d]\n",
+                   port[dev], xirq, xdma,
+                   mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]);
+
+        err = sc6000_init_board(vport, xirq, xdma, vmss_port, mpu_irq[dev]);
+        if (err < 0)
+                goto err_unmap2;
+
+        err = snd_ad1848_create(card, mss_port[dev] + 4, xirq, xdma,
+                                AD1848_HW_DETECT, &chip);
+        if (err < 0)
+                goto err_unmap2;
+        card->private_data = chip;
+
+        err = snd_ad1848_pcm(chip, 0, NULL);
+        if (err < 0) {
+                snd_printk(KERN_ERR PFX
+                           "error creating new ad1848 PCM device\n");
+                goto err_unmap2;
+        }
+        err = snd_ad1848_mixer(chip);
+        if (err < 0) {
+                snd_printk(KERN_ERR PFX "error creating new ad1848 mixer\n");
+                goto err_unmap2;
+        }
+        err = snd_sc6000_mixer(chip);
+        if (err < 0) {
+                snd_printk(KERN_ERR PFX "the mixer rewrite failed\n");
+                goto err_unmap2;
+        }
+        if (snd_opl3_create(card,
+                            0x388, 0x388 + 2,
+                            OPL3_HW_AUTO, 0, &opl3) < 0) {
+                snd_printk(KERN_ERR PFX "no OPL device at 0x%x-0x%x ?\n",
+                           0x388, 0x388 + 2);
+        } else {
+                err = snd_opl3_timer_new(opl3, 0, 1);
+                if (err < 0)
+                        goto err_unmap2;
+
+                err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                if (err < 0)
+                        goto err_unmap2;
+        }
+
+        if (mpu_port[dev] != SNDRV_AUTO_PORT) {
+                if (mpu_irq[dev] == SNDRV_AUTO_IRQ)
+                        mpu_irq[dev] = -1;
+                if (snd_mpu401_uart_new(card, 0,
+                                        MPU401_HW_MPU401,
+                                        mpu_port[dev], 0,
+                                        mpu_irq[dev], IRQF_DISABLED,
+                                        NULL) < 0)
+                        snd_printk(KERN_ERR "no MPU-401 device at 0x%lx ?\n",
+                                        mpu_port[dev]);
+        }
+
+        strcpy(card->driver, DRV_NAME);
+        strcpy(card->shortname, "SC-6000");
+        sprintf(card->longname, "Gallant SC-6000 at 0x%lx, irq %d, dma %d",
+                mss_port[dev], xirq, xdma);
+
+        snd_card_set_dev(card, devptr);
+
+        err = snd_card_register(card);
+        if (err < 0)
+                goto err_unmap2;
+
+        dev_set_drvdata(devptr, card);
+        return 0;
+
+err_unmap2:
+        release_region(mss_port[dev], 4);
+err_unmap1:
+        release_region(port[dev], 0x10);
+err_exit:
+        snd_card_free(card);
+        return err;
+}
+
+static int __devexit snd_sc6000_remove(struct device *devptr, unsigned int dev)
+{
+        release_region(port[dev], 0x10);
+        release_region(mss_port[dev], 4);
+
+        snd_card_free(dev_get_drvdata(devptr));
+        dev_set_drvdata(devptr, NULL);
+        return 0;
+}
+
+static struct isa_driver snd_sc6000_driver = {
+        .match          = snd_sc6000_match,
+        .probe          = snd_sc6000_probe,
+        .remove         = __devexit_p(snd_sc6000_remove),
+        /* FIXME: suspend/resume */
+        .driver         = {
+                .name   = DRV_NAME,
+        },
+};
+
+
+static int __init alsa_card_sc6000_init(void)
+{
+        return isa_register_driver(&snd_sc6000_driver, SNDRV_CARDS);
+}
+
+static void __exit alsa_card_sc6000_exit(void)
+{
+        isa_unregister_driver(&snd_sc6000_driver);
+}
+
+module_init(alsa_card_sc6000_init)
+module_exit(alsa_card_sc6000_exit)
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index cbad2a51cbaa..1cb921d6137e 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -45,10 +45,12 @@ MODULE_LICENSE("GPL");
 
 static int index[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_IDX;
 static char* id[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_STR;
-static long port[SNDRV_CARDS] __devinitdata = { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_PORT };
+static long port[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PORT;
+static long wss_port[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_PORT;
 static int irq[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_IRQ;
 static int mpu_irq[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_IRQ;
 static int dma[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_DMA;
+static int dma2[SNDRV_CARDS] __devinitdata = SNDRV_DEFAULT_DMA;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index number for SoundScape soundcard");
@@ -59,6 +61,9 @@ MODULE_PARM_DESC(id, "Description for SoundScape card");
 module_param_array(port, long, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for SoundScape driver.");
 
+module_param_array(wss_port, long, NULL, 0444);
+MODULE_PARM_DESC(wss_port, "WSS Port # for SoundScape driver.");
+
 module_param_array(irq, int, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for SoundScape driver.");
 
@@ -68,12 +73,16 @@ MODULE_PARM_DESC(mpu_irq, "MPU401 IRQ # for SoundScape driver.");
 module_param_array(dma, int, NULL, 0444);
 MODULE_PARM_DESC(dma, "DMA # for SoundScape driver.");
 
+module_param_array(dma2, int, NULL, 0444);
+MODULE_PARM_DESC(dma2, "DMA2 # for SoundScape driver.");
+
 #ifdef CONFIG_PNP
 static int isa_registered;
 static int pnp_registered;
 
 static struct pnp_card_device_id sscape_pnpids[] = {
-        { .id = "ENS3081", .devs = { { "ENS0000" } } },
+        { .id = "ENS3081", .devs = { { "ENS0000" } } }, /* Soundscape PnP */
+        { .id = "ENS4081", .devs = { { "ENS1011" } } }, /* VIVO90 */
         { .id = "" }    /* end */
 };
 
@@ -124,12 +133,21 @@ enum GA_REG {
 #define AD1845_FREQ_SEL_MSB    0x16
 #define AD1845_FREQ_SEL_LSB    0x17
 
+enum card_type {
+        SSCAPE,
+        SSCAPE_PNP,
+        SSCAPE_VIVO,
+};
+
 struct soundscape {
         spinlock_t lock;
         unsigned io_base;
+        unsigned wss_base;
         int codec_type;
         int ic_type;
+        enum card_type type;
         struct resource *io_res;
+        struct resource *wss_res;
         struct snd_cs4231 *chip;
         struct snd_mpu401 *mpu;
         struct snd_hwdep *hw;
@@ -340,8 +358,9 @@ static inline void activate_ad1845_unsafe(unsigned io_base)
  */
 static void soundscape_free(struct snd_card *c)
 {
-        register struct soundscape *sscape = get_card_soundscape(c);
+        struct soundscape *sscape = get_card_soundscape(c);
         release_and_free_resource(sscape->io_res);
+        release_and_free_resource(sscape->wss_res);
         free_dma(sscape->chip->dma1);
 }
 
@@ -382,7 +401,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
                 unsigned long flags;
                 unsigned char x;
 
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
 
                 spin_lock_irqsave(&s->lock, flags);
                 x = inb(HOST_DATA_IO(s->io_base));
@@ -409,7 +428,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)
                 unsigned long flags;
                 unsigned char x;
 
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
 
                 spin_lock_irqsave(&s->lock, flags);
                 x = inb(HOST_DATA_IO(s->io_base));
@@ -522,7 +541,7 @@ static int upload_dma_data(struct soundscape *s,
                 ret = -EAGAIN;
         }
 
-        _release_dma:
+_release_dma:
         /*
          * NOTE!!! We are NOT holding any spinlocks at this point !!!
          */
@@ -802,6 +821,7 @@ static int __devinit detect_sscape(struct soundscape *s)
         unsigned long flags;
         unsigned d;
         int retval = 0;
+        int codec = s->wss_base;
 
         spin_lock_irqsave(&s->lock, flags);
 
@@ -833,9 +853,27 @@ static int __devinit detect_sscape(struct soundscape *s)
         outb(0xfe, ODIE_ADDR_IO(s->io_base));
         if ((inb(ODIE_ADDR_IO(s->io_base)) & 0x9f) != 0x0e)
                 goto _done;
-        if ((inb(ODIE_DATA_IO(s->io_base)) & 0x9f) != 0x0e)
+
+        outb(0xfe, ODIE_ADDR_IO(s->io_base));
+        d = inb(ODIE_DATA_IO(s->io_base));
+        if (s->type != SSCAPE_VIVO && (d & 0x9f) != 0x0e)
                 goto _done;
 
+        d  = sscape_read_unsafe(s->io_base, GA_HMCTL_REG) & 0x3f;
+        sscape_write_unsafe(s->io_base, GA_HMCTL_REG, d | 0xc0);
+
+        if (s->type == SSCAPE_VIVO)
+                codec += 4;
+        /* wait for WSS codec */
+        for (d = 0; d < 500; d++) {
+                if ((inb(codec) & 0x80) == 0)
+                        break;
+                spin_unlock_irqrestore(&s->lock, flags);
+                msleep(1);
+                spin_lock_irqsave(&s->lock, flags);
+        }
+        snd_printd(KERN_INFO "init delay = %d ms\n", d);
+
         /*
          * SoundScape successfully detected!
          */
@@ -995,21 +1033,23 @@ static void ad1845_capture_format(struct snd_cs4231 * chip, struct snd_pcm_hw_pa
  * try to support at least some of the extra bits by overriding
  * some of the CS4231 callback.
  */
-static int __devinit create_ad1845(struct snd_card *card, unsigned port, int irq, int dma1)
+static int __devinit create_ad1845(struct snd_card *card, unsigned port,
+                                   int irq, int dma1, int dma2)
 {
         register struct soundscape *sscape = get_card_soundscape(card);
         struct snd_cs4231 *chip;
         int err;
 
-#define CS4231_SHARE_HARDWARE  (CS4231_HWSHARE_DMA1 | CS4231_HWSHARE_DMA2)
-        /*
-         * The AD1845 PCM device is only half-duplex, and so
-         * we only give it one DMA channel ...
-         */
-        if ((err = snd_cs4231_create(card,
-                                     port, -1, irq, dma1, dma1,
-                                     CS4231_HW_DETECT,
-                                     CS4231_HWSHARE_DMA1, &chip)) == 0) {
+        if (sscape->type == SSCAPE_VIVO)
+                port += 4;
+
+        if (dma1 == dma2)
+                dma2 = -1;
+
+        err = snd_cs4231_create(card,
+                                port, -1, irq, dma1, dma2,
+                                CS4231_HW_DETECT, CS4231_HWSHARE_DMA1, &chip);
+        if (!err) {
                 unsigned long flags;
                 struct snd_pcm *pcm;
 
@@ -1031,49 +1071,72 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, int irq
     snd_cs4231_mce_down(chip);
  */
 
-                /*
-                 * The input clock frequency on the SoundScape must
-                 * be 14.31818 MHz, because we must set this register
-                 * to get the playback to sound correct ...
-                 */
-                snd_cs4231_mce_up(chip);
-                spin_lock_irqsave(&chip->reg_lock, flags);
-                snd_cs4231_out(chip, AD1845_CRYS_CLOCK_SEL, 0x20);
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
-                snd_cs4231_mce_down(chip);
+                if (sscape->type != SSCAPE_VIVO) {
+                        int val;
+                        /*
+                         * The input clock frequency on the SoundScape must
+                         * be 14.31818 MHz, because we must set this register
+                         * to get the playback to sound correct ...
+                         */
+                        snd_cs4231_mce_up(chip);
+                        spin_lock_irqsave(&chip->reg_lock, flags);
+                        snd_cs4231_out(chip, AD1845_CRYS_CLOCK_SEL, 0x20);
+                        spin_unlock_irqrestore(&chip->reg_lock, flags);
+                        snd_cs4231_mce_down(chip);
 
-                /*
-                 * More custom configuration:
-                 * a) select "mode 2", and provide a current drive of 8 mA
-                 * b) enable frequency selection (for capture/playback)
-                 */
-                spin_lock_irqsave(&chip->reg_lock, flags);
-                snd_cs4231_out(chip, CS4231_MISC_INFO, (CS4231_MODE2 | 0x10));
-                snd_cs4231_out(chip, AD1845_PWR_DOWN_CTRL, snd_cs4231_in(chip, AD1845_PWR_DOWN_CTRL) | AD1845_FREQ_SEL_ENABLE);
-                spin_unlock_irqrestore(&chip->reg_lock, flags);
+                        /*
+                         * More custom configuration:
+                         * a) select "mode 2" and provide a current drive of 8mA
+                         * b) enable frequency selection (for capture/playback)
+                         */
+                        spin_lock_irqsave(&chip->reg_lock, flags);
+                        snd_cs4231_out(chip, CS4231_MISC_INFO,
+                                        CS4231_MODE2 | 0x10);
+                        val = snd_cs4231_in(chip, AD1845_PWR_DOWN_CTRL);
+                        snd_cs4231_out(chip, AD1845_PWR_DOWN_CTRL,
+                                        val | AD1845_FREQ_SEL_ENABLE);
+                        spin_unlock_irqrestore(&chip->reg_lock, flags);
+                }
 
-                if ((err = snd_cs4231_pcm(chip, 0, &pcm)) < 0) {
-                        snd_printk(KERN_ERR "sscape: No PCM device for AD1845 chip\n");
+                err = snd_cs4231_pcm(chip, 0, &pcm);
+                if (err < 0) {
+                        snd_printk(KERN_ERR "sscape: No PCM device "
+                                            "for AD1845 chip\n");
                         goto _error;
                 }
 
-                if ((err = snd_cs4231_mixer(chip)) < 0) {
-                        snd_printk(KERN_ERR "sscape: No mixer device for AD1845 chip\n");
+                err = snd_cs4231_mixer(chip);
+                if (err < 0) {
+                        snd_printk(KERN_ERR "sscape: No mixer device "
+                                            "for AD1845 chip\n");
                         goto _error;
                 }
-
-                if ((err = snd_ctl_add(card, snd_ctl_new1(&midi_mixer_ctl, chip))) < 0) {
-                        snd_printk(KERN_ERR "sscape: Could not create MIDI mixer control\n");
+                err = snd_cs4231_timer(chip, 0, NULL);
+                if (err < 0) {
+                        snd_printk(KERN_ERR "sscape: No timer device "
+                                            "for AD1845 chip\n");
                         goto _error;
                 }
 
+                if (sscape->type != SSCAPE_VIVO) {
+                        err = snd_ctl_add(card,
+                                          snd_ctl_new1(&midi_mixer_ctl, chip));
+                        if (err < 0) {
+                                snd_printk(KERN_ERR "sscape: Could not create "
+                                                    "MIDI mixer control\n");
+                                goto _error;
+                        }
+                        chip->set_playback_format = ad1845_playback_format;
+                        chip->set_capture_format = ad1845_capture_format;
+                }
+
                 strcpy(card->driver, "SoundScape");
                 strcpy(card->shortname, pcm->name);
                 snprintf(card->longname, sizeof(card->longname),
-                         "%s at 0x%lx, IRQ %d, DMA %d\n",
-                         pcm->name, chip->port, chip->irq, chip->dma1);
-                chip->set_playback_format = ad1845_playback_format;
-                chip->set_capture_format = ad1845_capture_format;
+                         "%s at 0x%lx, IRQ %d, DMA1 %d, DMA2 %d\n",
+                         pcm->name, chip->port, chip->irq,
+                         chip->dma1, chip->dma2);
+
                 sscape->chip = chip;
         }
 
@@ -1086,15 +1149,15 @@ static int __devinit create_ad1845(struct snd_card *card, unsigned port, int irq
  * Create an ALSA soundcard entry for the SoundScape, using
  * the given list of port, IRQ and DMA resources.
  */
-static int __devinit create_sscape(int dev, struct snd_card **rcardp)
+static int __devinit create_sscape(int dev, struct snd_card *card)
 {
-        struct snd_card *card;
-        register struct soundscape *sscape;
-        register unsigned dma_cfg;
+        struct soundscape *sscape = get_card_soundscape(card);
+        unsigned dma_cfg;
         unsigned irq_cfg;
         unsigned mpu_irq_cfg;
         unsigned xport;
         struct resource *io_res;
+        struct resource *wss_res;
         unsigned long flags;
         int err;
 
@@ -1118,61 +1181,69 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
          * Grab IO ports that we will need to probe so that we
          * can detect and control this hardware ...
          */
-        if ((io_res = request_region(xport, 8, "SoundScape")) == NULL) {
+        io_res = request_region(xport, 8, "SoundScape");
+        if (!io_res) {
                 snd_printk(KERN_ERR "sscape: can't grab port 0x%x\n", xport);
                 return -EBUSY;
         }
+        wss_res = NULL;
+        if (sscape->type == SSCAPE_VIVO) {
+                wss_res = request_region(wss_port[dev], 4, "SoundScape");
+                if (!wss_res) {
+                        snd_printk(KERN_ERR "sscape: can't grab port 0x%lx\n",
+                                            wss_port[dev]);
+                        err = -EBUSY;
+                        goto _release_region;
+                }
+        }
 
         /*
-         * Grab both DMA channels (OK, only one for now) ...
+         * Grab one DMA channel ...
          */
-        if ((err = request_dma(dma[dev], "SoundScape")) < 0) {
+        err = request_dma(dma[dev], "SoundScape");
+        if (err < 0) {
                 snd_printk(KERN_ERR "sscape: can't grab DMA %d\n", dma[dev]);
                 goto _release_region;
         }
 
-        /*
-         * Create a new ALSA sound card entry, in anticipation
-         * of detecting our hardware ...
-         */
-        if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                                 sizeof(struct soundscape))) == NULL) {
-                err = -ENOMEM;
-                goto _release_dma;
-        }
-
-        sscape = get_card_soundscape(card);
         spin_lock_init(&sscape->lock);
         spin_lock_init(&sscape->fwlock);
         sscape->io_res = io_res;
+        sscape->wss_res = wss_res;
         sscape->io_base = xport;
+        sscape->wss_base = wss_port[dev];
 
         if (!detect_sscape(sscape)) {
                 printk(KERN_ERR "sscape: hardware not detected at 0x%x\n", sscape->io_base);
                 err = -ENODEV;
-                goto _release_card;
+                goto _release_dma;
         }
 
         printk(KERN_INFO "sscape: hardware detected at 0x%x, using IRQ %d, DMA %d\n",
-                         sscape->io_base, irq[dev], dma[dev]);
+                         sscape->io_base, irq[dev], dma[dev]);
 
-        /*
-         * Now create the hardware-specific device so that we can
-         * load the microcode into the on-board processor.
-         * We cannot use the MPU-401 MIDI system until this firmware
-         * has been loaded into the card.
-         */
-        if ((err = snd_hwdep_new(card, "MC68EC000", 0, &(sscape->hw))) < 0) {
-                printk(KERN_ERR "sscape: Failed to create firmware device\n");
-                goto _release_card;
+        if (sscape->type != SSCAPE_VIVO) {
+                /*
+                 * Now create the hardware-specific device so that we can
+                 * load the microcode into the on-board processor.
+                 * We cannot use the MPU-401 MIDI system until this firmware
+                 * has been loaded into the card.
+                 */
+                err = snd_hwdep_new(card, "MC68EC000", 0, &(sscape->hw));
+                if (err < 0) {
+                        printk(KERN_ERR "sscape: Failed to create "
+                                        "firmware device\n");
+                        goto _release_dma;
+                }
+                strlcpy(sscape->hw->name, "SoundScape M68K",
+                        sizeof(sscape->hw->name));
+                sscape->hw->name[sizeof(sscape->hw->name) - 1] = '\0';
+                sscape->hw->iface = SNDRV_HWDEP_IFACE_SSCAPE;
+                sscape->hw->ops.open = sscape_hw_open;
+                sscape->hw->ops.release = sscape_hw_release;
+                sscape->hw->ops.ioctl = sscape_hw_ioctl;
+                sscape->hw->private_data = sscape;
         }
-        strlcpy(sscape->hw->name, "SoundScape M68K", sizeof(sscape->hw->name));
-        sscape->hw->name[sizeof(sscape->hw->name) - 1] = '\0';
-        sscape->hw->iface = SNDRV_HWDEP_IFACE_SSCAPE;
-        sscape->hw->ops.open = sscape_hw_open;
-        sscape->hw->ops.release = sscape_hw_release;
-        sscape->hw->ops.ioctl = sscape_hw_ioctl;
-        sscape->hw->private_data = sscape;
 
         /*
          * Tell the on-board devices where their resources are (I think -
@@ -1197,7 +1268,8 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
         sscape_write_unsafe(sscape->io_base,
                             GA_INTCFG_REG, 0xf0 | (mpu_irq_cfg << 2) | mpu_irq_cfg);
         sscape_write_unsafe(sscape->io_base,
-                            GA_CDCFG_REG, 0x09 | DMA_8BIT | (dma[dev] << 4) | (irq_cfg << 1));
+                            GA_CDCFG_REG, 0x09 | DMA_8BIT
+                            | (dma[dev] << 4) | (irq_cfg << 1));
 
         spin_unlock_irqrestore(&sscape->lock, flags);
 
@@ -1205,30 +1277,37 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
          * We have now enabled the codec chip, and so we should
          * detect the AD1845 device ...
          */
-        if ((err = create_ad1845(card, CODEC_IO(xport), irq[dev], dma[dev])) < 0) {
-                printk(KERN_ERR "sscape: No AD1845 device at 0x%x, IRQ %d\n",
-                                CODEC_IO(xport), irq[dev]);
-                goto _release_card;
+        err = create_ad1845(card, wss_port[dev], irq[dev],
+                            dma[dev], dma2[dev]);
+        if (err < 0) {
+                printk(KERN_ERR "sscape: No AD1845 device at 0x%lx, IRQ %d\n",
+                       wss_port[dev], irq[dev]);
+                goto _release_dma;
         }
 #define MIDI_DEVNUM  0
-        if ((err = create_mpu401(card, MIDI_DEVNUM, MPU401_IO(xport), mpu_irq[dev])) < 0) {
-                printk(KERN_ERR "sscape: Failed to create MPU-401 device at 0x%x\n",
-                                MPU401_IO(xport));
-                goto _release_card;
-        }
+        if (sscape->type != SSCAPE_VIVO) {
+                err = create_mpu401(card, MIDI_DEVNUM,
+                                    MPU401_IO(xport), mpu_irq[dev]);
+                if (err < 0) {
+                        printk(KERN_ERR "sscape: Failed to create "
+                                        "MPU-401 device at 0x%x\n",
+                                        MPU401_IO(xport));
+                        goto _release_dma;
+                }
 
-        /*
-         * Enable the master IRQ ...
-         */
-        sscape_write(sscape, GA_INTENA_REG, 0x80);
+                /*
+                 * Enable the master IRQ ...
+                 */
+                sscape_write(sscape, GA_INTENA_REG, 0x80);
 
-        /*
-         * Initialize mixer
-         */
-        sscape->midi_vol = 0;
-        host_write_ctrl_unsafe(sscape->io_base, CMD_SET_MIDI_VOL, 100);
-        host_write_ctrl_unsafe(sscape->io_base, 0, 100);
-        host_write_ctrl_unsafe(sscape->io_base, CMD_XXX_MIDI_VOL, 100);
+                /*
+                 * Initialize mixer
+                 */
+                sscape->midi_vol = 0;
+                host_write_ctrl_unsafe(sscape->io_base, CMD_SET_MIDI_VOL, 100);
+                host_write_ctrl_unsafe(sscape->io_base, 0, 100);
+                host_write_ctrl_unsafe(sscape->io_base, CMD_XXX_MIDI_VOL, 100);
+        }
 
         /*
          * Now that we have successfully created this sound card,
@@ -1237,17 +1316,14 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
          *       function now that our "constructor" has completed.
          */
         card->private_free = soundscape_free;
-        *rcardp = card;
 
         return 0;
 
-        _release_card:
-        snd_card_free(card);
-
-        _release_dma:
+_release_dma:
         free_dma(dma[dev]);
 
-        _release_region:
+_release_region:
+        release_and_free_resource(wss_res);
         release_and_free_resource(io_res);
 
         return err;
@@ -1276,19 +1352,33 @@ static int __devinit snd_sscape_match(struct device *pdev, unsigned int i)
 static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev)
 {
         struct snd_card *card;
+        struct soundscape *sscape;
         int ret;
 
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+                            sizeof(struct soundscape));
+        if (!card)
+                return -ENOMEM;
+
+        sscape = get_card_soundscape(card);
+        sscape->type = SSCAPE;
+
         dma[dev] &= 0x03;
-        ret = create_sscape(dev, &card);
+        ret = create_sscape(dev, card);
         if (ret < 0)
-                return ret;
+                goto _release_card;
+
         snd_card_set_dev(card, pdev);
         if ((ret = snd_card_register(card)) < 0) {
                 printk(KERN_ERR "sscape: Failed to register sound card\n");
-                return ret;
+                goto _release_card;
         }
         dev_set_drvdata(pdev, card);
         return 0;
+
+_release_card:
+        snd_card_free(card);
+        return ret;
 }
 
 static int __devexit snd_sscape_remove(struct device *devptr, unsigned int dev)
@@ -1325,6 +1415,7 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,
         static int idx = 0;
         struct pnp_dev *dev;
         struct snd_card *card;
+        struct soundscape *sscape;
         int ret;
 
         /*
@@ -1366,26 +1457,55 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard,
         }
 
         /*
+         * Create a new ALSA sound card entry, in anticipation
+         * of detecting our hardware ...
+         */
+        card = snd_card_new(index[idx], id[idx], THIS_MODULE,
+                            sizeof(struct soundscape));
+        if (!card)
+                return -ENOMEM;
+
+        sscape = get_card_soundscape(card);
+
+        /*
+         * Identify card model ...
+         */
+        if (!strncmp("ENS4081", pid->id, 7))
+                sscape->type = SSCAPE_VIVO;
+        else
+                sscape->type = SSCAPE_PNP;
+
+        /*
          * Read the correct parameters off the ISA PnP bus ...
          */
         port[idx] = pnp_port_start(dev, 0);
         irq[idx] = pnp_irq(dev, 0);
         mpu_irq[idx] = pnp_irq(dev, 1);
         dma[idx] = pnp_dma(dev, 0) & 0x03;
+        if (sscape->type == SSCAPE_PNP) {
+                dma2[idx] = dma[idx];
+                wss_port[idx] = CODEC_IO(port[idx]);
+        } else {
+                wss_port[idx] = pnp_port_start(dev, 1);
+                dma2[idx] = pnp_dma(dev, 1);
+        }
 
-        ret = create_sscape(idx, &card);
+        ret = create_sscape(idx, card);
         if (ret < 0)
-                return ret;
+                goto _release_card;
+
         snd_card_set_dev(card, &pcard->card->dev);
         if ((ret = snd_card_register(card)) < 0) {
                 printk(KERN_ERR "sscape: Failed to register sound card\n");
-                snd_card_free(card);
-                return ret;
+                goto _release_card;
         }
 
         pnp_set_card_drvdata(pcard, card);
         ++idx;
+        return 0;
 
+_release_card:
+        snd_card_free(card);
         return ret;
 }
 
diff --git a/sound/isa/wavefront/Makefile b/sound/isa/wavefront/Makefile
index b4cb28422db0..601bdddd44d0 100644
--- a/sound/isa/wavefront/Makefile
+++ b/sound/isa/wavefront/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index bacc51c86587..a1ebb7c5c684 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/time.h>
 #include <linux/wait.h>
+#include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/snd_wavefront.h>
@@ -53,9 +54,8 @@ static int debug_default = 0;  /* you can set this to control debugging
 
 /* XXX this needs to be made firmware and hardware version dependent */
 
-static char *ospath = "/etc/sound/wavefront.os"; /* where to find a processed
-                                                    version of the WaveFront OS
-                                                 */
+#define DEFAULT_OSPATH  "wavefront.os"
+static char *ospath = DEFAULT_OSPATH; /* the firmware file name */
 
 static int wait_usecs = 150; /* This magic number seems to give pretty optimal
                                 throughput based on my limited experimentation.
@@ -97,7 +97,7 @@ MODULE_PARM_DESC(sleep_interval, "how long to sleep when waiting for reply");
 module_param(sleep_tries, int, 0444);
 MODULE_PARM_DESC(sleep_tries, "how many times to try sleeping during a wait");
 module_param(ospath, charp, 0444);
-MODULE_PARM_DESC(ospath, "full pathname to processed ICS2115 OS firmware");
+MODULE_PARM_DESC(ospath, "pathname to processed ICS2115 OS firmware");
 module_param(reset_time, int, 0444);
 MODULE_PARM_DESC(reset_time, "how long to wait for a reset to take effect");
 module_param(ramcheck_time, int, 0444);
@@ -1768,7 +1768,7 @@ snd_wavefront_interrupt_bits (int irq)
 
 static void __devinit
 wavefront_should_cause_interrupt (snd_wavefront_t *dev, 
-                                  int val, int port, int timeout)
+                                  int val, int port, unsigned long timeout)
 
 {
         wait_queue_t wait;
@@ -1779,11 +1779,9 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
         dev->irq_ok = 0;
         outb (val,port);
         spin_unlock_irq(&dev->irq_lock);
-        while (1) {
-                if ((timeout = schedule_timeout(timeout)) == 0)
-                        return;
-                if (dev->irq_ok)
-                        return;
+        while (!dev->irq_ok && time_before(jiffies, timeout)) {
+                schedule_timeout_uninterruptible(1);
+                barrier();
         }
 }
 
@@ -1938,111 +1936,75 @@ wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
         return (1);
 }
 
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/unistd.h>
-#include <linux/syscalls.h>
-#include <asm/uaccess.h>
-
-
 static int __devinit
 wavefront_download_firmware (snd_wavefront_t *dev, char *path)
 
 {
-        unsigned char section[WF_SECTION_MAX];
-        signed char section_length; /* yes, just a char; max value is WF_SECTION_MAX */
+        unsigned char *buf;
+        int len, err;
         int section_cnt_downloaded = 0;
-        int fd;
-        int c;
-        int i;
-        mm_segment_t fs;
-
-        /* This tries to be a bit cleverer than the stuff Alan Cox did for
-           the generic sound firmware, in that it actually knows
-           something about the structure of the Motorola firmware. In
-           particular, it uses a version that has been stripped of the
-           20K of useless header information, and had section lengths
-           added, making it possible to load the entire OS without any
-           [kv]malloc() activity, since the longest entity we ever read is
-           42 bytes (well, WF_SECTION_MAX) long.
-        */
-
-        fs = get_fs();
-        set_fs (get_ds());
+        const struct firmware *firmware;
 
-        if ((fd = sys_open ((char __user *) path, 0, 0)) < 0) {
-                snd_printk ("Unable to load \"%s\".\n",
-                        path);
+        err = request_firmware(&firmware, path, dev->card->dev);
+        if (err < 0) {
+                snd_printk(KERN_ERR "firmware (%s) download failed!!!\n", path);
                 return 1;
         }
 
-        while (1) {
-                int x;
-
-                if ((x = sys_read (fd, (char __user *) &section_length, sizeof (section_length))) !=
-                    sizeof (section_length)) {
-                        snd_printk ("firmware read error.\n");
-                        goto failure;
-                }
-
-                if (section_length == 0) {
+        len = 0;
+        buf = firmware->data;
+        for (;;) {
+                int section_length = *(signed char *)buf;
+                if (section_length == 0)
                         break;
-                }
-
                 if (section_length < 0 || section_length > WF_SECTION_MAX) {
-                        snd_printk ("invalid firmware section length %d\n",
-                                    section_length);
+                        snd_printk(KERN_ERR
+                                   "invalid firmware section length %d\n",
+                                   section_length);
                         goto failure;
                 }
+                buf++;
+                len++;
 
-                if (sys_read (fd, (char __user *) section, section_length) != section_length) {
-                        snd_printk ("firmware section "
-                                "read error.\n");
+                if (firmware->size < len + section_length) {
+                        snd_printk(KERN_ERR "firmware section read error.\n");
                         goto failure;
                 }
 
                 /* Send command */
-        
-                if (wavefront_write (dev, WFC_DOWNLOAD_OS)) {
+                if (wavefront_write(dev, WFC_DOWNLOAD_OS))
                         goto failure;
-                }
         
-                for (i = 0; i < section_length; i++) {
-                        if (wavefront_write (dev, section[i])) {
+                for (; section_length; section_length--) {
+                        if (wavefront_write(dev, *buf))
                                 goto failure;
-                        }
+                        buf++;
+                        len++;
                 }
         
                 /* get ACK */
-        
-                if (wavefront_wait (dev, STAT_CAN_READ)) {
-
-                        if ((c = inb (dev->data_port)) != WF_ACK) {
-
-                                snd_printk ("download "
-                                            "of section #%d not "
-                                            "acknowledged, ack = 0x%x\n",
-                                            section_cnt_downloaded + 1, c);
-                                goto failure;
-                
-                        }
-
-                } else {
-                        snd_printk ("time out for firmware ACK.\n");
+                if (!wavefront_wait(dev, STAT_CAN_READ)) {
+                        snd_printk(KERN_ERR "time out for firmware ACK.\n");
+                        goto failure;
+                }
+                err = inb(dev->data_port);
+                if (err != WF_ACK) {
+                        snd_printk(KERN_ERR
+                                   "download of section #%d not "
+                                   "acknowledged, ack = 0x%x\n",
+                                   section_cnt_downloaded + 1, err);
                         goto failure;
                 }
 
+                section_cnt_downloaded++;
         }
 
-        sys_close (fd);
-        set_fs (fs);
+        release_firmware(firmware);
         return 0;
 
  failure:
-        sys_close (fd);
-        set_fs (fs);
-        snd_printk ("firmware download failed!!!\n");
+        release_firmware(firmware);
+        snd_printk(KERN_ERR "firmware download failed!!!\n");
         return 1;
 }
 
@@ -2232,3 +2194,5 @@ snd_wavefront_detect (snd_wavefront_card_t *card)
 
         return 0;
 }
+
+MODULE_FIRMWARE(DEFAULT_OSPATH);
diff --git a/sound/last.c b/sound/last.c
index 964314efff5c..282b0cdb0589 100644
--- a/sound/last.c
+++ b/sound/last.c
@@ -1,6 +1,6 @@
 /*
  *  Advanced Linux Sound Architecture
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index c6b44102aa5b..356bf21a1506 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -170,14 +170,14 @@ config SND_CA0106
           will be called snd-ca0106.
 
 config SND_CMIPCI
-        tristate "C-Media 8738, 8338"
+        tristate "C-Media 8338, 8738, 8768, 8770"
         depends on SND
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_PCM
         help
-          If you want to use soundcards based on C-Media CMI8338 or CMI8738
-          chips, say Y here and read
+          If you want to use soundcards based on C-Media CMI8338, CMI8738,
+          CMI8768 or CMI8770 chips, say Y here and read
           <file:Documentation/sound/alsa/CMIPCI.txt>.
 
           To compile this driver as a module, choose M here: the module
@@ -500,6 +500,103 @@ config SND_HDA_INTEL
           To compile this driver as a module, choose M here: the module
           will be called snd-hda-intel.
 
+config SND_HDA_HWDEP
+        bool "Build hwdep interface for HD-audio driver"
+        depends on SND_HDA_INTEL
+        select SND_HWDEP
+        help
+          Say Y here to build a hwdep interface for HD-audio driver.
+          This interface can be used for out-of-band communication
+          with codecs for debugging purposes.
+
+config SND_HDA_CODEC_REALTEK
+        bool "Build Realtek HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include Realtek HD-audio codec support in
+          snd-hda-intel driver, such as ALC880.
+
+config SND_HDA_CODEC_ANALOG
+        bool "Build Analog Device HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include Analog Device HD-audio codec support in
+          snd-hda-intel driver, such as AD1986A.
+
+config SND_HDA_CODEC_SIGMATEL
+        bool "Build IDT/Sigmatel HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include IDT (Sigmatel) HD-audio codec support in
+          snd-hda-intel driver, such as STAC9200.
+
+config SND_HDA_CODEC_VIA
+        bool "Build VIA HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include VIA HD-audio codec support in
+          snd-hda-intel driver, such as VT1708.
+
+config SND_HDA_CODEC_ATIHDMI
+        bool "Build ATI HDMI HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include ATI HDMI HD-audio codec support in
+          snd-hda-intel driver, such as ATI RS600 HDMI.
+
+config SND_HDA_CODEC_CONEXANT
+        bool "Build Conexant HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include Conexant HD-audio codec support in
+          snd-hda-intel driver, such as CX20549.
+
+config SND_HDA_CODEC_CMEDIA
+        bool "Build C-Media HD-audio codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include C-Media HD-audio codec support in
+          snd-hda-intel driver, such as CMI9880.
+
+config SND_HDA_CODEC_SI3054
+        bool "Build Silicon Labs 3054 HD-modem codec support"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to include Silicon Labs 3054 HD-modem codec
+          (and compatibles) support in snd-hda-intel driver.
+
+config SND_HDA_GENERIC
+        bool "Enable generic HD-audio codec parser"
+        depends on SND_HDA_INTEL
+        default y
+        help
+          Say Y here to enable the generic HD-audio codec parser
+          in snd-hda-intel driver.
+
+config SND_HDA_POWER_SAVE
+        bool "Aggressive power-saving on HD-audio"
+        depends on SND_HDA_INTEL && EXPERIMENTAL
+        help
+          Say Y here to enable more aggressive power-saving mode on
+          HD-audio driver.  The power-saving timeout can be configured
+          via power_save option or over sysfs on-the-fly.
+
+config SND_HDA_POWER_SAVE_DEFAULT
+        int "Default time-out for HD-audio power-save mode"
+        depends on SND_HDA_POWER_SAVE
+        default 0
+        help
+          The default time-out value in seconds for HD-audio automatic
+          power-save mode.  0 means to disable the power-save mode.
+
 config SND_HDSP
         tristate "RME Hammerfall DSP Audio"
         depends on SND
@@ -799,4 +896,12 @@ config SND_AC97_POWER_SAVE
           snd-ac97-codec driver.  You can toggle it dynamically over
           sysfs, too.
 
+config SND_AC97_POWER_SAVE_DEFAULT
+        int "Default time-out for AC97 power-save mode"
+        depends on SND_AC97_POWER_SAVE
+        default 0
+        help
+          The default time-out value in seconds for AC97 automatic
+          power-save mode.  0 means to disable the power-save mode.
+
 endmenu
diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index cd76e0293d06..09ddc82eeca2 100644
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ad1889-objs := ad1889.o
diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index f5d471896b95..0be48b1a22d0 100644
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ac97-codec-objs := ac97_codec.o ac97_pcm.o
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index bbed644bf9c5..6a9966df0cc9 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -39,7 +39,7 @@
 
 #include "ac97_patch.c"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Universal interface for Audio Codec '97");
 MODULE_LICENSE("GPL");
 
@@ -49,7 +49,7 @@ module_param(enable_loopback, bool, 0444);
 MODULE_PARM_DESC(enable_loopback, "Enable AC97 ADC/DAC Loopback Control");
 
 #ifdef CONFIG_SND_AC97_POWER_SAVE
-static int power_save;
+static int power_save = CONFIG_SND_AC97_POWER_SAVE_DEFAULT;
 module_param(power_save, bool, 0644);
 MODULE_PARM_DESC(power_save, "Enable AC97 power-saving control");
 #endif
@@ -176,7 +176,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x574d4C09, 0xffffffff, "WM9709",             NULL,           NULL},
 { 0x574d4C12, 0xffffffff, "WM9711,WM9712",      patch_wolfson11, NULL},
 { 0x574d4c13, 0xffffffff, "WM9713,WM9714",      patch_wolfson13, NULL, AC97_DEFAULT_POWER_OFF},
-{ 0x594d4800, 0xffffffff, "YMF743",             NULL,           NULL },
+{ 0x594d4800, 0xffffffff, "YMF743",             patch_yamaha_ymf743,    NULL },
 { 0x594d4802, 0xffffffff, "YMF752",             NULL,           NULL },
 { 0x594d4803, 0xffffffff, "YMF753",             patch_yamaha_ymf753,    NULL },
 { 0x83847600, 0xffffffff, "STAC9700,83,84",     patch_sigmatel_stac9700,        NULL },
@@ -779,6 +779,12 @@ static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_
                 change |= snd_ac97_update_bits_nolock(ac97, AC97_CXR_AUDIO_MISC, 
                                                       AC97_CXR_SPDIF_MASK | AC97_CXR_COPYRGT,
                                                       v);
+        } else if (ac97->id == AC97_ID_YMF743) {
+                change |= snd_ac97_update_bits_nolock(ac97,
+                                                      AC97_YMF7X3_DIT_CTRL,
+                                                      0xff38,
+                                                      ((val << 4) & 0xff00) |
+                                                      ((val << 2) & 0x0038));
         } else {
                 unsigned short extst = snd_ac97_read_cache(ac97, AC97_EXTENDED_STATUS);
                 snd_ac97_update_bits_nolock(ac97, AC97_EXTENDED_STATUS, AC97_EA_SPDIF, 0); /* turn off */
@@ -1375,7 +1381,8 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         for (idx = 0; idx < 2; idx++) {
                                 if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_tone[idx], ac97))) < 0)
                                         return err;
-                                if (ac97->id == AC97_ID_YMF753) {
+                                if (ac97->id == AC97_ID_YMF743 ||
+                                    ac97->id == AC97_ID_YMF753) {
                                         kctl->private_value &= ~(0xff << 16);
                                         kctl->private_value |= 7 << 16;
                                 }
@@ -2036,11 +2043,12 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
         else {
                 udelay(50);
                 if (ac97->scaps & AC97_SCAP_SKIP_AUDIO)
-                        err = ac97_reset_wait(ac97, HZ/2, 1);
+                        err = ac97_reset_wait(ac97, msecs_to_jiffies(500), 1);
                 else {
-                        err = ac97_reset_wait(ac97, HZ/2, 0);
+                        err = ac97_reset_wait(ac97, msecs_to_jiffies(500), 0);
                         if (err < 0)
-                                err = ac97_reset_wait(ac97, HZ/2, 1);
+                                err = ac97_reset_wait(ac97,
+                                                      msecs_to_jiffies(500), 1);
                 }
                 if (err < 0) {
                         snd_printk(KERN_WARNING "AC'97 %d does not respond - RESET\n", ac97->num);
@@ -2104,7 +2112,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
                 }
                 /* nothing should be in powerdown mode */
                 snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);
-                end_time = jiffies + (HZ / 10);
+                end_time = jiffies + msecs_to_jiffies(100);
                 do {
                         if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)
                                 goto __ready_ok;
@@ -2136,7 +2144,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
                 udelay(100);
                 /* nothing should be in powerdown mode */
                 snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0);
-                end_time = jiffies + (HZ / 10);
+                end_time = jiffies + msecs_to_jiffies(100);
                 do {
                         if ((snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS) & tmp) == tmp)
                                 goto __ready_ok;
@@ -2354,7 +2362,8 @@ int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)
                  * (for avoiding loud click noises for many (OSS) apps
                  *  that open/close frequently)
                  */
-                schedule_delayed_work(&ac97->power_work, HZ*2);
+                schedule_delayed_work(&ac97->power_work,
+                                      msecs_to_jiffies(2000));
         else {
                 cancel_delayed_work(&ac97->power_work);
                 update_power_regs(ac97);
@@ -2436,7 +2445,7 @@ EXPORT_SYMBOL(snd_ac97_suspend);
 /*
  * restore ac97 status
  */
-void snd_ac97_restore_status(struct snd_ac97 *ac97)
+static void snd_ac97_restore_status(struct snd_ac97 *ac97)
 {
         int i;
 
@@ -2457,7 +2466,7 @@ void snd_ac97_restore_status(struct snd_ac97 *ac97)
 /*
  * restore IEC958 status
  */
-void snd_ac97_restore_iec958(struct snd_ac97 *ac97)
+static void snd_ac97_restore_iec958(struct snd_ac97 *ac97)
 {
         if (ac97->ext_id & AC97_EI_SPDIF) {
                 if (ac97->regs[AC97_EXTENDED_STATUS] & AC97_EA_SPDIF) {
@@ -2494,7 +2503,10 @@ void snd_ac97_resume(struct snd_ac97 *ac97)
 
         snd_ac97_write(ac97, AC97_POWERDOWN, 0);
         if (! (ac97->flags & AC97_DEFAULT_POWER_OFF)) {
-                snd_ac97_write(ac97, AC97_RESET, 0);
+                if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO))
+                        snd_ac97_write(ac97, AC97_RESET, 0);
+                else if (!(ac97->scaps & AC97_SCAP_SKIP_MODEM))
+                        snd_ac97_write(ac97, AC97_EXTENDED_MID, 0);
                 udelay(100);
                 snd_ac97_write(ac97, AC97_POWERDOWN, 0);
         }
diff --git a/sound/pci/ac97/ac97_id.h b/sound/pci/ac97/ac97_id.h
index 6d73514dc49e..c129492c82b3 100644
--- a/sound/pci/ac97/ac97_id.h
+++ b/sound/pci/ac97/ac97_id.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -54,6 +54,7 @@
 #define AC97_ID_ALC658          0x414c4780
 #define AC97_ID_ALC658D         0x414c4781
 #define AC97_ID_ALC850          0x414c4790
+#define AC97_ID_YMF743          0x594d4800
 #define AC97_ID_YMF753          0x594d4803
 #define AC97_ID_VT1616          0x49434551
 #define AC97_ID_CM9738          0x434d4941
diff --git a/sound/pci/ac97/ac97_local.h b/sound/pci/ac97/ac97_local.h
index 78745c5c6df8..c276a5e3f7ac 100644
--- a/sound/pci/ac97/ac97_local.h
+++ b/sound/pci/ac97/ac97_local.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 581ebba4d1a7..98c8b727b62b 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -204,9 +204,13 @@ static inline int is_shared_micin(struct snd_ac97 *ac97)
 
 
 /* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */
+/* Modified for YMF743 by Keita Maehara <maehara@debian.org> */
 
-/* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */
-static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+/* It is possible to indicate to the Yamaha YMF7x3 the type of
+   speakers being used. */
+
+static int snd_ac97_ymf7x3_info_speaker(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[3] = {
                 "Standard", "Small", "Smaller"
@@ -221,12 +225,13 @@ static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct sn
         return 0;
 }
 
-static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int snd_ac97_ymf7x3_get_speaker(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         unsigned short val;
 
-        val = ac97->regs[AC97_YMF753_3D_MODE_SEL];
+        val = ac97->regs[AC97_YMF7X3_3D_MODE_SEL];
         val = (val >> 10) & 3;
         if (val > 0)    /* 0 = invalid */
                 val--;
@@ -234,7 +239,8 @@ static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd
         return 0;
 }
 
-static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int snd_ac97_ymf7x3_put_speaker(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         unsigned short val;
@@ -242,20 +248,22 @@ static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd
         if (ucontrol->value.enumerated.item[0] > 2)
                 return -EINVAL;
         val = (ucontrol->value.enumerated.item[0] + 1) << 10;
-        return snd_ac97_update(ac97, AC97_YMF753_3D_MODE_SEL, val);
+        return snd_ac97_update(ac97, AC97_YMF7X3_3D_MODE_SEL, val);
 }
 
-static const struct snd_kcontrol_new snd_ac97_ymf753_controls_speaker =
+static const struct snd_kcontrol_new snd_ac97_ymf7x3_controls_speaker =
 {
         .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name   = "3D Control - Speaker",
-        .info   = snd_ac97_ymf753_info_speaker,
-        .get    = snd_ac97_ymf753_get_speaker,
-        .put    = snd_ac97_ymf753_put_speaker,
+        .info   = snd_ac97_ymf7x3_info_speaker,
+        .get    = snd_ac97_ymf7x3_get_speaker,
+        .put    = snd_ac97_ymf7x3_put_speaker,
 };
 
-/* It is possible to indicate to the Yamaha YMF753 the source to direct to the S/PDIF output. */
-static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+/* It is possible to indicate to the Yamaha YMF7x3 the source to
+   direct to the S/PDIF output. */
+static int snd_ac97_ymf7x3_spdif_source_info(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[2] = { "AC-Link", "A/D Converter" };
 
@@ -268,17 +276,19 @@ static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, stru
         return 0;
 }
 
-static int snd_ac97_ymf753_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int snd_ac97_ymf7x3_spdif_source_get(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         unsigned short val;
 
-        val = ac97->regs[AC97_YMF753_DIT_CTRL2];
+        val = ac97->regs[AC97_YMF7X3_DIT_CTRL];
         ucontrol->value.enumerated.item[0] = (val >> 1) & 1;
         return 0;
 }
 
-static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int snd_ac97_ymf7x3_spdif_source_put(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         unsigned short val;
@@ -286,7 +296,75 @@ static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struc
         if (ucontrol->value.enumerated.item[0] > 1)
                 return -EINVAL;
         val = ucontrol->value.enumerated.item[0] << 1;
-        return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0002, val);
+        return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0002, val);
+}
+
+static int patch_yamaha_ymf7x3_3d(struct snd_ac97 *ac97)
+{
+        struct snd_kcontrol *kctl;
+        int err;
+
+        kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97);
+        err = snd_ctl_add(ac97->bus->card, kctl);
+        if (err < 0)
+                return err;
+        strcpy(kctl->id.name, "3D Control - Wide");
+        kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0);
+        snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);
+        err = snd_ctl_add(ac97->bus->card,
+                          snd_ac97_cnew(&snd_ac97_ymf7x3_controls_speaker,
+                                        ac97));
+        if (err < 0)
+                return err;
+        snd_ac97_write_cache(ac97, AC97_YMF7X3_3D_MODE_SEL, 0x0c00);
+        return 0;
+}
+
+static const struct snd_kcontrol_new snd_ac97_yamaha_ymf743_controls_spdif[3] =
+{
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),
+                    AC97_YMF7X3_DIT_CTRL, 0, 1, 0),
+        {
+                .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name   = SNDRV_CTL_NAME_IEC958("", PLAYBACK, NONE) "Source",
+                .info   = snd_ac97_ymf7x3_spdif_source_info,
+                .get    = snd_ac97_ymf7x3_spdif_source_get,
+                .put    = snd_ac97_ymf7x3_spdif_source_put,
+        },
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("", NONE, NONE) "Mute",
+                    AC97_YMF7X3_DIT_CTRL, 2, 1, 1)
+};
+
+static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
+{
+        int err;
+
+        err = patch_build_controls(ac97, &snd_ac97_controls_spdif[0], 3);
+        if (err < 0)
+                return err;
+        err = patch_build_controls(ac97,
+                                   snd_ac97_yamaha_ymf743_controls_spdif, 3);
+        if (err < 0)
+                return err;
+        /* set default PCM S/PDIF params */
+        /* PCM audio,no copyright,no preemphasis,PCM coder,original */
+        snd_ac97_write_cache(ac97, AC97_YMF7X3_DIT_CTRL, 0xa201);
+        return 0;
+}
+
+static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
+        .build_spdif    = patch_yamaha_ymf743_build_spdif,
+        .build_3d       = patch_yamaha_ymf7x3_3d,
+};
+
+static int patch_yamaha_ymf743(struct snd_ac97 *ac97)
+{
+        ac97->build_ops = &patch_yamaha_ymf743_ops;
+        ac97->caps |= AC97_BC_BASS_TREBLE;
+        ac97->caps |= 0x04 << 10; /* Yamaha 3D enhancement */
+        ac97->rates[AC97_RATES_SPDIF] = SNDRV_PCM_RATE_48000; /* 48k only */
+        ac97->ext_id |= AC97_EI_SPDIF; /* force the detection of spdif */
+        return 0;
 }
 
 /* The AC'97 spec states that the S/PDIF signal is to be output at pin 48.
@@ -311,7 +389,7 @@ static int snd_ac97_ymf753_spdif_output_pin_get(struct snd_kcontrol *kcontrol, s
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         unsigned short val;
 
-        val = ac97->regs[AC97_YMF753_DIT_CTRL2];
+        val = ac97->regs[AC97_YMF7X3_DIT_CTRL];
         ucontrol->value.enumerated.item[0] = (val & 0x0008) ? 2 : (val & 0x0020) ? 1 : 0;
         return 0;
 }
@@ -325,7 +403,7 @@ static int snd_ac97_ymf753_spdif_output_pin_put(struct snd_kcontrol *kcontrol, s
                 return -EINVAL;
         val = (ucontrol->value.enumerated.item[0] == 2) ? 0x0008 :
               (ucontrol->value.enumerated.item[0] == 1) ? 0x0020 : 0;
-        return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0028, val);
+        return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0028, val);
         /* The following can be used to direct S/PDIF output to pin 47 (EAPD).
            snd_ac97_write_cache(ac97, 0x62, snd_ac97_read(ac97, 0x62) | 0x0008); */
 }
@@ -334,9 +412,9 @@ static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = {
         {
                 .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name   = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
-                .info   = snd_ac97_ymf753_spdif_source_info,
-                .get    = snd_ac97_ymf753_spdif_source_get,
-                .put    = snd_ac97_ymf753_spdif_source_put,
+                .info   = snd_ac97_ymf7x3_spdif_source_info,
+                .get    = snd_ac97_ymf7x3_spdif_source_get,
+                .put    = snd_ac97_ymf7x3_spdif_source_put,
         },
         {
                 .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -345,25 +423,10 @@ static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = {
                 .get    = snd_ac97_ymf753_spdif_output_pin_get,
                 .put    = snd_ac97_ymf753_spdif_output_pin_put,
         },
-        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF753_DIT_CTRL2, 2, 1, 1)
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("", NONE, NONE) "Mute",
+                    AC97_YMF7X3_DIT_CTRL, 2, 1, 1)
 };
 
-static int patch_yamaha_ymf753_3d(struct snd_ac97 * ac97)
-{
-        struct snd_kcontrol *kctl;
-        int err;
-
-        if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)
-                return err;
-        strcpy(kctl->id.name, "3D Control - Wide");
-        kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0);
-        snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);
-        if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_ymf753_controls_speaker, ac97))) < 0)
-                return err;
-        snd_ac97_write_cache(ac97, AC97_YMF753_3D_MODE_SEL, 0x0c00);
-        return 0;
-}
-
 static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
 {
         int err;
@@ -374,7 +437,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
 }
 
 static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
-        .build_3d       = patch_yamaha_ymf753_3d,
+        .build_3d       = patch_yamaha_ymf7x3_3d,
         .build_post_spdif = patch_yamaha_ymf753_post_spdif
 };
 
@@ -1880,14 +1943,7 @@ static int patch_ad1981b(struct snd_ac97 *ac97)
         return 0;
 }
 
-static int snd_ac97_ad1888_lohpsel_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ac97_ad1888_lohpsel_info    snd_ctl_boolean_mono_info
 
 static int snd_ac97_ad1888_lohpsel_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2186,15 +2242,7 @@ static int patch_ad1985(struct snd_ac97 * ac97)
         return 0;
 }
 
-static int snd_ac97_ad1986_bool_info(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ac97_ad1986_bool_info       snd_ctl_boolean_mono_info
 
 static int snd_ac97_ad1986_lososel_get(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/ac97/ac97_patch.h b/sound/pci/ac97/ac97_patch.h
index fd341ce63762..9cccc27ea1b5 100644
--- a/sound/pci/ac97/ac97_patch.h
+++ b/sound/pci/ac97/ac97_patch.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index 4281e6d0c5b6..8cbc03332b01 100644
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
diff --git a/sound/pci/ac97/ac97_proc.c b/sound/pci/ac97/ac97_proc.c
index a3fdd7da911c..fed4a2c3d8a1 100644
--- a/sound/pci/ac97/ac97_proc.c
+++ b/sound/pci/ac97/ac97_proc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal interface for Audio Codec '97
  *
  *  For more details look to AC '97 component specification revision 2.2
@@ -236,10 +236,14 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe
                 val = snd_ac97_read(ac97, AC97_PCM_MIC_ADC_RATE);
                 snd_iprintf(buffer, "PCM MIC ADC      : %iHz\n", val);
         }
-        if ((ext & AC97_EI_SPDIF) || (ac97->flags & AC97_CS_SPDIF)) {
+        if ((ext & AC97_EI_SPDIF) || (ac97->flags & AC97_CS_SPDIF) ||
+            (ac97->id == AC97_ID_YMF743)) {
                 if (ac97->flags & AC97_CS_SPDIF)
                         val = snd_ac97_read(ac97, AC97_CSR_SPDIF);
-                else
+                else if (ac97->id == AC97_ID_YMF743) {
+                        val = snd_ac97_read(ac97, AC97_YMF7X3_DIT_CTRL);
+                        val = 0x2000 | (val & 0xff00) >> 4 | (val & 0x38) >> 2;
+                } else
                         val = snd_ac97_read(ac97, AC97_SPDIF);
 
                 snd_iprintf(buffer, "SPDIF Control    :%s%s%s%s Category=0x%x Generation=%i%s%s%s\n",
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c
index dc26820a03a5..722de451d15f 100644
--- a/sound/pci/ac97/ak4531_codec.c
+++ b/sound/pci/ac97/ak4531_codec.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal routines for AK4531 codec
  *
  *
@@ -29,7 +29,7 @@
 #include <sound/ak4531_codec.h>
 #include <sound/tlv.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Universal routines for AK4531 codec");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/pci/ali5451/Makefile b/sound/pci/ali5451/Makefile
index 2e1831597474..713459c12d22 100644
--- a/sound/pci/ali5451/Makefile
+++ b/sound/pci/ali5451/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ali5451-objs := ali5451.o
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 05b4c8696941..4c2bd7adf674 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -1804,15 +1804,7 @@ static int __devinit snd_ali_build_pcms(struct snd_ali *codec)
 .info = snd_ali5451_spdif_info, .get = snd_ali5451_spdif_get, \
 .put = snd_ali5451_spdif_put, .private_value = value}
 
-static int snd_ali5451_spdif_info(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ali5451_spdif_info          snd_ctl_boolean_mono_info
 
 static int snd_ali5451_spdif_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 8fb55d3b454b..1190ef366a41 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -1,7 +1,7 @@
 /*
  *  card-als4000.c - driver for Avance Logic ALS4000 based soundcards.
  *  Copyright (C) 2000 by Bart Hartgers <bart@etpmod.phys.tue.nl>,
- *                        Jaroslav Kysela <perex@suse.cz>
+ *                        Jaroslav Kysela <perex@perex.cz>
  *  Copyright (C) 2002 by Andreas Mohr <hw7oshyuv3001@sneakemail.com>
  *
  *  Framework borrowed from Massimo Piccioni's card-als100.c.
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 5ec1b6fcd548..f70286a7364a 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -232,6 +232,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         pci_disable_device(chip->pci_dev);
         //FIXME: this not the right place to unregister the gameport
         vortex_gameport_unregister(chip);
+        kfree(chip);
         return err;
 }
 
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 0c86a31c4336..38602b85874d 100644
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -728,15 +728,7 @@ static void vortex_Eqlzr_shutdown(vortex_t * vortex)
 /* ALSA interface */
 
 /* Control interface */
-static int
-snd_vortex_eqtoggle_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_vortex_eqtoggle_info        snd_ctl_boolean_mono_info
 
 static int
 snd_vortex_eqtoggle_get(struct snd_kcontrol *kcontrol,
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c
index c75d368ea087..8db3d3e6f7bb 100644
--- a/sound/pci/au88x0/au88x0_mpu401.c
+++ b/sound/pci/au88x0/au88x0_mpu401.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of MPU-401 in UART mode
  *
  *   Modified for the Aureal Vortex based Soundcards
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index d3e662a1285d..978b856f5621 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -370,8 +370,8 @@ static void vortex_wt_SetFrequency(vortex_t * vortex, int wt, unsigned int sr)
                         while ((edx & 0x80000000) == 0) {
                                 edx <<= 1;
                                 eax--;
-                                if (eax == 0) ;
-                                break;
+                                if (eax == 0)
+                                        break;
                         }
                         if (eax)
                                 edx <<= 1;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 131952f55857..91f9e6a112ff 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -147,15 +147,56 @@ MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards");
 /* SYNC, one WRITE per line, one extra WRITE per page boundary, SYNC, JUMP */
 #define MAX_RISC_SIZE ((1 + 255 + (PAGE_ALIGN(255 * 4092) / PAGE_SIZE - 1) + 1 + 1) * 8)
 
+/* Cards with configuration information */
+enum snd_bt87x_boardid {
+        SND_BT87X_BOARD_UNKNOWN,
+        SND_BT87X_BOARD_GENERIC,        /* both an & dig interfaces, 32kHz */
+        SND_BT87X_BOARD_ANALOG,         /* board with no external A/D */
+        SND_BT87X_BOARD_OSPREY2x0,
+        SND_BT87X_BOARD_OSPREY440,
+        SND_BT87X_BOARD_AVPHONE98,
+};
+
+/* Card configuration */
+struct snd_bt87x_board {
+        int dig_rate;           /* Digital input sampling rate */
+        u32 digital_fmt;        /* Register settings for digital input */
+        unsigned no_analog:1;   /* No analog input */
+        unsigned no_digital:1;  /* No digital input */
+};
+
+static const __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = {
+        [SND_BT87X_BOARD_UNKNOWN] = {
+                .dig_rate = 32000, /* just a guess */
+        },
+        [SND_BT87X_BOARD_GENERIC] = {
+                .dig_rate = 32000,
+        },
+        [SND_BT87X_BOARD_ANALOG] = {
+                .no_digital = 1,
+        },
+        [SND_BT87X_BOARD_OSPREY2x0] = {
+                .dig_rate = 44100,
+                .digital_fmt = CTL_DA_LRI | (1 << CTL_DA_LRD_SHIFT),
+        },
+        [SND_BT87X_BOARD_OSPREY440] = {
+                .dig_rate = 32000,
+                .digital_fmt = CTL_DA_LRI | (1 << CTL_DA_LRD_SHIFT),
+                .no_analog = 1,
+        },
+        [SND_BT87X_BOARD_AVPHONE98] = {
+                .dig_rate = 48000,
+        },
+};
+
 struct snd_bt87x {
         struct snd_card *card;
         struct pci_dev *pci;
+        struct snd_bt87x_board board;
 
         void __iomem *mmio;
         int irq;
 
-        int dig_rate;
-
         spinlock_t reg_lock;
         unsigned long opened;
         struct snd_pcm_substream *substream;
@@ -340,30 +381,11 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = {
 
 static int snd_bt87x_set_digital_hw(struct snd_bt87x *chip, struct snd_pcm_runtime *runtime)
 {
-        static struct {
-                int rate;
-                unsigned int bit;
-        } ratebits[] = {
-                {8000, SNDRV_PCM_RATE_8000},
-                {11025, SNDRV_PCM_RATE_11025},
-                {16000, SNDRV_PCM_RATE_16000},
-                {22050, SNDRV_PCM_RATE_22050},
-                {32000, SNDRV_PCM_RATE_32000},
-                {44100, SNDRV_PCM_RATE_44100},
-                {48000, SNDRV_PCM_RATE_48000}
-        };
-        int i;
-
-        chip->reg_control |= CTL_DA_IOM_DA;
+        chip->reg_control |= CTL_DA_IOM_DA | CTL_A_PWRDN;
         runtime->hw = snd_bt87x_digital_hw;
-        runtime->hw.rates = SNDRV_PCM_RATE_KNOT;
-        for (i = 0; i < ARRAY_SIZE(ratebits); ++i)
-                if (chip->dig_rate == ratebits[i].rate) {
-                        runtime->hw.rates = ratebits[i].bit;
-                        break;
-                }
-        runtime->hw.rate_min = chip->dig_rate;
-        runtime->hw.rate_max = chip->dig_rate;
+        runtime->hw.rates = snd_pcm_rate_to_rate_bit(chip->board.dig_rate);
+        runtime->hw.rate_min = chip->board.dig_rate;
+        runtime->hw.rate_max = chip->board.dig_rate;
         return 0;
 }
 
@@ -380,7 +402,7 @@ static int snd_bt87x_set_analog_hw(struct snd_bt87x *chip, struct snd_pcm_runtim
                 .rats = &analog_clock
         };
 
-        chip->reg_control &= ~CTL_DA_IOM_DA;
+        chip->reg_control &= ~(CTL_DA_IOM_DA | CTL_A_PWRDN);
         runtime->hw = snd_bt87x_analog_hw;
         return snd_pcm_hw_constraint_ratnums(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                              &constraint_rates);
@@ -419,6 +441,11 @@ static int snd_bt87x_close(struct snd_pcm_substream *substream)
 {
         struct snd_bt87x *chip = snd_pcm_substream_chip(substream);
 
+        spin_lock_irq(&chip->reg_lock);
+        chip->reg_control |= CTL_A_PWRDN;
+        snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip->reg_control);
+        spin_unlock_irq(&chip->reg_lock);
+
         chip->substream = NULL;
         clear_bit(0, &chip->opened);
         smp_mb__after_clear_bit();
@@ -569,15 +596,7 @@ static struct snd_kcontrol_new snd_bt87x_capture_volume = {
         .put = snd_bt87x_capture_volume_put,
 };
 
-static int snd_bt87x_capture_boost_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *info)
-{
-        info->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        info->count = 1;
-        info->value.integer.min = 0;
-        info->value.integer.max = 1;
-        return 0;
-}
+#define snd_bt87x_capture_boost_info    snd_ctl_boolean_mono_info
 
 static int snd_bt87x_capture_boost_get(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *value)
@@ -736,61 +755,69 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
         chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
                                      pci_resource_len(pci, 0));
         if (!chip->mmio) {
-                snd_bt87x_free(chip);
                 snd_printk(KERN_ERR "cannot remap io memory\n");
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto fail;
         }
 
-        chip->reg_control = CTL_DA_ES2 | CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT);
+        chip->reg_control = CTL_A_PWRDN | CTL_DA_ES2 |
+                            CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT);
         chip->interrupt_mask = MY_INTERRUPTS;
         snd_bt87x_writel(chip, REG_GPIO_DMA_CTL, chip->reg_control);
         snd_bt87x_writel(chip, REG_INT_MASK, 0);
         snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
 
-        if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
-                        "Bt87x audio", chip)) {
-                snd_bt87x_free(chip);
-                snd_printk(KERN_ERR "cannot grab irq\n");
-                return -EBUSY;
+        err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
+                          "Bt87x audio", chip);
+        if (err < 0) {
+                snd_printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
+                goto fail;
         }
         chip->irq = pci->irq;
         pci_set_master(pci);
         synchronize_irq(chip->irq);
 
         err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-        if (err < 0) {
-                snd_bt87x_free(chip);
-                return err;
-        }
+        if (err < 0)
+                goto fail;
+
         snd_card_set_dev(card, &pci->dev);
         *rchip = chip;
         return 0;
+
+fail:
+        snd_bt87x_free(chip);
+        return err;
 }
 
-#define BT_DEVICE(chip, subvend, subdev, rate) \
+#define BT_DEVICE(chip, subvend, subdev, id) \
         { .vendor = PCI_VENDOR_ID_BROOKTREE, \
           .device = chip, \
           .subvendor = subvend, .subdevice = subdev, \
-          .driver_data = rate }
+          .driver_data = SND_BT87X_BOARD_ ## id }
+/* driver_data is the card id for that device */
 
-/* driver_data is the default digital_rate value for that device */
 static struct pci_device_id snd_bt87x_ids[] = {
         /* Hauppauge WinTV series */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0x13eb, GENERIC),
         /* Hauppauge WinTV series */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, GENERIC),
         /* Viewcast Osprey 200 */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, OSPREY2x0),
         /* Viewcast Osprey 440 (rate is configurable via gpio) */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff07, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff07, OSPREY440),
         /* ATI TV-Wonder */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1002, 0x0001, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1002, 0x0001, GENERIC),
         /* Leadtek Winfast tv 2000xp delux */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC),
         /* Voodoo TV 200 */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, 32000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC),
         /* AVerMedia Studio No. 103, 203, ...? */
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98),
+        /* Prolink PixelView PV-M4900 */
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1554, 0x4011, GENERIC),
+        /* Pinnacle  Studio PCTV rave */
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0xbd11, 0x1200, GENERIC),
         { }
 };
 MODULE_DEVICE_TABLE(pci, snd_bt87x_ids);
@@ -815,7 +842,7 @@ static struct {
 
 static struct pci_driver driver;
 
-/* return the rate of the card, or a negative value if it's blacklisted */
+/* return the id of the card, or a negative value if it's blacklisted */
 static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
 {
         int i;
@@ -833,12 +860,12 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
                         return -EBUSY;
                 }
 
-        snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x, using default rate 32000\n",
-                   pci->device, pci->subsystem_vendor, pci->subsystem_device);
+        snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x\n",
+                   pci->device, pci->subsystem_vendor, pci->subsystem_device);
         snd_printk(KERN_DEBUG "please mail id, board name, and, "
                    "if it works, the correct digital_rate option to "
                    "<alsa-devel@alsa-project.org>\n");
-        return 32000; /* default rate */
+        return SND_BT87X_BOARD_UNKNOWN;
 }
 
 static int __devinit snd_bt87x_probe(struct pci_dev *pci,
@@ -847,12 +874,16 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
         static int dev;
         struct snd_card *card;
         struct snd_bt87x *chip;
-        int err, rate;
+        int err;
+        enum snd_bt87x_boardid boardid;
 
-        rate = pci_id->driver_data;
-        if (! rate)
-                if ((rate = snd_bt87x_detect_card(pci)) <= 0)
+        if (!pci_id->driver_data) {
+                err = snd_bt87x_detect_card(pci);
+                if (err < 0)
                         return -ENODEV;
+                boardid = err;
+        } else
+                boardid = pci_id->driver_data;
 
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
@@ -869,27 +900,39 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
         if (err < 0)
                 goto _error;
 
-        if (digital_rate[dev] > 0)
-                chip->dig_rate = digital_rate[dev];
-        else
-                chip->dig_rate = rate;
+        memcpy(&chip->board, &snd_bt87x_boards[boardid], sizeof(chip->board));
 
-        err = snd_bt87x_pcm(chip, DEVICE_DIGITAL, "Bt87x Digital");
-        if (err < 0)
-                goto _error;
-        err = snd_bt87x_pcm(chip, DEVICE_ANALOG, "Bt87x Analog");
-        if (err < 0)
-                goto _error;
+        if (!chip->board.no_digital) {
+                if (digital_rate[dev] > 0)
+                        chip->board.dig_rate = digital_rate[dev];
 
-        err = snd_ctl_add(card, snd_ctl_new1(&snd_bt87x_capture_volume, chip));
-        if (err < 0)
-                goto _error;
-        err = snd_ctl_add(card, snd_ctl_new1(&snd_bt87x_capture_boost, chip));
-        if (err < 0)
-                goto _error;
-        err = snd_ctl_add(card, snd_ctl_new1(&snd_bt87x_capture_source, chip));
-        if (err < 0)
-                goto _error;
+                chip->reg_control |= chip->board.digital_fmt;
+
+                err = snd_bt87x_pcm(chip, DEVICE_DIGITAL, "Bt87x Digital");
+                if (err < 0)
+                        goto _error;
+        }
+        if (!chip->board.no_analog) {
+                err = snd_bt87x_pcm(chip, DEVICE_ANALOG, "Bt87x Analog");
+                if (err < 0)
+                        goto _error;
+                err = snd_ctl_add(card, snd_ctl_new1(
+                                  &snd_bt87x_capture_volume, chip));
+                if (err < 0)
+                        goto _error;
+                err = snd_ctl_add(card, snd_ctl_new1(
+                                  &snd_bt87x_capture_boost, chip));
+                if (err < 0)
+                        goto _error;
+                err = snd_ctl_add(card, snd_ctl_new1(
+                                  &snd_bt87x_capture_source, chip));
+                if (err < 0)
+                        goto _error;
+        }
+        snd_printk(KERN_INFO "bt87x%d: Using board %d, %sanalog, %sdigital "
+                   "(rate %d Hz)\n", dev, boardid,
+                   chip->board.no_analog ? "no " : "",
+                   chip->board.no_digital ? "no " : "", chip->board.dig_rate);
 
         strcpy(card->driver, "Bt87x");
         sprintf(card->shortname, "Brooktree Bt%x", pci->device);
@@ -920,8 +963,8 @@ static void __devexit snd_bt87x_remove(struct pci_dev *pci)
 /* default entries for all Bt87x cards - it's not exported */
 /* driver_data is set to 0 to call detection */
 static struct pci_device_id snd_bt87x_default_ids[] __devinitdata = {
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, 0),
-        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, 0),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN),
         { }
 };
 
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index a0420bc63f0b..75da1746e758 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.21
+ *  Version: 0.0.22
  *
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
@@ -47,6 +47,8 @@
  *    Added GPIO info for SB Live 24bit.
  *  0.0.21
  *   Implement support for Line-in capture on SB Live 24bit.
+ *  0.0.22
+ *    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:
@@ -552,6 +554,95 @@
 #define CONTROL_CENTER_LFE_CHANNEL 1
 #define CONTROL_UNKNOWN_CHANNEL 2
 
+
+/* Based on WM8768 Datasheet Rev 4.2 page 32 */
+#define SPI_REG_MASK    0x1ff   /* 16-bit SPI writes have a 7-bit address */
+#define SPI_REG_SHIFT   9       /* followed by 9 bits of data */
+
+#define SPI_LDA1_REG            0       /* digital attenuation */
+#define SPI_RDA1_REG            1
+#define SPI_LDA2_REG            4
+#define SPI_RDA2_REG            5
+#define SPI_LDA3_REG            6
+#define SPI_RDA3_REG            7
+#define SPI_LDA4_REG            13
+#define SPI_RDA4_REG            14
+#define SPI_MASTDA_REG          8
+
+#define SPI_DA_BIT_UPDATE       (1<<8)  /* update attenuation values */
+#define SPI_DA_BIT_0dB          0xff    /* 0 dB */
+#define SPI_DA_BIT_infdB        0x00    /* inf dB attenuation (mute) */
+
+#define SPI_PL_REG              2
+#define SPI_PL_BIT_L_M          (0<<5)  /* left channel = mute */
+#define SPI_PL_BIT_L_L          (1<<5)  /* left channel = left */
+#define SPI_PL_BIT_L_R          (2<<5)  /* left channel = right */
+#define SPI_PL_BIT_L_C          (3<<5)  /* left channel = (L+R)/2 */
+#define SPI_PL_BIT_R_M          (0<<7)  /* right channel = mute */
+#define SPI_PL_BIT_R_L          (1<<7)  /* right channel = left */
+#define SPI_PL_BIT_R_R          (2<<7)  /* right channel = right */
+#define SPI_PL_BIT_R_C          (3<<7)  /* right channel = (L+R)/2 */
+#define SPI_IZD_REG             2
+#define SPI_IZD_BIT             (1<<4)  /* infinite zero detect */
+
+#define SPI_FMT_REG             3
+#define SPI_FMT_BIT_RJ          (0<<0)  /* right justified mode */
+#define SPI_FMT_BIT_LJ          (1<<0)  /* left justified mode */
+#define SPI_FMT_BIT_I2S         (2<<0)  /* I2S mode */
+#define SPI_FMT_BIT_DSP         (3<<0)  /* DSP Modes A or B */
+#define SPI_LRP_REG             3
+#define SPI_LRP_BIT             (1<<2)  /* invert LRCLK polarity */
+#define SPI_BCP_REG             3
+#define SPI_BCP_BIT             (1<<3)  /* invert BCLK polarity */
+#define SPI_IWL_REG             3
+#define SPI_IWL_BIT_16          (0<<4)  /* 16-bit world length */
+#define SPI_IWL_BIT_20          (1<<4)  /* 20-bit world length */
+#define SPI_IWL_BIT_24          (2<<4)  /* 24-bit world length */
+#define SPI_IWL_BIT_32          (3<<4)  /* 32-bit world length */
+
+#define SPI_MS_REG              10
+#define SPI_MS_BIT              (1<<5)  /* master mode */
+#define SPI_RATE_REG            10      /* only applies in master mode */
+#define SPI_RATE_BIT_128        (0<<6)  /* MCLK = LRCLK * 128 */
+#define SPI_RATE_BIT_192        (1<<6)
+#define SPI_RATE_BIT_256        (2<<6)
+#define SPI_RATE_BIT_384        (3<<6)
+#define SPI_RATE_BIT_512        (4<<6)
+#define SPI_RATE_BIT_768        (5<<6)
+
+/* They really do label the bit for the 4th channel "4" and not "3" */
+#define SPI_DMUTE0_REG          9
+#define SPI_DMUTE1_REG          9
+#define SPI_DMUTE2_REG          9
+#define SPI_DMUTE4_REG          15
+#define SPI_DMUTE0_BIT          (1<<3)
+#define SPI_DMUTE1_BIT          (1<<4)
+#define SPI_DMUTE2_BIT          (1<<5)
+#define SPI_DMUTE4_BIT          (1<<2)
+
+#define SPI_PHASE0_REG          3
+#define SPI_PHASE1_REG          3
+#define SPI_PHASE2_REG          3
+#define SPI_PHASE4_REG          15
+#define SPI_PHASE0_BIT          (1<<6)
+#define SPI_PHASE1_BIT          (1<<7)
+#define SPI_PHASE2_BIT          (1<<8)
+#define SPI_PHASE4_BIT          (1<<3)
+
+#define SPI_PDWN_REG            2       /* power down all DACs */
+#define SPI_PDWN_BIT            (1<<2)
+#define SPI_DACD0_REG           10      /* power down individual DACs */
+#define SPI_DACD1_REG           10
+#define SPI_DACD2_REG           10
+#define SPI_DACD4_REG           15
+#define SPI_DACD0_BIT           (1<<1)
+#define SPI_DACD1_BIT           (1<<2)
+#define SPI_DACD2_BIT           (1<<3)
+#define SPI_DACD4_BIT           (1<<0)  /* datasheet error says it's 1 */
+
+#define SPI_PWRDNALL_REG        10      /* power down everything */
+#define SPI_PWRDNALL_BIT        (1<<4)
+
 #include "ca_midi.h"
 
 struct snd_ca0106;
@@ -611,6 +702,8 @@ struct snd_ca0106 {
 
         struct snd_ca_midi midi;
         struct snd_ca_midi midi2;
+
+        u16 spi_dac_reg[16];
 };
 
 int snd_ca0106_mixer(struct snd_ca0106 *emu);
@@ -627,4 +720,5 @@ void snd_ca0106_ptr_write(struct snd_ca0106 *emu,
 
 int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value);
 
-
+int snd_ca0106_spi_write(struct snd_ca0106 * emu,
+                                   unsigned int data);
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index fcab8fb97e38..31d8db9f7a4c 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.23
+ *  Version: 0.0.25
  *
  *  FEATURES currently supported:
  *    Front, Rear and Center/LFE.
@@ -79,6 +79,10 @@
  *    Add support for MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97. From kiksen, bug #901
  *  0.0.23
  *    Implement support for Line-in capture on SB Live 24bit.
+ *  0.0.24
+ *    Add support for mute control on SB Live 24bit (cards w/ SPI DAC)
+ *  0.0.25
+ *    Powerdown SPI DAC channels when not in use
  *
  *  BUGS:
  *    Some stability problems when unloading the snd-ca0106 kernel module.
@@ -170,6 +174,15 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
 static struct snd_ca0106_details ca0106_chip_details[] = {
          /* Sound Blaster X-Fi Extreme Audio. This does not have an AC97. 53SB079000000 */
          /* It is really just a normal SB Live 24bit. */
+         /* Tested:
+          * See ALSA bug#3251
+          */
+         { .serial = 0x10131102,
+           .name   = "X-Fi Extreme Audio [SBxxxx]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* Sound Blaster X-Fi Extreme Audio. This does not have an AC97. 53SB079000000 */
+         /* It is really just a normal SB Live 24bit. */
          /*
           * CTRL:CA0111-WTLF
           * ADC: WM8775SEDS
@@ -261,10 +274,11 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
 
 /* hardware definition */
 static struct snd_pcm_hardware snd_ca0106_playback_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .info =                 SNDRV_PCM_INFO_MMAP | 
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_SYNC_START,
         .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
         .rates =                (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
                                  SNDRV_PCM_RATE_192000),
@@ -447,6 +461,19 @@ static void snd_ca0106_pcm_free_substream(struct snd_pcm_runtime *runtime)
         kfree(runtime->private_data);
 }
 
+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,
+};
+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,
+};
+
 /* open_playback callback */
 static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substream,
                                                 int channel_id)
@@ -481,6 +508,17 @@ static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substr
                 return err;
         if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
                 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]);
+                if (err < 0)
+                        return err;
+        }
         return 0;
 }
 
@@ -491,6 +529,14 @@ static int snd_ca0106_pcm_close_playback(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_ca0106_pcm *epcm = runtime->private_data;
         chip->playback_channels[epcm->channel_id].use = 0;
+
+        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]);
+        }
         /* FIXME: maybe zero others */
         return 0;
 }
@@ -809,6 +855,9 @@ static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream,
                 break;
         }
         snd_pcm_group_for_each_entry(s, substream) {
+                if (snd_pcm_substream_chip(s) != emu ||
+                    s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+                        continue;
                 runtime = s->runtime;
                 epcm = runtime->private_data;
                 channel = epcm->channel_id;
@@ -1214,28 +1263,23 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device, struct s
         return 0;
 }
 
+#define SPI_REG(reg, value)     (((reg) << SPI_REG_SHIFT) | (value))
 static unsigned int spi_dac_init[] = {
-        0x00ff,
-        0x02ff,
-        0x0400,
-        0x0520,
-        0x0620, /* Set 24 bit. Was 0x0600 */
-        0x08ff,
-        0x0aff,
-        0x0cff,
-        0x0eff,
-        0x10ff,
-        0x1200,
-        0x1400,
-        0x1480,
-        0x1800,
-        0x1aff,
-        0x1cff,
-        0x1e00,
-        0x0530,
-        0x0602,
-        0x0622,
-        0x1400,
+        SPI_REG(SPI_LDA1_REG,   SPI_DA_BIT_0dB), /* 0dB dig. attenuation */
+        SPI_REG(SPI_RDA1_REG,   SPI_DA_BIT_0dB),
+        SPI_REG(SPI_PL_REG,     SPI_PL_BIT_L_L | SPI_PL_BIT_R_R | SPI_IZD_BIT),
+        SPI_REG(SPI_FMT_REG,    SPI_FMT_BIT_I2S | SPI_IWL_BIT_24),
+        SPI_REG(SPI_LDA2_REG,   SPI_DA_BIT_0dB),
+        SPI_REG(SPI_RDA2_REG,   SPI_DA_BIT_0dB),
+        SPI_REG(SPI_LDA3_REG,   SPI_DA_BIT_0dB),
+        SPI_REG(SPI_RDA3_REG,   SPI_DA_BIT_0dB),
+        SPI_REG(SPI_MASTDA_REG, SPI_DA_BIT_0dB),
+        SPI_REG(9,              0x00),
+        SPI_REG(SPI_MS_REG,     SPI_DACD0_BIT | SPI_DACD1_BIT | SPI_DACD2_BIT),
+        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),
 };
 
 static unsigned int i2c_adc_init[][2] = {
@@ -1475,8 +1519,13 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
                 int size, n;
 
                 size = ARRAY_SIZE(spi_dac_init);
-                for (n=0; n < size; n++)
+                for (n = 0; n < size; n++) {
+                        int reg = spi_dac_init[n] >> SPI_REG_SHIFT;
+
                         snd_ca0106_spi_write(chip, spi_dac_init[n]);
+                        if (reg < ARRAY_SIZE(chip->spi_dac_reg))
+                                chip->spi_dac_reg[reg] = spi_dac_init[n];
+                }
         }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 9c3a9c8d1dc2..be519a17dfa5 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.17
+ *  Version: 0.0.18
  *
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
@@ -39,6 +39,8 @@
  *    Modified Copyright message.
  *  0.0.17
  *    Implement Mic and Line in Capture.
+ *  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:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
@@ -77,15 +79,7 @@
 static const DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
 static const DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);
 
-static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ca0106_shared_spdif_info    snd_ctl_boolean_mono_info
 
 static int snd_ca0106_shared_spdif_get(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
@@ -470,6 +464,42 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+#define spi_mute_info   snd_ctl_boolean_mono_info
+
+static int spi_mute_get(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int reg = kcontrol->private_value >> SPI_REG_SHIFT;
+        unsigned int bit = kcontrol->private_value & SPI_REG_MASK;
+
+        ucontrol->value.integer.value[0] = !(emu->spi_dac_reg[reg] & bit);
+        return 0;
+}
+
+static int spi_mute_put(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int reg = kcontrol->private_value >> SPI_REG_SHIFT;
+        unsigned int bit = kcontrol->private_value & SPI_REG_MASK;
+        int ret;
+
+        ret = emu->spi_dac_reg[reg] & bit;
+        if (ucontrol->value.integer.value[0]) {
+                if (!ret)       /* bit already cleared, do nothing */
+                        return 0;
+                emu->spi_dac_reg[reg] &= ~bit;
+        } else {
+                if (ret)        /* bit already set, do nothing */
+                        return 0;
+                emu->spi_dac_reg[reg] |= bit;
+        }
+
+        ret = snd_ca0106_spi_write(emu, emu->spi_dac_reg[reg]);
+        return ret ? -1 : 1;
+}
+
 #define CA_VOLUME(xname,chid,reg) \
 {                                                               \
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
@@ -562,6 +592,28 @@ 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 int __devinit remove_ctl(struct snd_card *card, const char *name)
 {
         struct snd_ctl_elem_id id;
@@ -591,9 +643,19 @@ static int __devinit rename_ctl(struct snd_card *card, const char *src, const ch
         return -ENOENT;
 }
 
+#define ADD_CTLS(emu, ctls)                                             \
+        do {                                                            \
+                int i, err;                                             \
+                for (i = 0; i < ARRAY_SIZE(ctls); i++) {                \
+                        err = snd_ctl_add(card, snd_ctl_new1(&ctls[i], emu)); \
+                        if (err < 0)                                    \
+                                return err;                             \
+                }                                                       \
+        } while (0)
+
 int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
 {
-        int i, err;
+        int err;
         struct snd_card *card = emu->card;
         char **c;
         static char *ca0106_remove_ctls[] = {
@@ -640,17 +702,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                 rename_ctl(card, c[0], c[1]);
 #endif
 
-        for (i = 0; i < ARRAY_SIZE(snd_ca0106_volume_ctls); i++) {
-                err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_volume_ctls[i], emu));
-                if (err < 0)
-                        return err;
-        }
+        ADD_CTLS(emu, snd_ca0106_volume_ctls);
         if (emu->details->i2c_adc == 1) {
-                for (i = 0; i < ARRAY_SIZE(snd_ca0106_volume_i2c_adc_ctls); i++) {
-                        err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_volume_i2c_adc_ctls[i], emu));
-                        if (err < 0)
-                                return err;
-                }
+                ADD_CTLS(emu, snd_ca0106_volume_i2c_adc_ctls);
                 if (emu->details->gpio_type == 1)
                         err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu));
                 else  /* gpio_type == 2 */
@@ -658,6 +712,8 @@ 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);
         return 0;
 }
 
diff --git a/sound/pci/ca0106/ca_midi.c b/sound/pci/ca0106/ca_midi.c
index 2e6eab1f1189..ad32eff2713f 100644
--- a/sound/pci/ca0106/ca_midi.c
+++ b/sound/pci/ca0106/ca_midi.c
@@ -6,7 +6,7 @@
  *  Changelog:
  *    Implementation is based on mpu401 and emu10k1x and
  *    tested with ca0106.
- *    mpu401: Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *    mpu401: Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *    emu10k1x: 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/ca0106/ca_midi.h b/sound/pci/ca0106/ca_midi.h
index b72c0933bd22..922ed3e3731e 100644
--- a/sound/pci/ca0106/ca_midi.h
+++ b/sound/pci/ca0106/ca_midi.h
@@ -22,9 +22,9 @@
  *
  */
 
-#include<linux/spinlock.h>
-#include<sound/rawmidi.h>
-#include<sound/mpu401.h>
+#include <linux/spinlock.h>
+#include <sound/rawmidi.h>
+#include <sound/mpu401.h>
 
 #define CA_MIDI_MODE_INPUT      MPU401_MODE_INPUT
 #define CA_MIDI_MODE_OUTPUT     MPU401_MODE_OUTPUT
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 7d3c5ee0005c..6832649879ce 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -95,30 +95,34 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_CHADC0               0x00000001      /* ch0, 0:playback, 1:record */
 
 #define CM_REG_FUNCTRL1         0x04
-#define CM_ASFC_MASK            0x0000E000      /* ADC sampling frequency */
-#define CM_ASFC_SHIFT           13
-#define CM_DSFC_MASK            0x00001C00      /* DAC sampling frequency */
-#define CM_DSFC_SHIFT           10
+#define CM_DSFC_MASK            0x0000E000      /* channel 1 (DAC?) sampling frequency */
+#define CM_DSFC_SHIFT           13
+#define CM_ASFC_MASK            0x00001C00      /* channel 0 (ADC?) sampling frequency */
+#define CM_ASFC_SHIFT           10
 #define CM_SPDF_1               0x00000200      /* SPDIF IN/OUT at channel B */
 #define CM_SPDF_0               0x00000100      /* SPDIF OUT only channel A */
-#define CM_SPDFLOOP             0x00000080      /* ext. SPDIIF/OUT -> IN loopback */
+#define CM_SPDFLOOP             0x00000080      /* ext. SPDIIF/IN -> OUT loopback */
 #define CM_SPDO2DAC             0x00000040      /* SPDIF/OUT can be heard from internal DAC */
 #define CM_INTRM                0x00000020      /* master control block (MCB) interrupt enabled */
 #define CM_BREQ                 0x00000010      /* bus master enabled */
 #define CM_VOICE_EN             0x00000008      /* legacy voice (SB16,FM) */
-#define CM_UART_EN              0x00000004      /* UART */
-#define CM_JYSTK_EN             0x00000002      /* joy stick */
+#define CM_UART_EN              0x00000004      /* legacy UART */
+#define CM_JYSTK_EN             0x00000002      /* legacy joystick */
+#define CM_ZVPORT               0x00000001      /* ZVPORT */
 
 #define CM_REG_CHFORMAT         0x08
 
 #define CM_CHB3D5C              0x80000000      /* 5,6 channels */
+#define CM_FMOFFSET2            0x40000000      /* initial FM PCM offset 2 when Fmute=1 */
 #define CM_CHB3D                0x20000000      /* 4 channels */
 
 #define CM_CHIP_MASK1           0x1f000000
 #define CM_CHIP_037             0x01000000
-
-#define CM_SPDIF_SELECT1        0x00080000      /* for model <= 037 ? */
+#define CM_SETLAT48             0x00800000      /* set latency timer 48h */
+#define CM_EDGEIRQ              0x00400000      /* emulated edge trigger legacy IRQ */
+#define CM_SPD24SEL39           0x00200000      /* 24-bit spdif: model 039 */
 #define CM_AC3EN1               0x00100000      /* enable AC3: model 037 */
+#define CM_SPDIF_SELECT1        0x00080000      /* for model <= 037 ? */
 #define CM_SPD24SEL             0x00020000      /* 24bit spdif: model 037 */
 /* #define CM_SPDIF_INVERSE     0x00010000 */ /* ??? */
 
@@ -128,35 +132,45 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_ADCBITLEN_14         0x00008000
 #define CM_ADCBITLEN_13         0x0000C000
 
-#define CM_ADCDACLEN_MASK       0x00003000
+#define CM_ADCDACLEN_MASK       0x00003000      /* model 037 */
 #define CM_ADCDACLEN_060        0x00000000
 #define CM_ADCDACLEN_066        0x00001000
 #define CM_ADCDACLEN_130        0x00002000
 #define CM_ADCDACLEN_280        0x00003000
 
+#define CM_ADCDLEN_MASK         0x00003000      /* model 039 */
+#define CM_ADCDLEN_ORIGINAL     0x00000000
+#define CM_ADCDLEN_EXTRA        0x00001000
+#define CM_ADCDLEN_24K          0x00002000
+#define CM_ADCDLEN_WEIGHT       0x00003000
+
 #define CM_CH1_SRATE_176K       0x00000800
+#define CM_CH1_SRATE_96K        0x00000800      /* model 055? */
 #define CM_CH1_SRATE_88K        0x00000400
 #define CM_CH0_SRATE_176K       0x00000200
+#define CM_CH0_SRATE_96K        0x00000200      /* model 055? */
 #define CM_CH0_SRATE_88K        0x00000100
 
 #define CM_SPDIF_INVERSE2       0x00000080      /* model 055? */
+#define CM_DBLSPDS              0x00000040      /* double SPDIF sample rate 88.2/96 */
+#define CM_POLVALID             0x00000020      /* inverse SPDIF/IN valid bit */
+#define CM_SPDLOCKED            0x00000010
 
-#define CM_CH1FMT_MASK          0x0000000C
+#define CM_CH1FMT_MASK          0x0000000C      /* bit 3: 16 bits, bit 2: stereo */
 #define CM_CH1FMT_SHIFT         2
-#define CM_CH0FMT_MASK          0x00000003
+#define CM_CH0FMT_MASK          0x00000003      /* bit 1: 16 bits, bit 0: stereo */
 #define CM_CH0FMT_SHIFT         0
 
 #define CM_REG_INT_HLDCLR       0x0C
 #define CM_CHIP_MASK2           0xff000000
+#define CM_CHIP_8768            0x20000000
+#define CM_CHIP_055             0x08000000
 #define CM_CHIP_039             0x04000000
 #define CM_CHIP_039_6CH         0x01000000
-#define CM_CHIP_055             0x08000000
-#define CM_CHIP_8768            0x20000000
+#define CM_UNKNOWN_INT_EN       0x00080000      /* ? */
 #define CM_TDMA_INT_EN          0x00040000
 #define CM_CH1_INT_EN           0x00020000
 #define CM_CH0_INT_EN           0x00010000
-#define CM_INT_HOLD             0x00000002
-#define CM_INT_CLEAR            0x00000001
 
 #define CM_REG_INT_STATUS       0x10
 #define CM_INTR                 0x80000000
@@ -175,12 +189,13 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_CHINT0               0x00000001
 
 #define CM_REG_LEGACY_CTRL      0x14
-#define CM_NXCHG                0x80000000      /* h/w multi channels? */
+#define CM_NXCHG                0x80000000      /* don't map base reg dword->sample */
 #define CM_VMPU_MASK            0x60000000      /* MPU401 i/o port address */
 #define CM_VMPU_330             0x00000000
 #define CM_VMPU_320             0x20000000
 #define CM_VMPU_310             0x40000000
 #define CM_VMPU_300             0x60000000
+#define CM_ENWR8237             0x10000000      /* enable bus master to write 8237 base reg */
 #define CM_VSBSEL_MASK          0x0C000000      /* SB16 base address */
 #define CM_VSBSEL_220           0x00000000
 #define CM_VSBSEL_240           0x04000000
@@ -191,44 +206,74 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_FMSEL_3C8            0x01000000
 #define CM_FMSEL_3E0            0x02000000
 #define CM_FMSEL_3E8            0x03000000
-#define CM_ENSPDOUT             0x00800000      /* enable XPDIF/OUT to I/O interface */
-#define CM_SPDCOPYRHT           0x00400000      /* set copyright spdif in/out */
+#define CM_ENSPDOUT             0x00800000      /* enable XSPDIF/OUT to I/O interface */
+#define CM_SPDCOPYRHT           0x00400000      /* spdif in/out copyright bit */
 #define CM_DAC2SPDO             0x00200000      /* enable wave+fm_midi -> SPDIF/OUT */
-#define CM_SETRETRY             0x00010000      /* 0: legacy i/o wait (default), 1: legacy i/o bus retry */
+#define CM_INVIDWEN             0x00100000      /* internal vendor ID write enable, model 039? */
+#define CM_SETRETRY             0x00100000      /* 0: legacy i/o wait (default), 1: legacy i/o bus retry */
+#define CM_C_EEACCESS           0x00080000      /* direct programming eeprom regs */
+#define CM_C_EECS               0x00040000
+#define CM_C_EEDI46             0x00020000
+#define CM_C_EECK46             0x00010000
 #define CM_CHB3D6C              0x00008000      /* 5.1 channels support */
-#define CM_LINE_AS_BASS         0x00006000      /* use line-in as bass */
+#define CM_CENTR2LIN            0x00004000      /* line-in as center out */
+#define CM_BASE2LIN             0x00002000      /* line-in as bass out */
+#define CM_EXBASEN              0x00001000      /* external bass input enable */
 
 #define CM_REG_MISC_CTRL        0x18
-#define CM_PWD                  0x80000000
+#define CM_PWD                  0x80000000      /* power down */
 #define CM_RESET                0x40000000
-#define CM_SFIL_MASK            0x30000000
-#define CM_TXVX                 0x08000000
-#define CM_N4SPK3D              0x04000000      /* 4ch output */
+#define CM_SFIL_MASK            0x30000000      /* filter control at front end DAC, model 037? */
+#define CM_VMGAIN               0x10000000      /* analog master amp +6dB, model 039? */
+#define CM_TXVX                 0x08000000      /* model 037? */
+#define CM_N4SPK3D              0x04000000      /* copy front to rear */
 #define CM_SPDO5V               0x02000000      /* 5V spdif output (1 = 0.5v (coax)) */
 #define CM_SPDIF48K             0x01000000      /* write */
 #define CM_SPATUS48K            0x01000000      /* read */
-#define CM_ENDBDAC              0x00800000      /* enable dual dac */
+#define CM_ENDBDAC              0x00800000      /* enable double dac */
 #define CM_XCHGDAC              0x00400000      /* 0: front=ch0, 1: front=ch1 */
 #define CM_SPD32SEL             0x00200000      /* 0: 16bit SPDIF, 1: 32bit */
-#define CM_SPDFLOOPI            0x00100000      /* int. SPDIF-IN -> int. OUT */
-#define CM_FM_EN                0x00080000      /* enalbe FM */
+#define CM_SPDFLOOPI            0x00100000      /* int. SPDIF-OUT -> int. IN */
+#define CM_FM_EN                0x00080000      /* enable legacy FM */
 #define CM_AC3EN2               0x00040000      /* enable AC3: model 039 */
-#define CM_VIDWPDSB             0x00010000 
+#define CM_ENWRASID             0x00010000      /* choose writable internal SUBID (audio) */
+#define CM_VIDWPDSB             0x00010000      /* model 037? */
 #define CM_SPDF_AC97            0x00008000      /* 0: SPDIF/OUT 44.1K, 1: 48K */
-#define CM_MASK_EN              0x00004000
-#define CM_VIDWPPRT             0x00002000
-#define CM_SFILENB              0x00001000
-#define CM_MMODE_MASK           0x00000E00
+#define CM_MASK_EN              0x00004000      /* activate channel mask on legacy DMA */
+#define CM_ENWRMSID             0x00002000      /* choose writable internal SUBID (modem) */
+#define CM_VIDWPPRT             0x00002000      /* model 037? */
+#define CM_SFILENB              0x00001000      /* filter stepping at front end DAC, model 037? */
+#define CM_MMODE_MASK           0x00000E00      /* model DAA interface mode */
 #define CM_SPDIF_SELECT2        0x00000100      /* for model > 039 ? */
 #define CM_ENCENTER             0x00000080
-#define CM_FLINKON              0x00000040
-#define CM_FLINKOFF             0x00000020
-#define CM_MIDSMP               0x00000010
-#define CM_UPDDMA_MASK          0x0000000C
-#define CM_TWAIT_MASK           0x00000003
+#define CM_FLINKON              0x00000080      /* force modem link detection on, model 037 */
+#define CM_MUTECH1              0x00000040      /* mute PCI ch1 to DAC */
+#define CM_FLINKOFF             0x00000040      /* force modem link detection off, model 037 */
+#define CM_UNKNOWN_18_5         0x00000020      /* ? */
+#define CM_MIDSMP               0x00000010      /* 1/2 interpolation at front end DAC */
+#define CM_UPDDMA_MASK          0x0000000C      /* TDMA position update notification */
+#define CM_UPDDMA_2048          0x00000000
+#define CM_UPDDMA_1024          0x00000004
+#define CM_UPDDMA_512           0x00000008
+#define CM_UPDDMA_256           0x0000000C              
+#define CM_TWAIT_MASK           0x00000003      /* model 037 */
+#define CM_TWAIT1               0x00000002      /* FM i/o cycle, 0: 48, 1: 64 PCICLKs */
+#define CM_TWAIT0               0x00000001      /* i/o cycle, 0: 4, 1: 6 PCICLKs */
+
+#define CM_REG_TDMA_POSITION    0x1C
+#define CM_TDMA_CNT_MASK        0xFFFF0000      /* current byte/word count */
+#define CM_TDMA_ADR_MASK        0x0000FFFF      /* current address */
 
         /* byte */
 #define CM_REG_MIXER0           0x20
+#define CM_REG_SBVR             0x20            /* write: sb16 version */
+#define CM_REG_DEV              0x20            /* read: hardware device version */
+
+#define CM_REG_MIXER21          0x21
+#define CM_UNKNOWN_21_MASK      0x78            /* ? */
+#define CM_X_ADPCM              0x04            /* SB16 ADPCM enable */
+#define CM_PROINV               0x02            /* SBPro left/right channel switching */
+#define CM_X_SB16               0x01            /* SB16 compatible */
 
 #define CM_REG_SB16_DATA        0x22
 #define CM_REG_SB16_ADDR        0x23
@@ -243,8 +288,8 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_FMMUTE_SHIFT         7
 #define CM_WSMUTE               0x40    /* mute PCM */
 #define CM_WSMUTE_SHIFT         6
-#define CM_SPK4                 0x20    /* lin-in -> rear line out */
-#define CM_SPK4_SHIFT           5
+#define CM_REAR2LIN             0x20    /* lin-in -> rear line out */
+#define CM_REAR2LIN_SHIFT       5
 #define CM_REAR2FRONT           0x10    /* exchange rear/front */
 #define CM_REAR2FRONT_SHIFT     4
 #define CM_WAVEINL              0x08    /* digital wave rec. left chan */
@@ -276,12 +321,13 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 #define CM_VAUXR_MASK           0x0f
 
 #define CM_REG_MISC             0x27
+#define CM_UNKNOWN_27_MASK      0xd8    /* ? */
 #define CM_XGPO1                0x20
 // #define CM_XGPBIO            0x04
 #define CM_MIC_CENTER_LFE       0x04    /* mic as center/lfe out? (model 039 or later?) */
 #define CM_SPDIF_INVERSE        0x04    /* spdif input phase inverse (model 037) */
 #define CM_SPDVALID             0x02    /* spdif input valid check */
-#define CM_DMAUTO               0x01
+#define CM_DMAUTO               0x01    /* SB16 DMA auto detect */
 
 #define CM_REG_AC97             0x28    /* hmmm.. do we have ac97 link? */
 /*
@@ -322,18 +368,20 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 /*
  * extended registers
  */
-#define CM_REG_CH0_FRAME1       0x80    /* base address */
-#define CM_REG_CH0_FRAME2       0x84
+#define CM_REG_CH0_FRAME1       0x80    /* write: base address */
+#define CM_REG_CH0_FRAME2       0x84    /* read: current address */
 #define CM_REG_CH1_FRAME1       0x88    /* 0-15: count of samples at bus master; buffer size */
 #define CM_REG_CH1_FRAME2       0x8C    /* 16-31: count of samples at codec; fragment size */
+
 #define CM_REG_EXT_MISC         0x90
-#define CM_REG_MISC_CTRL_8768   0x92    /* reg. name the same as 0x18 */
-#define CM_CHB3D8C              0x20    /* 7.1 channels support */
-#define CM_SPD32FMT             0x10    /* SPDIF/IN 32k */
-#define CM_ADC2SPDIF            0x08    /* ADC output to SPDIF/OUT */
-#define CM_SHAREADC             0x04    /* DAC in ADC as Center/LFE */
-#define CM_REALTCMP             0x02    /* monitor the CMPL/CMPR of ADC */
-#define CM_INVLRCK              0x01    /* invert ZVPORT's LRCK */
+#define CM_ADC48K44K            0x10000000      /* ADC parameters group, 0: 44k, 1: 48k */
+#define CM_CHB3D8C              0x00200000      /* 7.1 channels support */
+#define CM_SPD32FMT             0x00100000      /* SPDIF/IN 32k sample rate */
+#define CM_ADC2SPDIF            0x00080000      /* ADC output to SPDIF/OUT */
+#define CM_SHAREADC             0x00040000      /* DAC in ADC as Center/LFE */
+#define CM_REALTCMP             0x00020000      /* monitor the CMPL/CMPR of ADC */
+#define CM_INVLRCK              0x00010000      /* invert ZVPORT's LRCK */
+#define CM_UNKNOWN_90_MASK      0x0000FFFF      /* ? */
 
 /*
  * size of i/o region
@@ -383,15 +431,14 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
 
 struct cmipci_pcm {
         struct snd_pcm_substream *substream;
-        int running;            /* dac/adc running? */
+        u8 running;             /* dac/adc running? */
+        u8 fmt;                 /* format bits */
+        u8 is_dac;
+        u8 needs_silencing;
         unsigned int dma_size;  /* in frames */
-        unsigned int period_size;       /* in frames */
+        unsigned int shift;
+        unsigned int ch;        /* channel (0/1) */
         unsigned int offset;    /* physical address of the buffer */
-        unsigned int fmt;       /* format bits */
-        int ch;                 /* channel (0/1) */
-        unsigned int is_dac;            /* is dac? */
-        int bytes_per_frame;
-        int shift;
 };
 
 /* mixer elements toggled/resumed during ac3 playback */
@@ -424,7 +471,6 @@ struct cmipci {
 
         int chip_version;
         int max_channels;
-        unsigned int has_dual_dac: 1;
         unsigned int can_ac3_sw: 1;
         unsigned int can_ac3_hw: 1;
         unsigned int can_multi_ch: 1;
@@ -557,6 +603,9 @@ static unsigned int rates[] = { 5512, 11025, 22050, 44100, 8000, 16000, 32000, 4
 static unsigned int snd_cmipci_rate_freq(unsigned int rate)
 {
         unsigned int i;
+
+        if (rate > 48000)
+                rate /= 2;
         for (i = 0; i < ARRAY_SIZE(rates); i++) {
                 if (rates[i] == rate)
                         return i;
@@ -671,19 +720,19 @@ static int snd_cmipci_hw_free(struct snd_pcm_substream *substream)
 /*
  */
 
-static unsigned int hw_channels[] = {1, 2, 4, 5, 6, 8};
+static unsigned int hw_channels[] = {1, 2, 4, 6, 8};
 static struct snd_pcm_hw_constraint_list hw_constraints_channels_4 = {
         .count = 3,
         .list = hw_channels,
         .mask = 0,
 };
 static struct snd_pcm_hw_constraint_list hw_constraints_channels_6 = {
-        .count = 5,
+        .count = 4,
         .list = hw_channels,
         .mask = 0,
 };
 static struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {
-        .count = 6,
+        .count = 5,
         .list = hw_channels,
         .mask = 0,
 };
@@ -691,48 +740,37 @@ static struct snd_pcm_hw_constraint_list hw_constraints_channels_8 = {
 static int set_dac_channels(struct cmipci *cm, struct cmipci_pcm *rec, int channels)
 {
         if (channels > 2) {
-                if (! cm->can_multi_ch)
+                if (!cm->can_multi_ch || !rec->ch)
                         return -EINVAL;
                 if (rec->fmt != 0x03) /* stereo 16bit only */
                         return -EINVAL;
+        }
 
+        if (cm->can_multi_ch) {
                 spin_lock_irq(&cm->reg_lock);
-                snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);
-                snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
-                if (channels > 4) {
-                        snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
-                        snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
+                if (channels > 2) {
+                        snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);
+                        snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
                 } else {
-                        snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
-                        snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
+                        snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);
+                        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
                 }
-                if (channels >= 6) {
+                if (channels == 8)
+                        snd_cmipci_set_bit(cm, CM_REG_EXT_MISC, CM_CHB3D8C);
+                else
+                        snd_cmipci_clear_bit(cm, CM_REG_EXT_MISC, CM_CHB3D8C);
+                if (channels == 6) {
+                        snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
                         snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_CHB3D6C);
-                        snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_ENCENTER);
                 } else {
-                        snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_CHB3D6C);
-                        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_ENCENTER);
-                }
-                if (cm->chip_version == 68) {
-                        if (channels == 8) {
-                                snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL_8768, CM_CHB3D8C);
-                        } else {
-                                snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL_8768, CM_CHB3D8C);
-                        }
-                }
-                spin_unlock_irq(&cm->reg_lock);
-
-        } else {
-                if (cm->can_multi_ch) {
-                        spin_lock_irq(&cm->reg_lock);
-                        snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);
-                        snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
                         snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
                         snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_CHB3D6C);
-                        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_ENCENTER);
-                        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
-                        spin_unlock_irq(&cm->reg_lock);
                 }
+                if (channels == 4)
+                        snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
+                else
+                        snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
+                spin_unlock_irq(&cm->reg_lock);
         }
         return 0;
 }
@@ -746,6 +784,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
                                  struct snd_pcm_substream *substream)
 {
         unsigned int reg, freq, val;
+        unsigned int period_size;
         struct snd_pcm_runtime *runtime = substream->runtime;
 
         rec->fmt = 0;
@@ -765,11 +804,11 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
         rec->offset = runtime->dma_addr;
         /* buffer and period sizes in frame */
         rec->dma_size = runtime->buffer_size << rec->shift;
-        rec->period_size = runtime->period_size << rec->shift;
+        period_size = runtime->period_size << rec->shift;
         if (runtime->channels > 2) {
                 /* multi-channels */
                 rec->dma_size = (rec->dma_size * runtime->channels) / 2;
-                rec->period_size = (rec->period_size * runtime->channels) / 2;
+                period_size = (period_size * runtime->channels) / 2;
         }
 
         spin_lock_irq(&cm->reg_lock);
@@ -780,7 +819,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
         /* program sample counts */
         reg = rec->ch ? CM_REG_CH1_FRAME2 : CM_REG_CH0_FRAME2;
         snd_cmipci_write_w(cm, reg, rec->dma_size - 1);
-        snd_cmipci_write_w(cm, reg + 2, rec->period_size - 1);
+        snd_cmipci_write_w(cm, reg + 2, period_size - 1);
 
         /* set adc/dac flag */
         val = rec->ch ? CM_CHADC1 : CM_CHADC0;
@@ -795,11 +834,11 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
         freq = snd_cmipci_rate_freq(runtime->rate);
         val = snd_cmipci_read(cm, CM_REG_FUNCTRL1);
         if (rec->ch) {
-                val &= ~CM_ASFC_MASK;
-                val |= (freq << CM_ASFC_SHIFT) & CM_ASFC_MASK;
-        } else {
                 val &= ~CM_DSFC_MASK;
                 val |= (freq << CM_DSFC_SHIFT) & CM_DSFC_MASK;
+        } else {
+                val &= ~CM_ASFC_MASK;
+                val |= (freq << CM_ASFC_SHIFT) & CM_ASFC_MASK;
         }
         snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);
         //snd_printd("cmipci: functrl1 = %08x\n", val);
@@ -813,6 +852,16 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
                 val &= ~CM_CH0FMT_MASK;
                 val |= rec->fmt << CM_CH0FMT_SHIFT;
         }
+        if (cm->chip_version == 68) {
+                if (runtime->rate == 88200)
+                        val |= CM_CH0_SRATE_88K << (rec->ch * 2);
+                else
+                        val &= ~(CM_CH0_SRATE_88K << (rec->ch * 2));
+                if (runtime->rate == 96000)
+                        val |= CM_CH0_SRATE_96K << (rec->ch * 2);
+                else
+                        val &= ~(CM_CH0_SRATE_96K << (rec->ch * 2));
+        }
         snd_cmipci_write(cm, CM_REG_CHFORMAT, val);
         //snd_printd("cmipci: chformat = %08x\n", val);
 
@@ -826,7 +875,7 @@ static int snd_cmipci_pcm_prepare(struct cmipci *cm, struct cmipci_pcm *rec,
  * PCM trigger/stop
  */
 static int snd_cmipci_pcm_trigger(struct cmipci *cm, struct cmipci_pcm *rec,
-                                  struct snd_pcm_substream *substream, int cmd)
+                                  int cmd)
 {
         unsigned int inthld, chen, reset, pause;
         int result = 0;
@@ -855,6 +904,7 @@ static int snd_cmipci_pcm_trigger(struct cmipci *cm, struct cmipci_pcm *rec,
                 cm->ctrl &= ~chen;
                 snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl | reset);
                 snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl & ~reset);
+                rec->needs_silencing = rec->is_dac;
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
         case SNDRV_PCM_TRIGGER_SUSPEND:
@@ -906,7 +956,7 @@ static int snd_cmipci_playback_trigger(struct snd_pcm_substream *substream,
                                        int cmd)
 {
         struct cmipci *cm = snd_pcm_substream_chip(substream);
-        return snd_cmipci_pcm_trigger(cm, &cm->channel[CM_CH_PLAY], substream, cmd);
+        return snd_cmipci_pcm_trigger(cm, &cm->channel[CM_CH_PLAY], cmd);
 }
 
 static snd_pcm_uframes_t snd_cmipci_playback_pointer(struct snd_pcm_substream *substream)
@@ -925,7 +975,7 @@ static int snd_cmipci_capture_trigger(struct snd_pcm_substream *substream,
                                      int cmd)
 {
         struct cmipci *cm = snd_pcm_substream_chip(substream);
-        return snd_cmipci_pcm_trigger(cm, &cm->channel[CM_CH_CAPT], substream, cmd);
+        return snd_cmipci_pcm_trigger(cm, &cm->channel[CM_CH_CAPT], cmd);
 }
 
 static snd_pcm_uframes_t snd_cmipci_capture_pointer(struct snd_pcm_substream *substream)
@@ -1199,15 +1249,19 @@ static int setup_spdif_playback(struct cmipci *cm, struct snd_pcm_substream *sub
                         snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_PLAYBACK_SPDF);
                 setup_ac3(cm, subs, do_ac3, rate);
 
-                if (rate == 48000)
+                if (rate == 48000 || rate == 96000)
                         snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_SPDIF48K | CM_SPDF_AC97);
                 else
                         snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_SPDIF48K | CM_SPDF_AC97);
-
+                if (rate > 48000)
+                        snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);
+                else
+                        snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);
         } else {
                 /* they are controlled via "IEC958 Output Switch" */
                 /* snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_ENSPDOUT); */
                 /* snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_SPDO2DAC); */
+                snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_DBLSPDS);
                 snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1, CM_PLAYBACK_SPDF);
                 setup_ac3(cm, subs, 0, 0);
         }
@@ -1227,7 +1281,7 @@ static int snd_cmipci_playback_prepare(struct snd_pcm_substream *substream)
         int rate = substream->runtime->rate;
         int err, do_spdif, do_ac3 = 0;
 
-        do_spdif = ((rate == 44100 || rate == 48000) &&
+        do_spdif = (rate >= 44100 &&
                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE &&
                     substream->runtime->channels == 2);
         if (do_spdif && cm->can_ac3_hw) 
@@ -1252,11 +1306,75 @@ static int snd_cmipci_playback_spdif_prepare(struct snd_pcm_substream *substream
         return snd_cmipci_pcm_prepare(cm, &cm->channel[CM_CH_PLAY], substream);
 }
 
+/*
+ * Apparently, the samples last played on channel A stay in some buffer, even
+ * after the channel is reset, and get added to the data for the rear DACs when
+ * playing a multichannel stream on channel B.  This is likely to generate
+ * wraparounds and thus distortions.
+ * To avoid this, we play at least one zero sample after the actual stream has
+ * stopped.
+ */
+static void snd_cmipci_silence_hack(struct cmipci *cm, struct cmipci_pcm *rec)
+{
+        struct snd_pcm_runtime *runtime = rec->substream->runtime;
+        unsigned int reg, val;
+
+        if (rec->needs_silencing && runtime && runtime->dma_area) {
+                /* set up a small silence buffer */
+                memset(runtime->dma_area, 0, PAGE_SIZE);
+                reg = rec->ch ? CM_REG_CH1_FRAME2 : CM_REG_CH0_FRAME2;
+                val = ((PAGE_SIZE / 4) - 1) | (((PAGE_SIZE / 4) / 2 - 1) << 16);
+                snd_cmipci_write(cm, reg, val);
+        
+                /* configure for 16 bits, 2 channels, 8 kHz */
+                if (runtime->channels > 2)
+                        set_dac_channels(cm, rec, 2);
+                spin_lock_irq(&cm->reg_lock);
+                val = snd_cmipci_read(cm, CM_REG_FUNCTRL1);
+                val &= ~(CM_ASFC_MASK << (rec->ch * 3));
+                val |= (4 << CM_ASFC_SHIFT) << (rec->ch * 3);
+                snd_cmipci_write(cm, CM_REG_FUNCTRL1, val);
+                val = snd_cmipci_read(cm, CM_REG_CHFORMAT);
+                val &= ~(CM_CH0FMT_MASK << (rec->ch * 2));
+                val |= (3 << CM_CH0FMT_SHIFT) << (rec->ch * 2);
+                if (cm->chip_version == 68) {
+                        val &= ~(CM_CH0_SRATE_88K << (rec->ch * 2));
+                        val &= ~(CM_CH0_SRATE_96K << (rec->ch * 2));
+                }
+                snd_cmipci_write(cm, CM_REG_CHFORMAT, val);
+        
+                /* start stream (we don't need interrupts) */
+                cm->ctrl |= CM_CHEN0 << rec->ch;
+                snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl);
+                spin_unlock_irq(&cm->reg_lock);
+
+                msleep(1);
+
+                /* stop and reset stream */
+                spin_lock_irq(&cm->reg_lock);
+                cm->ctrl &= ~(CM_CHEN0 << rec->ch);
+                val = CM_RST_CH0 << rec->ch;
+                snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl | val);
+                snd_cmipci_write(cm, CM_REG_FUNCTRL0, cm->ctrl & ~val);
+                spin_unlock_irq(&cm->reg_lock);
+
+                rec->needs_silencing = 0;
+        }
+}
+
 static int snd_cmipci_playback_hw_free(struct snd_pcm_substream *substream)
 {
         struct cmipci *cm = snd_pcm_substream_chip(substream);
         setup_spdif_playback(cm, substream, 0, 0);
         restore_mixer_state(cm);
+        snd_cmipci_silence_hack(cm, &cm->channel[0]);
+        return snd_cmipci_hw_free(substream);
+}
+
+static int snd_cmipci_playback2_hw_free(struct snd_pcm_substream *substream)
+{
+        struct cmipci *cm = snd_pcm_substream_chip(substream);
+        snd_cmipci_silence_hack(cm, &cm->channel[1]);
         return snd_cmipci_hw_free(substream);
 }
 
@@ -1515,7 +1633,11 @@ static int snd_cmipci_playback_open(struct snd_pcm_substream *substream)
         if ((err = open_device_check(cm, CM_OPEN_PLAYBACK, substream)) < 0)
                 return err;
         runtime->hw = snd_cmipci_playback;
-        runtime->hw.channels_max = cm->max_channels;
+        if (cm->chip_version == 68) {
+                runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                     SNDRV_PCM_RATE_96000;
+                runtime->hw.rate_max = 96000;
+        }
         snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
         cm->dig_pcm_status = cm->dig_status;
         return 0;
@@ -1558,9 +1680,14 @@ static int snd_cmipci_playback2_open(struct snd_pcm_substream *substream)
                         else if (cm->max_channels == 8)
                                 snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, &hw_constraints_channels_8);
                 }
-                snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
         }
         mutex_unlock(&cm->open_mutex);
+        if (cm->chip_version == 68) {
+                runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                     SNDRV_PCM_RATE_96000;
+                runtime->hw.rate_max = 96000;
+        }
+        snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 0, 0x10000);
         return 0;
 }
 
@@ -1574,8 +1701,15 @@ static int snd_cmipci_playback_spdif_open(struct snd_pcm_substream *substream)
                 return err;
         if (cm->can_ac3_hw) {
                 runtime->hw = snd_cmipci_playback_spdif;
-                if (cm->chip_version >= 37)
+                if (cm->chip_version >= 37) {
                         runtime->hw.formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                        snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
+                }
+                if (cm->chip_version == 68) {
+                        runtime->hw.rates |= SNDRV_PCM_RATE_88200 |
+                                             SNDRV_PCM_RATE_96000;
+                        runtime->hw.rate_max = 96000;
+                }
         } else {
                 runtime->hw = snd_cmipci_playback_iec958_subframe;
         }
@@ -1668,7 +1802,7 @@ static struct snd_pcm_ops snd_cmipci_playback2_ops = {
         .close =        snd_cmipci_playback2_close,
         .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_cmipci_playback2_hw_params,
-        .hw_free =      snd_cmipci_hw_free,
+        .hw_free =      snd_cmipci_playback2_hw_free,
         .prepare =      snd_cmipci_capture_prepare,     /* channel B */
         .trigger =      snd_cmipci_capture_trigger,     /* channel B */
         .pointer =      snd_cmipci_capture_pointer,     /* channel B */
@@ -2139,15 +2273,7 @@ struct cmipci_switch_args {
                                          */
 };
 
-static int snd_cmipci_uswitch_info(struct snd_kcontrol *kcontrol,
-                                   struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_cmipci_uswitch_info         snd_ctl_boolean_mono_info
 
 static int _snd_cmipci_uswitch_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol,
@@ -2260,8 +2386,8 @@ DEFINE_SWITCH_ARG(exchange_dac, CM_REG_MISC_CTRL, CM_XCHGDAC, 0, 0, 0); /* rever
 DEFINE_SWITCH_ARG(exchange_dac, CM_REG_MISC_CTRL, CM_XCHGDAC, CM_XCHGDAC, 0, 0);
 #endif
 DEFINE_BIT_SWITCH_ARG(fourch, CM_REG_MISC_CTRL, CM_N4SPK3D, 0, 0);
-// DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_SPK4, 1, 0);
-// DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS, 0, 0);
+// DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_REAR2LIN, 1, 0);
+// DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_CENTR2LIN|CM_BASE2LIN, 0, 0);
 // DEFINE_BIT_SWITCH_ARG(joystick, CM_REG_FUNCTRL1, CM_JYSTK_EN, 0, 0); /* now module option */
 DEFINE_SWITCH_ARG(modem, CM_REG_MISC_CTRL, CM_FLINKON|CM_FLINKOFF, CM_FLINKON, 0, 0);
 
@@ -2331,11 +2457,11 @@ static inline unsigned int get_line_in_mode(struct cmipci *cm)
         unsigned int val;
         if (cm->chip_version >= 39) {
                 val = snd_cmipci_read(cm, CM_REG_LEGACY_CTRL);
-                if (val & CM_LINE_AS_BASS)
+                if (val & (CM_CENTR2LIN | CM_BASE2LIN))
                         return 2;
         }
         val = snd_cmipci_read_b(cm, CM_REG_MIXER1);
-        if (val & CM_SPK4)
+        if (val & CM_REAR2LIN)
                 return 1;
         return 0;
 }
@@ -2359,13 +2485,13 @@ static int snd_cmipci_line_in_mode_put(struct snd_kcontrol *kcontrol,
 
         spin_lock_irq(&cm->reg_lock);
         if (ucontrol->value.enumerated.item[0] == 2)
-                change = snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
+                change = snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_CENTR2LIN | CM_BASE2LIN);
         else
-                change = snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_LINE_AS_BASS);
+                change = snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_CENTR2LIN | CM_BASE2LIN);
         if (ucontrol->value.enumerated.item[0] == 1)
-                change |= snd_cmipci_set_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
+                change |= snd_cmipci_set_bit_b(cm, CM_REG_MIXER1, CM_REAR2LIN);
         else
-                change |= snd_cmipci_clear_bit_b(cm, CM_REG_MIXER1, CM_SPK4);
+                change |= snd_cmipci_clear_bit_b(cm, CM_REG_MIXER1, CM_REAR2LIN);
         spin_unlock_irq(&cm->reg_lock);
         return change;
 }
@@ -2583,19 +2709,18 @@ static void snd_cmipci_proc_read(struct snd_info_entry *entry,
                                  struct snd_info_buffer *buffer)
 {
         struct cmipci *cm = entry->private_data;
-        int i;
+        int i, v;
         
-        snd_iprintf(buffer, "%s\n\n", cm->card->longname);
-        for (i = 0; i < 0x40; i++) {
-                int v = inb(cm->iobase + i);
+        snd_iprintf(buffer, "%s\n", cm->card->longname);
+        for (i = 0; i < 0x94; i++) {
+                if (i == 0x28)
+                        i = 0x90;
+                v = inb(cm->iobase + i);
                 if (i % 4 == 0)
-                        snd_iprintf(buffer, "%02x: ", i);
-                snd_iprintf(buffer, "%02x", v);
-                if (i % 4 == 3)
-                        snd_iprintf(buffer, "\n");
-                else
-                        snd_iprintf(buffer, " ");
+                        snd_iprintf(buffer, "\n%02x:", i);
+                snd_iprintf(buffer, " %02x", v);
         }
+        snd_iprintf(buffer, "\n");
 }
 
 static void __devinit snd_cmipci_proc_init(struct cmipci *cm)
@@ -2633,46 +2758,40 @@ static void __devinit query_chip(struct cmipci *cm)
         if (! detect) {
                 /* check reg 08h, bit 24-28 */
                 detect = snd_cmipci_read(cm, CM_REG_CHFORMAT) & CM_CHIP_MASK1;
-                if (! detect) {
+                switch (detect) {
+                case 0:
                         cm->chip_version = 33;
-                        cm->max_channels = 2;
                         if (cm->do_soft_ac3)
                                 cm->can_ac3_sw = 1;
                         else
                                 cm->can_ac3_hw = 1;
-                        cm->has_dual_dac = 1;
-                } else {
+                        break;
+                case CM_CHIP_037:
                         cm->chip_version = 37;
-                        cm->max_channels = 2;
                         cm->can_ac3_hw = 1;
-                        cm->has_dual_dac = 1;
+                        break;
+                default:
+                        cm->chip_version = 39;
+                        cm->can_ac3_hw = 1;
+                        break;
                 }
+                cm->max_channels = 2;
         } else {
-                /* check reg 0Ch, bit 26 */
-                if (detect & CM_CHIP_8768) {
-                        cm->chip_version = 68;
-                        cm->max_channels = 8;
-                        cm->can_ac3_hw = 1;
-                        cm->has_dual_dac = 1;
-                        cm->can_multi_ch = 1;
-                } else if (detect & CM_CHIP_055) {
-                        cm->chip_version = 55;
-                        cm->max_channels = 6;
-                        cm->can_ac3_hw = 1;
-                        cm->has_dual_dac = 1;
-                        cm->can_multi_ch = 1;
-                } else if (detect & CM_CHIP_039) {
+                if (detect & CM_CHIP_039) {
                         cm->chip_version = 39;
                         if (detect & CM_CHIP_039_6CH) /* 4 or 6 channels */
                                 cm->max_channels = 6;
                         else
                                 cm->max_channels = 4;
-                        cm->can_ac3_hw = 1;
-                        cm->has_dual_dac = 1;
-                        cm->can_multi_ch = 1;
+                } else if (detect & CM_CHIP_8768) {
+                        cm->chip_version = 68;
+                        cm->max_channels = 8;
                 } else {
-                        printk(KERN_ERR "chip %x version not supported\n", detect);
+                        cm->chip_version = 55;
+                        cm->max_channels = 6;
                 }
+                cm->can_ac3_hw = 1;
+                cm->can_multi_ch = 1;
         }
 }
 
@@ -2782,10 +2901,14 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)
         if (!fm_port)
                 goto disable_fm;
 
-        /* first try FM regs in PCI port range */
-        iosynth = cm->iobase + CM_REG_FM_PCI;
-        err = snd_opl3_create(cm->card, iosynth, iosynth + 2,
-                              OPL3_HW_OPL3, 1, &opl3);
+        if (cm->chip_version >= 39) {
+                /* first try FM regs in PCI port range */
+                iosynth = cm->iobase + CM_REG_FM_PCI;
+                err = snd_opl3_create(cm->card, iosynth, iosynth + 2,
+                                      OPL3_HW_OPL3, 1, &opl3);
+        } else {
+                err = -EIO;
+        }
         if (err < 0) {
                 /* then try legacy ports */
                 val = snd_cmipci_read(cm, CM_REG_LEGACY_CTRL) & ~CM_FMSEL_MASK;
@@ -2829,9 +2952,10 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
         static struct snd_device_ops ops = {
                 .dev_free =     snd_cmipci_dev_free,
         };
-        unsigned int val = 0;
+        unsigned int val;
         long iomidi;
-        int integrated_midi;
+        int integrated_midi = 0;
+        char modelstr[16];
         int pcm_index, pcm_spdif_index;
         static struct pci_device_id intel_82437vx[] = {
                 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
@@ -2904,6 +3028,8 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
 #endif
 
         /* initialize codec registers */
+        snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_RESET);
+        snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_RESET);
         snd_cmipci_write(cm, CM_REG_INT_HLDCLR, 0);     /* disable ints */
         snd_cmipci_ch_reset(cm, CM_CH_PLAY);
         snd_cmipci_ch_reset(cm, CM_CH_CAPT);
@@ -2917,6 +3043,10 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
 #else
         snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
 #endif
+        if (cm->chip_version) {
+                snd_cmipci_write_b(cm, CM_REG_EXT_MISC, 0x20); /* magic */
+                snd_cmipci_write_b(cm, CM_REG_EXT_MISC + 1, 0x09); /* more magic */
+        }
         /* Set Bus Master Request */
         snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_BREQ);
 
@@ -2931,15 +3061,55 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
                 break;
         }
 
+        if (cm->chip_version < 68) {
+                val = pci->device < 0x110 ? 8338 : 8738;
+        } else {
+                switch (snd_cmipci_read_b(cm, CM_REG_INT_HLDCLR + 3) & 0x03) {
+                case 0:
+                        val = 8769;
+                        break;
+                case 2:
+                        val = 8762;
+                        break;
+                default:
+                        switch ((pci->subsystem_vendor << 16) |
+                                pci->subsystem_device) {
+                        case 0x13f69761:
+                        case 0x584d3741:
+                        case 0x584d3751:
+                        case 0x584d3761:
+                        case 0x584d3771:
+                        case 0x72848384:
+                                val = 8770;
+                                break;
+                        default:
+                                val = 8768;
+                                break;
+                        }
+                }
+        }
+        sprintf(card->shortname, "C-Media CMI%d", val);
+        if (cm->chip_version < 68)
+                sprintf(modelstr, " (model %d)", cm->chip_version);
+        else
+                modelstr[0] = '\0';
+        sprintf(card->longname, "%s%s at %#lx, irq %i",
+                card->shortname, modelstr, cm->iobase, cm->irq);
+
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
                 snd_cmipci_free(cm);
                 return err;
         }
 
-        integrated_midi = snd_cmipci_read_b(cm, CM_REG_MPU_PCI) != 0xff;
-        if (integrated_midi && mpu_port[dev] == 1)
-                iomidi = cm->iobase + CM_REG_MPU_PCI;
-        else {
+        if (cm->chip_version >= 39) {
+                val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);
+                if (val != 0x00 && val != 0xff) {
+                        iomidi = cm->iobase + CM_REG_MPU_PCI;
+                        integrated_midi = 1;
+                }
+        }
+        if (!integrated_midi) {
+                val = 0;
                 iomidi = mpu_port[dev];
                 switch (iomidi) {
                 case 0x320: val = CM_VMPU_320; break;
@@ -2953,11 +3123,21 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
                         snd_cmipci_write(cm, CM_REG_LEGACY_CTRL, val);
                         /* enable UART */
                         snd_cmipci_set_bit(cm, CM_REG_FUNCTRL1, CM_UART_EN);
+                        if (inb(iomidi + 1) == 0xff) {
+                                snd_printk(KERN_ERR "cannot enable MPU-401 port"
+                                           " at %#lx\n", iomidi);
+                                snd_cmipci_clear_bit(cm, CM_REG_FUNCTRL1,
+                                                     CM_UART_EN);
+                                iomidi = 0;
+                        }
                 }
         }
 
-        if ((err = snd_cmipci_create_fm(cm, fm_port[dev])) < 0)
-                return err;
+        if (cm->chip_version < 68) {
+                err = snd_cmipci_create_fm(cm, fm_port[dev]);
+                if (err < 0)
+                        return err;
+        }
 
         /* reset mixer */
         snd_cmipci_mixer_write(cm, 0, 0);
@@ -2969,11 +3149,9 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
         if ((err = snd_cmipci_pcm_new(cm, pcm_index)) < 0)
                 return err;
         pcm_index++;
-        if (cm->has_dual_dac) {
-                if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
-                        return err;
-                pcm_index++;
-        }
+        if ((err = snd_cmipci_pcm2_new(cm, pcm_index)) < 0)
+                return err;
+        pcm_index++;
         if (cm->can_ac3_hw || cm->can_ac3_sw) {
                 pcm_spdif_index = pcm_index;
                 if ((err = snd_cmipci_pcm_spdif_new(cm, pcm_index)) < 0)
@@ -3057,15 +3235,6 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,
         }
         card->private_data = cm;
 
-        sprintf(card->shortname, "C-Media PCI %s", card->driver);
-        sprintf(card->longname, "%s (model %d) at 0x%lx, irq %i",
-                card->shortname,
-                cm->chip_version,
-                cm->iobase,
-                cm->irq);
-
-        //snd_printd("%s is detected\n", card->longname);
-
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);
                 return err;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 44cf54607647..9a55f4a9739b 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Cirrus Logic CS4281 based PCI soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 #include <sound/initval.h>
 
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Cirrus Logic CS4281");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,CS4281}}");
@@ -842,12 +842,11 @@ static snd_pcm_uframes_t snd_cs4281_pointer(struct snd_pcm_substream *substream)
 
 static struct snd_pcm_hardware snd_cs4281_playback =
 {
-        .info =                 (SNDRV_PCM_INFO_MMAP |
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_MMAP_VALID |
-                                 SNDRV_PCM_INFO_PAUSE |
-                                 SNDRV_PCM_INFO_RESUME |
-                                 SNDRV_PCM_INFO_SYNC_START),
+        .info =                 SNDRV_PCM_INFO_MMAP |
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_PAUSE |
+                                SNDRV_PCM_INFO_RESUME,
         .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
                                 SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |
                                 SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -868,12 +867,11 @@ static struct snd_pcm_hardware snd_cs4281_playback =
 
 static struct snd_pcm_hardware snd_cs4281_capture =
 {
-        .info =                 (SNDRV_PCM_INFO_MMAP |
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_MMAP_VALID |
-                                 SNDRV_PCM_INFO_PAUSE |
-                                 SNDRV_PCM_INFO_RESUME |
-                                 SNDRV_PCM_INFO_SYNC_START),
+        .info =                 SNDRV_PCM_INFO_MMAP |
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_PAUSE |
+                                SNDRV_PCM_INFO_RESUME,
         .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
                                 SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |
                                 SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -904,7 +902,6 @@ static int snd_cs4281_playback_open(struct snd_pcm_substream *substream)
         dma->right_slot = 1;
         runtime->private_data = dma;
         runtime->hw = snd_cs4281_playback;
-        snd_pcm_set_sync(substream);
         /* should be detected from the AC'97 layer, but it seems
            that although CS4297A rev B reports 18-bit ADC resolution,
            samples are 20-bit */
@@ -924,7 +921,6 @@ static int snd_cs4281_capture_open(struct snd_pcm_substream *substream)
         dma->right_slot = 11;
         runtime->private_data = dma;
         runtime->hw = snd_cs4281_capture;
-        snd_pcm_set_sync(substream);
         /* should be detected from the AC'97 layer, but it seems
            that although CS4297A rev B reports 18-bit ADC resolution,
            samples are 20-bit */
diff --git a/sound/pci/cs46xx/Makefile b/sound/pci/cs46xx/Makefile
index d8b77b89aec4..67e811ec8539 100644
--- a/sound/pci/cs46xx/Makefile
+++ b/sound/pci/cs46xx/Makefile
@@ -1,12 +1,10 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
-snd-cs46xx-objs := cs46xx.o cs46xx_lib.o
-ifeq ($(CONFIG_SND_CS46XX_NEW_DSP),y)
-  snd-cs46xx-objs += dsp_spos.o dsp_spos_scb_lib.o
-endif
+snd-cs46xx-y := cs46xx.o cs46xx_lib.o
+snd-cs46xx-$(CONFIG_SND_CS46XX_NEW_DSP) += dsp_spos.o dsp_spos_scb_lib.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS46XX) += snd-cs46xx.o
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index 8b6cd144d101..2699cb6c2cd6 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #include <sound/cs46xx.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Cirrus Logic Sound Fusion CS46XX");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Cirrus Logic,Sound Fusion (CS4280)},"
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 71d7aab9d869..2c7bfc9fef61 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Abramo Bagnara <abramo@alsa-project.org>
  *                   Cirrus Logic, Inc.
  *  Routines for control of Cirrus Logic CS461x chips
@@ -1818,15 +1818,7 @@ static int snd_cs46xx_vol_iec958_put(struct snd_kcontrol *kcontrol, struct snd_c
 }
 #endif
 
-static int snd_mixer_boolean_info(struct snd_kcontrol *kcontrol, 
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_mixer_boolean_info          snd_ctl_boolean_mono_info
 
 static int snd_cs46xx_iec958_get(struct snd_kcontrol *kcontrol, 
                                  struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/cs46xx/cs46xx_lib.h b/sound/pci/cs46xx/cs46xx_lib.h
index 20dcd72f06c1..018a7de56017 100644
--- a/sound/pci/cs46xx/cs46xx_lib.h
+++ b/sound/pci/cs46xx/cs46xx_lib.h
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/cs46xx/dsp_spos.h b/sound/pci/cs46xx/dsp_spos.h
index 0d246bca4184..f9e169d33c03 100644
--- a/sound/pci/cs46xx/dsp_spos.h
+++ b/sound/pci/cs46xx/dsp_spos.h
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Cirrus Logic's Sound Fusion CS46XX based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 57e357de1500..eded4dfeba12 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -1480,7 +1480,7 @@ void cs46xx_dsp_destroy_pcm_channel (struct snd_cs46xx * chip,
         if (!pcm_channel->src_scb->ref_count) {
                 cs46xx_dsp_remove_scb(chip,pcm_channel->src_scb);
 
-                snd_assert (pcm_channel->src_slot >= 0 && pcm_channel->src_slot <= DSP_MAX_SRC_NR,
+                snd_assert (pcm_channel->src_slot >= 0 && pcm_channel->src_slot < DSP_MAX_SRC_NR,
                             return );
 
                 ins->src_scb_slots[pcm_channel->src_slot] = 0;
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index ad947b4c04cc..bb3d57e6a3cb 100644
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -2,11 +2,8 @@
 # Makefile for cs5535audio
 #
 
-snd-cs5535audio-objs := cs5535audio.o cs5535audio_pcm.o
-
-ifeq ($(CONFIG_PM),y)
-snd-cs5535audio-objs += cs5535audio_pm.o
-endif
+snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
+snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index b8e75ef9c1e6..2b35889787be 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -206,7 +206,6 @@ static void process_bm1_irq(struct cs5535audio *cs5535au)
 static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
 {
         u16 acc_irq_stat;
-        u8 bm_stat;
         unsigned char count;
         struct cs5535audio *cs5535au = dev_id;
 
@@ -217,7 +216,7 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
 
         if (!acc_irq_stat)
                 return IRQ_NONE;
-        for (count = 0; count < 10; count++) {
+        for (count = 0; count < 4; count++) {
                 if (acc_irq_stat & (1 << count)) {
                         switch (count) {
                         case IRQ_STS:
@@ -232,26 +231,9 @@ static irqreturn_t snd_cs5535audio_interrupt(int irq, void *dev_id)
                         case BM1_IRQ_STS:
                                 process_bm1_irq(cs5535au);
                                 break;
-                        case BM2_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM2_STATUS);
-                                break;
-                        case BM3_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM3_STATUS);
-                                break;
-                        case BM4_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM4_STATUS);
-                                break;
-                        case BM5_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM5_STATUS);
-                                break;
-                        case BM6_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM6_STATUS);
-                                break;
-                        case BM7_IRQ_STS:
-                                bm_stat = cs_readb(cs5535au, ACC_BM7_STATUS);
-                                break;
                         default:
-                                snd_printk(KERN_ERR "Unexpected irq src\n");
+                                snd_printk(KERN_ERR "Unexpected irq src: "
+                                                "0x%x\n", acc_irq_stat);
                                 break;
                         }
                 }
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 4fd1f31a6cf9..66bae7664193 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -16,57 +16,28 @@
 #define ACC_IRQ_STATUS                  0x12
 #define ACC_BM0_CMD                     0x20
 #define ACC_BM1_CMD                     0x28
-#define ACC_BM2_CMD                     0x30
-#define ACC_BM3_CMD                     0x38
-#define ACC_BM4_CMD                     0x40
-#define ACC_BM5_CMD                     0x48
-#define ACC_BM6_CMD                     0x50
-#define ACC_BM7_CMD                     0x58
 #define ACC_BM0_PRD                     0x24
 #define ACC_BM1_PRD                     0x2C
-#define ACC_BM2_PRD                     0x34
-#define ACC_BM3_PRD                     0x3C
-#define ACC_BM4_PRD                     0x44
-#define ACC_BM5_PRD                     0x4C
-#define ACC_BM6_PRD                     0x54
-#define ACC_BM7_PRD                     0x5C
 #define ACC_BM0_STATUS                  0x21
 #define ACC_BM1_STATUS                  0x29
-#define ACC_BM2_STATUS                  0x31
-#define ACC_BM3_STATUS                  0x39
-#define ACC_BM4_STATUS                  0x41
-#define ACC_BM5_STATUS                  0x49
-#define ACC_BM6_STATUS                  0x51
-#define ACC_BM7_STATUS                  0x59
 #define ACC_BM0_PNTR                    0x60
 #define ACC_BM1_PNTR                    0x64
-#define ACC_BM2_PNTR                    0x68
-#define ACC_BM3_PNTR                    0x6C
-#define ACC_BM4_PNTR                    0x70
-#define ACC_BM5_PNTR                    0x74
-#define ACC_BM6_PNTR                    0x78
-#define ACC_BM7_PNTR                    0x7C
+
 /* acc_codec bar0 reg bits */
 /* ACC_IRQ_STATUS */
 #define IRQ_STS                         0
 #define WU_IRQ_STS                      1
 #define BM0_IRQ_STS                     2
 #define BM1_IRQ_STS                     3
-#define BM2_IRQ_STS                     4
-#define BM3_IRQ_STS                     5
-#define BM4_IRQ_STS                     6
-#define BM5_IRQ_STS                     7
-#define BM6_IRQ_STS                     8
-#define BM7_IRQ_STS                     9
 /* ACC_BMX_STATUS */
 #define EOP                             (1<<0)
 #define BM_EOP_ERR                      (1<<1)
 /* ACC_BMX_CTL */
-#define BM_CTL_EN                       0x00000001
-#define BM_CTL_PAUSE                    0x00000011
-#define BM_CTL_DIS                      0x00000000
-#define BM_CTL_BYTE_ORD_LE              0x00000000
-#define BM_CTL_BYTE_ORD_BE              0x00000100
+#define BM_CTL_EN                       0x01
+#define BM_CTL_PAUSE                    0x03
+#define BM_CTL_DIS                      0x00
+#define BM_CTL_BYTE_ORD_LE              0x00
+#define BM_CTL_BYTE_ORD_BE              0x04
 /* cs5535 specific ac97 codec register defines */
 #define CMD_MASK                        0xFF00FFFF
 #define CMD_NEW                         0x00010000
@@ -106,7 +77,6 @@ struct cs5535audio_dma {
         struct snd_pcm_substream *substream;
         unsigned int buf_addr, buf_bytes;
         unsigned int period_bytes, periods;
-        int suspended;
         u32 saved_prd;
 };
 
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index 5450a9e8f133..21df0634af32 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -43,7 +43,6 @@ static struct snd_pcm_hardware snd_cs5535audio_playback =
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                 SNDRV_PCM_INFO_MMAP_VALID |
                                 SNDRV_PCM_INFO_PAUSE |
-                                SNDRV_PCM_INFO_SYNC_START |
                                 SNDRV_PCM_INFO_RESUME
                                 ),
         .formats =              (
@@ -71,8 +70,7 @@ static struct snd_pcm_hardware snd_cs5535audio_capture =
                                 SNDRV_PCM_INFO_MMAP |
                                 SNDRV_PCM_INFO_INTERLEAVED |
                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                SNDRV_PCM_INFO_MMAP_VALID |
-                                SNDRV_PCM_INFO_SYNC_START
+                                SNDRV_PCM_INFO_MMAP_VALID
                                 ),
         .formats =              (
                                 SNDRV_PCM_FMTBIT_S16_LE
@@ -102,7 +100,6 @@ static int snd_cs5535audio_playback_open(struct snd_pcm_substream *substream)
         runtime->hw = snd_cs5535audio_playback;
         cs5535au->playback_substream = substream;
         runtime->private_data = &(cs5535au->dmas[CS5535AUDIO_DMA_PLAYBACK]);
-        snd_pcm_set_sync(substream);
         if ((err = snd_pcm_hw_constraint_integer(runtime,
                                 SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
@@ -164,6 +161,7 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au,
         jmpprd_addr = cpu_to_le32(lastdesc->addr +
                                   (sizeof(struct cs5535audio_dma_desc)*periods));
 
+        dma->substream = substream;
         dma->period_bytes = period_bytes;
         dma->periods = periods;
         spin_lock_irq(&cs5535au->reg_lock);
@@ -241,6 +239,7 @@ static void cs5535audio_clear_dma_packets(struct cs5535audio *cs5535au,
 {
         snd_dma_free_pages(&dma->desc_buf);
         dma->desc_buf.area = NULL;
+        dma->substream = NULL;
 }
 
 static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,
@@ -298,14 +297,12 @@ static int snd_cs5535audio_trigger(struct snd_pcm_substream *substream, int cmd)
                 break;
         case SNDRV_PCM_TRIGGER_RESUME:
                 dma->ops->enable_dma(cs5535au);
-                dma->suspended = 0;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
                 dma->ops->disable_dma(cs5535au);
                 break;
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 dma->ops->disable_dma(cs5535au);
-                dma->suspended = 1;
                 break;
         default:
                 snd_printk(KERN_ERR "unhandled trigger\n");
@@ -348,7 +345,6 @@ static int snd_cs5535audio_capture_open(struct snd_pcm_substream *substream)
         runtime->hw = snd_cs5535audio_capture;
         cs5535au->capture_substream = substream;
         runtime->private_data = &(cs5535au->dmas[CS5535AUDIO_DMA_CAPTURE]);
-        snd_pcm_set_sync(substream);
         if ((err = snd_pcm_hw_constraint_integer(runtime,
                                          SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c
index 3e4d198a4502..838708f6d45e 100644
--- a/sound/pci/cs5535audio/cs5535audio_pm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pm.c
@@ -64,18 +64,21 @@ int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state)
         int i;
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        snd_pcm_suspend_all(cs5535au->pcm);
+        snd_ac97_suspend(cs5535au->ac97);
         for (i = 0; i < NUM_CS5535AUDIO_DMAS; i++) {
                 struct cs5535audio_dma *dma = &cs5535au->dmas[i];
-                if (dma && dma->substream && !dma->suspended) 
+                if (dma && dma->substream)
                         dma->saved_prd = dma->ops->read_prd(cs5535au);
         }
-        snd_pcm_suspend_all(cs5535au->pcm);
-        snd_ac97_suspend(cs5535au->ac97);
         /* save important regs, then disable aclink in hw */
         snd_cs5535audio_stop_hardware(cs5535au);
 
+        if (pci_save_state(pci)) {
+                printk(KERN_ERR "cs5535audio: pci_save_state failed!\n");
+                return -EIO;
+        }
         pci_disable_device(pci);
-        pci_save_state(pci);
         pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
@@ -89,7 +92,12 @@ int snd_cs5535audio_resume(struct pci_dev *pci)
         int i;
 
         pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
+        if (pci_restore_state(pci) < 0) {
+                printk(KERN_ERR "cs5535audio: pci_restore_state failed, "
+                       "disabling device\n");
+                snd_card_disconnect(card);
+                return -EIO;
+        }
         if (pci_enable_device(pci) < 0) {
                 printk(KERN_ERR "cs5535audio: pci_enable_device failed, "
                        "disabling device\n");
@@ -112,17 +120,17 @@ int snd_cs5535audio_resume(struct pci_dev *pci)
         if (!timeout)
                 snd_printk(KERN_ERR "Failure getting AC Link ready\n");
 
-        /* we depend on ac97 to perform the codec power up */
-        snd_ac97_resume(cs5535au->ac97);
         /* set up rate regs, dma. actual initiation is done in trig */
         for (i = 0; i < NUM_CS5535AUDIO_DMAS; i++) {
                 struct cs5535audio_dma *dma = &cs5535au->dmas[i];
-                if (dma && dma->substream && dma->suspended) {
+                if (dma && dma->substream) {
                         dma->substream->ops->prepare(dma->substream);
                         dma->ops->setup_prd(cs5535au, dma->saved_prd);
                 }
         }
-                
+
+        /* we depend on ac97 to perform the codec power up */
+        snd_ac97_resume(cs5535au->ac97);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
 
         return 0;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index f27b6a733b96..499ee1a5319d 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1595,15 +1595,7 @@ static struct snd_kcontrol_new snd_echo_clock_source_switch __devinitdata = {
 #ifdef ECHOCARD_HAS_PHANTOM_POWER
 
 /******************* Phantom power switch *******************/
-static int snd_echo_phantom_power_info(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_echo_phantom_power_info     snd_ctl_boolean_mono_info
 
 static int snd_echo_phantom_power_get(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
@@ -1646,15 +1638,7 @@ static struct snd_kcontrol_new snd_echo_phantom_power_switch __devinitdata = {
 #ifdef ECHOCARD_HAS_DIGITAL_IN_AUTOMUTE
 
 /******************* Digital input automute switch *******************/
-static int snd_echo_automute_info(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_echo_automute_info          snd_ctl_boolean_mono_info
 
 static int snd_echo_automute_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
@@ -1695,18 +1679,7 @@ static struct snd_kcontrol_new snd_echo_automute_switch __devinitdata = {
 
 
 /******************* VU-meters switch *******************/
-static int snd_echo_vumeters_switch_info(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_info *uinfo)
-{
-        struct echoaudio *chip;
-
-        chip = snd_kcontrol_chip(kcontrol);
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_echo_vumeters_switch_info           snd_ctl_boolean_mono_info
 
 static int snd_echo_vumeters_switch_put(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index 42afa837d9b4..e6c100770392 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -43,11 +43,11 @@ static int wait_handshake(struct echoaudio *chip)
 {
         int i;
 
-        /* Wait up to 10ms for the handshake from the DSP */
+        /* Wait up to 20ms for the handshake from the DSP */
         for (i = 0; i < HANDSHAKE_TIMEOUT; i++) {
                 /* Look for the handshake value */
+                barrier();
                 if (chip->comm_page->handshake) {
-                        /*if (i)  DE_ACT(("Handshake time: %d\n", i));*/
                         return 0;
                 }
                 udelay(1);
diff --git a/sound/pci/echoaudio/echoaudio_dsp.h b/sound/pci/echoaudio/echoaudio_dsp.h
index e55ee00991ac..e352f3ae292c 100644
--- a/sound/pci/echoaudio/echoaudio_dsp.h
+++ b/sound/pci/echoaudio/echoaudio_dsp.h
@@ -642,18 +642,18 @@ struct comm_page {		/*				Base	Length*/
         u32 flags;              /* See Appendix A below         0x004   4 */
         u32 unused;             /* Unused entry                 0x008   4 */
         u32 sample_rate;        /* Card sample rate in Hz       0x00c   4 */
-        volatile u32 handshake; /* DSP command handshake        0x010   4 */
+        u32 handshake;          /* DSP command handshake        0x010   4 */
         u32 cmd_start;          /* Chs. to start mask           0x014   4 */
         u32 cmd_stop;           /* Chs. to stop mask            0x018   4 */
         u32 cmd_reset;          /* Chs. to reset mask           0x01c   4 */
         u16 audio_format[DSP_MAXPIPES]; /* Chs. audio format    0x020   32*2 */
         struct sg_entry sglist_addr[DSP_MAXPIPES];
                                 /* Chs. Physical sglist addrs   0x060   32*8 */
-        volatile u32 position[DSP_MAXPIPES];
+        u32 position[DSP_MAXPIPES];
                                 /* Positions for ea. ch.        0x160   32*4 */
-        volatile s8 vu_meter[DSP_MAXPIPES];
+        s8 vu_meter[DSP_MAXPIPES];
                                 /* VU meters                    0x1e0   32*1 */
-        volatile s8 peak_meter[DSP_MAXPIPES];
+        s8 peak_meter[DSP_MAXPIPES];
                                 /* Peak meters                  0x200   32*1 */
         s8 line_out_level[DSP_MAXAUDIOOUTPUTS];
                                 /* Output gain                  0x220   16*1 */
@@ -665,7 +665,7 @@ struct comm_page {		/*				Base	Length*/
                         /* Gina/Darla play filters - obsolete   0x3c0   168*4 */
         u32 rec_coeff[MAX_REC_TAPS];
                         /* Gina/Darla record filters - obsolete 0x660   192*4 */
-        volatile u16 midi_input[MIDI_IN_BUFFER_SIZE];
+        u16 midi_input[MIDI_IN_BUFFER_SIZE];
                         /* MIDI input data transfer buffer      0x960   256*2 */
         u8 gd_clock_state;      /* Chg Gina/Darla clock state   0xb60   1 */
         u8 gd_spdif_status;     /* Chg. Gina/Darla S/PDIF state 0xb61   1 */
@@ -674,11 +674,10 @@ struct comm_page {		/*				Base	Length*/
         u32 nominal_level_mask; /* -10 level enable mask        0xb64   4 */
         u16 input_clock;        /* Chg. Input clock state       0xb68   2 */
         u16 output_clock;       /* Chg. Output clock state      0xb6a   2 */
-        volatile u32 status_clocks;
-                                /* Current Input clock state    0xb6c   4 */
+        u32 status_clocks;      /* Current Input clock state    0xb6c   4 */
         u32 ext_box_status;     /* External box status          0xb70   4 */
         u32 cmd_add_buffer;     /* Pipes to add (obsolete)      0xb74   4 */
-        volatile u32 midi_out_free_count;
+        u32 midi_out_free_count;
                         /* # of bytes free in MIDI output FIFO  0xb78   4 */
         u32 unused2;            /* Cyclic pipes                 0xb7c   4 */
         u32 control_register;
diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
index e521c38cef45..cf2d5636d8be 100644
--- a/sound/pci/emu10k1/Makefile
+++ b/sound/pci/emu10k1/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 55caf341933a..9680caff90c8 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -1,6 +1,6 @@
 /*
  *  The driver for the EMU10K1 (SB Live!) based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *      Added support for Audigy 2 Value.
@@ -32,7 +32,7 @@
 #include <sound/emu10k1.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("EMU10K1");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS},"
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 404ae1be0a4b..97c41d72a255 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips
  *
@@ -31,6 +31,8 @@
  *
  */
 
+#include <linux/sched.h>
+#include <linux/kthread.h>
 #include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -702,6 +704,65 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * file
         return 0;
 }
 
+int emu1010_firmware_thread(void *data) {
+        struct snd_emu10k1 * emu = data;
+        int tmp,tmp2;
+        int reg;
+        int err;
+
+        for (;;) {
+                /* Delay to allow Audio Dock to settle */
+                msleep(1000);
+                if (kthread_should_stop())
+                        break;
+                snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp ); /* IRQ Status */
+                snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg ); /* OPTIONS: Which cards are attached to the EMU */
+                if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
+                        /* Audio Dock attached */
+                        /* Return to Audio Dock programming mode */
+                        snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
+                        snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK );
+                        if (emu->card_capabilities->emu1010 == 1) {
+                                if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) {
+                                        return err;
+                                }
+                        } else if (emu->card_capabilities->emu1010 == 2) {
+                                if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
+                                        return err;
+                                }
+                        } else if (emu->card_capabilities->emu1010 == 3) {
+                                if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
+                                        return err;
+                                }
+                        }
+
+                        snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0 );
+                        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
+                        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
+                        /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
+                        snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+                        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID=0x%x\n",reg);
+                        if ((reg & 0x1f) != 0x15) {
+                                /* FPGA failed to be programmed */
+                                snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg=0x%x\n", reg);
+                                return 0;
+                                return -ENODEV;
+                        }
+                        snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
+                        snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
+                        snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
+                        snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
+                        /* Sync clocking between 1010 and Dock */
+                        /* Allow DLL to settle */
+                        msleep(10);
+                        /* Unmute all. Default is muted after a firmware load */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                        break;
+                }
+        }
+        return 0;
+}
+
 /*
  * EMU-1010 - details found out from this driver, official MS Win drivers,
  * testing the card:
@@ -817,8 +878,16 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
         snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); 
-        /* ADAT input. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x01 );
+        /* Optical -> ADAT I/O  */
+        /* 0 : SPDIF
+         * 1 : ADAT
+         */
+        emu->emu1010.optical_in = 1; /* IN_ADAT */
+        emu->emu1010.optical_out = 1; /* IN_ADAT */
+        tmp = 0;
+        tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
+                (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
+        snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp );
         snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp );
         /* Set no attenuation on Audio Dock pads. */
         snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 );
@@ -1004,49 +1073,12 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp ); 
         snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 ); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */
 
-        /* Delay to allow Audio Dock to settle */
-        msleep(100);
-        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp ); /* IRQ Status */
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg ); /* OPTIONS: Which cards are attached to the EMU */
-        /* FIXME: The loading of this should be able to happen any time,
-         * as the user can plug/unplug it at any time
-         */
-        if (reg & (EMU_HANA_OPTION_DOCK_ONLINE | EMU_HANA_OPTION_DOCK_OFFLINE) ) {
-                /* Audio Dock attached */
-                /* Return to Audio Dock programming mode */
-                snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
-                snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK );
-                if (emu->card_capabilities->emu1010 == 1) {
-                        if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) {
-                                return err;
-                        }
-                } else if (emu->card_capabilities->emu1010 == 2) {
-                        if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
-                                return err;
-                        }
-                } else if (emu->card_capabilities->emu1010 == 3) {
-                        if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
-                                return err;
-                        }
-                }
+        /* Start Micro/Audio Dock firmware loader thread */
+        emu->emu1010.firmware_thread = kthread_create(&emu1010_firmware_thread,
+                                   emu,
+                                   "emu1010_firmware");
+        wake_up_process(emu->emu1010.firmware_thread);
 
-                snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0 );
-                snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
-                snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
-                /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
-                snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
-                snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID=0x%x\n",reg);
-                if ((reg & 0x3f) != 0x15) {
-                        /* FPGA failed to be programmed */
-                        snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg=0x%x\n", reg);
-                        return 0;
-                        return -ENODEV;
-                }
-                snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
-                snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
-                snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
-                snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
-        }
 #if 0
         snd_emu1010_fpga_link_dst_src_write(emu,
                 EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32B + 2); /* ALICE2 bus 0xa2 */
@@ -1132,7 +1164,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
         emu->emu1010.output_source[23] = 28;
 
         /* TEMP: Select SPDIF in/out */
-        snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */
+        //snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */
 
         /* TEMP: Select 48kHz SPDIF out */
         snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */
@@ -1173,6 +1205,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
         if (emu->card_capabilities->emu1010) {
                 /* Disable 48Volt power to Audio Dock */
                 snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
+                kthread_stop(emu->emu1010.firmware_thread);
         }
         if (emu->memhdr)
                 snd_util_memhdr_free(emu->memhdr);
@@ -1722,8 +1755,9 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
                 goto error;
         }
 
-        emu->page_ptr_table = (void **)vmalloc(emu->max_cache_pages * sizeof(void*));
-        emu->page_addr_table = (unsigned long*)vmalloc(emu->max_cache_pages * sizeof(unsigned long));
+        emu->page_ptr_table = vmalloc(emu->max_cache_pages * sizeof(void *));
+        emu->page_addr_table = vmalloc(emu->max_cache_pages *
+                                       sizeof(unsigned long));
         if (emu->page_ptr_table == NULL || emu->page_addr_table == NULL) {
                 err = -ENOMEM;
                 goto error;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index e4af7a9b808c..1ec7ebaff9e9 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1062,14 +1062,7 @@ static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
         return 0;
 }
 
-static int snd_emu10k1x_shared_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_emu10k1x_shared_spdif_info  snd_ctl_boolean_mono_info
 
 static int snd_emu10k1x_shared_spdif_get(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 7206c0fa06f2..9bf1cd592199 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for effect processor FX8010
  *
@@ -642,10 +642,8 @@ snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, struct snd_ctl_elem_id *id)
 {
         struct snd_emu10k1_fx8010_ctl *ctl;
         struct snd_kcontrol *kcontrol;
-        struct list_head *list;
-        
-        list_for_each(list, &emu->fx8010.gpr_ctl) {
-                ctl = emu10k1_gpr_ctl(list);
+
+        list_for_each_entry(ctl, &emu->fx8010.gpr_ctl, list) {
                 kcontrol = ctl->kcontrol;
                 if (kcontrol->id.iface == id->iface &&
                     !strcmp(kcontrol->id.name, id->name) &&
@@ -895,14 +893,12 @@ static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,
         struct snd_emu10k1_fx8010_control_gpr *gctl;
         struct snd_emu10k1_fx8010_ctl *ctl;
         struct snd_ctl_elem_id *id;
-        struct list_head *list;
 
         gctl = kmalloc(sizeof(*gctl), GFP_KERNEL);
         if (! gctl)
                 return -ENOMEM;
 
-        list_for_each(list, &emu->fx8010.gpr_ctl) {
-                ctl = emu10k1_gpr_ctl(list);
+        list_for_each_entry(ctl, &emu->fx8010.gpr_ctl, list) {
                 total++;
                 if (icode->gpr_list_controls &&
                     i < icode->gpr_list_control_count) {
@@ -1207,7 +1203,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
         A_OP(icode, &ptr, iMAC0, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Front Playback Volume", gpr, 100);
         gpr += 2;
-        
+
         /* PCM Surround Playback (independent from stereo mix) */
         A_OP(icode, &ptr, iMAC0, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR));
         A_OP(icode, &ptr, iMAC0, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR));
@@ -1267,8 +1263,16 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
 
         /* emu1212 DSP 0 and DSP 1 Capture */
         if (emu->card_capabilities->emu1010) {
-                A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_P16VIN(0x0));
-                A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_P16VIN(0x1));
+                if (emu->card_capabilities->ca0108_chip) {
+                        /* Note:JCD:No longer bit shift lower 16bits to upper 16bits of 32bit value. */
+                        A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x0), A_C_00000001);
+                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_GPR(tmp));
+                        A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x1), A_C_00000001);
+                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr), A_GPR(tmp));
+                } else {
+                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_P16VIN(0x0));
+                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_P16VIN(0x1));
+                }
                 snd_emu10k1_init_stereo_control(&controls[nctl++], "EMU Capture Volume", gpr, 0);
                 gpr += 2;
         }
@@ -1516,7 +1520,11 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
                 /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
                 snd_printk("EMU outputs on\n");
                 for (z = 0; z < 8; z++) {
-                        A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+                        if (emu->card_capabilities->ca0108_chip) {
+                                A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+                        } else {
+                                A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+                        }
                 }
         }
 
@@ -1557,106 +1565,116 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
 #endif
 
         if (emu->card_capabilities->emu1010) {
-                snd_printk("EMU inputs on\n");
-                /* Capture 16 (originally 8) channels of S32_LE sound */
-                
-                /* printk("emufx.c: gpr=0x%x, tmp=0x%x\n",gpr, tmp); */
-                /* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
-                /* A_P16VIN(0) is delayed by one sample,
-                 * so all other A_P16VIN channels will need to also be delayed
-                 */
-                /* Left ADC in. 1 of 2 */
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_P16VIN(0x0), A_FXBUS2(0) );
-                /* Right ADC in 1 of 2 */
-                gpr_map[gpr++] = 0x00000000;
-                /* Delaying by one sample: instead of copying the input
-                 * value A_P16VIN to output A_FXBUS2 as in the first channel,
-                 * we use an auxiliary register, delaying the value by one
-                 * sample
-                 */
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(2) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x1), A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(4) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x2), A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(6) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x3), A_C_00000000, A_C_00000000);
-                /* For 96kHz mode */
-                /* Left ADC in. 2 of 2 */
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0x8) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x4), A_C_00000000, A_C_00000000);
-                /* Right ADC in 2 of 2 */
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xa) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x5), A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xc) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x6), A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xe) );
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x7), A_C_00000000, A_C_00000000);
-                /* Pavel Hofman - we still have voices, A_FXBUS2s, and
-                 * A_P16VINs available -
-                 * let's add 8 more capture channels - total of 16
-                 */
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x10));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x8),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x12));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x9),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x14));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xa),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x16));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xb),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x18));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xc),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x1a));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xd),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x1c));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xe),
-                     A_C_00000000, A_C_00000000);
-                gpr_map[gpr++] = 0x00000000;
-                snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                          bit_shifter16,
-                                                          A_GPR(gpr - 1),
-                                                          A_FXBUS2(0x1e));
-                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xf),
-                     A_C_00000000, A_C_00000000);
+                if (emu->card_capabilities->ca0108_chip) {
+                        snd_printk("EMU2 inputs on\n");
+                        for (z = 0; z < 0x10; z++) {
+                                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 
+                                                                        bit_shifter16,
+                                                                        A3_EMU32IN(z),
+                                                                        A_FXBUS2(z*2) );
+                        }
+                } else {
+                        snd_printk("EMU inputs on\n");
+                        /* Capture 16 (originally 8) channels of S32_LE sound */
+
+                        /* printk("emufx.c: gpr=0x%x, tmp=0x%x\n",gpr, tmp); */
+                        /* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
+                        /* A_P16VIN(0) is delayed by one sample,
+                         * so all other A_P16VIN channels will need to also be delayed
+                         */
+                        /* Left ADC in. 1 of 2 */
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_P16VIN(0x0), A_FXBUS2(0) );
+                        /* Right ADC in 1 of 2 */
+                        gpr_map[gpr++] = 0x00000000;
+                        /* Delaying by one sample: instead of copying the input
+                         * value A_P16VIN to output A_FXBUS2 as in the first channel,
+                         * we use an auxiliary register, delaying the value by one
+                         * sample
+                         */
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(2) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x1), A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(4) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x2), A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(6) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x3), A_C_00000000, A_C_00000000);
+                        /* For 96kHz mode */
+                        /* Left ADC in. 2 of 2 */
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0x8) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x4), A_C_00000000, A_C_00000000);
+                        /* Right ADC in 2 of 2 */
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xa) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x5), A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xc) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x6), A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xe) );
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x7), A_C_00000000, A_C_00000000);
+                        /* Pavel Hofman - we still have voices, A_FXBUS2s, and
+                         * A_P16VINs available -
+                         * let's add 8 more capture channels - total of 16
+                         */
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x10));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x8),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x12));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x9),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x14));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xa),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x16));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xb),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x18));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xc),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x1a));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xd),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x1c));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xe),
+                             A_C_00000000, A_C_00000000);
+                        gpr_map[gpr++] = 0x00000000;
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
+                                                                  bit_shifter16,
+                                                                  A_GPR(gpr - 1),
+                                                                  A_FXBUS2(0x1e));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xf),
+                             A_C_00000000, A_C_00000000);
+                }
 
 #if 0
                 for (z = 4; z < 8; z++) {
@@ -2418,14 +2436,13 @@ static void copy_string(char *dst, char *src, char *null, int idx)
                 strcpy(dst, src);
 }
 
-static int snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu,
+static void snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu,
                                    struct snd_emu10k1_fx8010_info *info)
 {
         char **fxbus, **extin, **extout;
         unsigned short fxbus_mask, extin_mask, extout_mask;
         int res;
 
-        memset(info, 0, sizeof(info));
         info->internal_tram_size = emu->fx8010.itram_size;
         info->external_tram_size = emu->fx8010.etram_pages.bytes / 2;
         fxbus = fxbuses;
@@ -2442,7 +2459,6 @@ static int snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu,
         for (res = 16; res < 32; res++, extout++)
                 copy_string(info->extout_names[res], extout_mask & (1 << res) ? *extout : NULL, "Unused", res);
         info->gpr_controls = emu->fx8010.gpr_count;
-        return 0;
 }
 
 static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, unsigned int cmd, unsigned long arg)
@@ -2463,10 +2479,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
                 info = kmalloc(sizeof(*info), GFP_KERNEL);
                 if (!info)
                         return -ENOMEM;
-                if ((res = snd_emu10k1_fx8010_info(emu, info)) < 0) {
-                        kfree(info);
-                        return res;
-                }
+                snd_emu10k1_fx8010_info(emu, info);
                 if (copy_to_user(argp, info, sizeof(*info))) {
                         kfree(info);
                         return -EFAULT;
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 7b2c1dcc5337..54a2034d8edd 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Takashi Iwai <tiwai@suse.de>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / mixer routines
@@ -400,15 +400,7 @@ static struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] __devinitdata = {
 
 
 
-
-static int snd_emu1010_adc_pads_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_emu1010_adc_pads_info       snd_ctl_boolean_mono_info
 
 static int snd_emu1010_adc_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -456,14 +448,7 @@ static struct snd_kcontrol_new snd_emu1010_adc_pads[] __devinitdata = {
         EMU1010_ADC_PADS("ADC1 14dB PAD 0202 Capture Switch", EMU_HANA_0202_ADC_PAD1),
 };
 
-static int snd_emu1010_dac_pads_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_emu1010_dac_pads_info       snd_ctl_boolean_mono_info
 
 static int snd_emu1010_dac_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -516,17 +501,19 @@ static struct snd_kcontrol_new snd_emu1010_dac_pads[] __devinitdata = {
 static int snd_emu1010_internal_clock_info(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[2] = {
-                "44100", "48000"
+        static char *texts[4] = {
+                "44100", "48000", "SPDIF", "ADAT"
         };
-
+                
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-        if (uinfo->value.enumerated.item > 1)
-                uinfo->value.enumerated.item = 1;
+        uinfo->value.enumerated.items = 4;
+        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_emu1010_internal_clock_get(struct snd_kcontrol *kcontrol,
@@ -584,6 +571,44 @@ static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol,
                         /* Unmute all */
                         snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
                         break;
+                        
+                case 2: /* Take clock from S/PDIF IN */
+                        /* Mute all */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                        /* Default fallback clock 48kHz */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
+                        /* Word Clock source, sync to S/PDIF input */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                                EMU_HANA_WCLOCK_HANA_SPDIF_IN | EMU_HANA_WCLOCK_1X );
+                        /* Set LEDs on Audio Dock */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
+                                EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
+                        /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
+                        /* Allow DLL to settle */
+                        msleep(10);
+                        /* Unmute all */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                        break;
+                
+                case 3:                         
+                        /* Take clock from ADAT IN */
+                        /* Mute all */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                        /* Default fallback clock 48kHz */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
+                        /* Word Clock source, sync to ADAT input */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                                EMU_HANA_WCLOCK_HANA_ADAT_IN | EMU_HANA_WCLOCK_1X );
+                        /* Set LEDs on Audio Dock */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
+                        /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
+                        /* Allow DLL to settle */
+                        msleep(10);
+                        /*   Unmute all */
+                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                         
+                        
+                        break;          
                 }
         }
         return change;
@@ -871,7 +896,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =
         .access =       SNDRV_CTL_ELEM_ACCESS_READ,
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
         .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-        .count =        4,
+        .count =        3,
         .info =         snd_emu10k1_spdif_info,
         .get =          snd_emu10k1_spdif_get_mask
 };
@@ -880,7 +905,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_control =
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
         .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-        .count =        4,
+        .count =        3,
         .info =         snd_emu10k1_spdif_info,
         .get =          snd_emu10k1_spdif_get,
         .put =          snd_emu10k1_spdif_put
@@ -1326,14 +1351,7 @@ static struct snd_kcontrol_new snd_emu10k1_efx_attn_control =
         .put =          snd_emu10k1_efx_attn_put
 };
 
-static int snd_emu10k1_shared_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_emu10k1_shared_spdif_info   snd_ctl_boolean_mono_info
 
 static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c
index 950c6bcd6b7d..04c7cf703531 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of EMU10K1 MPU-401 in UART mode
  *
  *
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c
index eda5cb373ded..5ce5befc701b 100644
--- a/sound/pci/emu10k1/emupcm.c
+++ b/sound/pci/emu10k1/emupcm.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / PCM routines
  *  Multichannel PCM support Copyright (c) Lee Revell <rlrevell@joe-job.com>
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index 2c1585991bc8..c3fb10e81c9e 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / proc interface routines
  *
@@ -240,8 +240,42 @@ static void snd_emu10k1_proc_spdif_read(struct snd_info_entry *entry,
                                   struct snd_info_buffer *buffer)
 {
         struct snd_emu10k1 *emu = entry->private_data;
-        snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
-        snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+        u32 value;
+        u32 value2;
+        unsigned long flags;
+        u32 rate;
+
+        if (emu->card_capabilities->emu1010) {
+                spin_lock_irqsave(&emu->emu_lock, flags);
+                snd_emu1010_fpga_read(emu, 0x38, &value);
+                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                if ((value & 0x1) == 0) {
+                        spin_lock_irqsave(&emu->emu_lock, flags);
+                        snd_emu1010_fpga_read(emu, 0x2a, &value);
+                        snd_emu1010_fpga_read(emu, 0x2b, &value2);
+                        spin_unlock_irqrestore(&emu->emu_lock, flags);
+                        rate = 0x1770000 / (((value << 5) | value2)+1); 
+                        snd_iprintf(buffer, "ADAT Locked : %u\n", rate);
+                } else {
+                        snd_iprintf(buffer, "ADAT Unlocked\n");
+                }
+                spin_lock_irqsave(&emu->emu_lock, flags);
+                snd_emu1010_fpga_read(emu, 0x20, &value);
+                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                if ((value & 0x4) == 0) {
+                        spin_lock_irqsave(&emu->emu_lock, flags);
+                        snd_emu1010_fpga_read(emu, 0x28, &value);
+                        snd_emu1010_fpga_read(emu, 0x29, &value2);
+                        spin_unlock_irqrestore(&emu->emu_lock, flags);
+                        rate = 0x1770000 / (((value << 5) | value2)+1); 
+                        snd_iprintf(buffer, "SPDIF Locked : %d\n", rate);
+                } else {
+                        snd_iprintf(buffer, "SPDIF Unlocked\n");
+                }
+        } else {
+                snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
+                snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
+        }
 #if 0
         val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);
         snd_iprintf(buffer, "\nZoomed Video\n");
@@ -379,20 +413,16 @@ static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,
                                      struct snd_info_buffer *buffer)
 {
         struct snd_emu10k1 *emu = entry->private_data;
-        unsigned long value;
+        int value;
         unsigned long flags;
-        unsigned long regs;
         int i;
         snd_iprintf(buffer, "EMU1010 Registers:\n\n");
 
-        for(i = 0; i < 0x30; i+=1) {
+        for(i = 0; i < 0x40; i+=1) {
                 spin_lock_irqsave(&emu->emu_lock, flags);
-                regs=i+0x40; /* 0x40 upwards are registers. */
-                outl(regs, emu->port + A_IOCFG);
-                outl(regs | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-                value = inl(emu->port + A_IOCFG);
+                snd_emu1010_fpga_read(emu, i, &value);
                 spin_unlock_irqrestore(&emu->emu_lock, flags);
-                snd_iprintf(buffer, "%02X: %08lX, %02lX\n", i, value, (value >> 8) & 0x7f);
+                snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f);
         }
 }
 
@@ -555,9 +585,9 @@ int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
 {
         struct snd_info_entry *entry;
 #ifdef CONFIG_SND_DEBUG
-        if ((emu->card_capabilities->emu1010) &&
-             snd_card_proc_new(emu->card, "emu1010_regs", &entry)) {
-                snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);
+        if (emu->card_capabilities->emu1010) {
+                if (! snd_card_proc_new(emu->card, "emu1010_regs", &entry)) 
+                        snd_info_set_text_ops(entry, emu, snd_emu_proc_emu1010_reg_read);
         }
         if (! snd_card_proc_new(emu->card, "io_regs", &entry)) {
                 snd_info_set_text_ops(entry, emu, snd_emu_proc_io_reg_read);
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 116e1c8d9361..6702c15fefa3 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips
  *
@@ -226,9 +226,9 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,
         return 0;
 }
 
-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value)
 {
-        if (reg < 0 || reg > 0x3f)
+        if (reg > 0x3f)
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
         if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */
@@ -244,9 +244,9 @@ int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
         return 0;
 }
 
-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value)
 {
-        if (reg < 0 || reg > 0x3f)
+        if (reg > 0x3f)
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
         outl(reg, emu->port + A_IOCFG);
@@ -261,7 +261,7 @@ int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
 /* Each Destination has one and only one Source,
  * but one Source can feed any number of Destinations simultaneously.
  */
-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src)
+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src)
 {
         snd_emu1010_fpga_write(emu, 0x00, ((dst >> 8) & 0x3f) );
         snd_emu1010_fpga_write(emu, 0x01, (dst & 0x3f) );
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index 4f18f7e8bcfb..3c114b45e0b2 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *  Routines for IRQ control of EMU10K1 chips
  *
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 4fcaefe5a3c5..48097c6bb15c 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) by Takashi Iwai <tiwai@suse.de>
  *
  *  EMU10K1 memory page allocation (PTB area)
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 7ee19c63c2c8..d619a3842cdd 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -124,11 +124,12 @@
 
  /* hardware definition */
 static struct snd_pcm_hardware snd_p16v_playback_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_RESUME |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .info =                 SNDRV_PCM_INFO_MMAP | 
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                SNDRV_PCM_INFO_RESUME |
+                                SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_SYNC_START,
         .formats =              SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 24-bit samples padded to 32 bits. */
         .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 
         .rate_min =             44100,
@@ -207,6 +208,11 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substrea
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
 
+        runtime->sync.id32[0] = substream->pcm->card->number;
+        runtime->sync.id32[1] = 'P';
+        runtime->sync.id32[2] = 16;
+        runtime->sync.id32[3] = 'V';
+
         return 0;
 }
 /* open_capture callback */
@@ -448,6 +454,9 @@ static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,
                 break;
         }
         snd_pcm_group_for_each_entry(s, substream) {
+                if (snd_pcm_substream_chip(s) != emu ||
+                    s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+                        continue;
                 runtime = s->runtime;
                 epcm = runtime->private_data;
                 channel = substream->pcm->device-emu->p16v_device_offset;
diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index 1db50fe61475..04fa8492abb0 100644
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *                   Creative Labs, Inc.
  *                   Lee Revell <rlrevell@joe-job.com>
  *  Routines for control of EMU10K1 chips - voice manager
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 21cb4268a59b..b958f869cb13 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for Ensoniq ES1370/ES1371 AudioPCI soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Thomas Sailer <sailer@ife.ee.ethz.ch>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@
 #endif
 
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Thomas Sailer <sailer@ife.ee.ethz.ch>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Thomas Sailer <sailer@ife.ee.ethz.ch>");
 MODULE_LICENSE("GPL");
 #ifdef CHIP1370
 MODULE_DESCRIPTION("Ensoniq AudioPCI ES1370");
@@ -1419,15 +1419,7 @@ static int snd_ens1373_spdif_stream_put(struct snd_kcontrol *kcontrol,
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_es1371_spdif_info, \
   .get = snd_es1371_spdif_get, .put = snd_es1371_spdif_put }
 
-static int snd_es1371_spdif_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1371_spdif_info           snd_ctl_boolean_mono_info
 
 static int snd_es1371_spdif_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
@@ -1489,15 +1481,7 @@ static struct snd_kcontrol_new snd_es1371_mixer_spdif[] __devinitdata = {
 };
 
 
-static int snd_es1373_rear_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1373_rear_info            snd_ctl_boolean_mono_info
 
 static int snd_es1373_rear_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
@@ -1542,15 +1526,7 @@ static struct snd_kcontrol_new snd_ens1373_rear __devinitdata =
         .put =          snd_es1373_rear_put,
 };
 
-static int snd_es1373_line_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1373_line_info            snd_ctl_boolean_mono_info
 
 static int snd_es1373_line_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
@@ -1707,15 +1683,7 @@ static int __devinit snd_ensoniq_1371_mixer(struct ensoniq *ensoniq,
   .get = snd_ensoniq_control_get, .put = snd_ensoniq_control_put, \
   .private_value = mask }
 
-static int snd_ensoniq_control_info(struct snd_kcontrol *kcontrol,
-                                    struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ensoniq_control_info        snd_ctl_boolean_mono_info
 
 static int snd_ensoniq_control_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index fec29a108945..fb25abe68a02 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for ESS Solo-1 (ES1938, ES1946, ES1969) soundcard
  *  Copyright (c) by Jaromir Koutek <miri@punknet.cz>,
- *                   Jaroslav Kysela <perex@suse.cz>,
+ *                   Jaroslav Kysela <perex@perex.cz>,
  *                   Thomas Sailer <sailer@ife.ee.ethz.ch>,
  *                   Abramo Bagnara <abramo@alsa-project.org>,
  *                   Markus Gruber <gruber@eikon.tum.de>
@@ -1066,15 +1066,7 @@ static int snd_es1938_put_mux(struct snd_kcontrol *kcontrol,
         return snd_es1938_mixer_bits(chip, 0x1c, 0x07, val) != val;
 }
 
-static int snd_es1938_info_spatializer_enable(struct snd_kcontrol *kcontrol,
-                                              struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1938_info_spatializer_enable      snd_ctl_boolean_mono_info
 
 static int snd_es1938_get_spatializer_enable(struct snd_kcontrol *kcontrol,
                                              struct snd_ctl_elem_value *ucontrol)
@@ -1120,15 +1112,7 @@ static int snd_es1938_get_hw_volume(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int snd_es1938_info_hw_switch(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_es1938_info_hw_switch               snd_ctl_boolean_stereo_info
 
 static int snd_es1938_get_hw_switch(struct snd_kcontrol *kcontrol,
                                     struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 2faf009076bb..d69b11d1f993 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -843,10 +843,9 @@ static void snd_es1968_bob_dec(struct es1968 *chip)
                 snd_es1968_bob_stop(chip);
         else if (chip->bob_freq > ESM_BOB_FREQ) {
                 /* check reduction of timer frequency */
-                struct list_head *p;
                 int max_freq = ESM_BOB_FREQ;
-                list_for_each(p, &chip->substream_list) {
-                        struct esschan *es = list_entry(p, struct esschan, list);
+                struct esschan *es;
+                list_for_each_entry(es, &chip->substream_list, list) {
                         if (max_freq < es->bob_freq)
                                 max_freq = es->bob_freq;
                 }
@@ -1316,12 +1315,11 @@ static struct snd_pcm_hardware snd_es1968_capture = {
 
 static int calc_available_memory_size(struct es1968 *chip)
 {
-        struct list_head *p;
         int max_size = 0;
-        
+        struct esm_memory *buf;
+
         mutex_lock(&chip->memory_mutex);
-        list_for_each(p, &chip->buf_list) {
-                struct esm_memory *buf = list_entry(p, struct esm_memory, list);
+        list_for_each_entry(buf, &chip->buf_list, list) {
                 if (buf->empty && buf->buf.bytes > max_size)
                         max_size = buf->buf.bytes;
         }
@@ -1335,12 +1333,10 @@ static int calc_available_memory_size(struct es1968 *chip)
 static struct esm_memory *snd_es1968_new_memory(struct es1968 *chip, int size)
 {
         struct esm_memory *buf;
-        struct list_head *p;
-        
+
         size = ALIGN(size, ESM_MEM_ALIGN);
         mutex_lock(&chip->memory_mutex);
-        list_for_each(p, &chip->buf_list) {
-                buf = list_entry(p, struct esm_memory, list);
+        list_for_each_entry(buf, &chip->buf_list, list) {
                 if (buf->empty && buf->buf.bytes >= size)
                         goto __found;
         }
@@ -1938,10 +1934,9 @@ static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)
         }
 
         if (event & ESM_SOUND_IRQ) {
-                struct list_head *p;
+                struct esschan *es;
                 spin_lock(&chip->substream_lock);
-                list_for_each(p, &chip->substream_list) {
-                        struct esschan *es = list_entry(p, struct esschan, list);
+                list_for_each_entry(es, &chip->substream_list, list) {
                         if (es->running)
                                 snd_es1968_update_pcm(chip, es);
                 }
@@ -2345,7 +2340,7 @@ static int es1968_resume(struct pci_dev *pci)
 {
         struct snd_card *card = pci_get_drvdata(pci);
         struct es1968 *chip = card->private_data;
-        struct list_head *p;
+        struct esschan *es;
 
         if (! chip->do_pm)
                 return 0;
@@ -2374,8 +2369,7 @@ static int es1968_resume(struct pci_dev *pci)
         /* restore ac97 state */
         snd_ac97_resume(chip->ac97);
 
-        list_for_each(p, &chip->substream_list) {
-                struct esschan *es = list_entry(p, struct esschan, list);
+        list_for_each_entry(es, &chip->substream_list, list) {
                 switch (es->mode) {
                 case ESM_MODE_PLAY:
                         snd_es1968_playback_setup(chip, es, es->substream->runtime);
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 11015178e207..9939109f05a2 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1,6 +1,6 @@
 /*
  *  The driver for the ForteMedia FM801 based soundcards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *  Support FM only card by Andy Shevchenko <andy@smile.org.ua>
  *
@@ -42,7 +42,7 @@
 #define TEA575X_RADIO 1
 #endif
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ForteMedia FM801");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{ForteMedia,FM801},"
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index b2484bbdcc1d..ab0c726d648e 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,19 +1,18 @@
-snd-hda-intel-objs := hda_intel.o
+snd-hda-intel-y := hda_intel.o
 # since snd-hda-intel is the only driver using hda-codec,
 # merge it into a single module although it was originally
 # designed to be individual modules
-snd-hda-intel-objs += hda_codec.o \
-        hda_generic.o \
-        patch_realtek.o \
-        patch_cmedia.o \
-        patch_analog.o \
-        patch_sigmatel.o \
-        patch_si3054.o \
-        patch_atihdmi.o \
-        patch_conexant.o \
-        patch_via.o
-ifdef CONFIG_PROC_FS
-snd-hda-intel-objs += hda_proc.o
-endif
+snd-hda-intel-y += hda_codec.o
+snd-hda-intel-$(CONFIG_PROC_FS) += hda_proc.o
+snd-hda-intel-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
+snd-hda-intel-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_REALTEK) += patch_realtek.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CMEDIA) += patch_cmedia.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ANALOG) += patch_analog.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SIGMATEL) += patch_sigmatel.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SI3054) += patch_si3054.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ATIHDMI) += patch_atihdmi.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CONEXANT) += patch_conexant.o
+snd-hda-intel-$(CONFIG_SND_HDA_CODEC_VIA) += patch_via.o
 
 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index f87f8f088956..187533e477c6 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -31,7 +31,15 @@
 #include <sound/tlv.h>
 #include <sound/initval.h>
 #include "hda_local.h"
-
+#include <sound/hda_hwdep.h>
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+/* define this option here to hide as static */
+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
+module_param(power_save, int, 0644);
+MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
+                 "(in second, 0 = disable).");
+#endif
 
 /*
  * vendor / preset table
@@ -59,6 +67,13 @@ static struct hda_vendor_id hda_vendor_ids[] = {
 #include "hda_patch.h"
 
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static void hda_power_work(struct work_struct *work);
+static void hda_keep_power_on(struct hda_codec *codec);
+#else
+static inline void hda_keep_power_on(struct hda_codec *codec) {}
+#endif
+
 /**
  * snd_hda_codec_read - send a command and get the response
  * @codec: the HDA codec
@@ -76,12 +91,14 @@ unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int verb, unsigned int parm)
 {
         unsigned int res;
+        snd_hda_power_up(codec);
         mutex_lock(&codec->bus->cmd_mutex);
         if (!codec->bus->ops.command(codec, nid, direct, verb, parm))
                 res = codec->bus->ops.get_response(codec);
         else
                 res = (unsigned int)-1;
         mutex_unlock(&codec->bus->cmd_mutex);
+        snd_hda_power_down(codec);
         return res;
 }
 
@@ -101,9 +118,11 @@ int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
                          unsigned int verb, unsigned int parm)
 {
         int err;
+        snd_hda_power_up(codec);
         mutex_lock(&codec->bus->cmd_mutex);
         err = codec->bus->ops.command(codec, nid, direct, verb, parm);
         mutex_unlock(&codec->bus->cmd_mutex);
+        snd_hda_power_down(codec);
         return err;
 }
 
@@ -136,6 +155,8 @@ int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
         unsigned int parm;
 
         parm = snd_hda_param_read(codec, nid, AC_PAR_NODE_COUNT);
+        if (parm == -1)
+                return 0;
         *start_id = (parm >> 16) & 0x7fff;
         return (int)(parm & 0x7fff);
 }
@@ -387,6 +408,13 @@ int __devinit snd_hda_bus_new(struct snd_card *card,
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_GENERIC
+#define is_generic_config(codec) \
+        (codec->bus->modelname && !strcmp(codec->bus->modelname, "generic"))
+#else
+#define is_generic_config(codec)        0
+#endif
+
 /*
  * find a matching codec preset
  */
@@ -395,7 +423,7 @@ find_codec_preset(struct hda_codec *codec)
 {
         const struct hda_codec_preset **tbl, *preset;
 
-        if (codec->bus->modelname && !strcmp(codec->bus->modelname, "generic"))
+        if (is_generic_config(codec))
                 return NULL; /* use the generic parser */
 
         for (tbl = hda_preset_tables; *tbl; tbl++) {
@@ -486,6 +514,10 @@ static int read_widget_caps(struct hda_codec *codec, hda_nid_t fg_node)
 }
 
 
+static void init_hda_cache(struct hda_cache_rec *cache,
+                           unsigned int record_size);
+static void free_hda_cache(struct hda_cache_rec *cache);
+
 /*
  * codec destructor
  */
@@ -493,17 +525,20 @@ static void snd_hda_codec_free(struct hda_codec *codec)
 {
         if (!codec)
                 return;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        cancel_delayed_work(&codec->power_work);
+        flush_scheduled_work();
+#endif
         list_del(&codec->list);
         codec->bus->caddr_tbl[codec->addr] = NULL;
         if (codec->patch_ops.free)
                 codec->patch_ops.free(codec);
-        kfree(codec->amp_info);
+        free_hda_cache(&codec->amp_cache);
+        free_hda_cache(&codec->cmd_cache);
         kfree(codec->wcaps);
         kfree(codec);
 }
 
-static void init_amp_hash(struct hda_codec *codec);
-
 /**
  * snd_hda_codec_new - create a HDA codec
  * @bus: the bus to assign
@@ -537,7 +572,17 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
         codec->bus = bus;
         codec->addr = codec_addr;
         mutex_init(&codec->spdif_mutex);
-        init_amp_hash(codec);
+        init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
+        init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        INIT_DELAYED_WORK(&codec->power_work, hda_power_work);
+        /* snd_hda_codec_new() marks the codec as power-up, and leave it as is.
+         * the caller has to power down appropriatley after initialization
+         * phase.
+         */
+        hda_keep_power_on(codec);
+#endif
 
         list_add_tail(&codec->list, &bus->codec_list);
         bus->caddr_tbl[codec_addr] = codec;
@@ -581,10 +626,26 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
                 snd_hda_get_codec_name(codec, bus->card->mixername,
                                        sizeof(bus->card->mixername));
 
-        if (codec->preset && codec->preset->patch)
-                err = codec->preset->patch(codec);
-        else
+#ifdef CONFIG_SND_HDA_GENERIC
+        if (is_generic_config(codec)) {
                 err = snd_hda_parse_generic_codec(codec);
+                goto patched;
+        }
+#endif
+        if (codec->preset && codec->preset->patch) {
+                err = codec->preset->patch(codec);
+                goto patched;
+        }
+
+        /* call the default parser */
+#ifdef CONFIG_SND_HDA_GENERIC
+        err = snd_hda_parse_generic_codec(codec);
+#else
+        printk(KERN_ERR "hda-codec: No codec parser is available\n");
+        err = -ENODEV;
+#endif
+
+ patched:
         if (err < 0) {
                 snd_hda_codec_free(codec);
                 return err;
@@ -594,6 +655,9 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
                 init_unsol_queue(bus);
 
         snd_hda_codec_proc_new(codec);
+#ifdef CONFIG_SND_HDA_HWDEP
+        snd_hda_create_hwdep(codec);
+#endif
 
         sprintf(component, "HDA:%08x", codec->vendor_id);
         snd_component_add(codec->bus->card, component);
@@ -637,59 +701,72 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
 #define INFO_AMP_VOL(ch)        (1 << (1 + (ch)))
 
 /* initialize the hash table */
-static void __devinit init_amp_hash(struct hda_codec *codec)
+static void __devinit init_hda_cache(struct hda_cache_rec *cache,
+                                     unsigned int record_size)
+{
+        memset(cache, 0, sizeof(*cache));
+        memset(cache->hash, 0xff, sizeof(cache->hash));
+        cache->record_size = record_size;
+}
+
+static void free_hda_cache(struct hda_cache_rec *cache)
 {
-        memset(codec->amp_hash, 0xff, sizeof(codec->amp_hash));
-        codec->num_amp_entries = 0;
-        codec->amp_info_size = 0;
-        codec->amp_info = NULL;
+        kfree(cache->buffer);
 }
 
 /* query the hash.  allocate an entry if not found. */
-static struct hda_amp_info *get_alloc_amp_hash(struct hda_codec *codec, u32 key)
+static struct hda_cache_head  *get_alloc_hash(struct hda_cache_rec *cache,
+                                              u32 key)
 {
-        u16 idx = key % (u16)ARRAY_SIZE(codec->amp_hash);
-        u16 cur = codec->amp_hash[idx];
-        struct hda_amp_info *info;
+        u16 idx = key % (u16)ARRAY_SIZE(cache->hash);
+        u16 cur = cache->hash[idx];
+        struct hda_cache_head *info;
 
         while (cur != 0xffff) {
-                info = &codec->amp_info[cur];
+                info = (struct hda_cache_head *)(cache->buffer +
+                                                 cur * cache->record_size);
                 if (info->key == key)
                         return info;
                 cur = info->next;
         }
 
         /* add a new hash entry */
-        if (codec->num_amp_entries >= codec->amp_info_size) {
+        if (cache->num_entries >= cache->size) {
                 /* reallocate the array */
-                int new_size = codec->amp_info_size + 64;
-                struct hda_amp_info *new_info;
-                new_info = kcalloc(new_size, sizeof(struct hda_amp_info),
-                                   GFP_KERNEL);
-                if (!new_info) {
+                unsigned int new_size = cache->size + 64;
+                void *new_buffer;
+                new_buffer = kcalloc(new_size, cache->record_size, GFP_KERNEL);
+                if (!new_buffer) {
                         snd_printk(KERN_ERR "hda_codec: "
                                    "can't malloc amp_info\n");
                         return NULL;
                 }
-                if (codec->amp_info) {
-                        memcpy(new_info, codec->amp_info,
-                               codec->amp_info_size *
-                               sizeof(struct hda_amp_info));
-                        kfree(codec->amp_info);
+                if (cache->buffer) {
+                        memcpy(new_buffer, cache->buffer,
+                               cache->size * cache->record_size);
+                        kfree(cache->buffer);
                 }
-                codec->amp_info_size = new_size;
-                codec->amp_info = new_info;
+                cache->size = new_size;
+                cache->buffer = new_buffer;
         }
-        cur = codec->num_amp_entries++;
-        info = &codec->amp_info[cur];
+        cur = cache->num_entries++;
+        info = (struct hda_cache_head *)(cache->buffer +
+                                         cur * cache->record_size);
         info->key = key;
-        info->status = 0; /* not initialized yet */
-        info->next = codec->amp_hash[idx];
-        codec->amp_hash[idx] = cur;
+        info->val = 0;
+        info->next = cache->hash[idx];
+        cache->hash[idx] = cur;
 
         return info;
 }
 
+/* query and allocate an amp hash entry */
+static inline struct hda_amp_info *
+get_alloc_amp_hash(struct hda_codec *codec, u32 key)
+{
+        return (struct hda_amp_info *)get_alloc_hash(&codec->amp_cache, key);
+}
+
 /*
  * query AMP capabilities for the given widget and direction
  */
@@ -700,7 +777,7 @@ static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
         info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, 0));
         if (!info)
                 return 0;
-        if (!(info->status & INFO_AMP_CAPS)) {
+        if (!(info->head.val & INFO_AMP_CAPS)) {
                 if (!(get_wcaps(codec, nid) & AC_WCAP_AMP_OVRD))
                         nid = codec->afg;
                 info->amp_caps = snd_hda_param_read(codec, nid,
@@ -708,7 +785,7 @@ static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)
                                                     AC_PAR_AMP_OUT_CAP :
                                                     AC_PAR_AMP_IN_CAP);
                 if (info->amp_caps)
-                        info->status |= INFO_AMP_CAPS;
+                        info->head.val |= INFO_AMP_CAPS;
         }
         return info->amp_caps;
 }
@@ -722,7 +799,7 @@ int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
         if (!info)
                 return -EINVAL;
         info->amp_caps = caps;
-        info->status |= INFO_AMP_CAPS;
+        info->head.val |= INFO_AMP_CAPS;
         return 0;
 }
 
@@ -736,7 +813,7 @@ static unsigned int get_vol_mute(struct hda_codec *codec,
 {
         u32 val, parm;
 
-        if (info->status & INFO_AMP_VOL(ch))
+        if (info->head.val & INFO_AMP_VOL(ch))
                 return info->vol[ch];
 
         parm = ch ? AC_AMP_GET_RIGHT : AC_AMP_GET_LEFT;
@@ -745,7 +822,7 @@ static unsigned int get_vol_mute(struct hda_codec *codec,
         val = snd_hda_codec_read(codec, nid, 0,
                                  AC_VERB_GET_AMP_GAIN_MUTE, parm);
         info->vol[ch] = val & 0xff;
-        info->status |= INFO_AMP_VOL(ch);
+        info->head.val |= INFO_AMP_VOL(ch);
         return info->vol[ch];
 }
 
@@ -792,12 +869,50 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
                 return 0;
         val &= mask;
         val |= get_vol_mute(codec, info, nid, ch, direction, idx) & ~mask;
-        if (info->vol[ch] == val && !codec->in_resume)
+        if (info->vol[ch] == val)
                 return 0;
         put_vol_mute(codec, info, nid, ch, direction, idx, val);
         return 1;
 }
 
+/*
+ * update the AMP stereo with the same mask and value
+ */
+int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
+                             int direction, int idx, int mask, int val)
+{
+        int ch, ret = 0;
+        for (ch = 0; ch < 2; ch++)
+                ret |= snd_hda_codec_amp_update(codec, nid, ch, direction,
+                                                idx, mask, val);
+        return ret;
+}
+
+#ifdef SND_HDA_NEEDS_RESUME
+/* resume the all amp commands from the cache */
+void snd_hda_codec_resume_amp(struct hda_codec *codec)
+{
+        struct hda_amp_info *buffer = codec->amp_cache.buffer;
+        int i;
+
+        for (i = 0; i < codec->amp_cache.size; i++, buffer++) {
+                u32 key = buffer->head.key;
+                hda_nid_t nid;
+                unsigned int idx, dir, ch;
+                if (!key)
+                        continue;
+                nid = key & 0xff;
+                idx = (key >> 16) & 0xff;
+                dir = (key >> 24) & 0xff;
+                for (ch = 0; ch < 2; ch++) {
+                        if (!(buffer->head.val & INFO_AMP_VOL(ch)))
+                                continue;
+                        put_vol_mute(codec, buffer, nid, ch, dir, idx,
+                                     buffer->vol[ch]);
+                }
+        }
+}
+#endif /* SND_HDA_NEEDS_RESUME */
 
 /*
  * AMP control callbacks
@@ -844,9 +959,11 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
         long *valp = ucontrol->value.integer.value;
 
         if (chs & 1)
-                *valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx) & 0x7f;
+                *valp++ = snd_hda_codec_amp_read(codec, nid, 0, dir, idx)
+                        & HDA_AMP_VOLMASK;
         if (chs & 2)
-                *valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx) & 0x7f;
+                *valp = snd_hda_codec_amp_read(codec, nid, 1, dir, idx)
+                        & HDA_AMP_VOLMASK;
         return 0;
 }
 
@@ -861,6 +978,7 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
         long *valp = ucontrol->value.integer.value;
         int change = 0;
 
+        snd_hda_power_up(codec);
         if (chs & 1) {
                 change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
                                                   0x7f, *valp);
@@ -869,6 +987,7 @@ int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
         if (chs & 2)
                 change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
                                                    0x7f, *valp);
+        snd_hda_power_down(codec);
         return change;
 }
 
@@ -923,10 +1042,10 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
 
         if (chs & 1)
                 *valp++ = (snd_hda_codec_amp_read(codec, nid, 0, dir, idx) &
-                           0x80) ? 0 : 1;
+                           HDA_AMP_MUTE) ? 0 : 1;
         if (chs & 2)
                 *valp = (snd_hda_codec_amp_read(codec, nid, 1, dir, idx) &
-                         0x80) ? 0 : 1;
+                         HDA_AMP_MUTE) ? 0 : 1;
         return 0;
 }
 
@@ -941,15 +1060,22 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
         long *valp = ucontrol->value.integer.value;
         int change = 0;
 
+        snd_hda_power_up(codec);
         if (chs & 1) {
                 change = snd_hda_codec_amp_update(codec, nid, 0, dir, idx,
-                                                  0x80, *valp ? 0 : 0x80);
+                                                  HDA_AMP_MUTE,
+                                                  *valp ? 0 : HDA_AMP_MUTE);
                 valp++;
         }
         if (chs & 2)
                 change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
-                                                   0x80, *valp ? 0 : 0x80);
-        
+                                                   HDA_AMP_MUTE,
+                                                   *valp ? 0 : HDA_AMP_MUTE);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (codec->patch_ops.check_power_status)
+                codec->patch_ops.check_power_status(codec, nid);
+#endif
+        snd_hda_power_down(codec);
         return change;
 }
 
@@ -1002,6 +1128,93 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
 }
 
 /*
+ * generic bound volume/swtich controls
+ */
+int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_bind_ctls *c;
+        int err;
+
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        kcontrol->private_value = *c->values;
+        err = c->ops->info(kcontrol, uinfo);
+        kcontrol->private_value = (long)c;
+        mutex_unlock(&codec->spdif_mutex);
+        return err;
+}
+
+int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_bind_ctls *c;
+        int err;
+
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        kcontrol->private_value = *c->values;
+        err = c->ops->get(kcontrol, ucontrol);
+        kcontrol->private_value = (long)c;
+        mutex_unlock(&codec->spdif_mutex);
+        return err;
+}
+
+int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_bind_ctls *c;
+        unsigned long *vals;
+        int err = 0, change = 0;
+
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        for (vals = c->values; *vals; vals++) {
+                kcontrol->private_value = *vals;
+                err = c->ops->put(kcontrol, ucontrol);
+                if (err < 0)
+                        break;
+                change |= err;
+        }
+        kcontrol->private_value = (long)c;
+        mutex_unlock(&codec->spdif_mutex);
+        return err < 0 ? err : change;
+}
+
+int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+                           unsigned int size, unsigned int __user *tlv)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct hda_bind_ctls *c;
+        int err;
+
+        c = (struct hda_bind_ctls *)kcontrol->private_value;
+        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        kcontrol->private_value = *c->values;
+        err = c->ops->tlv(kcontrol, op_flag, size, tlv);
+        kcontrol->private_value = (long)c;
+        mutex_unlock(&codec->spdif_mutex);
+        return err;
+}
+
+struct hda_ctl_ops snd_hda_bind_vol = {
+        .info = snd_hda_mixer_amp_volume_info,
+        .get = snd_hda_mixer_amp_volume_get,
+        .put = snd_hda_mixer_amp_volume_put,
+        .tlv = snd_hda_mixer_amp_tlv
+};
+
+struct hda_ctl_ops snd_hda_bind_sw = {
+        .info = snd_hda_mixer_amp_switch_info,
+        .get = snd_hda_mixer_amp_switch_get,
+        .put = snd_hda_mixer_amp_switch_put,
+        .tlv = snd_hda_mixer_amp_tlv
+};
+
+/*
  * SPDIF out controls
  */
 
@@ -1118,26 +1331,20 @@ static int snd_hda_spdif_default_put(struct snd_kcontrol *kcontrol,
         change = codec->spdif_ctls != val;
         codec->spdif_ctls = val;
 
-        if (change || codec->in_resume) {
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
-                                    val & 0xff);
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2,
-                                    val >> 8);
+        if (change) {
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_DIGI_CONVERT_1,
+                                          val & 0xff);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_DIGI_CONVERT_2,
+                                          val >> 8);
         }
 
         mutex_unlock(&codec->spdif_mutex);
         return change;
 }
 
-static int snd_hda_spdif_out_switch_info(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hda_spdif_out_switch_info   snd_ctl_boolean_mono_info
 
 static int snd_hda_spdif_out_switch_get(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
@@ -1161,17 +1368,16 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol,
         if (ucontrol->value.integer.value[0])
                 val |= AC_DIG1_ENABLE;
         change = codec->spdif_ctls != val;
-        if (change || codec->in_resume) {
+        if (change) {
                 codec->spdif_ctls = val;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
-                                    val & 0xff);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_DIGI_CONVERT_1,
+                                          val & 0xff);
                 /* unmute amp switch (if any) */
                 if ((get_wcaps(codec, nid) & AC_WCAP_OUT_AMP) &&
                     (val & AC_DIG1_ENABLE))
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE,
-                                            AC_AMP_SET_RIGHT | AC_AMP_SET_LEFT |
-                                            AC_AMP_SET_OUTPUT);
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, 0);
         }
         mutex_unlock(&codec->spdif_mutex);
         return change;
@@ -1219,8 +1425,7 @@ static struct snd_kcontrol_new dig_mixes[] = {
  *
  * Returns 0 if successful, or a negative error code.
  */
-int __devinit snd_hda_create_spdif_out_ctls(struct hda_codec *codec,
-                                            hda_nid_t nid)
+int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
         int err;
         struct snd_kcontrol *kctl;
@@ -1264,10 +1469,10 @@ static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol,
 
         mutex_lock(&codec->spdif_mutex);
         change = codec->spdif_in_enable != val;
-        if (change || codec->in_resume) {
+        if (change) {
                 codec->spdif_in_enable = val;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
-                                    val);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_DIGI_CONVERT_1, val);
         }
         mutex_unlock(&codec->spdif_mutex);
         return change;
@@ -1318,8 +1523,7 @@ static struct snd_kcontrol_new dig_in_ctls[] = {
  *
  * Returns 0 if successful, or a negative error code.
  */
-int __devinit snd_hda_create_spdif_in_ctls(struct hda_codec *codec,
-                                           hda_nid_t nid)
+int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
         int err;
         struct snd_kcontrol *kctl;
@@ -1338,6 +1542,79 @@ int __devinit snd_hda_create_spdif_in_ctls(struct hda_codec *codec,
         return 0;
 }
 
+#ifdef SND_HDA_NEEDS_RESUME
+/*
+ * command cache
+ */
+
+/* build a 32bit cache key with the widget id and the command parameter */
+#define build_cmd_cache_key(nid, verb)  ((verb << 8) | nid)
+#define get_cmd_cache_nid(key)          ((key) & 0xff)
+#define get_cmd_cache_cmd(key)          (((key) >> 8) & 0xffff)
+
+/**
+ * snd_hda_codec_write_cache - send a single command with caching
+ * @codec: the HDA codec
+ * @nid: NID to send the command
+ * @direct: direct flag
+ * @verb: the verb to send
+ * @parm: the parameter for the verb
+ *
+ * Send a single command without waiting for response.
+ *
+ * Returns 0 if successful, or a negative error code.
+ */
+int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
+                              int direct, unsigned int verb, unsigned int parm)
+{
+        int err;
+        snd_hda_power_up(codec);
+        mutex_lock(&codec->bus->cmd_mutex);
+        err = codec->bus->ops.command(codec, nid, direct, verb, parm);
+        if (!err) {
+                struct hda_cache_head *c;
+                u32 key = build_cmd_cache_key(nid, verb);
+                c = get_alloc_hash(&codec->cmd_cache, key);
+                if (c)
+                        c->val = parm;
+        }
+        mutex_unlock(&codec->bus->cmd_mutex);
+        snd_hda_power_down(codec);
+        return err;
+}
+
+/* resume the all commands from the cache */
+void snd_hda_codec_resume_cache(struct hda_codec *codec)
+{
+        struct hda_cache_head *buffer = codec->cmd_cache.buffer;
+        int i;
+
+        for (i = 0; i < codec->cmd_cache.size; i++, buffer++) {
+                u32 key = buffer->key;
+                if (!key)
+                        continue;
+                snd_hda_codec_write(codec, get_cmd_cache_nid(key), 0,
+                                    get_cmd_cache_cmd(key), buffer->val);
+        }
+}
+
+/**
+ * snd_hda_sequence_write_cache - sequence writes with caching
+ * @codec: the HDA codec
+ * @seq: VERB array to send
+ *
+ * Send the commands sequentially from the given array.
+ * Thte commands are recorded on cache for power-save and resume.
+ * The array must be terminated with NID=0.
+ */
+void snd_hda_sequence_write_cache(struct hda_codec *codec,
+                                  const struct hda_verb *seq)
+{
+        for (; seq->nid; seq++)
+                snd_hda_codec_write_cache(codec, seq->nid, 0, seq->verb,
+                                          seq->param);
+}
+#endif /* SND_HDA_NEEDS_RESUME */
 
 /*
  * set power state of the codec
@@ -1345,23 +1622,86 @@ int __devinit snd_hda_create_spdif_in_ctls(struct hda_codec *codec,
 static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
                                 unsigned int power_state)
 {
-        hda_nid_t nid, nid_start;
-        int nodes;
+        hda_nid_t nid;
+        int i;
 
         snd_hda_codec_write(codec, fg, 0, AC_VERB_SET_POWER_STATE,
                             power_state);
 
-        nodes = snd_hda_get_sub_nodes(codec, fg, &nid_start);
-        for (nid = nid_start; nid < nodes + nid_start; nid++) {
-                if (get_wcaps(codec, nid) & AC_WCAP_POWER)
+        nid = codec->start_nid;
+        for (i = 0; i < codec->num_nodes; i++, nid++) {
+                if (get_wcaps(codec, nid) & AC_WCAP_POWER) {
+                        unsigned int pincap;
+                        /*
+                         * don't power down the widget if it controls eapd
+                         * and EAPD_BTLENABLE is set.
+                         */
+                        pincap = snd_hda_param_read(codec, nid, AC_PAR_PIN_CAP);
+                        if (pincap & AC_PINCAP_EAPD) {
+                                int eapd = snd_hda_codec_read(codec, nid,
+                                        0, AC_VERB_GET_EAPD_BTLENABLE, 0);
+                                eapd &= 0x02;
+                                if (power_state == AC_PWRST_D3 && eapd)
+                                        continue;
+                        }
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_POWER_STATE,
                                             power_state);
+                }
         }
 
-        if (power_state == AC_PWRST_D0)
+        if (power_state == AC_PWRST_D0) {
+                unsigned long end_time;
+                int state;
                 msleep(10);
+                /* wait until the codec reachs to D0 */
+                end_time = jiffies + msecs_to_jiffies(500);
+                do {
+                        state = snd_hda_codec_read(codec, fg, 0,
+                                                   AC_VERB_GET_POWER_STATE, 0);
+                        if (state == power_state)
+                                break;
+                        msleep(1);
+                } while (time_after_eq(end_time, jiffies));
+        }
+}
+
+#ifdef SND_HDA_NEEDS_RESUME
+/*
+ * call suspend and power-down; used both from PM and power-save
+ */
+static void hda_call_codec_suspend(struct hda_codec *codec)
+{
+        if (codec->patch_ops.suspend)
+                codec->patch_ops.suspend(codec, PMSG_SUSPEND);
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D3);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        cancel_delayed_work(&codec->power_work);
+        codec->power_on = 0;
+        codec->power_transition = 0;
+#endif
+}
+
+/*
+ * kick up codec; used both from PM and power-save
+ */
+static void hda_call_codec_resume(struct hda_codec *codec)
+{
+        hda_set_power_state(codec,
+                            codec->afg ? codec->afg : codec->mfg,
+                            AC_PWRST_D0);
+        if (codec->patch_ops.resume)
+                codec->patch_ops.resume(codec);
+        else {
+                if (codec->patch_ops.init)
+                        codec->patch_ops.init(codec);
+                snd_hda_codec_resume_amp(codec);
+                snd_hda_codec_resume_cache(codec);
+        }
 }
+#endif /* SND_HDA_NEEDS_RESUME */
 
 
 /**
@@ -1376,28 +1716,24 @@ int __devinit snd_hda_build_controls(struct hda_bus *bus)
 {
         struct hda_codec *codec;
 
-        /* build controls */
         list_for_each_entry(codec, &bus->codec_list, list) {
-                int err;
-                if (!codec->patch_ops.build_controls)
-                        continue;
-                err = codec->patch_ops.build_controls(codec);
-                if (err < 0)
-                        return err;
-        }
-
-        /* initialize */
-        list_for_each_entry(codec, &bus->codec_list, list) {
-                int err;
+                int err = 0;
+                /* fake as if already powered-on */
+                hda_keep_power_on(codec);
+                /* then fire up */
                 hda_set_power_state(codec,
                                     codec->afg ? codec->afg : codec->mfg,
                                     AC_PWRST_D0);
-                if (!codec->patch_ops.init)
-                        continue;
-                err = codec->patch_ops.init(codec);
+                /* continue to initialize... */
+                if (codec->patch_ops.init)
+                        err = codec->patch_ops.init(codec);
+                if (!err && codec->patch_ops.build_controls)
+                        err = codec->patch_ops.build_controls(codec);
+                snd_hda_power_down(codec);
                 if (err < 0)
                         return err;
         }
+
         return 0;
 }
 
@@ -1789,9 +2125,9 @@ int __devinit snd_hda_build_pcms(struct hda_bus *bus)
  *
  * If no entries are matching, the function returns a negative value.
  */
-int __devinit snd_hda_check_board_config(struct hda_codec *codec,
-                                         int num_configs, const char **models,
-                                         const struct snd_pci_quirk *tbl)
+int snd_hda_check_board_config(struct hda_codec *codec,
+                               int num_configs, const char **models,
+                               const struct snd_pci_quirk *tbl)
 {
         if (codec->bus->modelname && models) {
                 int i;
@@ -1841,10 +2177,9 @@ int __devinit snd_hda_check_board_config(struct hda_codec *codec,
  *
  * Returns 0 if successful, or a negative error code.
  */
-int __devinit snd_hda_add_new_ctls(struct hda_codec *codec,
-                                   struct snd_kcontrol_new *knew)
+int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
 {
-        int err;
+        int err;
 
         for (; knew->name; knew++) {
                 struct snd_kcontrol *kctl;
@@ -1867,6 +2202,93 @@ int __devinit snd_hda_add_new_ctls(struct hda_codec *codec,
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
+                                unsigned int power_state);
+
+static void hda_power_work(struct work_struct *work)
+{
+        struct hda_codec *codec =
+                container_of(work, struct hda_codec, power_work.work);
+
+        if (!codec->power_on || codec->power_count) {
+                codec->power_transition = 0;
+                return;
+        }
+
+        hda_call_codec_suspend(codec);
+        if (codec->bus->ops.pm_notify)
+                codec->bus->ops.pm_notify(codec);
+}
+
+static void hda_keep_power_on(struct hda_codec *codec)
+{
+        codec->power_count++;
+        codec->power_on = 1;
+}
+
+void snd_hda_power_up(struct hda_codec *codec)
+{
+        codec->power_count++;
+        if (codec->power_on || codec->power_transition)
+                return;
+
+        codec->power_on = 1;
+        if (codec->bus->ops.pm_notify)
+                codec->bus->ops.pm_notify(codec);
+        hda_call_codec_resume(codec);
+        cancel_delayed_work(&codec->power_work);
+        codec->power_transition = 0;
+}
+
+void snd_hda_power_down(struct hda_codec *codec)
+{
+        --codec->power_count;
+        if (!codec->power_on || codec->power_count || codec->power_transition)
+                return;
+        if (power_save) {
+                codec->power_transition = 1; /* avoid reentrance */
+                schedule_delayed_work(&codec->power_work,
+                                      msecs_to_jiffies(power_save * 1000));
+        }
+}
+
+int snd_hda_check_amp_list_power(struct hda_codec *codec,
+                                 struct hda_loopback_check *check,
+                                 hda_nid_t nid)
+{
+        struct hda_amp_list *p;
+        int ch, v;
+
+        if (!check->amplist)
+                return 0;
+        for (p = check->amplist; p->nid; p++) {
+                if (p->nid == nid)
+                        break;
+        }
+        if (!p->nid)
+                return 0; /* nothing changed */
+
+        for (p = check->amplist; p->nid; p++) {
+                for (ch = 0; ch < 2; ch++) {
+                        v = snd_hda_codec_amp_read(codec, p->nid, ch, p->dir,
+                                                   p->idx);
+                        if (!(v & HDA_AMP_MUTE) && v > 0) {
+                                if (!check->power_on) {
+                                        check->power_on = 1;
+                                        snd_hda_power_up(codec);
+                                }
+                                return 1;
+                        }
+                }
+        }
+        if (check->power_on) {
+                check->power_on = 0;
+                snd_hda_power_down(codec);
+        }
+        return 0;
+}
+#endif
 
 /*
  * Channel mode helper
@@ -1913,12 +2335,12 @@ int snd_hda_ch_mode_put(struct hda_codec *codec,
 
         mode = ucontrol->value.enumerated.item[0];
         snd_assert(mode < num_chmodes, return -EINVAL);
-        if (*max_channelsp == chmode[mode].channels && !codec->in_resume)
+        if (*max_channelsp == chmode[mode].channels)
                 return 0;
         /* change the current channel setting */
         *max_channelsp = chmode[mode].channels;
         if (chmode[mode].sequence)
-                snd_hda_sequence_write(codec, chmode[mode].sequence);
+                snd_hda_sequence_write_cache(codec, chmode[mode].sequence);
         return 1;
 }
 
@@ -1933,6 +2355,8 @@ int snd_hda_input_mux_info(const struct hda_input_mux *imux,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = imux->num_items;
+        if (!imux->num_items)
+                return 0;
         index = uinfo->value.enumerated.item;
         if (index >= imux->num_items)
                 index = imux->num_items - 1;
@@ -1948,13 +2372,15 @@ int snd_hda_input_mux_put(struct hda_codec *codec,
 {
         unsigned int idx;
 
+        if (!imux->num_items)
+                return 0;
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
-                            imux->items[idx].index);
+        snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
+                                  imux->items[idx].index);
         *cur_val = idx;
         return 1;
 }
@@ -2118,7 +2544,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
  * Helper for automatic ping configuration
  */
 
-static int __devinit is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
+static int is_in_nid_list(hda_nid_t nid, hda_nid_t *list)
 {
         for (; *list; list++)
                 if (*list == nid)
@@ -2169,9 +2595,9 @@ static void sort_pins_by_sequence(hda_nid_t * pins, short * sequences,
  * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
  * respectively.
  */
-int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec,
-                                           struct auto_pin_cfg *cfg,
-                                           hda_nid_t *ignore_nids)
+int snd_hda_parse_pin_def_config(struct hda_codec *codec,
+                                 struct auto_pin_cfg *cfg,
+                                 hda_nid_t *ignore_nids)
 {
         hda_nid_t nid, nid_start;
         int nodes;
@@ -2371,13 +2797,12 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
 {
         struct hda_codec *codec;
 
-        /* FIXME: should handle power widget capabilities */
         list_for_each_entry(codec, &bus->codec_list, list) {
-                if (codec->patch_ops.suspend)
-                        codec->patch_ops.suspend(codec, state);
-                hda_set_power_state(codec,
-                                    codec->afg ? codec->afg : codec->mfg,
-                                    AC_PWRST_D3);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+                if (!codec->power_on)
+                        continue;
+#endif
+                hda_call_codec_suspend(codec);
         }
         return 0;
 }
@@ -2388,76 +2813,30 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state)
  * @state: resume state
  *
  * Returns 0 if successful.
+ *
+ * This fucntion is defined only when POWER_SAVE isn't set.
+ * In the power-save mode, the codec is resumed dynamically.
  */
 int snd_hda_resume(struct hda_bus *bus)
 {
         struct hda_codec *codec;
 
         list_for_each_entry(codec, &bus->codec_list, list) {
-                hda_set_power_state(codec,
-                                    codec->afg ? codec->afg : codec->mfg,
-                                    AC_PWRST_D0);
-                if (codec->patch_ops.resume)
-                        codec->patch_ops.resume(codec);
+                if (snd_hda_codec_needs_resume(codec))
+                        hda_call_codec_resume(codec);
         }
         return 0;
 }
-
-/**
- * snd_hda_resume_ctls - resume controls in the new control list
- * @codec: the HDA codec
- * @knew: the array of struct snd_kcontrol_new
- *
- * This function resumes the mixer controls in the struct snd_kcontrol_new array,
- * originally for snd_hda_add_new_ctls().
- * The array must be terminated with an empty entry as terminator.
- */
-int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew)
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+int snd_hda_codecs_inuse(struct hda_bus *bus)
 {
-        struct snd_ctl_elem_value *val;
+        struct hda_codec *codec;
 
-        val = kmalloc(sizeof(*val), GFP_KERNEL);
-        if (!val)
-                return -ENOMEM;
-        codec->in_resume = 1;
-        for (; knew->name; knew++) {
-                int i, count;
-                count = knew->count ? knew->count : 1;
-                for (i = 0; i < count; i++) {
-                        memset(val, 0, sizeof(*val));
-                        val->id.iface = knew->iface;
-                        val->id.device = knew->device;
-                        val->id.subdevice = knew->subdevice;
-                        strcpy(val->id.name, knew->name);
-                        val->id.index = knew->index ? knew->index : i;
-                        /* Assume that get callback reads only from cache,
-                         * not accessing to the real hardware
-                         */
-                        if (snd_ctl_elem_read(codec->bus->card, val) < 0)
-                                continue;
-                        snd_ctl_elem_write(codec->bus->card, NULL, val);
-                }
+        list_for_each_entry(codec, &bus->codec_list, list) {
+                if (snd_hda_codec_needs_resume(codec))
+                        return 1;
         }
-        codec->in_resume = 0;
-        kfree(val);
         return 0;
 }
-
-/**
- * snd_hda_resume_spdif_out - resume the digital out
- * @codec: the HDA codec
- */
-int snd_hda_resume_spdif_out(struct hda_codec *codec)
-{
-        return snd_hda_resume_ctls(codec, dig_mixes);
-}
-
-/**
- * snd_hda_resume_spdif_in - resume the digital in
- * @codec: the HDA codec
- */
-int snd_hda_resume_spdif_in(struct hda_codec *codec)
-{
-        return snd_hda_resume_ctls(codec, dig_in_ctls);
-}
+#endif
 #endif
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 56c26e7ccdf1..2bce925d84ef 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -24,6 +24,11 @@
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
+#include <sound/hwdep.h>
+
+#if defined(CONFIG_PM) || defined(CONFIG_SND_HDA_POWER_SAVE)
+#define SND_HDA_NEEDS_RESUME    /* resume control code is required */
+#endif
 
 /*
  * nodes
@@ -199,7 +204,9 @@ enum {
 #define AC_AMPCAP_OFFSET_SHIFT          0
 #define AC_AMPCAP_NUM_STEPS             (0x7f<<8)  /* number of steps */
 #define AC_AMPCAP_NUM_STEPS_SHIFT       8
-#define AC_AMPCAP_STEP_SIZE             (0x7f<<16) /* step size 0-32dB in 0.25dB */
+#define AC_AMPCAP_STEP_SIZE             (0x7f<<16) /* step size 0-32dB
+                                                    * in 0.25dB
+                                                    */
 #define AC_AMPCAP_STEP_SIZE_SHIFT       16
 #define AC_AMPCAP_MUTE                  (1<<31)    /* mute capable */
 #define AC_AMPCAP_MUTE_SHIFT            31
@@ -409,6 +416,10 @@ struct hda_bus_ops {
         unsigned int (*get_response)(struct hda_codec *codec);
         /* free the private data */
         void (*private_free)(struct hda_bus *);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        /* notify power-up/down from codec to contoller */
+        void (*pm_notify)(struct hda_codec *codec);
+#endif
 };
 
 /* template to pass to the bus constructor */
@@ -436,7 +447,8 @@ struct hda_bus {
 
         /* codec linked list */
         struct list_head codec_list;
-        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
+        /* link caddr -> codec */
+        struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1];
 
         struct mutex cmd_mutex;
 
@@ -469,19 +481,34 @@ struct hda_codec_ops {
         int (*init)(struct hda_codec *codec);
         void (*free)(struct hda_codec *codec);
         void (*unsol_event)(struct hda_codec *codec, unsigned int res);
-#ifdef CONFIG_PM
+#ifdef SND_HDA_NEEDS_RESUME
         int (*suspend)(struct hda_codec *codec, pm_message_t state);
         int (*resume)(struct hda_codec *codec);
 #endif
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);
+#endif
 };
 
 /* record for amp information cache */
-struct hda_amp_info {
+struct hda_cache_head {
         u32 key;                /* hash key */
+        u16 val;                /* assigned value */
+        u16 next;               /* next link; -1 = terminal */
+};
+
+struct hda_amp_info {
+        struct hda_cache_head head;
         u32 amp_caps;           /* amp capabilities */
         u16 vol[2];             /* current volume & mute */
-        u16 status;             /* update flag */
-        u16 next;               /* next link */
+};
+
+struct hda_cache_rec {
+        u16 hash[64];                   /* hash table for index */
+        unsigned int num_entries;       /* number of assigned entries */
+        unsigned int size;              /* allocated size */
+        unsigned int record_size;       /* record size (including header) */
+        void *buffer;                   /* hash table entries */
 };
 
 /* PCM callbacks */
@@ -499,7 +526,7 @@ struct hda_pcm_ops {
 
 /* PCM information for each substream */
 struct hda_pcm_stream {
-        unsigned int substreams;        /* number of substreams, 0 = not exist */
+        unsigned int substreams;        /* number of substreams, 0 = not exist*/
         unsigned int channels_min;      /* min. number of channels */
         unsigned int channels_max;      /* max. number of channels */
         hda_nid_t nid;  /* default NID to query rates/formats/bps, or set up */
@@ -536,11 +563,6 @@ struct hda_codec {
         /* set by patch */
         struct hda_codec_ops patch_ops;
 
-        /* resume phase - all controls should update even if
-         * the values are not changed
-         */
-        unsigned int in_resume;
-
         /* PCM to create, set by patch_ops.build_pcms callback */
         unsigned int num_pcms;
         struct hda_pcm *pcm_info;
@@ -553,16 +575,22 @@ struct hda_codec {
         hda_nid_t start_nid;
         u32 *wcaps;
 
-        /* hash for amp access */
-        u16 amp_hash[32];
-        int num_amp_entries;
-        int amp_info_size;
-        struct hda_amp_info *amp_info;
+        struct hda_cache_rec amp_cache; /* cache for amp access */
+        struct hda_cache_rec cmd_cache; /* cache for other commands */
 
         struct mutex spdif_mutex;
         unsigned int spdif_status;      /* IEC958 status bits */
         unsigned short spdif_ctls;      /* SPDIF control bits */
         unsigned int spdif_in_enable;   /* SPDIF input enable? */
+
+        struct snd_hwdep *hwdep;        /* assigned hwdep device */
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        unsigned int power_on :1;       /* current (global) power-state */
+        unsigned int power_transition :1; /* power-state in transition */
+        int power_count;        /* current (global) power refcount */
+        struct delayed_work power_work; /* delayed task for powerdown */
+#endif
 };
 
 /* direction */
@@ -582,13 +610,17 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 /*
  * low level functions
  */
-unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, int direct,
+unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,
+                                int direct,
                                 unsigned int verb, unsigned int parm);
 int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct,
                         unsigned int verb, unsigned int parm);
-#define snd_hda_param_read(codec, nid, param) snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)
-int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *start_id);
-int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, hda_nid_t *conn_list, int max_conns);
+#define snd_hda_param_read(codec, nid, param) \
+        snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)
+int snd_hda_get_sub_nodes(struct hda_codec *codec, hda_nid_t nid,
+                          hda_nid_t *start_id);
+int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid,
+                            hda_nid_t *conn_list, int max_conns);
 
 struct hda_verb {
         hda_nid_t nid;
@@ -596,11 +628,24 @@ struct hda_verb {
         u32 param;
 };
 
-void snd_hda_sequence_write(struct hda_codec *codec, const struct hda_verb *seq);
+void snd_hda_sequence_write(struct hda_codec *codec,
+                            const struct hda_verb *seq);
 
 /* unsolicited event */
 int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex);
 
+/* cached write */
+#ifdef SND_HDA_NEEDS_RESUME
+int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
+                              int direct, unsigned int verb, unsigned int parm);
+void snd_hda_sequence_write_cache(struct hda_codec *codec,
+                                  const struct hda_verb *seq);
+void snd_hda_codec_resume_cache(struct hda_codec *codec);
+#else
+#define snd_hda_codec_write_cache       snd_hda_codec_write
+#define snd_hda_sequence_write_cache    snd_hda_sequence_write
+#endif
+
 /*
  * Mixer
  */
@@ -610,10 +655,13 @@ int snd_hda_build_controls(struct hda_bus *bus);
  * PCM
  */
 int snd_hda_build_pcms(struct hda_bus *bus);
-void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid, u32 stream_tag,
+void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
+                                u32 stream_tag,
                                 int channel_id, int format);
-unsigned int snd_hda_calc_stream_format(unsigned int rate, unsigned int channels,
-                                        unsigned int format, unsigned int maxbps);
+unsigned int snd_hda_calc_stream_format(unsigned int rate,
+                                        unsigned int channels,
+                                        unsigned int format,
+                                        unsigned int maxbps);
 int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                                 u32 *ratesp, u64 *formatsp, unsigned int *bpsp);
 int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,
@@ -632,4 +680,19 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state);
 int snd_hda_resume(struct hda_bus *bus);
 #endif
 
+/*
+ * power saving
+ */
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+void snd_hda_power_up(struct hda_codec *codec);
+void snd_hda_power_down(struct hda_codec *codec);
+#define snd_hda_codec_needs_resume(codec) codec->power_count
+int snd_hda_codecs_inuse(struct hda_bus *bus);
+#else
+static inline void snd_hda_power_up(struct hda_codec *codec) {}
+static inline void snd_hda_power_down(struct hda_codec *codec) {}
+#define snd_hda_codec_needs_resume(codec) 1
+#define snd_hda_codecs_inuse(bus) 1
+#endif
+
 #endif /* __SOUND_HDA_CODEC_H */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 000287f7da43..c957eb58de5c 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -70,6 +70,13 @@ struct hda_gspec {
         struct hda_pcm pcm_rec;         /* PCM information */
 
         struct list_head nid_list;      /* list of widgets */
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define MAX_LOOPBACK_AMPS       7
+        struct hda_loopback_check loopback;
+        int num_loopbacks;
+        struct hda_amp_list loopback_list[MAX_LOOPBACK_AMPS + 1];
+#endif
 };
 
 /*
@@ -88,13 +95,12 @@ struct hda_gspec {
 static void snd_hda_generic_free(struct hda_codec *codec)
 {
         struct hda_gspec *spec = codec->spec;
-        struct list_head *p, *n;
+        struct hda_gnode *node, *n;
 
         if (! spec)
                 return;
         /* free all widgets */
-        list_for_each_safe(p, n, &spec->nid_list) {
-                struct hda_gnode *node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry_safe(node, n, &spec->nid_list, list) {
                 if (node->conn_list != node->slist)
                         kfree(node->conn_list);
                 kfree(node);
@@ -196,11 +202,9 @@ static int build_afg_tree(struct hda_codec *codec)
 /* FIXME: should avoid the braindead linear search */
 static struct hda_gnode *hda_get_node(struct hda_gspec *spec, hda_nid_t nid)
 {
-        struct list_head *p;
         struct hda_gnode *node;
 
-        list_for_each(p, &spec->nid_list) {
-                node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry(node, &spec->nid_list, list) {
                 if (node->nid == nid)
                         return node;
         }
@@ -218,9 +222,8 @@ static int unmute_output(struct hda_codec *codec, struct hda_gnode *node)
         ofs = (node->amp_out_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
         if (val >= ofs)
                 val -= ofs;
-        val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
-        val |= AC_AMP_SET_OUTPUT;
-        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
+        snd_hda_codec_amp_stereo(codec, node->nid, HDA_OUTPUT, 0, 0xff, val);
+        return 0;
 }
 
 /*
@@ -234,11 +237,8 @@ static int unmute_input(struct hda_codec *codec, struct hda_gnode *node, unsigne
         ofs = (node->amp_in_caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
         if (val >= ofs)
                 val -= ofs;
-        val |= AC_AMP_SET_LEFT | AC_AMP_SET_RIGHT;
-        val |= AC_AMP_SET_INPUT;
-        // awk added - fixed to allow unmuting of indexed amps
-        val |= index << AC_AMP_SET_INDEX_SHIFT;
-        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, val);
+        snd_hda_codec_amp_stereo(codec, node->nid, HDA_INPUT, index, 0xff, val);
+        return 0;
 }
 
 /*
@@ -248,7 +248,8 @@ static int select_input_connection(struct hda_codec *codec, struct hda_gnode *no
                                    unsigned int index)
 {
         snd_printdd("CONNECT: NID=0x%x IDX=0x%x\n", node->nid, index);
-        return snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_CONNECT_SEL, index);
+        return snd_hda_codec_write_cache(codec, node->nid, 0,
+                                         AC_VERB_SET_CONNECT_SEL, index);
 }
 
 /*
@@ -256,11 +257,9 @@ static int select_input_connection(struct hda_codec *codec, struct hda_gnode *no
  */
 static void clear_check_flags(struct hda_gspec *spec)
 {
-        struct list_head *p;
         struct hda_gnode *node;
 
-        list_for_each(p, &spec->nid_list) {
-                node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry(node, &spec->nid_list, list) {
                 node->checked = 0;
         }
 }
@@ -343,12 +342,10 @@ static struct hda_gnode *parse_output_jack(struct hda_codec *codec,
                                            struct hda_gspec *spec,
                                            int jack_type)
 {
-        struct list_head *p;
         struct hda_gnode *node;
         int err;
 
-        list_for_each(p, &spec->nid_list) {
-                node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry(node, &spec->nid_list, list) {
                 if (node->type != AC_WID_PIN)
                         continue;
                 /* output capable? */
@@ -379,7 +376,7 @@ static struct hda_gnode *parse_output_jack(struct hda_codec *codec,
                         /* unmute the PIN output */
                         unmute_output(codec, node);
                         /* set PIN-Out enable */
-                        snd_hda_codec_write(codec, node->nid, 0,
+                        snd_hda_codec_write_cache(codec, node->nid, 0,
                                             AC_VERB_SET_PIN_WIDGET_CONTROL,
                                             AC_PINCTL_OUT_EN |
                                             ((node->pin_caps & AC_PINCAP_HP_DRV) ?
@@ -570,7 +567,8 @@ static int parse_adc_sub_nodes(struct hda_codec *codec, struct hda_gspec *spec,
         /* unmute the PIN external input */
         unmute_input(codec, node, 0); /* index = 0? */
         /* set PIN-In enable */
-        snd_hda_codec_write(codec, node->nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
+        snd_hda_codec_write_cache(codec, node->nid, 0,
+                                  AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
 
         return 1; /* found */
 }
@@ -659,7 +657,6 @@ static int parse_input_path(struct hda_codec *codec, struct hda_gnode *adc_node)
 static int parse_input(struct hda_codec *codec)
 {
         struct hda_gspec *spec = codec->spec;
-        struct list_head *p;
         struct hda_gnode *node;
         int err;
 
@@ -668,8 +665,7 @@ static int parse_input(struct hda_codec *codec)
          * If it reaches to certain input PINs, we take it as the
          * input path.
          */
-        list_for_each(p, &spec->nid_list) {
-                node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry(node, &spec->nid_list, list) {
                 if (node->wid_caps & AC_WCAP_DIGITAL)
                         continue; /* skip SPDIF */
                 if (node->type == AC_WID_AUD_IN) {
@@ -684,11 +680,33 @@ static int parse_input(struct hda_codec *codec)
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static void add_input_loopback(struct hda_codec *codec, hda_nid_t nid,
+                               int dir, int idx)
+{
+        struct hda_gspec *spec = codec->spec;
+        struct hda_amp_list *p;
+
+        if (spec->num_loopbacks >= MAX_LOOPBACK_AMPS) {
+                snd_printk(KERN_ERR "hda_generic: Too many loopback ctls\n");
+                return;
+        }
+        p = &spec->loopback_list[spec->num_loopbacks++];
+        p->nid = nid;
+        p->dir = dir;
+        p->idx = idx;
+        spec->loopback.amplist = spec->loopback_list;
+}
+#else
+#define add_input_loopback(codec,nid,dir,idx)
+#endif
+
 /*
  * create mixer controls if possible
  */
 static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
-                        unsigned int index, const char *type, const char *dir_sfx)
+                        unsigned int index, const char *type,
+                        const char *dir_sfx, int is_loopback)
 {
         char name[32];
         int err;
@@ -702,6 +720,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
         if ((node->wid_caps & AC_WCAP_IN_AMP) &&
             (node->amp_in_caps & AC_AMPCAP_MUTE)) {
                 knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, index, HDA_INPUT);
+                if (is_loopback)
+                        add_input_loopback(codec, node->nid, HDA_INPUT, index);
                 snd_printdd("[%s] NID=0x%x, DIR=IN, IDX=0x%x\n", name, node->nid, index);
                 if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
                         return err;
@@ -709,6 +729,8 @@ static int create_mixer(struct hda_codec *codec, struct hda_gnode *node,
         } else if ((node->wid_caps & AC_WCAP_OUT_AMP) &&
                    (node->amp_out_caps & AC_AMPCAP_MUTE)) {
                 knew = (struct snd_kcontrol_new)HDA_CODEC_MUTE(name, node->nid, 0, HDA_OUTPUT);
+                if (is_loopback)
+                        add_input_loopback(codec, node->nid, HDA_OUTPUT, 0);
                 snd_printdd("[%s] NID=0x%x, DIR=OUT\n", name, node->nid);
                 if ((err = snd_ctl_add(codec->bus->card, snd_ctl_new1(&knew, codec))) < 0)
                         return err;
@@ -767,7 +789,7 @@ static int create_output_mixers(struct hda_codec *codec, const char **names)
         for (i = 0; i < spec->pcm_vol_nodes; i++) {
                 err = create_mixer(codec, spec->pcm_vol[i].node,
                                    spec->pcm_vol[i].index,
-                                   names[i], "Playback");
+                                   names[i], "Playback", 0);
                 if (err < 0)
                         return err;
         }
@@ -784,7 +806,7 @@ static int build_output_controls(struct hda_codec *codec)
         case 1:
                 return create_mixer(codec, spec->pcm_vol[0].node,
                                     spec->pcm_vol[0].index,
-                                    "Master", "Playback");
+                                    "Master", "Playback", 0);
         case 2:
                 if (defcfg_type(spec->out_pin_node[0]) == AC_JACK_SPEAKER)
                         return create_output_mixers(codec, types_speaker);
@@ -820,7 +842,7 @@ static int build_input_controls(struct hda_codec *codec)
         if (spec->input_mux.num_items == 1) {
                 err = create_mixer(codec, adc_node,
                                    spec->input_mux.items[0].index,
-                                   NULL, "Capture");
+                                   NULL, "Capture", 0);
                 if (err < 0)
                         return err;
                 return 0;
@@ -886,7 +908,8 @@ static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,
                         return err;
                 else if (err >= 1) {
                         if (err == 1) {
-                                err = create_mixer(codec, node, i, type, "Playback");
+                                err = create_mixer(codec, node, i, type,
+                                                   "Playback", 1);
                                 if (err < 0)
                                         return err;
                                 if (err > 0)
@@ -911,7 +934,6 @@ static int parse_loopback_path(struct hda_codec *codec, struct hda_gspec *spec,
 static int build_loopback_controls(struct hda_codec *codec)
 {
         struct hda_gspec *spec = codec->spec;
-        struct list_head *p;
         struct hda_gnode *node;
         int err;
         const char *type;
@@ -919,8 +941,7 @@ static int build_loopback_controls(struct hda_codec *codec)
         if (! spec->out_pin_node[0])
                 return 0;
 
-        list_for_each(p, &spec->nid_list) {
-                node = list_entry(p, struct hda_gnode, list);
+        list_for_each_entry(node, &spec->nid_list, list) {
                 if (node->type != AC_WID_PIN)
                         continue;
                 /* input capable? */
@@ -1022,6 +1043,14 @@ static int build_generic_pcms(struct hda_codec *codec)
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int generic_check_power_status(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct hda_gspec *spec = codec->spec;
+        return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
+}
+#endif
+
 
 /*
  */
@@ -1029,6 +1058,9 @@ static struct hda_codec_ops generic_patch_ops = {
         .build_controls = build_generic_controls,
         .build_pcms = build_generic_pcms,
         .free = snd_hda_generic_free,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        .check_power_status = generic_check_power_status,
+#endif
 };
 
 /*
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
new file mode 100644
index 000000000000..bafb7b01f5a1
--- /dev/null
+++ b/sound/pci/hda/hda_hwdep.c
@@ -0,0 +1,122 @@
+/*
+ * HWDEP Interface for HD-audio codec
+ *
+ * Copyright (c) 2007 Takashi Iwai <tiwai@suse.de>
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This driver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pci.h>
+#include <linux/compat.h>
+#include <linux/mutex.h>
+#include <sound/core.h>
+#include "hda_codec.h"
+#include "hda_local.h"
+#include <sound/hda_hwdep.h>
+
+/*
+ * write/read an out-of-bound verb
+ */
+static int verb_write_ioctl(struct hda_codec *codec,
+                            struct hda_verb_ioctl __user *arg)
+{
+        u32 verb, res;
+
+        if (get_user(verb, &arg->verb))
+                return -EFAULT;
+        res = snd_hda_codec_read(codec, verb >> 24, 0,
+                                 (verb >> 8) & 0xffff, verb & 0xff);
+        if (put_user(res, &arg->res))
+                return -EFAULT;
+        return 0;
+}
+
+static int get_wcap_ioctl(struct hda_codec *codec,
+                          struct hda_verb_ioctl __user *arg)
+{
+        u32 verb, res;
+        
+        if (get_user(verb, &arg->verb))
+                return -EFAULT;
+        res = get_wcaps(codec, verb >> 24);
+        if (put_user(res, &arg->res))
+                return -EFAULT;
+        return 0;
+}
+
+
+/*
+ */
+static int hda_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
+                           unsigned int cmd, unsigned long arg)
+{
+        struct hda_codec *codec = hw->private_data;
+        void __user *argp = (void __user *)arg;
+
+        switch (cmd) {
+        case HDA_IOCTL_PVERSION:
+                return put_user(HDA_HWDEP_VERSION, (int __user *)argp);
+        case HDA_IOCTL_VERB_WRITE:
+                return verb_write_ioctl(codec, argp);
+        case HDA_IOCTL_GET_WCAP:
+                return get_wcap_ioctl(codec, argp);
+        }
+        return -ENOIOCTLCMD;
+}
+
+#ifdef CONFIG_COMPAT
+static int hda_hwdep_ioctl_compat(struct snd_hwdep *hw, struct file *file,
+                                  unsigned int cmd, unsigned long arg)
+{
+        return hda_hwdep_ioctl(hw, file, cmd, (unsigned long)compat_ptr(arg));
+}
+#endif
+
+static int hda_hwdep_open(struct snd_hwdep *hw, struct file *file)
+{
+#ifndef CONFIG_SND_DEBUG_DETECT
+        if (!capable(CAP_SYS_RAWIO))
+                return -EACCES;
+#endif
+        return 0;
+}
+
+int __devinit snd_hda_create_hwdep(struct hda_codec *codec)
+{
+        char hwname[16];
+        struct snd_hwdep *hwdep;
+        int err;
+
+        sprintf(hwname, "HDA Codec %d", codec->addr);
+        err = snd_hwdep_new(codec->bus->card, hwname, codec->addr, &hwdep);
+        if (err < 0)
+                return err;
+        codec->hwdep = hwdep;
+        sprintf(hwdep->name, "HDA Codec %d", codec->addr);
+        hwdep->iface = SNDRV_HWDEP_IFACE_HDA;
+        hwdep->private_data = codec;
+        hwdep->exclusive = 1;
+
+        hwdep->ops.open = hda_hwdep_open;
+        hwdep->ops.ioctl = hda_hwdep_ioctl;
+#ifdef CONFIG_COMPAT
+        hwdep->ops.ioctl_compat = hda_hwdep_ioctl_compat;
+#endif
+
+        return 0;
+}
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 92bc8b3fa2a0..3fa0f9704909 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1,6 +1,7 @@
 /*
  *
- *  hda_intel.c - Implementation of primary alsa driver code base for Intel HD Audio.
+ *  hda_intel.c - Implementation of primary alsa driver code base
+ *                for Intel HD Audio.
  *
  *  Copyright(c) 2004 Intel Corporation. All rights reserved.
  *
@@ -64,14 +65,27 @@ MODULE_PARM_DESC(id, "ID string for Intel HD audio interface.");
 module_param(model, charp, 0444);
 MODULE_PARM_DESC(model, "Use the given board model.");
 module_param(position_fix, int, 0444);
-MODULE_PARM_DESC(position_fix, "Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size).");
+MODULE_PARM_DESC(position_fix, "Fix DMA pointer "
+                 "(0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size).");
 module_param(probe_mask, int, 0444);
 MODULE_PARM_DESC(probe_mask, "Bitmask to probe codecs (default = -1).");
 module_param(single_cmd, bool, 0444);
-MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs (for debugging only).");
+MODULE_PARM_DESC(single_cmd, "Use single command to communicate with codecs "
+                 "(for debugging only).");
 module_param(enable_msi, int, 0);
 MODULE_PARM_DESC(enable_msi, "Enable Message Signaled Interrupt (MSI)");
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+/* power_save option is defined in hda_codec.c */
+
+/* reset the HD-audio controller in power save mode.
+ * this may give more power-saving, but will take longer time to
+ * wake up.
+ */
+static int power_save_controller = 1;
+module_param(power_save_controller, bool, 0644);
+MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");
+#endif
 
 /* just for backward compatibility */
 static int enable;
@@ -98,6 +112,7 @@ MODULE_DESCRIPTION("Intel HDA driver");
 
 #define SFX     "hda-intel: "
 
+
 /*
  * registers
  */
@@ -213,15 +228,16 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define SD_INT_DESC_ERR         0x10    /* descriptor error interrupt */
 #define SD_INT_FIFO_ERR         0x08    /* FIFO error interrupt */
 #define SD_INT_COMPLETE         0x04    /* completion interrupt */
-#define SD_INT_MASK             (SD_INT_DESC_ERR|SD_INT_FIFO_ERR|SD_INT_COMPLETE)
+#define SD_INT_MASK             (SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\
+                                 SD_INT_COMPLETE)
 
 /* SD_STS */
 #define SD_STS_FIFO_READY       0x20    /* FIFO ready */
 
 /* INTCTL and INTSTS */
-#define ICH6_INT_ALL_STREAM     0xff            /* all stream interrupts */
-#define ICH6_INT_CTRL_EN        0x40000000      /* controller interrupt enable bit */
-#define ICH6_INT_GLOBAL_EN      0x80000000      /* global interrupt enable bit */
+#define ICH6_INT_ALL_STREAM     0xff       /* all stream interrupts */
+#define ICH6_INT_CTRL_EN        0x40000000 /* controller interrupt enable bit */
+#define ICH6_INT_GLOBAL_EN      0x80000000 /* global interrupt enable bit */
 
 /* GCTL unsolicited response enable bit */
 #define ICH6_GCTL_UREN          (1<<8)
@@ -257,22 +273,26 @@ enum {
  */
 
 struct azx_dev {
-        u32 *bdl;                       /* virtual address of the BDL */
-        dma_addr_t bdl_addr;            /* physical address of the BDL */
-        u32 *posbuf;                    /* position buffer pointer */
+        u32 *bdl;               /* virtual address of the BDL */
+        dma_addr_t bdl_addr;    /* physical address of the BDL */
+        u32 *posbuf;            /* position buffer pointer */
 
-        unsigned int bufsize;           /* size of the play buffer in bytes */
-        unsigned int fragsize;          /* size of each period in bytes */
-        unsigned int frags;             /* number for period in the play buffer */
-        unsigned int fifo_size;         /* FIFO size */
+        unsigned int bufsize;   /* size of the play buffer in bytes */
+        unsigned int fragsize;  /* size of each period in bytes */
+        unsigned int frags;     /* number for period in the play buffer */
+        unsigned int fifo_size; /* FIFO size */
 
-        void __iomem *sd_addr;          /* stream descriptor pointer */
+        void __iomem *sd_addr;  /* stream descriptor pointer */
 
-        u32 sd_int_sta_mask;            /* stream int status mask */
+        u32 sd_int_sta_mask;    /* stream int status mask */
 
         /* pcm support */
-        struct snd_pcm_substream *substream;    /* assigned substream, set in PCM open */
-        unsigned int format_val;        /* format value to be set in the controller and the codec */
+        struct snd_pcm_substream *substream;    /* assigned substream,
+                                                 * set in PCM open
+                                                 */
+        unsigned int format_val;        /* format value to be set in the
+                                         * controller and the codec
+                                         */
         unsigned char stream_tag;       /* assigned stream */
         unsigned char index;            /* stream index */
         /* for sanity check of position buffer */
@@ -337,6 +357,7 @@ struct azx {
 
         /* flags */
         int position_fix;
+        unsigned int running :1;
         unsigned int initialized :1;
         unsigned int single_cmd :1;
         unsigned int polling_mode :1;
@@ -418,7 +439,8 @@ static int azx_alloc_cmd_io(struct azx *chip)
         int err;
 
         /* single page (at least 4096 bytes) must suffice for both ringbuffes */
-        err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
+        err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                  snd_dma_pci_data(chip->pci),
                                   PAGE_SIZE, &chip->rb);
         if (err < 0) {
                 snd_printk(KERN_ERR SFX "cannot allocate CORB/RIRB\n");
@@ -531,9 +553,9 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
                         azx_update_rirb(chip);
                         spin_unlock_irq(&chip->reg_lock);
                 }
-                if (! chip->rirb.cmds)
+                if (!chip->rirb.cmds)
                         return chip->rirb.res; /* the last value */
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (time_after_eq(timeout, jiffies));
 
         if (chip->msi) {
@@ -585,16 +607,19 @@ static int azx_single_send_cmd(struct hda_codec *codec, u32 val)
 
         while (timeout--) {
                 /* check ICB busy bit */
-                if (! (azx_readw(chip, IRS) & ICH6_IRS_BUSY)) {
+                if (!((azx_readw(chip, IRS) & ICH6_IRS_BUSY))) {
                         /* Clear IRV valid bit */
-                        azx_writew(chip, IRS, azx_readw(chip, IRS) | ICH6_IRS_VALID);
+                        azx_writew(chip, IRS, azx_readw(chip, IRS) |
+                                   ICH6_IRS_VALID);
                         azx_writel(chip, IC, val);
-                        azx_writew(chip, IRS, azx_readw(chip, IRS) | ICH6_IRS_BUSY);
+                        azx_writew(chip, IRS, azx_readw(chip, IRS) |
+                                   ICH6_IRS_BUSY);
                         return 0;
                 }
                 udelay(1);
         }
-        snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n", azx_readw(chip, IRS), val);
+        snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n",
+                   azx_readw(chip, IRS), val);
         return -EIO;
 }
 
@@ -610,7 +635,8 @@ static unsigned int azx_single_get_response(struct hda_codec *codec)
                         return azx_readl(chip, IR);
                 udelay(1);
         }
-        snd_printd(SFX "get_response timeout: IRS=0x%x\n", azx_readw(chip, IRS));
+        snd_printd(SFX "get_response timeout: IRS=0x%x\n",
+                   azx_readw(chip, IRS));
         return (unsigned int)-1;
 }
 
@@ -652,12 +678,18 @@ static unsigned int azx_get_response(struct hda_codec *codec)
                 return azx_rirb_get_response(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static void azx_power_notify(struct hda_codec *codec);
+#endif
 
 /* reset codec link */
 static int azx_reset(struct azx *chip)
 {
         int count;
 
+        /* clear STATESTS */
+        azx_writeb(chip, STATESTS, STATESTS_INT_MASK);
+
         /* reset controller */
         azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);
 
@@ -777,18 +809,12 @@ static void azx_stream_stop(struct azx *chip, struct azx_dev *azx_dev)
 
 
 /*
- * initialize the chip
+ * reset and start the controller registers
  */
 static void azx_init_chip(struct azx *chip)
 {
-        unsigned char reg;
-
-        /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
-         * TCSEL == Traffic Class Select Register, which sets PCI express QOS
-         * Ensuring these bits are 0 clears playback static on some HD Audio codecs
-         */
-        pci_read_config_byte (chip->pci, ICH6_PCIREG_TCSEL, &reg);
-        pci_write_config_byte(chip->pci, ICH6_PCIREG_TCSEL, reg & 0xf8);
+        if (chip->initialized)
+                return;
 
         /* reset controller */
         azx_reset(chip);
@@ -805,19 +831,45 @@ static void azx_init_chip(struct azx *chip)
         azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr);
         azx_writel(chip, DPUBASE, upper_32bit(chip->posbuf.addr));
 
+        chip->initialized = 1;
+}
+
+/*
+ * initialize the PCI registers
+ */
+/* update bits in a PCI register byte */
+static void update_pci_byte(struct pci_dev *pci, unsigned int reg,
+                            unsigned char mask, unsigned char val)
+{
+        unsigned char data;
+
+        pci_read_config_byte(pci, reg, &data);
+        data &= ~mask;
+        data |= (val & mask);
+        pci_write_config_byte(pci, reg, data);
+}
+
+static void azx_init_pci(struct azx *chip)
+{
+        /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
+         * TCSEL == Traffic Class Select Register, which sets PCI express QOS
+         * Ensuring these bits are 0 clears playback static on some HD Audio
+         * codecs
+         */
+        update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
+
         switch (chip->driver_type) {
         case AZX_DRIVER_ATI:
                 /* For ATI SB450 azalia HD audio, we need to enable snoop */
-                pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
-                                     &reg);
-                pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
-                                      (reg & 0xf8) | ATI_SB450_HDAUDIO_ENABLE_SNOOP);
+                update_pci_byte(chip->pci,
+                                ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                                0x07, ATI_SB450_HDAUDIO_ENABLE_SNOOP);
                 break;
         case AZX_DRIVER_NVIDIA:
                 /* For NVIDIA HDA, enable snoop */
-                pci_read_config_byte(chip->pci,NVIDIA_HDA_TRANSREG_ADDR, &reg);
-                pci_write_config_byte(chip->pci,NVIDIA_HDA_TRANSREG_ADDR,
-                                      (reg & 0xf0) | NVIDIA_HDA_ENABLE_COHBITS);
+                update_pci_byte(chip->pci,
+                                NVIDIA_HDA_TRANSREG_ADDR,
+                                0x0f, NVIDIA_HDA_ENABLE_COHBITS);
                 break;
         }
 }
@@ -857,7 +909,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
         /* clear rirb int */
         status = azx_readb(chip, RIRBSTS);
         if (status & RIRB_INT_MASK) {
-                if (! chip->single_cmd && (status & RIRB_INT_RESPONSE))
+                if (!chip->single_cmd && (status & RIRB_INT_RESPONSE))
                         azx_update_rirb(chip);
                 azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);
         }
@@ -911,9 +963,11 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
         int timeout;
 
         /* make sure the run bit is zero for SD */
-        azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) & ~SD_CTL_DMA_START);
+        azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) &
+                      ~SD_CTL_DMA_START);
         /* reset stream */
-        azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) | SD_CTL_STREAM_RESET);
+        azx_sd_writeb(azx_dev, SD_CTL, azx_sd_readb(azx_dev, SD_CTL) |
+                      SD_CTL_STREAM_RESET);
         udelay(3);
         timeout = 300;
         while (!((val = azx_sd_readb(azx_dev, SD_CTL)) & SD_CTL_STREAM_RESET) &&
@@ -931,7 +985,7 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
 
         /* program the stream_tag */
         azx_sd_writel(azx_dev, SD_CTL,
-                      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK) |
+                      (azx_sd_readl(azx_dev, SD_CTL) & ~SD_CTL_STREAM_TAG_MASK)|
                       (azx_dev->stream_tag << SD_CTL_STREAM_TAG_SHIFT));
 
         /* program the length of samples in cyclic buffer */
@@ -951,11 +1005,13 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev)
         azx_sd_writel(azx_dev, SD_BDLPU, upper_32bit(azx_dev->bdl_addr));
 
         /* enable the position buffer */
-        if (! (azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
-                azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr | ICH6_DPLBASE_ENABLE);
+        if (!(azx_readl(chip, DPLBASE) & ICH6_DPLBASE_ENABLE))
+                azx_writel(chip, DPLBASE,
+                           (u32)chip->posbuf.addr |ICH6_DPLBASE_ENABLE);
 
         /* set the interrupt enable bits in the descriptor control register */
-        azx_sd_writel(azx_dev, SD_CTL, azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);
+        azx_sd_writel(azx_dev, SD_CTL,
+                      azx_sd_readl(azx_dev, SD_CTL) | SD_INT_MASK);
 
         return 0;
 }
@@ -986,8 +1042,12 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
         bus_temp.pci = chip->pci;
         bus_temp.ops.command = azx_send_cmd;
         bus_temp.ops.get_response = azx_get_response;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        bus_temp.ops.pm_notify = azx_power_notify;
+#endif
 
-        if ((err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus)) < 0)
+        err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus);
+        if (err < 0)
                 return err;
 
         codecs = audio_codecs = 0;
@@ -1038,7 +1098,7 @@ static inline struct azx_dev *azx_assign_device(struct azx *chip, int stream)
                 nums = chip->capture_streams;
         }
         for (i = 0; i < nums; i++, dev++)
-                if (! chip->azx_dev[dev].opened) {
+                if (!chip->azx_dev[dev].opened) {
                         chip->azx_dev[dev].opened = 1;
                         return &chip->azx_dev[dev];
                 }
@@ -1052,7 +1112,8 @@ static inline void azx_release_device(struct azx_dev *azx_dev)
 }
 
 static struct snd_pcm_hardware azx_pcm_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+        .info =                 (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID |
                                  /* No full-resume yet implemented */
@@ -1105,8 +1166,11 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
                                    128);
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
                                    128);
-        if ((err = hinfo->ops.open(hinfo, apcm->codec, substream)) < 0) {
+        snd_hda_power_up(apcm->codec);
+        err = hinfo->ops.open(hinfo, apcm->codec, substream);
+        if (err < 0) {
                 azx_release_device(azx_dev);
+                snd_hda_power_down(apcm->codec);
                 mutex_unlock(&chip->open_mutex);
                 return err;
         }
@@ -1135,13 +1199,16 @@ static int azx_pcm_close(struct snd_pcm_substream *substream)
         spin_unlock_irqrestore(&chip->reg_lock, flags);
         azx_release_device(azx_dev);
         hinfo->ops.close(hinfo, apcm->codec, substream);
+        snd_hda_power_down(apcm->codec);
         mutex_unlock(&chip->open_mutex);
         return 0;
 }
 
-static int azx_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params)
+static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
+                             struct snd_pcm_hw_params *hw_params)
 {
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+        return snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
 }
 
 static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
@@ -1175,13 +1242,15 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
                                                          runtime->channels,
                                                          runtime->format,
                                                          hinfo->maxbps);
-        if (! azx_dev->format_val) {
-                snd_printk(KERN_ERR SFX "invalid format_val, rate=%d, ch=%d, format=%d\n",
+        if (!azx_dev->format_val) {
+                snd_printk(KERN_ERR SFX
+                           "invalid format_val, rate=%d, ch=%d, format=%d\n",
                            runtime->rate, runtime->channels, runtime->format);
                 return -EINVAL;
         }
 
-        snd_printdd("azx_pcm_prepare: bufsize=0x%x, fragsize=0x%x, format=0x%x\n",
+        snd_printdd("azx_pcm_prepare: bufsize=0x%x, fragsize=0x%x, "
+                    "format=0x%x\n",
                     azx_dev->bufsize, azx_dev->fragsize, azx_dev->format_val);
         azx_setup_periods(azx_dev);
         azx_setup_controller(chip, azx_dev);
@@ -1223,7 +1292,8 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
             cmd == SNDRV_PCM_TRIGGER_SUSPEND ||
             cmd == SNDRV_PCM_TRIGGER_STOP) {
                 int timeout = 5000;
-                while (azx_sd_readb(azx_dev, SD_CTL) & SD_CTL_DMA_START && --timeout)
+                while ((azx_sd_readb(azx_dev, SD_CTL) & SD_CTL_DMA_START) &&
+                       --timeout)
                         ;
         }
         return err;
@@ -1241,7 +1311,7 @@ static snd_pcm_uframes_t azx_pcm_pointer(struct snd_pcm_substream *substream)
                 /* use the position buffer */
                 pos = le32_to_cpu(*azx_dev->posbuf);
                 if (chip->position_fix == POS_FIX_AUTO &&
-                    azx_dev->period_intr == 1 && ! pos) {
+                    azx_dev->period_intr == 1 && !pos) {
                         printk(KERN_WARNING
                                "hda-intel: Invalid position buffer, "
                                "using LPIB read method instead.\n");
@@ -1292,7 +1362,8 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
         snd_assert(cpcm->name, return -EINVAL);
 
         err = snd_pcm_new(chip->card, cpcm->name, pcm_dev,
-                          cpcm->stream[0].substreams, cpcm->stream[1].substreams,
+                          cpcm->stream[0].substreams,
+                          cpcm->stream[1].substreams,
                           &pcm);
         if (err < 0)
                 return err;
@@ -1322,26 +1393,27 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
 
 static int __devinit azx_pcm_create(struct azx *chip)
 {
-        struct list_head *p;
         struct hda_codec *codec;
         int c, err;
         int pcm_dev;
 
-        if ((err = snd_hda_build_pcms(chip->bus)) < 0)
+        err = snd_hda_build_pcms(chip->bus);
+        if (err < 0)
                 return err;
 
         /* create audio PCMs */
         pcm_dev = 0;
-        list_for_each(p, &chip->bus->codec_list) {
-                codec = list_entry(p, struct hda_codec, list);
+        list_for_each_entry(codec, &chip->bus->codec_list, list) {
                 for (c = 0; c < codec->num_pcms; c++) {
                         if (codec->pcm_info[c].is_modem)
                                 continue; /* create later */
                         if (pcm_dev >= AZX_MAX_AUDIO_PCMS) {
-                                snd_printk(KERN_ERR SFX "Too many audio PCMs\n");
+                                snd_printk(KERN_ERR SFX
+                                           "Too many audio PCMs\n");
                                 return -EINVAL;
                         }
-                        err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev);
+                        err = create_codec_pcm(chip, codec,
+                                               &codec->pcm_info[c], pcm_dev);
                         if (err < 0)
                                 return err;
                         pcm_dev++;
@@ -1350,16 +1422,17 @@ static int __devinit azx_pcm_create(struct azx *chip)
 
         /* create modem PCMs */
         pcm_dev = AZX_MAX_AUDIO_PCMS;
-        list_for_each(p, &chip->bus->codec_list) {
-                codec = list_entry(p, struct hda_codec, list);
+        list_for_each_entry(codec, &chip->bus->codec_list, list) {
                 for (c = 0; c < codec->num_pcms; c++) {
-                        if (! codec->pcm_info[c].is_modem)
+                        if (!codec->pcm_info[c].is_modem)
                                 continue; /* already created */
                         if (pcm_dev >= AZX_MAX_PCMS) {
-                                snd_printk(KERN_ERR SFX "Too many modem PCMs\n");
+                                snd_printk(KERN_ERR SFX
+                                           "Too many modem PCMs\n");
                                 return -EINVAL;
                         }
-                        err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev);
+                        err = create_codec_pcm(chip, codec,
+                                               &codec->pcm_info[c], pcm_dev);
                         if (err < 0)
                                 return err;
                         chip->pcm[pcm_dev]->dev_class = SNDRV_PCM_CLASS_MODEM;
@@ -1386,7 +1459,8 @@ static int __devinit azx_init_stream(struct azx *chip)
         int i;
 
         /* initialize each stream (aka device)
-         * assign the starting bdl address to each stream (device) and initialize
+         * assign the starting bdl address to each stream (device)
+         * and initialize
          */
         for (i = 0; i < chip->num_streams; i++) {
                 unsigned int off = sizeof(u32) * (i * AZX_MAX_FRAG * 4);
@@ -1423,6 +1497,46 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
 }
 
 
+static void azx_stop_chip(struct azx *chip)
+{
+        if (!chip->initialized)
+                return;
+
+        /* disable interrupts */
+        azx_int_disable(chip);
+        azx_int_clear(chip);
+
+        /* disable CORB/RIRB */
+        azx_free_cmd_io(chip);
+
+        /* disable position buffer */
+        azx_writel(chip, DPLBASE, 0);
+        azx_writel(chip, DPUBASE, 0);
+
+        chip->initialized = 0;
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+/* power-up/down the controller */
+static void azx_power_notify(struct hda_codec *codec)
+{
+        struct azx *chip = codec->bus->private_data;
+        struct hda_codec *c;
+        int power_on = 0;
+
+        list_for_each_entry(c, &codec->bus->codec_list, list) {
+                if (c->power_on) {
+                        power_on = 1;
+                        break;
+                }
+        }
+        if (power_on)
+                azx_init_chip(chip);
+        else if (chip->running && power_save_controller)
+                azx_stop_chip(chip);
+}
+#endif /* CONFIG_SND_HDA_POWER_SAVE */
+
 #ifdef CONFIG_PM
 /*
  * power management
@@ -1436,8 +1550,9 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state)
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         for (i = 0; i < chip->pcm_devs; i++)
                 snd_pcm_suspend_all(chip->pcm[i]);
-        snd_hda_suspend(chip->bus, state);
-        azx_free_cmd_io(chip);
+        if (chip->initialized)
+                snd_hda_suspend(chip->bus, state);
+        azx_stop_chip(chip);
         if (chip->irq >= 0) {
                 synchronize_irq(chip->irq);
                 free_irq(chip->irq, chip);
@@ -1470,7 +1585,11 @@ static int azx_resume(struct pci_dev *pci)
                         chip->msi = 0;
         if (azx_acquire_irq(chip, 1) < 0)
                 return -EIO;
-        azx_init_chip(chip);
+        azx_init_pci(chip);
+
+        if (snd_hda_codecs_inuse(chip->bus))
+                azx_init_chip(chip);
+
         snd_hda_resume(chip->bus);
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
         return 0;
@@ -1485,20 +1604,9 @@ static int azx_free(struct azx *chip)
 {
         if (chip->initialized) {
                 int i;
-
                 for (i = 0; i < chip->num_streams; i++)
                         azx_stream_stop(chip, &chip->azx_dev[i]);
-
-                /* disable interrupts */
-                azx_int_disable(chip);
-                azx_int_clear(chip);
-
-                /* disable CORB/RIRB */
-                azx_free_cmd_io(chip);
-
-                /* disable position buffer */
-                azx_writel(chip, DPLBASE, 0);
-                azx_writel(chip, DPUBASE, 0);
+                azx_stop_chip(chip);
         }
 
         if (chip->irq >= 0) {
@@ -1534,6 +1642,7 @@ static int azx_dev_free(struct snd_device *device)
  */
 static struct snd_pci_quirk position_fix_list[] __devinitdata = {
         SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_NONE),
+        SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_NONE),
         {}
 };
 
@@ -1544,7 +1653,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
         if (fix == POS_FIX_AUTO) {
                 q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
                 if (q) {
-                        snd_printdd(KERN_INFO
+                        printk(KERN_INFO
                                     "hda_intel: position_fix set to %d "
                                     "for device %04x:%04x\n",
                                     q->value, q->subvendor, q->subdevice);
@@ -1555,6 +1664,36 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 }
 
 /*
+ * black-lists for probe_mask
+ */
+static struct snd_pci_quirk probe_mask_list[] __devinitdata = {
+        /* Thinkpad often breaks the controller communication when accessing
+         * to the non-working (or non-existing) modem codec slot.
+         */
+        SND_PCI_QUIRK(0x1014, 0x05b7, "Thinkpad Z60", 0x01),
+        SND_PCI_QUIRK(0x17aa, 0x2010, "Thinkpad X/T/R60", 0x01),
+        SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X/T/R61", 0x01),
+        {}
+};
+
+static void __devinit check_probe_mask(struct azx *chip)
+{
+        const struct snd_pci_quirk *q;
+
+        if (probe_mask == -1) {
+                q = snd_pci_quirk_lookup(chip->pci, probe_mask_list);
+                if (q) {
+                        printk(KERN_INFO
+                               "hda_intel: probe_mask set to 0x%x "
+                               "for device %04x:%04x\n",
+                               q->value, q->subvendor, q->subdevice);
+                        probe_mask = q->value;
+                }
+        }
+}
+
+
+/*
  * constructor
  */
 static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
@@ -1589,6 +1728,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         chip->msi = enable_msi;
 
         chip->position_fix = check_position_fix(chip, position_fix);
+        check_probe_mask(chip);
 
         chip->single_cmd = single_cmd;
 
@@ -1650,37 +1790,43 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                 break;
         }
         chip->num_streams = chip->playback_streams + chip->capture_streams;
-        chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev), GFP_KERNEL);
+        chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev),
+                                GFP_KERNEL);
         if (!chip->azx_dev) {
                 snd_printk(KERN_ERR "cannot malloc azx_dev\n");
                 goto errout;
         }
 
         /* allocate memory for the BDL for each stream */
-        if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                       BDL_SIZE, &chip->bdl)) < 0) {
+        err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                  snd_dma_pci_data(chip->pci),
+                                  BDL_SIZE, &chip->bdl);
+        if (err < 0) {
                 snd_printk(KERN_ERR SFX "cannot allocate BDL\n");
                 goto errout;
         }
         /* allocate memory for the position buffer */
-        if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                       chip->num_streams * 8, &chip->posbuf)) < 0) {
+        err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
+                                  snd_dma_pci_data(chip->pci),
+                                  chip->num_streams * 8, &chip->posbuf);
+        if (err < 0) {
                 snd_printk(KERN_ERR SFX "cannot allocate posbuf\n");
                 goto errout;
         }
         /* allocate CORB/RIRB */
-        if (! chip->single_cmd)
-                if ((err = azx_alloc_cmd_io(chip)) < 0)
+        if (!chip->single_cmd) {
+                err = azx_alloc_cmd_io(chip);
+                if (err < 0)
                         goto errout;
+        }
 
         /* initialize streams */
         azx_init_stream(chip);
 
         /* initialize chip */
+        azx_init_pci(chip);
         azx_init_chip(chip);
 
-        chip->initialized = 1;
-
         /* codec detection */
         if (!chip->codec_mask) {
                 snd_printk(KERN_ERR SFX "no codecs found!\n");
@@ -1688,14 +1834,16 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
                 goto errout;
         }
 
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) <0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err <0) {
                 snd_printk(KERN_ERR SFX "Error creating device [card]!\n");
                 goto errout;
         }
 
         strcpy(card->driver, "HDA-Intel");
         strcpy(card->shortname, driver_short_names[chip->driver_type]);
-        sprintf(card->longname, "%s at 0x%lx irq %i", card->shortname, chip->addr, chip->irq);
+        sprintf(card->longname, "%s at 0x%lx irq %i",
+                card->shortname, chip->addr, chip->irq);
 
         *rchip = chip;
         return 0;
@@ -1705,7 +1853,21 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         return err;
 }
 
-static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
+static void power_down_all_codecs(struct azx *chip)
+{
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        /* The codecs were powered up in snd_hda_codec_new().
+         * Now all initialization done, so turn them down if possible
+         */
+        struct hda_codec *codec;
+        list_for_each_entry(codec, &chip->bus->codec_list, list) {
+                snd_hda_power_down(codec);
+        }
+#endif
+}
+
+static int __devinit azx_probe(struct pci_dev *pci,
+                               const struct pci_device_id *pci_id)
 {
         struct snd_card *card;
         struct azx *chip;
@@ -1725,31 +1887,37 @@ static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id *
         card->private_data = chip;
 
         /* create codec instances */
-        if ((err = azx_codec_create(chip, model)) < 0) {
+        err = azx_codec_create(chip, model);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
         /* create PCM streams */
-        if ((err = azx_pcm_create(chip)) < 0) {
+        err = azx_pcm_create(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
         /* create mixer controls */
-        if ((err = azx_mixer_create(chip)) < 0) {
+        err = azx_mixer_create(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
         snd_card_set_dev(card, &pci->dev);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
         pci_set_drvdata(pci, card);
+        chip->running = 1;
+        power_down_all_codecs(chip);
 
         return err;
 }
@@ -1791,6 +1959,10 @@ static struct pci_device_id azx_ids[] = {
         { 0x10de, 0x0775, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP77 */
         { 0x10de, 0x0776, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP77 */
         { 0x10de, 0x0777, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP77 */
+        { 0x10de, 0x0ac0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */
+        { 0x10de, 0x0ac1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */
+        { 0x10de, 0x0ac2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */
+        { 0x10de, 0x0ac3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, azx_ids);
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index f91ea5ec9f6d..a79d0ed5469c 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -26,7 +26,8 @@
 /*
  * for mixer controls
  */
-#define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19))
+#define HDA_COMPOSE_AMP_VAL(nid,chs,idx,dir) \
+        ((nid) | ((chs)<<16) | ((dir)<<18) | ((idx)<<19))
 /* mono volume with index (index=0,1,...) (channel=1,2) */
 #define HDA_CODEC_VOLUME_MONO_IDX(xname, xcidx, nid, channel, xindex, direction) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx,  \
@@ -64,18 +65,35 @@
 #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \
         HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction)
 
-int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, unsigned int size, unsigned int __user *tlv);
-int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo);
+int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+                          unsigned int size, unsigned int __user *tlv);
+int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo);
+int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol);
 /* lowlevel accessor with caching; use carefully */
 int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
                            int direction, int index);
 int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
                              int direction, int idx, int mask, int val);
+int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
+                             int dir, int idx, int mask, int val);
+#ifdef SND_HDA_NEEDS_RESUME
+void snd_hda_codec_resume_amp(struct hda_codec *codec);
+#endif
+
+/* amp value bits */
+#define HDA_AMP_MUTE    0x80
+#define HDA_AMP_UNMUTE  0x00
+#define HDA_AMP_VOLMASK 0x7f
 
 /* mono switch binding multiple inputs */
 #define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \
@@ -86,11 +104,61 @@ int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
           .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, indices, direction) }
 
 /* stereo switch binding multiple inputs */
-#define HDA_BIND_MUTE(xname,nid,indices,dir) HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir)
+#define HDA_BIND_MUTE(xname,nid,indices,dir) \
+        HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir)
+
+int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol);
+
+/* more generic bound controls */
+struct hda_ctl_ops {
+        snd_kcontrol_info_t *info;
+        snd_kcontrol_get_t *get;
+        snd_kcontrol_put_t *put;
+        snd_kcontrol_tlv_rw_t *tlv;
+};
 
-int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
-int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+extern struct hda_ctl_ops snd_hda_bind_vol;     /* for bind-volume with TLV */
+extern struct hda_ctl_ops snd_hda_bind_sw;      /* for bind-switch */
 
+struct hda_bind_ctls {
+        struct hda_ctl_ops *ops;
+        long values[];
+};
+
+int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo);
+int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol);
+int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+                           unsigned int size, unsigned int __user *tlv);
+
+#define HDA_BIND_VOL(xname, bindrec) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+          .name = xname, \
+          .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                          SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
+                          SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,\
+          .info = snd_hda_mixer_bind_ctls_info,\
+          .get =  snd_hda_mixer_bind_ctls_get,\
+          .put = snd_hda_mixer_bind_ctls_put,\
+          .tlv = { .c = snd_hda_mixer_bind_tlv },\
+          .private_value = (long) (bindrec) }
+#define HDA_BIND_SW(xname, bindrec) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,\
+          .name = xname, \
+          .info = snd_hda_mixer_bind_ctls_info,\
+          .get =  snd_hda_mixer_bind_ctls_get,\
+          .put = snd_hda_mixer_bind_ctls_put,\
+          .private_value = (long) (bindrec) }
+
+/*
+ * SPDIF I/O
+ */
 int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid);
 int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid);
 
@@ -107,8 +175,10 @@ struct hda_input_mux {
         struct hda_input_mux_item items[HDA_MAX_NUM_INPUTS];
 };
 
-int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo);
-int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux,
+int snd_hda_input_mux_info(const struct hda_input_mux *imux,
+                           struct snd_ctl_elem_info *uinfo);
+int snd_hda_input_mux_put(struct hda_codec *codec,
+                          const struct hda_input_mux *imux,
                           struct snd_ctl_elem_value *ucontrol, hda_nid_t nid,
                           unsigned int *cur_val);
 
@@ -120,13 +190,19 @@ struct hda_channel_mode {
         const struct hda_verb *sequence;
 };
 
-int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo,
-                         const struct hda_channel_mode *chmode, int num_chmodes);
-int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
-                        const struct hda_channel_mode *chmode, int num_chmodes,
+int snd_hda_ch_mode_info(struct hda_codec *codec,
+                         struct snd_ctl_elem_info *uinfo,
+                         const struct hda_channel_mode *chmode,
+                         int num_chmodes);
+int snd_hda_ch_mode_get(struct hda_codec *codec,
+                        struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode,
+                        int num_chmodes,
                         int max_channels);
-int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol,
-                        const struct hda_channel_mode *chmode, int num_chmodes,
+int snd_hda_ch_mode_put(struct hda_codec *codec,
+                        struct snd_ctl_elem_value *ucontrol,
+                        const struct hda_channel_mode *chmode,
+                        int num_chmodes,
                         int *max_channelsp);
 
 /*
@@ -146,20 +222,25 @@ struct hda_multi_out {
         int dig_out_used;       /* current usage of digital out (HDA_DIG_XXX) */
 };
 
-int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout);
-int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout);
+int snd_hda_multi_out_dig_open(struct hda_codec *codec,
+                               struct hda_multi_out *mout);
+int snd_hda_multi_out_dig_close(struct hda_codec *codec,
+                                struct hda_multi_out *mout);
 int snd_hda_multi_out_dig_prepare(struct hda_codec *codec,
                                   struct hda_multi_out *mout,
                                   unsigned int stream_tag,
                                   unsigned int format,
                                   struct snd_pcm_substream *substream);
-int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout,
+int snd_hda_multi_out_analog_open(struct hda_codec *codec,
+                                  struct hda_multi_out *mout,
                                   struct snd_pcm_substream *substream);
-int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout,
+int snd_hda_multi_out_analog_prepare(struct hda_codec *codec,
+                                     struct hda_multi_out *mout,
                                      unsigned int stream_tag,
                                      unsigned int format,
                                      struct snd_pcm_substream *substream);
-int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout);
+int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
+                                     struct hda_multi_out *mout);
 
 /*
  * generic codec parser
@@ -181,16 +262,8 @@ static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }
 int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,
                                const char **modelnames,
                                const struct snd_pci_quirk *pci_list);
-int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);
-
-/*
- * power management
- */
-#ifdef CONFIG_PM
-int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew);
-int snd_hda_resume_spdif_out(struct hda_codec *codec);
-int snd_hda_resume_spdif_in(struct hda_codec *codec);
-#endif
+int snd_hda_add_new_ctls(struct hda_codec *codec,
+                         struct snd_kcontrol_new *knew);
 
 /*
  * unsolicited event handler
@@ -232,7 +305,9 @@ extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];
 
 struct auto_pin_cfg {
         int line_outs;
-        hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
+        hda_nid_t line_out_pins[5]; /* sorted in the order of
+                                     * Front/Surr/CLFE/Side
+                                     */
         int speaker_outs;
         hda_nid_t speaker_pins[5];
         int hp_outs;
@@ -243,13 +318,19 @@ struct auto_pin_cfg {
         hda_nid_t dig_in_pin;
 };
 
-#define get_defcfg_connect(cfg) ((cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT)
-#define get_defcfg_association(cfg) ((cfg & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT)
-#define get_defcfg_location(cfg) ((cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
-#define get_defcfg_sequence(cfg) (cfg & AC_DEFCFG_SEQUENCE)
-#define get_defcfg_device(cfg) ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
-
-int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
+#define get_defcfg_connect(cfg) \
+        ((cfg & AC_DEFCFG_PORT_CONN) >> AC_DEFCFG_PORT_CONN_SHIFT)
+#define get_defcfg_association(cfg) \
+        ((cfg & AC_DEFCFG_DEF_ASSOC) >> AC_DEFCFG_ASSOC_SHIFT)
+#define get_defcfg_location(cfg) \
+        ((cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
+#define get_defcfg_sequence(cfg) \
+        (cfg & AC_DEFCFG_SEQUENCE)
+#define get_defcfg_device(cfg) \
+        ((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+
+int snd_hda_parse_pin_def_config(struct hda_codec *codec,
+                                 struct auto_pin_cfg *cfg,
                                  hda_nid_t *ignore_nids);
 
 /* amp values */
@@ -280,4 +361,32 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
 int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
                               unsigned int caps);
 
+/*
+ * hwdep interface
+ */
+int snd_hda_create_hwdep(struct hda_codec *codec);
+
+/*
+ * power-management
+ */
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+void snd_hda_schedule_power_save(struct hda_codec *codec);
+
+struct hda_amp_list {
+        hda_nid_t nid;
+        unsigned char dir;
+        unsigned char idx;
+};
+
+struct hda_loopback_check {
+        struct hda_amp_list *amplist;
+        int power_on;
+};
+
+int snd_hda_check_amp_list_power(struct hda_codec *codec,
+                                 struct hda_loopback_check *check,
+                                 hda_nid_t nid);
+#endif /* CONFIG_SND_HDA_POWER_SAVE */
+
 #endif /* __SOUND_HDA_LOCAL_H */
diff --git a/sound/pci/hda/hda_patch.h b/sound/pci/hda/hda_patch.h
index 9f9e9ae44a9d..f5c23bb16d7e 100644
--- a/sound/pci/hda/hda_patch.h
+++ b/sound/pci/hda/hda_patch.h
@@ -20,13 +20,29 @@ extern struct hda_codec_preset snd_hda_preset_conexant[];
 extern struct hda_codec_preset snd_hda_preset_via[];
 
 static const struct hda_codec_preset *hda_preset_tables[] = {
+#ifdef CONFIG_SND_HDA_CODEC_REALTEK
         snd_hda_preset_realtek,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_CMEDIA
         snd_hda_preset_cmedia,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_ANALOG
         snd_hda_preset_analog,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_SIGMATEL
         snd_hda_preset_sigmatel,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_SI3054
         snd_hda_preset_si3054,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_ATIHDMI
         snd_hda_preset_atihdmi,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_CONEXANT
         snd_hda_preset_conexant,
+#endif
+#ifdef CONFIG_SND_HDA_CODEC_VIA
         snd_hda_preset_via,
+#endif
         NULL
 };
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index ac15066fd300..e94944f34ffd 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -58,7 +58,8 @@ static void print_amp_caps(struct snd_info_buffer *buffer,
                 snd_iprintf(buffer, "N/A\n");
                 return;
         }
-        snd_iprintf(buffer, "ofs=0x%02x, nsteps=0x%02x, stepsize=0x%02x, mute=%x\n",
+        snd_iprintf(buffer, "ofs=0x%02x, nsteps=0x%02x, stepsize=0x%02x, "
+                    "mute=%x\n",
                     caps & AC_AMPCAP_OFFSET,
                     (caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT,
                     (caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT,
@@ -76,11 +77,13 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
         for (i = 0; i < indices; i++) {
                 snd_iprintf(buffer, " [");
                 if (stereo) {
-                        val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
+                        val = snd_hda_codec_read(codec, nid, 0,
+                                                 AC_VERB_GET_AMP_GAIN_MUTE,
                                                  AC_AMP_GET_LEFT | dir | i);
                         snd_iprintf(buffer, "0x%02x ", val);
                 }
-                val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_AMP_GAIN_MUTE,
+                val = snd_hda_codec_read(codec, nid, 0,
+                                         AC_VERB_GET_AMP_GAIN_MUTE,
                                          AC_AMP_GET_RIGHT | dir | i);
                 snd_iprintf(buffer, "0x%02x]", val);
         }
@@ -237,7 +240,8 @@ static void print_pin_caps(struct snd_info_buffer *buffer,
 }
 
 
-static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
+static void print_codec_info(struct snd_info_entry *entry,
+                             struct snd_info_buffer *buffer)
 {
         struct hda_codec *codec = entry->private_data;
         char buf[32];
@@ -258,6 +262,7 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
 
         if (! codec->afg)
                 return;
+        snd_hda_power_up(codec);
         snd_iprintf(buffer, "Default PCM:\n");
         print_pcm_caps(buffer, codec, codec->afg);
         snd_iprintf(buffer, "Default Amp-In caps: ");
@@ -268,12 +273,15 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
         nodes = snd_hda_get_sub_nodes(codec, codec->afg, &nid);
         if (! nid || nodes < 0) {
                 snd_iprintf(buffer, "Invalid AFG subtree\n");
+                snd_hda_power_down(codec);
                 return;
         }
         for (i = 0; i < nodes; i++, nid++) {
-                unsigned int wid_caps = snd_hda_param_read(codec, nid,
-                                                           AC_PAR_AUDIO_WIDGET_CAP);
-                unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
+                unsigned int wid_caps =
+                        snd_hda_param_read(codec, nid,
+                                           AC_PAR_AUDIO_WIDGET_CAP);
+                unsigned int wid_type =
+                        (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
                 int conn_len = 0; 
                 hda_nid_t conn[HDA_MAX_CONNECTIONS];
 
@@ -313,7 +321,9 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
                 if (wid_type == AC_WID_PIN) {
                         unsigned int pinctls;
                         print_pin_caps(buffer, codec, nid);
-                        pinctls = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                        pinctls = snd_hda_codec_read(codec, nid, 0,
+                                             AC_VERB_GET_PIN_WIDGET_CONTROL,
+                                                     0);
                         snd_iprintf(buffer, "  Pin-ctls: 0x%02x:", pinctls);
                         if (pinctls & AC_PINCTL_IN_EN)
                                 snd_iprintf(buffer, " IN");
@@ -333,7 +343,8 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
                 if (wid_caps & AC_WCAP_POWER)
                         snd_iprintf(buffer, "  Power: 0x%x\n",
                                     snd_hda_codec_read(codec, nid, 0,
-                                                       AC_VERB_GET_POWER_STATE, 0));
+                                                       AC_VERB_GET_POWER_STATE,
+                                                       0));
 
                 if (wid_caps & AC_WCAP_CONN_LIST) {
                         int c, curr = -1;
@@ -350,6 +361,7 @@ static void print_codec_info(struct snd_info_entry *entry, struct snd_info_buffe
                         snd_iprintf(buffer, "\n");
                 }
         }
+        snd_hda_power_down(codec);
 }
 
 /*
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 4d7f8d11ad75..54cfd4526d20 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -73,6 +73,12 @@ struct ad198x_spec {
         struct snd_kcontrol_new *kctl_alloc;
         struct hda_input_mux private_imux;
         hda_nid_t private_dac_nids[4];
+
+        unsigned int jack_present :1;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        struct hda_loopback_check loopback;
+#endif
 };
 
 /*
@@ -144,6 +150,14 @@ static int ad198x_build_controls(struct hda_codec *codec)
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int ad198x_check_power_status(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct ad198x_spec *spec = codec->spec;
+        return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
+}
+#endif
+
 /*
  * Analog playback callbacks
  */
@@ -318,30 +332,13 @@ static void ad198x_free(struct hda_codec *codec)
         kfree(codec->spec);
 }
 
-#ifdef CONFIG_PM
-static int ad198x_resume(struct hda_codec *codec)
-{
-        struct ad198x_spec *spec = codec->spec;
-        int i;
-
-        codec->patch_ops.init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-        return 0;
-}
-#endif
-
 static struct hda_codec_ops ad198x_patch_ops = {
         .build_controls = ad198x_build_controls,
         .build_pcms = ad198x_build_pcms,
         .init = ad198x_init,
         .free = ad198x_free,
-#ifdef CONFIG_PM
-        .resume = ad198x_resume,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        .check_power_status = ad198x_check_power_status,
 #endif
 };
 
@@ -350,15 +347,7 @@ static struct hda_codec_ops ad198x_patch_ops = {
  * EAPD control
  * the private value = nid | (invert << 8)
  */
-static int ad198x_eapd_info(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define ad198x_eapd_info        snd_ctl_boolean_mono_info
 
 static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,
                            struct snd_ctl_elem_value *ucontrol)
@@ -384,12 +373,12 @@ static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
         eapd = ucontrol->value.integer.value[0];
         if (invert)
                 eapd = !eapd;
-        if (eapd == spec->cur_eapd && ! codec->in_resume)
+        if (eapd == spec->cur_eapd)
                 return 0;
         spec->cur_eapd = eapd;
-        snd_hda_codec_write(codec, nid,
-                            0, AC_VERB_SET_EAPD_BTLENABLE,
-                            eapd ? 0x02 : 0x00);
+        snd_hda_codec_write_cache(codec, nid,
+                                  0, AC_VERB_SET_EAPD_BTLENABLE,
+                                  eapd ? 0x02 : 0x00);
         return 1;
 }
 
@@ -430,94 +419,36 @@ static struct hda_input_mux ad1986a_capture_source = {
         },
 };
 
-/*
- * PCM control
- *
- * bind volumes/mutes of 3 DACs as a single PCM control for simplicity
- */
-
-#define ad1986a_pcm_amp_vol_info        snd_hda_mixer_amp_volume_info
-
-static int ad1986a_pcm_amp_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *ad = codec->spec;
-
-        mutex_lock(&ad->amp_mutex);
-        snd_hda_mixer_amp_volume_get(kcontrol, ucontrol);
-        mutex_unlock(&ad->amp_mutex);
-        return 0;
-}
-
-static int ad1986a_pcm_amp_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *ad = codec->spec;
-        int i, change = 0;
-
-        mutex_lock(&ad->amp_mutex);
-        for (i = 0; i < ARRAY_SIZE(ad1986a_dac_nids); i++) {
-                kcontrol->private_value = HDA_COMPOSE_AMP_VAL(ad1986a_dac_nids[i], 3, 0, HDA_OUTPUT);
-                change |= snd_hda_mixer_amp_volume_put(kcontrol, ucontrol);
-        }
-        kcontrol->private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT);
-        mutex_unlock(&ad->amp_mutex);
-        return change;
-}
-
-#define ad1986a_pcm_amp_sw_info         snd_hda_mixer_amp_switch_info
 
-static int ad1986a_pcm_amp_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *ad = codec->spec;
-
-        mutex_lock(&ad->amp_mutex);
-        snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
-        mutex_unlock(&ad->amp_mutex);
-        return 0;
-}
-
-static int ad1986a_pcm_amp_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *ad = codec->spec;
-        int i, change = 0;
+static 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),
+                HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
-        mutex_lock(&ad->amp_mutex);
-        for (i = 0; i < ARRAY_SIZE(ad1986a_dac_nids); i++) {
-                kcontrol->private_value = HDA_COMPOSE_AMP_VAL(ad1986a_dac_nids[i], 3, 0, HDA_OUTPUT);
-                change |= snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);
-        }
-        kcontrol->private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT);
-        mutex_unlock(&ad->amp_mutex);
-        return change;
-}
+static 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),
+                HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /*
  * mixers
  */
 static struct snd_kcontrol_new ad1986a_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "PCM Playback Volume",
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                          SNDRV_CTL_ELEM_ACCESS_TLV_READ |
-                          SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK,
-                .info = ad1986a_pcm_amp_vol_info,
-                .get = ad1986a_pcm_amp_vol_get,
-                .put = ad1986a_pcm_amp_vol_put,
-                .tlv = { .c = snd_hda_mixer_amp_tlv },
-                .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "PCM Playback Switch",
-                .info = ad1986a_pcm_amp_sw_info,
-                .get = ad1986a_pcm_amp_sw_get,
-                .put = ad1986a_pcm_amp_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)
-        },
+        /*
+         * bind volumes/mutes of 3 DACs as a single PCM control for simplicity
+         */
+        HDA_BIND_VOL("PCM Playback Volume", &ad1986a_bind_pcm_vol),
+        HDA_BIND_SW("PCM Playback Switch", &ad1986a_bind_pcm_sw),
         HDA_CODEC_VOLUME("Front Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Surround Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
@@ -569,13 +500,30 @@ static struct snd_kcontrol_new ad1986a_3st_mixers[] = {
 /* laptop model - 2ch only */
 static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };
 
+/* master controls both pins 0x1a and 0x1b */
+static struct hda_bind_ctls ad1986a_laptop_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
+                0,
+        },
+};
+
+static struct hda_bind_ctls ad1986a_laptop_master_sw = {
+        .ops = &snd_hda_bind_sw,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
+                0,
+        },
+};
+
 static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Master Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Master Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-        /* HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),
-           HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT), */
+        HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),
@@ -603,68 +551,114 @@ static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
 
 /* laptop-eapd model - 2ch only */
 
-/* master controls both pins 0x1a and 0x1b */
-static int ad1986a_laptop_master_vol_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
+static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
+        .num_items = 3,
+        .items = {
+                { "Mic", 0x0 },
+                { "Internal Mic", 0x4 },
+                { "Mix", 0x5 },
+        },
+};
+
+static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
+        HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw),
+        HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Capture Source",
+                .info = ad198x_mux_enum_info,
+                .get = ad198x_mux_enum_get,
+                .put = ad198x_mux_enum_put,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "External Amplifier",
+                .info = ad198x_eapd_info,
+                .get = ad198x_eapd_get,
+                .put = ad198x_eapd_put,
+                .private_value = 0x1b | (1 << 8), /* port-D, inversed */
+        },
+        { } /* end */
+};
+
+/* laptop-automute - 2ch only */
+
+static void ad1986a_update_hp(struct hda_codec *codec)
 {
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int mute;
 
-        change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
+        if (spec->jack_present)
+                mute = HDA_AMP_MUTE; /* mute internal speaker */
+        else
+                /* unmute internal speaker if necessary */
+                mute = snd_hda_codec_amp_read(codec, 0x1a, 0, HDA_OUTPUT, 0);
+        snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, mute);
 }
 
-static int ad1986a_laptop_master_sw_put(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *ucontrol)
+static void ad1986a_hp_automute(struct hda_codec *codec)
+{
+        struct ad198x_spec *spec = codec->spec;
+        unsigned int present;
+
+        present = snd_hda_codec_read(codec, 0x1a, 0, AC_VERB_GET_PIN_SENSE, 0);
+        spec->jack_present = (present & 0x80000000) != 0;
+        ad1986a_update_hp(codec);
+}
+
+#define AD1986A_HP_EVENT                0x37
+
+static void ad1986a_hp_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        if ((res >> 26) != AD1986A_HP_EVENT)
+                return;
+        ad1986a_hp_automute(codec);
+}
+
+static int ad1986a_hp_init(struct hda_codec *codec)
+{
+        ad198x_init(codec);
+        ad1986a_hp_automute(codec);
+        return 0;
+}
+
+/* bind hp and internal speaker mute (with plug check) */
+static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         long *valp = ucontrol->value.integer.value;
         int change;
 
         change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
-                                          0x80, valp[0] ? 0 : 0x80);
+                                          HDA_AMP_MUTE,
+                                          valp[0] ? 0 : HDA_AMP_MUTE);
         change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
-                                           0x80, valp[1] ? 0 : 0x80);
-        snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
-                                 0x80, valp[0] ? 0 : 0x80);
-        snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
-                                 0x80, valp[1] ? 0 : 0x80);
+                                           HDA_AMP_MUTE,
+                                           valp[1] ? 0 : HDA_AMP_MUTE);
+        if (change)
+                ad1986a_update_hp(codec);
         return change;
 }
 
-static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
-        .num_items = 3,
-        .items = {
-                { "Mic", 0x0 },
-                { "Internal Mic", 0x4 },
-                { "Mix", 0x5 },
-        },
-};
-
-static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = ad1986a_laptop_master_vol_put,
-                .tlv = { .c = snd_hda_mixer_amp_tlv },
-                .private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
-        },
+static struct snd_kcontrol_new ad1986a_laptop_automute_mixers[] = {
+        HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
                 .info = snd_hda_mixer_amp_switch_info,
                 .get = snd_hda_mixer_amp_switch_get,
-                .put = ad1986a_laptop_master_sw_put,
+                .put = ad1986a_hp_master_sw_put,
                 .private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
         },
         HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
@@ -674,6 +668,8 @@ static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x18, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x18, 0x0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
         {
@@ -807,12 +803,20 @@ static struct hda_verb ad1986a_ultra_init[] = {
         { } /* end */
 };
 
+/* pin sensing on HP jack */
+static struct hda_verb ad1986a_hp_init_verbs[] = {
+        {0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_HP_EVENT},
+        {}
+};
+
+
 /* models */
 enum {
         AD1986A_6STACK,
         AD1986A_3STACK,
         AD1986A_LAPTOP,
         AD1986A_LAPTOP_EAPD,
+        AD1986A_LAPTOP_AUTOMUTE,
         AD1986A_ULTRA,
         AD1986A_MODELS
 };
@@ -822,6 +826,7 @@ static const char *ad1986a_models[AD1986A_MODELS] = {
         [AD1986A_3STACK]        = "3stack",
         [AD1986A_LAPTOP]        = "laptop",
         [AD1986A_LAPTOP_EAPD]   = "laptop-eapd",
+        [AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute",
         [AD1986A_ULTRA]         = "ultra",
 };
 
@@ -850,11 +855,22 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),
         SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP),
         SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK),
-        SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_EAPD),
+        SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE),
         SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),
         {}
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1986a_loopbacks[] = {
+        { 0x13, HDA_OUTPUT, 0 }, /* Mic */
+        { 0x14, HDA_OUTPUT, 0 }, /* Phone */
+        { 0x15, HDA_OUTPUT, 0 }, /* CD */
+        { 0x16, HDA_OUTPUT, 0 }, /* Aux */
+        { 0x17, HDA_OUTPUT, 0 }, /* Line */
+        { } /* end */
+};
+#endif
+
 static int patch_ad1986a(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
@@ -864,7 +880,6 @@ static int patch_ad1986a(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 6;
@@ -879,6 +894,9 @@ static int patch_ad1986a(struct hda_codec *codec)
         spec->mixers[0] = ad1986a_mixers;
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = ad1986a_init_verbs;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1986a_loopbacks;
+#endif
 
         codec->patch_ops = ad198x_patch_ops;
 
@@ -914,6 +932,19 @@ static int patch_ad1986a(struct hda_codec *codec)
                 spec->multiout.dig_out_nid = 0;
                 spec->input_mux = &ad1986a_laptop_eapd_capture_source;
                 break;
+        case AD1986A_LAPTOP_AUTOMUTE:
+                spec->mixers[0] = ad1986a_laptop_automute_mixers;
+                spec->num_init_verbs = 3;
+                spec->init_verbs[1] = ad1986a_eapd_init_verbs;
+                spec->init_verbs[2] = ad1986a_hp_init_verbs;
+                spec->multiout.max_channels = 2;
+                spec->multiout.num_dacs = 1;
+                spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
+                spec->multiout.dig_out_nid = 0;
+                spec->input_mux = &ad1986a_laptop_eapd_capture_source;
+                codec->patch_ops.unsol_event = ad1986a_hp_unsol_event;
+                codec->patch_ops.init = ad1986a_hp_init;
+                break;
         case AD1986A_ULTRA:
                 spec->mixers[0] = ad1986a_laptop_eapd_mixers;
                 spec->num_init_verbs = 2;
@@ -982,8 +1013,9 @@ static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
 
         if (spec->spdif_route != ucontrol->value.enumerated.item[0]) {
                 spec->spdif_route = ucontrol->value.enumerated.item[0];
-                snd_hda_codec_write(codec, spec->multiout.dig_out_nid, 0,
-                                    AC_VERB_SET_CONNECT_SEL, spec->spdif_route);
+                snd_hda_codec_write_cache(codec, spec->multiout.dig_out_nid, 0,
+                                          AC_VERB_SET_CONNECT_SEL,
+                                          spec->spdif_route);
                 return 1;
         }
         return 0;
@@ -1063,6 +1095,13 @@ static struct hda_verb ad1983_init_verbs[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1983_loopbacks[] = {
+        { 0x12, HDA_OUTPUT, 0 }, /* Mic */
+        { 0x13, HDA_OUTPUT, 0 }, /* Line */
+        { } /* end */
+};
+#endif
 
 static int patch_ad1983(struct hda_codec *codec)
 {
@@ -1072,7 +1111,6 @@ static int patch_ad1983(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 2;
@@ -1088,6 +1126,9 @@ static int patch_ad1983(struct hda_codec *codec)
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = ad1983_init_verbs;
         spec->spdif_route = 0;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1983_loopbacks;
+#endif
 
         codec->patch_ops = ad198x_patch_ops;
 
@@ -1211,6 +1252,17 @@ static struct hda_verb ad1981_init_verbs[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1981_loopbacks[] = {
+        { 0x12, HDA_OUTPUT, 0 }, /* Front Mic */
+        { 0x13, HDA_OUTPUT, 0 }, /* Line */
+        { 0x1b, HDA_OUTPUT, 0 }, /* Aux */
+        { 0x1c, HDA_OUTPUT, 0 }, /* Mic */
+        { 0x1d, HDA_OUTPUT, 0 }, /* CD */
+        { } /* end */
+};
+#endif
+
 /*
  * Patch for HP nx6320
  *
@@ -1240,31 +1292,21 @@ static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,
                 return 0;
 
         /* toggle HP mute appropriately */
-        snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
-                                 0x80, spec->cur_eapd ? 0 : 0x80);
-        snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
-                                 0x80, spec->cur_eapd ? 0 : 0x80);
+        snd_hda_codec_amp_stereo(codec, 0x06, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE,
+                                 spec->cur_eapd ? 0 : HDA_AMP_MUTE);
         return 1;
 }
 
 /* bind volumes of both NID 0x05 and 0x06 */
-static int ad1981_hp_master_vol_put(struct snd_kcontrol *kcontrol,
-                                    struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls ad1981_hp_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x06, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* mute internal speaker if HP is plugged */
 static void ad1981_hp_automute(struct hda_codec *codec)
@@ -1273,10 +1315,8 @@ static void ad1981_hp_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x06, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
+        snd_hda_codec_amp_stereo(codec, 0x05, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
 
 /* toggle input of built-in and mic jack appropriately */
@@ -1327,14 +1367,7 @@ static struct hda_input_mux ad1981_hp_capture_source = {
 };
 
 static struct snd_kcontrol_new ad1981_hp_mixers[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = ad1981_hp_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -1474,7 +1507,6 @@ static int patch_ad1981(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         spec->multiout.max_channels = 2;
@@ -1490,6 +1522,9 @@ static int patch_ad1981(struct hda_codec *codec)
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = ad1981_init_verbs;
         spec->spdif_route = 0;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1981_loopbacks;
+#endif
 
         codec->patch_ops = ad198x_patch_ops;
 
@@ -1897,16 +1932,19 @@ static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol,
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int sel;
 
-        sel = snd_hda_codec_read(codec, 0x02, 0, AC_VERB_GET_CONNECT_SEL, 0);
-        if (sel > 0) {
+        sel = snd_hda_codec_read(codec, 0x1d, 0, AC_VERB_GET_AMP_GAIN_MUTE,
+                                 AC_AMP_GET_INPUT);
+        if (!(sel & 0x80))
+                ucontrol->value.enumerated.item[0] = 0;
+        else {
                 sel = snd_hda_codec_read(codec, 0x0b, 0,
                                          AC_VERB_GET_CONNECT_SEL, 0);
                 if (sel < 3)
                         sel++;
                 else
                         sel = 0;
+                ucontrol->value.enumerated.item[0] = sel;
         }
-        ucontrol->value.enumerated.item[0] = sel;
         return 0;
 }
 
@@ -1918,23 +1956,39 @@ static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol,
         int change;
 
         val = ucontrol->value.enumerated.item[0];
-        sel = snd_hda_codec_read(codec, 0x02, 0, AC_VERB_GET_CONNECT_SEL, 0);
         if (!val) {
-                change = sel != 0;
-                if (change || codec->in_resume)
-                        snd_hda_codec_write(codec, 0x02, 0,
-                                            AC_VERB_SET_CONNECT_SEL, 0);
+                sel = snd_hda_codec_read(codec, 0x1d, 0,
+                                         AC_VERB_GET_AMP_GAIN_MUTE,
+                                         AC_AMP_GET_INPUT);
+                change = sel & 0x80;
+                if (change) {
+                        snd_hda_codec_write_cache(codec, 0x1d, 0,
+                                                  AC_VERB_SET_AMP_GAIN_MUTE,
+                                                  AMP_IN_UNMUTE(0));
+                        snd_hda_codec_write_cache(codec, 0x1d, 0,
+                                                  AC_VERB_SET_AMP_GAIN_MUTE,
+                                                  AMP_IN_MUTE(1));
+                }
         } else {
-                change = sel == 0;
-                if (change || codec->in_resume)
-                        snd_hda_codec_write(codec, 0x02, 0,
-                                            AC_VERB_SET_CONNECT_SEL, 1);
+                sel = snd_hda_codec_read(codec, 0x1d, 0,
+                                         AC_VERB_GET_AMP_GAIN_MUTE,
+                                         AC_AMP_GET_INPUT | 0x01);
+                change = sel & 0x80;
+                if (change) {
+                        snd_hda_codec_write_cache(codec, 0x1d, 0,
+                                                  AC_VERB_SET_AMP_GAIN_MUTE,
+                                                  AMP_IN_MUTE(0));
+                        snd_hda_codec_write_cache(codec, 0x1d, 0,
+                                                  AC_VERB_SET_AMP_GAIN_MUTE,
+                                                  AMP_IN_UNMUTE(1));
+                }
                 sel = snd_hda_codec_read(codec, 0x0b, 0,
                                          AC_VERB_GET_CONNECT_SEL, 0) + 1;
                 change |= sel != val;
-                if (change || codec->in_resume)
-                        snd_hda_codec_write(codec, 0x0b, 0,
-                                            AC_VERB_SET_CONNECT_SEL, val - 1);
+                if (change)
+                        snd_hda_codec_write_cache(codec, 0x0b, 0,
+                                                  AC_VERB_SET_CONNECT_SEL,
+                                                  val - 1);
         }
         return change;
 }
@@ -2047,10 +2101,9 @@ static struct hda_verb ad1988_spdif_init_verbs[] = {
         {0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */
         {0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1 */
         {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
         /* SPDIF out pin */
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x17}, /* 0dB */
 
         { }
 };
@@ -2225,6 +2278,15 @@ static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res)
                 snd_hda_sequence_write(codec, ad1988_laptop_hp_off);
 } 
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1988_loopbacks[] = {
+        { 0x20, HDA_INPUT, 0 }, /* Front Mic */
+        { 0x20, HDA_INPUT, 1 }, /* Line */
+        { 0x20, HDA_INPUT, 4 }, /* Mic */
+        { 0x20, HDA_INPUT, 6 }, /* CD */
+        { } /* end */
+};
+#endif
 
 /*
  * Automatic parse of I/O pins from the BIOS configuration
@@ -2663,7 +2725,6 @@ static int patch_ad1988(struct hda_codec *codec)
         if (spec == NULL)
                 return -ENOMEM;
 
-        mutex_init(&spec->amp_mutex);
         codec->spec = spec;
 
         if (is_rev2(codec))
@@ -2770,6 +2831,9 @@ static int patch_ad1988(struct hda_codec *codec)
                 codec->patch_ops.unsol_event = ad1988_laptop_unsol_event;
                 break;
         }
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1988_loopbacks;
+#endif
 
         return 0;
 }
@@ -2926,6 +2990,16 @@ static struct hda_verb ad1884_init_verbs[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1884_loopbacks[] = {
+        { 0x20, HDA_INPUT, 0 }, /* Front Mic */
+        { 0x20, HDA_INPUT, 1 }, /* Mic */
+        { 0x20, HDA_INPUT, 2 }, /* CD */
+        { 0x20, HDA_INPUT, 4 }, /* Docking */
+        { } /* end */
+};
+#endif
+
 static int patch_ad1884(struct hda_codec *codec)
 {
         struct ad198x_spec *spec;
@@ -2950,6 +3024,9 @@ static int patch_ad1884(struct hda_codec *codec)
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = ad1884_init_verbs;
         spec->spdif_route = 0;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1884_loopbacks;
+#endif
 
         codec->patch_ops = ad198x_patch_ops;
 
@@ -3331,6 +3408,16 @@ static struct hda_verb ad1882_init_verbs[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list ad1882_loopbacks[] = {
+        { 0x20, HDA_INPUT, 0 }, /* Front Mic */
+        { 0x20, HDA_INPUT, 1 }, /* Mic */
+        { 0x20, HDA_INPUT, 4 }, /* Line */
+        { 0x20, HDA_INPUT, 6 }, /* CD */
+        { } /* end */
+};
+#endif
+
 /* models */
 enum {
         AD1882_3STACK,
@@ -3369,6 +3456,9 @@ static int patch_ad1882(struct hda_codec *codec)
         spec->num_init_verbs = 1;
         spec->init_verbs[0] = ad1882_init_verbs;
         spec->spdif_route = 0;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = ad1882_loopbacks;
+#endif
 
         codec->patch_ops = ad198x_patch_ops;
 
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index 72d3ab9751ac..fbb8969dc559 100644
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -62,19 +62,6 @@ static int atihdmi_init(struct hda_codec *codec)
         return 0;
 }
 
-#ifdef CONFIG_PM
-/*
- * resume
- */
-static int atihdmi_resume(struct hda_codec *codec)
-{
-        atihdmi_init(codec);
-        snd_hda_resume_spdif_out(codec);
-
-        return 0;
-}
-#endif
-
 /*
  * Digital out
  */
@@ -141,9 +128,6 @@ static struct hda_codec_ops atihdmi_patch_ops = {
         .build_pcms = atihdmi_build_pcms,
         .init = atihdmi_init,
         .free = atihdmi_free,
-#ifdef CONFIG_PM
-        .resume = atihdmi_resume,
-#endif
 };
 
 static int patch_atihdmi(struct hda_codec *codec)
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index 3c722e667bc8..2468f3171222 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -427,27 +427,6 @@ static int cmi9880_init(struct hda_codec *codec)
         return 0;
 }
 
-#ifdef CONFIG_PM
-/*
- * resume
- */
-static int cmi9880_resume(struct hda_codec *codec)
-{
-        struct cmi_spec *spec = codec->spec;
-
-        cmi9880_init(codec);
-        snd_hda_resume_ctls(codec, cmi9880_basic_mixer);
-        if (spec->channel_modes)
-                snd_hda_resume_ctls(codec, cmi9880_ch_mode_mixer);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-
-        return 0;
-}
-#endif
-
 /*
  * Analog playback callbacks
  */
@@ -635,9 +614,6 @@ static struct hda_codec_ops cmi9880_patch_ops = {
         .build_pcms = cmi9880_build_pcms,
         .init = cmi9880_init,
         .free = cmi9880_free,
-#ifdef CONFIG_PM
-        .resume = cmi9880_resume,
-#endif
 };
 
 static int patch_cmi9880(struct hda_codec *codec)
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 4d8e8af5c819..080e3001d9c5 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -311,23 +311,6 @@ static void conexant_free(struct hda_codec *codec)
         kfree(codec->spec);
 }
 
-#ifdef CONFIG_PM
-static int conexant_resume(struct hda_codec *codec)
-{
-        struct conexant_spec *spec = codec->spec;
-        int i;
-
-        codec->patch_ops.init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-        return 0;
-}
-#endif
-
 static int conexant_build_controls(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
@@ -358,9 +341,6 @@ static struct hda_codec_ops conexant_patch_ops = {
         .build_pcms = conexant_build_pcms,
         .init = conexant_init,
         .free = conexant_free,
-#ifdef CONFIG_PM
-        .resume = conexant_resume,
-#endif
 };
 
 /*
@@ -368,15 +348,7 @@ static struct hda_codec_ops conexant_patch_ops = {
  * the private value = nid | (invert << 8)
  */
 
-static int cxt_eapd_info(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define cxt_eapd_info           snd_ctl_boolean_mono_info
 
 static int cxt_eapd_get(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
@@ -404,13 +376,13 @@ static int cxt_eapd_put(struct snd_kcontrol *kcontrol,
         eapd = ucontrol->value.integer.value[0];
         if (invert)
                 eapd = !eapd;
-        if (eapd == spec->cur_eapd && !codec->in_resume)
+        if (eapd == spec->cur_eapd)
                 return 0;
         
         spec->cur_eapd = eapd;
-        snd_hda_codec_write(codec, nid,
-                            0, AC_VERB_SET_EAPD_BTLENABLE,
-                            eapd ? 0x02 : 0x00);
+        snd_hda_codec_write_cache(codec, nid,
+                                  0, AC_VERB_SET_EAPD_BTLENABLE,
+                                  eapd ? 0x02 : 0x00);
         return 1;
 }
 
@@ -500,34 +472,25 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         /* toggle internal speakers mute depending of presence of
          * the headphone jack
          */
-        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 
-        bits = spec->cur_eapd ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x11, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         return 1;
 }
 
 /* bind volumes of both NID 0x10 and 0x11 */
-static int cxt5045_hp_master_vol_put(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* toggle input of built-in and mic jack appropriately */
 static void cxt5045_hp_automic(struct hda_codec *codec)
@@ -562,9 +525,9 @@ static void cxt5045_hp_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x11, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; 
-        snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; 
+        snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* unsolicited event for HP jack sensing */
@@ -595,14 +558,7 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
         HDA_CODEC_MUTE("Int Mic Switch", 0x1a, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Ext Mic Volume", 0x1a, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Ext Mic Switch", 0x1a, 0x02, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = cxt5045_hp_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -915,33 +871,24 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         /* toggle internal speakers mute depending of presence of
          * the headphone jack
          */
-        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
-        bits = spec->cur_eapd ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         return 1;
 }
 
 /* bind volumes of both NID 0x13 (Headphones) and 0x1d (Speakers) */
-static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls cxt5047_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* mute internal speaker if HP is plugged */
 static void cxt5047_hp_automute(struct hda_codec *codec)
@@ -952,12 +899,12 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
+        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* mute internal speaker if HP is plugged */
@@ -969,12 +916,12 @@ static void cxt5047_hp2_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = spec->hp_present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = spec->hp_present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
+        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* toggle input of built-in and mic jack appropriately */
@@ -1063,14 +1010,7 @@ static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = cxt5047_hp_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &cxt5047_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 9a47eec5a27b..53b0428abfc2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -102,6 +102,8 @@ enum {
 /* ALC268 models */
 enum {
         ALC268_3ST,
+        ALC268_TOSHIBA,
+        ALC268_ACER,
         ALC268_AUTO,
         ALC268_MODEL_LAST /* last tag */
 };
@@ -129,6 +131,7 @@ enum {
         ALC861VD_6ST_DIG,
         ALC861VD_LENOVO,
         ALC861VD_DALLAS,
+        ALC861VD_HP,
         ALC861VD_AUTO,
         ALC861VD_MODEL_LAST,
 };
@@ -140,6 +143,7 @@ enum {
         ALC662_3ST_6ch,
         ALC662_5ST_DIG,
         ALC662_LENOVO_101E,
+        ALC662_ASUS_EEEPC_P701,
         ALC662_AUTO,
         ALC662_MODEL_LAST,
 };
@@ -152,7 +156,9 @@ enum {
         ALC882_W2JC,
         ALC882_TARGA,
         ALC882_ASUS_A7J,
+        ALC882_ASUS_A7M,
         ALC885_MACPRO,
+        ALC885_MBP3,
         ALC885_IMAC24,
         ALC882_AUTO,
         ALC882_MODEL_LAST,
@@ -167,12 +173,14 @@ enum {
         ALC883_TARGA_DIG,
         ALC883_TARGA_2ch_DIG,
         ALC883_ACER,
+        ALC883_ACER_ASPIRE,
         ALC883_MEDION,
         ALC883_MEDION_MD2,      
         ALC883_LAPTOP_EAPD,
         ALC883_LENOVO_101E_2ch,
         ALC883_LENOVO_NB0763,
-        ALC888_LENOVO_MS7195_DIG,               
+        ALC888_LENOVO_MS7195_DIG,
+        ALC883_HAIER_W66,               
         ALC888_6ST_HP,
         ALC888_3ST_HP,
         ALC883_AUTO,
@@ -239,6 +247,10 @@ struct alc_spec {
         /* for pin sensing */
         unsigned int sense_updated: 1;
         unsigned int jack_present: 1;
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        struct hda_loopback_check loopback;
+#endif
 };
 
 /*
@@ -263,6 +275,9 @@ struct alc_config_preset {
         const struct hda_input_mux *input_mux;
         void (*unsol_event)(struct hda_codec *, unsigned int);
         void (*init_hook)(struct hda_codec *);
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        struct hda_amp_list *loopbacks;
+#endif
 };
 
 
@@ -441,8 +456,9 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
         change = pinctl != alc_pin_mode_values[val];
         if (change) {
                 /* Set pin mode to that requested */
-                snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                    alc_pin_mode_values[val]);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          alc_pin_mode_values[val]);
 
                 /* Also enable the retasking pin's input/output as required 
                  * for the requested pin mode.  Enum values of 2 or less are
@@ -455,19 +471,15 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
                  * this turns out to be necessary in the future.
                  */
                 if (val <= 2) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE,
-                                            AMP_OUT_MUTE);
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE,
-                                            AMP_IN_UNMUTE(0));
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, HDA_AMP_MUTE);
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
+                                                 HDA_AMP_MUTE, 0);
                 } else {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE,
-                                            AMP_IN_MUTE(0));
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_AMP_GAIN_MUTE,
-                                            AMP_OUT_UNMUTE);
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT, 0,
+                                                 HDA_AMP_MUTE, HDA_AMP_MUTE);
+                        snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                                 HDA_AMP_MUTE, 0);
                 }
         }
         return change;
@@ -486,15 +498,7 @@ static int alc_pin_mode_put(struct snd_kcontrol *kcontrol,
  * needed for any "production" models.
  */
 #ifdef CONFIG_SND_DEBUG
-static int alc_gpio_data_info(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define alc_gpio_data_info      snd_ctl_boolean_mono_info
 
 static int alc_gpio_data_get(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
@@ -527,7 +531,8 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
                 gpio_data &= ~mask;
         else
                 gpio_data |= mask;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_GPIO_DATA, gpio_data);
+        snd_hda_codec_write_cache(codec, nid, 0,
+                                  AC_VERB_SET_GPIO_DATA, gpio_data);
 
         return change;
 }
@@ -547,15 +552,7 @@ static int alc_gpio_data_put(struct snd_kcontrol *kcontrol,
  * necessary.
  */
 #ifdef CONFIG_SND_DEBUG
-static int alc_spdif_ctrl_info(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define alc_spdif_ctrl_info     snd_ctl_boolean_mono_info
 
 static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
@@ -588,8 +585,8 @@ static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol,
                 ctrl_data &= ~mask;
         else
                 ctrl_data |= mask;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
-                            ctrl_data);
+        snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
+                                  ctrl_data);
 
         return change;
 }
@@ -638,6 +635,9 @@ static void setup_preset(struct alc_spec *spec,
 
         spec->unsol_event = preset->unsol_event;
         spec->init_hook = preset->init_hook;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = preset->loopbacks;
+#endif
 }
 
 /* Enable GPIO mask and set output */
@@ -662,6 +662,44 @@ static struct hda_verb alc_gpio3_init_verbs[] = {
         { }
 };
 
+static void alc_sku_automute(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int mute;
+        unsigned int present;
+        unsigned int hp_nid = spec->autocfg.hp_pins[0];
+        unsigned int sp_nid = spec->autocfg.speaker_pins[0];
+
+        /* need to execute and sync at first */
+        snd_hda_codec_read(codec, hp_nid, 0, AC_VERB_SET_PIN_SENSE, 0);
+        present = snd_hda_codec_read(codec, hp_nid, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0);
+        spec->jack_present = (present & 0x80000000) != 0;
+        if (spec->jack_present) {
+                /* mute internal speaker */
+                snd_hda_codec_amp_stereo(codec, sp_nid, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
+        } else {
+                /* unmute internal speaker if necessary */
+                mute = snd_hda_codec_amp_read(codec, hp_nid, 0, HDA_OUTPUT, 0);
+                snd_hda_codec_amp_stereo(codec, sp_nid, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
+        }
+}
+
+/* unsolicited event for HP jack sensing */
+static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        if (codec->vendor_id == 0x10ec0880)
+                res >>= 28;
+        else
+                res >>= 26;
+        if (res != ALC880_HP_EVENT)
+                return;
+
+        alc_sku_automute(codec);
+}
+
 /* 32-bit subsystem ID for BIOS loading in HD Audio codec.
  *      31 ~ 16 :       Manufacture ID
  *      15 ~ 8  :       SKU ID
@@ -672,13 +710,48 @@ static void alc_subsystem_id(struct hda_codec *codec,
                              unsigned int porta, unsigned int porte,
                              unsigned int portd)
 {
-        unsigned int ass, tmp;
+        unsigned int ass, tmp, i;
+        unsigned nid;
+        struct alc_spec *spec = codec->spec;
 
-        ass = codec->subsystem_id;
-        if (!(ass & 1))
+        ass = codec->subsystem_id & 0xffff;
+        if ((ass != codec->bus->pci->subsystem_device) && (ass & 1))
+                goto do_sku;
+
+        /*      
+         * 31~30        : port conetcivity
+         * 29~21        : reserve
+         * 20           : PCBEEP input
+         * 19~16        : Check sum (15:1)
+         * 15~1         : Custom
+         * 0            : override
+        */
+        nid = 0x1d;
+        if (codec->vendor_id == 0x10ec0260)
+                nid = 0x17;
+        ass = snd_hda_codec_read(codec, nid, 0,
+                                 AC_VERB_GET_CONFIG_DEFAULT, 0);
+        if (!(ass & 1) && !(ass & 0x100000))
+                return;
+        if ((ass >> 30) != 1)   /* no physical connection */
                 return;
 
-        /* Override */
+        /* check sum */
+        tmp = 0;
+        for (i = 1; i < 16; i++) {
+                if ((ass >> i) && 1)
+                        tmp++;
+        }
+        if (((ass >> 16) & 0xf) != tmp)
+                return;
+do_sku:
+        /*
+         * 0 : override
+         * 1 :  Swap Jack
+         * 2 : 0 --> Desktop, 1 --> Laptop
+         * 3~5 : External Amplifier control
+         * 7~6 : Reserved
+        */
         tmp = (ass & 0x38) >> 3;        /* external Amp control */
         switch (tmp) {
         case 1:
@@ -690,38 +763,108 @@ static void alc_subsystem_id(struct hda_codec *codec,
         case 7:
                 snd_hda_sequence_write(codec, alc_gpio3_init_verbs);
                 break;
-        case 5:
+        case 5: /* set EAPD output high */
                 switch (codec->vendor_id) {
-                case 0x10ec0862:
-                case 0x10ec0660:
-                case 0x10ec0662:        
+                case 0x10ec0260:
+                        snd_hda_codec_write(codec, 0x0f, 0,
+                                            AC_VERB_SET_EAPD_BTLENABLE, 2);
+                        snd_hda_codec_write(codec, 0x10, 0,
+                                            AC_VERB_SET_EAPD_BTLENABLE, 2);
+                        break;
+                case 0x10ec0262:
                 case 0x10ec0267:
                 case 0x10ec0268:
+                case 0x10ec0269:
+                case 0x10ec0862:
+                case 0x10ec0662:        
                         snd_hda_codec_write(codec, 0x14, 0,
                                             AC_VERB_SET_EAPD_BTLENABLE, 2);
                         snd_hda_codec_write(codec, 0x15, 0,
                                             AC_VERB_SET_EAPD_BTLENABLE, 2);
-                        return;
+                        break;
                 }
-        case 6:
-                if (ass & 4) {  /* bit 2 : 0 = Desktop, 1 = Laptop */
-                        hda_nid_t port = 0;
-                        tmp = (ass & 0x1800) >> 11;
-                        switch (tmp) {
-                        case 0: port = porta; break;
-                        case 1: port = porte; break;
-                        case 2: port = portd; break;
-                        }
-                        if (port)
-                                snd_hda_codec_write(codec, port, 0,
-                                                    AC_VERB_SET_EAPD_BTLENABLE,
-                                                    2);
+                switch (codec->vendor_id) {
+                case 0x10ec0260:
+                        snd_hda_codec_write(codec, 0x1a, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7);
+                        tmp = snd_hda_codec_read(codec, 0x1a, 0,
+                                                 AC_VERB_GET_PROC_COEF, 0);
+                        snd_hda_codec_write(codec, 0x1a, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7);
+                        snd_hda_codec_write(codec, 0x1a, 0,
+                                            AC_VERB_SET_PROC_COEF,
+                                            tmp | 0x2010);
+                        break;
+                case 0x10ec0262:
+                case 0x10ec0880:
+                case 0x10ec0882:
+                case 0x10ec0883:
+                case 0x10ec0885:
+                case 0x10ec0888:
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7);
+                        tmp = snd_hda_codec_read(codec, 0x20, 0,
+                                                 AC_VERB_GET_PROC_COEF, 0);
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7); 
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_PROC_COEF,
+                                            tmp | 0x2010);
+                        break;
+                case 0x10ec0267:
+                case 0x10ec0268:
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7);
+                        tmp = snd_hda_codec_read(codec, 0x20, 0,
+                                                 AC_VERB_GET_PROC_COEF, 0);
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_COEF_INDEX, 7); 
+                        snd_hda_codec_write(codec, 0x20, 0,
+                                            AC_VERB_SET_PROC_COEF,
+                                            tmp | 0x3000);
+                        break;
                 }
-                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_COEF_INDEX, 7);
-                snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PROC_COEF,
-                                    (tmp == 5 ? 0x3040 : 0x3050));
+        default:
                 break;
         }
+        
+        /* is laptop and enable the function "Mute internal speaker
+         * when the external headphone out jack is plugged"
+         */
+        if (!(ass & 0x4) || !(ass & 0x8000))
+                return;
+        /*
+         * 10~8 : Jack location
+         * 12~11: Headphone out -> 00: PortA, 01: PortE, 02: PortD, 03: Resvered
+         * 14~13: Resvered
+         * 15   : 1 --> enable the function "Mute internal speaker
+         *              when the external headphone out jack is plugged"
+         */
+        if (!spec->autocfg.speaker_pins[0]) {
+                if (spec->multiout.dac_nids[0])
+                        spec->autocfg.speaker_pins[0] =
+                                spec->multiout.dac_nids[0];
+                else
+                        return;
+        }
+
+        if (!spec->autocfg.hp_pins[0]) {
+                tmp = (ass >> 11) & 0x3;        /* HP to chassis */
+                if (tmp == 0)
+                        spec->autocfg.hp_pins[0] = porta;
+                else if (tmp == 1)
+                        spec->autocfg.hp_pins[0] = porte;
+                else if (tmp == 2)
+                        spec->autocfg.hp_pins[0] = portd;
+                else
+                        return;
+        }
+
+        snd_hda_codec_write(codec, spec->autocfg.hp_pins[0], 0,
+                            AC_VERB_SET_UNSOLICITED_ENABLE,
+                            AC_USRSP_EN | ALC880_HP_EVENT);
+        spec->unsol_event = alc_sku_unsol_event;
+        spec->init_hook = alc_sku_automute;     
 }
 
 /*
@@ -1304,11 +1447,13 @@ static struct hda_verb alc880_volume_init_verbs[] = {
          * panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
 
         /*
          * Set up output mixers (0x0c - 0x0f)
@@ -1568,15 +1713,11 @@ static void alc880_uniwill_hp_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x16, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x16, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* auto-toggle front mic */
@@ -1587,11 +1728,8 @@ static void alc880_uniwill_mic_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x18, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x0b, 0, HDA_INPUT, 1,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x0b, 1, HDA_INPUT, 1,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
 }
 
 static void alc880_uniwill_automute(struct hda_codec *codec)
@@ -1623,11 +1761,8 @@ static void alc880_uniwill_p53_hp_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_INPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_INPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_INPUT, 0, HDA_AMP_MUTE, bits);
 }
 
 static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)
@@ -1635,19 +1770,14 @@ static void alc880_uniwill_p53_dcvol_automute(struct hda_codec *codec)
         unsigned int present;
         
         present = snd_hda_codec_read(codec, 0x21, 0,
-                                     AC_VERB_GET_VOLUME_KNOB_CONTROL, 0) & 0x7f;
-
-        snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
-                                 0x7f, present);
-        snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
-                                 0x7f,  present);
-
-        snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
-                                 0x7f,  present);
-        snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
-                                 0x7f, present);
-
+                                     AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);
+        present &= HDA_AMP_VOLMASK;
+        snd_hda_codec_amp_stereo(codec, 0x0c, HDA_OUTPUT, 0,
+                                 HDA_AMP_VOLMASK, present);
+        snd_hda_codec_amp_stereo(codec, 0x0d, HDA_OUTPUT, 0,
+                                 HDA_AMP_VOLMASK, present);
 }
+
 static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
                                            unsigned int res)
 {
@@ -1868,8 +1998,8 @@ static struct hda_verb alc880_lg_init_verbs[] = {
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         /* mute all amp mixer inputs */
         {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
         /* line-in to input */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -1900,11 +2030,9 @@ static void alc880_lg_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x17, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x17, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -1973,7 +2101,7 @@ static struct hda_verb alc880_lg_lw_init_verbs[] = {
         {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
         /* speaker-out */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -1999,11 +2127,9 @@ static void alc880_lg_lw_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -2015,6 +2141,24 @@ static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc880_lg_lw_automute(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list alc880_loopbacks[] = {
+        { 0x0b, HDA_INPUT, 0 },
+        { 0x0b, HDA_INPUT, 1 },
+        { 0x0b, HDA_INPUT, 2 },
+        { 0x0b, HDA_INPUT, 3 },
+        { 0x0b, HDA_INPUT, 4 },
+        { } /* end */
+};
+
+static struct hda_amp_list alc880_lg_loopbacks[] = {
+        { 0x0b, HDA_INPUT, 1 },
+        { 0x0b, HDA_INPUT, 6 },
+        { 0x0b, HDA_INPUT, 7 },
+        { } /* end */
+};
+#endif
+
 /*
  * Common callbacks
  */
@@ -2041,24 +2185,11 @@ static void alc_unsol_event(struct hda_codec *codec, unsigned int res)
                 spec->unsol_event(codec, res);
 }
 
-#ifdef CONFIG_PM
-/*
- * resume
- */
-static int alc_resume(struct hda_codec *codec)
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int alc_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 {
         struct alc_spec *spec = codec->spec;
-        int i;
-
-        alc_init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-
-        return 0;
+        return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
 }
 #endif
 
@@ -2293,8 +2424,8 @@ static struct hda_codec_ops alc_patch_ops = {
         .init = alc_init,
         .free = alc_free,
         .unsol_event = alc_unsol_event,
-#ifdef CONFIG_PM
-        .resume = alc_resume,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        .check_power_status = alc_check_power_status,
 #endif
 };
 
@@ -2392,11 +2523,14 @@ static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol,
                                      AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
         new_ctl = ctls[ucontrol->value.enumerated.item[0]];
         if (old_ctl != new_ctl) {
-                snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL, new_ctl);
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    (ucontrol->value.enumerated.item[0] >= 3 ?
-                                     0xb080 : 0xb000));
+                int val;
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          new_ctl);
+                val = ucontrol->value.enumerated.item[0] >= 3 ?
+                        HDA_AMP_MUTE : 0;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, val);
                 return 1;
         }
         return 0;
@@ -2439,7 +2573,8 @@ static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol,
         sel = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_CONNECT_SEL, 0) & 3;
         if (ucontrol->value.enumerated.item[0] != sel) {
                 sel = ucontrol->value.enumerated.item[0] & 3;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, sel);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_CONNECT_SEL, sel);
                 return 1;
         }
         return 0;
@@ -2885,6 +3020,7 @@ static struct alc_config_preset alc880_presets[] = {
                                 alc880_beep_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc880_dac_nids),
                 .dac_nids = alc880_dac_nids,
+                .dig_out_nid = ALC880_DIGOUT_NID,
                 .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
                 .channel_mode = alc880_2_jack_modes,
                 .input_mux = &alc880_capture_source,
@@ -2916,6 +3052,9 @@ static struct alc_config_preset alc880_presets[] = {
                 .input_mux = &alc880_lg_capture_source,
                 .unsol_event = alc880_lg_unsol_event,
                 .init_hook = alc880_lg_automute,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+                .loopbacks = alc880_lg_loopbacks,
+#endif
         },
         [ALC880_LG_LW] = {
                 .mixers = { alc880_lg_lw_mixer },
@@ -3399,6 +3538,10 @@ static int patch_alc880(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC880_AUTO)
                 spec->init_hook = alc880_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc880_loopbacks;
+#endif
 
         return 0;
 }
@@ -3747,12 +3890,12 @@ static struct hda_verb alc260_init_verbs[] = {
         /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
          * Line In 2 = 0x03
          */
-        /* mute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-        /* mute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        /* mute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        /* mute analog inputs */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
         /* mute Front out path */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@@ -3797,12 +3940,12 @@ static struct hda_verb alc260_hp_init_verbs[] = {
         /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
          * Line In 2 = 0x03
          */
-        /* unmute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        /* mute analog inputs */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
         /* Unmute Front out path */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
@@ -3847,12 +3990,12 @@ static struct hda_verb alc260_hp_3013_init_verbs[] = {
         /* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &
          * Line In 2 = 0x03
          */
-        /* unmute CD */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x04 << 8))},
-        /* unmute Line In */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x02 << 8))},
-        /* unmute Mic */
-        {0x07,  AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
+        /* mute analog inputs */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
         /* Amp Indexes: DAC = 0x01 & mixer = 0x00 */
         /* Unmute Front out path */
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
@@ -4069,13 +4212,17 @@ static void alc260_replacer_672v_automute(struct hda_codec *codec)
         present = snd_hda_codec_read(codec, 0x0f, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
         if (present) {
-                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 1);
-                snd_hda_codec_write(codec, 0x0f, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
+                snd_hda_codec_write_cache(codec, 0x01, 0,
+                                          AC_VERB_SET_GPIO_DATA, 1);
+                snd_hda_codec_write_cache(codec, 0x0f, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          PIN_HP);
         } else {
-                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);
-                snd_hda_codec_write(codec, 0x0f, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+                snd_hda_codec_write_cache(codec, 0x01, 0,
+                                          AC_VERB_SET_GPIO_DATA, 0);
+                snd_hda_codec_write_cache(codec, 0x0f, 0,
+                                          AC_VERB_SET_PIN_WIDGET_CONTROL,
+                                          PIN_OUT);
         }
 }
 
@@ -4470,11 +4617,12 @@ static struct hda_verb alc260_volume_init_verbs[] = {
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        /* mute analog inputs */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x08 - 0x0a)
@@ -4551,6 +4699,17 @@ static void alc260_auto_init(struct hda_codec *codec)
         alc260_auto_init_analog_input(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list alc260_loopbacks[] = {
+        { 0x07, HDA_INPUT, 0 },
+        { 0x07, HDA_INPUT, 1 },
+        { 0x07, HDA_INPUT, 2 },
+        { 0x07, HDA_INPUT, 3 },
+        { 0x07, HDA_INPUT, 4 },
+        { } /* end */
+};
+#endif
+
 /*
  * ALC260 configurations
  */
@@ -4750,6 +4909,10 @@ static int patch_alc260(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC260_AUTO)
                 spec->init_hook = alc260_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc260_loopbacks;
+#endif
 
         return 0;
 }
@@ -4812,12 +4975,13 @@ static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol,
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
         for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
+                unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
+                                         imux->items[i].index,
+                                         HDA_AMP_MUTE, v);
         }
         *cur_val = idx;
         return 1;
@@ -4879,6 +5043,38 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = {
         { 8, alc882_sixstack_ch8_init },
 };
 
+/*
+ * macbook pro ALC885 can switch LineIn to LineOut without loosing Mic
+ */
+
+/*
+ * 2ch mode
+ */
+static struct hda_verb alc885_mbp_ch2_init[] = {
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        { } /* end */
+};
+
+/*
+ * 6ch mode
+ */
+static struct hda_verb alc885_mbp_ch6_init[] = {
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        { } /* end */
+};
+
+static struct hda_channel_mode alc885_mbp_6ch_modes[2] = {
+        { 2, alc885_mbp_ch2_init },
+        { 6, alc885_mbp_ch6_init },
+};
+
+
 /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17
  *                 Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b
  */
@@ -4909,6 +5105,19 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc885_mbp3_mixer[] = {
+        HDA_CODEC_VOLUME("Master Volume", 0x0c, 0x00, HDA_OUTPUT),
+        HDA_BIND_MUTE   ("Master Switch", 0x0c, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE  ("Speaker Switch", 0x14, 0x00, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Out Volume", 0x0d,0x00, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line In Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE  ("Line In 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 In Boost", 0x1a, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x00, HDA_INPUT),
+        { } /* end */
+};
 static struct snd_kcontrol_new alc882_w2jc_mixer[] = {
         HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
@@ -4934,8 +5143,10 @@ 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("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT),
         { } /* end */
 };
 
@@ -4955,6 +5166,23 @@ 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),
+        { } /* end */
+};
+
+static struct snd_kcontrol_new alc882_asus_a7m_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
         { } /* end */
 };
 
@@ -5119,6 +5347,66 @@ static struct hda_verb alc882_macpro_init_verbs[] = {
         { }
 };
 
+/* Macbook Pro rev3 */
+static struct hda_verb alc885_mbp3_init_verbs[] = {
+        /* Front mixer: unmute input/output amp left and right (volume = 0) */
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* Rear mixer */
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        /* Front Pin: output 0 (0x0c) */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* HP Pin: output 0 (0x0d) */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc4},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        /* Mic (rear) pin: input vref at 80% */
+        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Front Mic pin: input vref at 80% */
+        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+        {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        /* Line In pin: use output 1 when in LineOut mode */
+        {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
+        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01},
+
+        /* FIXME: use matrix-type input source selection */
+        /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
+        /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* Input mixer2 */
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* Input mixer3 */
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        /* ADC1: mute amp left and right */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC2: mute amp left and right */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* ADC3: mute amp left and right */
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        { }
+};
+
 /* iMac 24 mixer. */
 static struct snd_kcontrol_new alc885_imac24_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x00, HDA_OUTPUT),
@@ -5154,14 +5442,10 @@ static void alc885_imac24_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x18, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x18, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
+        snd_hda_codec_amp_stereo(codec, 0x18, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+        snd_hda_codec_amp_stereo(codec, 0x1a, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
 
 /* Processes unsolicited events. */
@@ -5173,6 +5457,27 @@ static void alc885_imac24_unsol_event(struct hda_codec *codec,
                 alc885_imac24_automute(codec);
 }
 
+static void alc885_mbp3_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_codec_read(codec, 0x15, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        snd_hda_codec_amp_stereo(codec, 0x14,  HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE);
+
+}
+static void alc885_mbp3_unsol_event(struct hda_codec *codec,
+                                    unsigned int res)
+{
+        /* Headphone insertion or removal. */
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc885_mbp3_automute(codec);
+}
+
+
 static struct hda_verb alc882_targa_verbs[] = {
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -5198,11 +5503,10 @@ static void alc882_targa_automute(struct hda_codec *codec)
  
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_write(codec, 1, 0, AC_VERB_SET_GPIO_DATA, present ? 1 : 3);
+        snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+        snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
+                                  present ? 1 : 3);
 }
 
 static void alc882_targa_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -5233,6 +5537,24 @@ static struct hda_verb alc882_asus_a7j_verbs[] = {
         { } /* end */
 };
 
+static struct hda_verb alc882_asus_a7m_verbs[] = {
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        {0x16, AC_VERB_SET_CONNECT_SEL, 0x00}, /* Front */
+
+        {0x18, AC_VERB_SET_CONNECT_SEL, 0x02}, /* mic/clfe */
+        {0x1a, AC_VERB_SET_CONNECT_SEL, 0x01}, /* line/surround */
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
+        { } /* end */
+};
+
 static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
 {
         unsigned int gpiostate, gpiomask, gpiodir;
@@ -5265,6 +5587,20 @@ static void alc882_gpio_mute(struct hda_codec *codec, int pin, int muted)
                             AC_VERB_SET_GPIO_DATA, gpiostate);
 }
 
+/* set up GPIO at initialization */
+static void alc885_macpro_init_hook(struct hda_codec *codec)
+{
+        alc882_gpio_mute(codec, 0, 0);
+        alc882_gpio_mute(codec, 1, 0);
+}
+
+/* set up GPIO and update auto-muting at initialization */
+static void alc885_imac24_init_hook(struct hda_codec *codec)
+{
+        alc885_macpro_init_hook(codec);
+        alc885_imac24_automute(codec);
+}
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -5279,17 +5615,17 @@ static struct hda_verb alc882_auto_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x0c - 0x0f)
@@ -5378,6 +5714,10 @@ static struct snd_kcontrol_new alc882_capture_mixer[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define alc882_loopbacks        alc880_loopbacks
+#endif
+
 /* pcm configuration: identiacal with ALC880 */
 #define alc882_pcm_analog_playback      alc880_pcm_analog_playback
 #define alc882_pcm_analog_capture       alc880_pcm_analog_capture
@@ -5392,7 +5732,11 @@ static const char *alc882_models[ALC882_MODEL_LAST] = {
         [ALC882_6ST_DIG]        = "6stack-dig",
         [ALC882_ARIMA]          = "arima",
         [ALC882_W2JC]           = "w2jc",
+        [ALC882_TARGA]          = "targa",
+        [ALC882_ASUS_A7J]       = "asus-a7j",
+        [ALC882_ASUS_A7M]       = "asus-a7m",
         [ALC885_MACPRO]         = "macpro",
+        [ALC885_MBP3]           = "mbp3",
         [ALC885_IMAC24]         = "imac24",
         [ALC882_AUTO]           = "auto",
 };
@@ -5404,6 +5748,8 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8  */
         SND_PCI_QUIRK(0x161f, 0x2054, "Arima W820", ALC882_ARIMA),
         SND_PCI_QUIRK(0x1043, 0x060d, "Asus A7J", ALC882_ASUS_A7J),
+        SND_PCI_QUIRK(0x1043, 0x1243, "Asus A7J", ALC882_ASUS_A7J),
+        SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_ASUS_A7M),
         SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),
         SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
         SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_W2JC),
@@ -5455,6 +5801,20 @@ static struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc882_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
         },
+        [ALC885_MBP3] = {
+                .mixers = { alc885_mbp3_mixer, alc882_chmode_mixer },
+                .init_verbs = { alc885_mbp3_init_verbs,
+                                alc880_gpio1_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .channel_mode = alc885_mbp_6ch_modes,
+                .num_channel_mode = ARRAY_SIZE(alc885_mbp_6ch_modes),
+                .input_mux = &alc882_capture_source,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .dig_in_nid = ALC882_DIGIN_NID,
+                .unsol_event = alc885_mbp3_unsol_event,
+                .init_hook = alc885_mbp3_automute,
+        },
         [ALC885_MACPRO] = {
                 .mixers = { alc882_macpro_mixer },
                 .init_verbs = { alc882_macpro_init_verbs },
@@ -5465,6 +5825,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,
+                .init_hook = alc885_macpro_init_hook,
         },
         [ALC885_IMAC24] = {
                 .mixers = { alc885_imac24_mixer },
@@ -5477,7 +5838,7 @@ static struct alc_config_preset alc882_presets[] = {
                 .channel_mode = alc882_ch_modes,
                 .input_mux = &alc882_capture_source,
                 .unsol_event = alc885_imac24_unsol_event,
-                .init_hook = alc885_imac24_automute,
+                .init_hook = alc885_imac24_init_hook,
         },
         [ALC882_TARGA] = {
                 .mixers = { alc882_targa_mixer, alc882_chmode_mixer,
@@ -5509,6 +5870,19 @@ static struct alc_config_preset alc882_presets[] = {
                 .need_dac_fix = 1,
                 .input_mux = &alc882_capture_source,
         },      
+        [ALC882_ASUS_A7M] = {
+                .mixers = { alc882_asus_a7m_mixer, alc882_chmode_mixer },
+                .init_verbs = { alc882_init_verbs, alc882_eapd_verbs,
+                                alc880_gpio1_init_verbs,
+                                alc882_asus_a7m_verbs },
+                .num_dacs = ARRAY_SIZE(alc882_dac_nids),
+                .dac_nids = alc882_dac_nids,
+                .dig_out_nid = ALC882_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
+                .channel_mode = alc880_threestack_modes,
+                .need_dac_fix = 1,
+                .input_mux = &alc882_capture_source,
+        },      
 };
 
 
@@ -5608,6 +5982,32 @@ static void alc882_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+/* add mic boosts if needed */
+static int alc_auto_add_mic_boost(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err;
+        hda_nid_t nid;
+
+        nid = spec->autocfg.input_pins[AUTO_PIN_MIC];
+        if (nid) {
+                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) {
+                err = add_control(spec, ALC_CTL_WIDGET_VOL,
+                                  "Front Mic Boost",
+                                  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
 /* almost identical with ALC880 parser... */
 static int alc882_parse_auto_config(struct hda_codec *codec)
 {
@@ -5616,10 +6016,17 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
 
         if (err < 0)
                 return err;
-        else if (err > 0)
-                /* hack - override the init verbs */
-                spec->init_verbs[0] = alc882_auto_init_verbs;
-        return err;
+        else if (!err)
+                return 0; /* no config found */
+
+        err = alc_auto_add_mic_boost(codec);
+        if (err < 0)
+                return err;
+
+        /* hack - override the init verbs */
+        spec->init_verbs[0] = alc882_auto_init_verbs;
+
+        return 1; /* config found */
 }
 
 /* additional initialization for auto-configuration model */
@@ -5654,6 +6061,9 @@ static int patch_alc882(struct hda_codec *codec)
                 case 0x106b1000: /* iMac 24 */
                         board_config = ALC885_IMAC24;
                         break;
+                case 0x106b2c00: /* Macbook Pro rev3 */
+                        board_config = ALC885_MBP3;
+                        break;
                 default:
                         printk(KERN_INFO "hda_codec: Unknown model for ALC882, "
                                          "trying auto-probe from BIOS...\n");
@@ -5680,11 +6090,6 @@ static int patch_alc882(struct hda_codec *codec)
         if (board_config != ALC882_AUTO)
                 setup_preset(spec, &alc882_presets[board_config]);
 
-        if (board_config == ALC885_MACPRO || board_config == ALC885_IMAC24) {
-                alc882_gpio_mute(codec, 0, 0);
-                alc882_gpio_mute(codec, 1, 0);
-        }
-
         spec->stream_name_analog = "ALC882 Analog";
         spec->stream_analog_playback = &alc882_pcm_analog_playback;
         spec->stream_analog_capture = &alc882_pcm_analog_capture;
@@ -5715,6 +6120,10 @@ static int patch_alc882(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC882_AUTO)
                 spec->init_hook = alc882_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc882_loopbacks;
+#endif
 
         return 0;
 }
@@ -5792,12 +6201,13 @@ static int alc883_mux_enum_put(struct snd_kcontrol *kcontrol,
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
         for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
+                unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
+                                         imux->items[i].index,
+                                         HDA_AMP_MUTE, v);
         }
         *cur_val = idx;
         return 1;
@@ -5822,6 +6232,18 @@ static struct hda_verb alc883_3ST_ch2_init[] = {
 };
 
 /*
+ * 4ch mode
+ */
+static struct hda_verb alc883_3ST_ch4_init[] = {
+        { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+        { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
+        { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
+        { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE },
+        { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 },
+        { } /* end */
+};
+
+/*
  * 6ch mode
  */
 static struct hda_verb alc883_3ST_ch6_init[] = {
@@ -5834,8 +6256,9 @@ static struct hda_verb alc883_3ST_ch6_init[] = {
         { } /* end */
 };
 
-static struct hda_channel_mode alc883_3ST_6ch_modes[2] = {
+static struct hda_channel_mode alc883_3ST_6ch_modes[3] = {
         { 2, alc883_3ST_ch2_init },
+        { 4, alc883_3ST_ch4_init },
         { 6, alc883_3ST_ch6_init },
 };
 
@@ -6235,6 +6658,31 @@ static struct snd_kcontrol_new alc888_3st_hp_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                /* .name = "Capture Source", */
+                .name = "Input Source",
+                .count = 2,
+                .info = alc883_mux_enum_info,
+                .get = alc883_mux_enum_get,
+                .put = alc883_mux_enum_put,
+        },
+        { } /* end */
+};
+
 static struct snd_kcontrol_new alc883_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -6270,11 +6718,12 @@ static struct hda_verb alc883_init_verbs[] = {
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
 
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        /* mute analog input loopbacks */
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /* Front Pin: output 0 (0x0c) */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -6366,6 +6815,19 @@ static struct hda_verb alc888_lenovo_ms7195_verbs[] = {
         { } /* end */
 };
 
+static struct hda_verb alc883_haier_w66_verbs[] = {
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+        {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        { } /* end */
+};
+
 static struct hda_verb alc888_6st_hp_verbs[] = {
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},  /* Front: output 0 (0x0c) */
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x02},  /* Rear : output 2 (0x0e) */
@@ -6409,15 +6871,10 @@ static void alc888_lenovo_ms7195_front_automute(struct hda_codec *codec)
  
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        
+        snd_hda_codec_amp_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 */
@@ -6427,12 +6884,10 @@ static void alc888_lenovo_ms7195_rca_automute(struct hda_codec *codec)
  
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
+
 static void alc883_lenovo_ms7195_unsol_event(struct hda_codec *codec,
                                              unsigned int res)
 {
@@ -6459,10 +6914,8 @@ static void alc883_medion_md2_automute(struct hda_codec *codec)
  
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
 
 static void alc883_medion_md2_unsol_event(struct hda_codec *codec,
@@ -6480,13 +6933,11 @@ static void alc883_tagra_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_write(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
-                            present ? 1 : 3);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        snd_hda_codec_write_cache(codec, 1, 0, AC_VERB_SET_GPIO_DATA,
+                                  present ? 1 : 3);
 }
 
 static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -6495,6 +6946,25 @@ static void alc883_tagra_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc883_tagra_automute(codec);
 }
 
+static void alc883_haier_w66_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+        unsigned char bits;
+
+        present = snd_hda_codec_read(codec, 0x1b, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        bits = present ? 0x80 : 0;
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 0x80, bits);
+}
+
+static void alc883_haier_w66_unsol_event(struct hda_codec *codec,
+                                         unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc883_haier_w66_automute(codec);
+}
+
 static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
 {
         unsigned int present;
@@ -6502,11 +6972,9 @@ static void alc883_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc883_lenovo_101e_all_automute(struct hda_codec *codec)
@@ -6516,15 +6984,11 @@ static void alc883_lenovo_101e_all_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec,
@@ -6536,6 +7000,44 @@ static void alc883_lenovo_101e_unsol_event(struct hda_codec *codec,
                 alc883_lenovo_101e_ispeaker_automute(codec);
 }
 
+/* toggle speaker-output according to the hp-jack state */
+static void alc883_acer_aspire_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+ 
+        present = snd_hda_codec_read(codec, 0x14, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+        snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+}
+
+static void alc883_acer_aspire_unsol_event(struct hda_codec *codec,
+                                           unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc883_acer_aspire_automute(codec);
+}
+
+static struct hda_verb alc883_acer_eapd_verbs[] = {
+        /* HP Pin: output 0 (0x0c) */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* Front Pin: output 0 (0x0c) */
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
+        /* eanable EAPD on medion laptop */
+        {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
+        {0x20, AC_VERB_SET_PROC_COEF, 0x3050},
+        /* enable unsolicited event */
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        { }
+};
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -6548,17 +7050,17 @@ static struct hda_verb alc883_auto_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x0c - 0x0f)
@@ -6621,6 +7123,10 @@ static struct snd_kcontrol_new alc883_capture_mixer[] = {
         { } /* end */
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define alc883_loopbacks        alc880_loopbacks
+#endif
+
 /* pcm configuration: identiacal with ALC880 */
 #define alc883_pcm_analog_playback      alc880_pcm_analog_playback
 #define alc883_pcm_analog_capture       alc880_pcm_analog_capture
@@ -6638,12 +7144,14 @@ static const char *alc883_models[ALC883_MODEL_LAST] = {
         [ALC883_TARGA_DIG]      = "targa-dig",
         [ALC883_TARGA_2ch_DIG]  = "targa-2ch-dig",
         [ALC883_ACER]           = "acer",
+        [ALC883_ACER_ASPIRE]    = "acer-aspire",
         [ALC883_MEDION]         = "medion",
         [ALC883_MEDION_MD2]     = "medion-md2",
         [ALC883_LAPTOP_EAPD]    = "laptop-eapd",
         [ALC883_LENOVO_101E_2ch] = "lenovo-101e",
         [ALC883_LENOVO_NB0763]  = "lenovo-nb0763",
         [ALC888_LENOVO_MS7195_DIG] = "lenovo-ms7195-dig",
+        [ALC883_HAIER_W66]      = "haier-w66",
         [ALC888_6ST_HP]         = "6stack-hp",
         [ALC888_3ST_HP]         = "3stack-hp",
         [ALC883_AUTO]           = "auto",
@@ -6669,10 +7177,14 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1462, 0x3fcc, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x3fc1, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x3fc3, "MSI", ALC883_TARGA_DIG),
+        SND_PCI_QUIRK(0x1462, 0x3fdf, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG),
         SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),
+        SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_ACER_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE),
+        SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER),
         SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
@@ -6685,6 +7197,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
         SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),
+        SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
+        SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),
+        SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG),
+        SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG),
         {}
 };
 
@@ -6771,8 +7287,7 @@ static struct alc_config_preset alc883_presets[] = {
                 .init_hook = alc883_tagra_automute,
         },
         [ALC883_ACER] = {
-                .mixers = { alc883_base_mixer,
-                            alc883_chmode_mixer },
+                .mixers = { alc883_base_mixer },
                 /* On TravelMate laptops, GPIO 0 enables the internal speaker
                  * and the headphone jack.  Turn this on and rely on the
                  * standard mute methods whenever the user wants to turn
@@ -6787,6 +7302,20 @@ static struct alc_config_preset alc883_presets[] = {
                 .channel_mode = alc883_3ST_2ch_modes,
                 .input_mux = &alc883_capture_source,
         },
+        [ALC883_ACER_ASPIRE] = {
+                .mixers = { alc883_acer_aspire_mixer },
+                .init_verbs = { alc883_init_verbs, alc883_acer_eapd_verbs },
+                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+                .dac_nids = alc883_dac_nids,
+                .dig_out_nid = ALC883_DIGOUT_NID,
+                .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+                .adc_nids = alc883_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+                .channel_mode = alc883_3ST_2ch_modes,
+                .input_mux = &alc883_capture_source,
+                .unsol_event = alc883_acer_aspire_unsol_event,
+                .init_hook = alc883_acer_aspire_automute,
+        },
         [ALC883_MEDION] = {
                 .mixers = { alc883_fivestack_mixer,
                             alc883_chmode_mixer },
@@ -6815,8 +7344,7 @@ static struct alc_config_preset alc883_presets[] = {
                 .init_hook = alc883_medion_md2_automute,
         },      
         [ALC883_LAPTOP_EAPD] = {
-                .mixers = { alc883_base_mixer,
-                            alc883_chmode_mixer },
+                .mixers = { alc883_base_mixer },
                 .init_verbs = { alc883_init_verbs, alc882_eapd_verbs },
                 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
                 .dac_nids = alc883_dac_nids,
@@ -6867,6 +7395,20 @@ static struct alc_config_preset alc883_presets[] = {
                 .input_mux = &alc883_capture_source,
                 .unsol_event = alc883_lenovo_ms7195_unsol_event,
                 .init_hook = alc888_lenovo_ms7195_front_automute,
+        },
+        [ALC883_HAIER_W66] = {
+                .mixers = { alc883_tagra_2ch_mixer},
+                .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs},
+                .num_dacs = ARRAY_SIZE(alc883_dac_nids),
+                .dac_nids = alc883_dac_nids,
+                .dig_out_nid = ALC883_DIGOUT_NID,
+                .num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
+                .adc_nids = alc883_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+                .channel_mode = alc883_3ST_2ch_modes,
+                .input_mux = &alc883_capture_source,
+                .unsol_event = alc883_haier_w66_unsol_event,
+                .init_hook = alc883_haier_w66_automute,
         },      
         [ALC888_6ST_HP] = {
                 .mixers = { alc888_6st_hp_mixer, alc883_chmode_mixer },
@@ -6977,12 +7519,19 @@ static int alc883_parse_auto_config(struct hda_codec *codec)
 
         if (err < 0)
                 return err;
-        else if (err > 0)
-                /* hack - override the init verbs */
-                spec->init_verbs[0] = alc883_auto_init_verbs;
+        else if (!err)
+                return 0; /* no config found */
+
+        err = alc_auto_add_mic_boost(codec);
+        if (err < 0)
+                return err;
+
+        /* hack - override the init verbs */
+        spec->init_verbs[0] = alc883_auto_init_verbs;
         spec->mixers[spec->num_mixers] = alc883_capture_mixer;
         spec->num_mixers++;
-        return err;
+
+        return 1; /* config found */
 }
 
 /* additional initialization for auto-configuration model */
@@ -7046,6 +7595,10 @@ static int patch_alc883(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC883_AUTO)
                 spec->init_hook = alc883_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc883_loopbacks;
+#endif
 
         return 0;
 }
@@ -7156,9 +7709,46 @@ static struct snd_kcontrol_new alc262_HP_BPC_WildWest_option_mixer[] = {
         { } /* end */
 };
 
+/* bind hp and internal speaker mute (with plug check) */
+static int alc262_sony_master_sw_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        long *valp = ucontrol->value.integer.value;
+        int change;
+
+        /* change hp mute */
+        change = snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
+                                          HDA_AMP_MUTE,
+                                          valp[0] ? 0 : HDA_AMP_MUTE);
+        change |= snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
+                                           HDA_AMP_MUTE,
+                                           valp[1] ? 0 : HDA_AMP_MUTE);
+        if (change) {
+                /* change speaker according to HP jack state */
+                struct alc_spec *spec = codec->spec;
+                unsigned int mute;
+                if (spec->jack_present)
+                        mute = HDA_AMP_MUTE;
+                else
+                        mute = snd_hda_codec_amp_read(codec, 0x15, 0,
+                                                      HDA_OUTPUT, 0);
+                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
+        }
+        return change;
+}
+
 static struct snd_kcontrol_new alc262_sony_mixer[] = {
-        HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Front Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Switch",
+                .info = snd_hda_mixer_amp_switch_info,
+                .get = snd_hda_mixer_amp_switch_get,
+                .put = alc262_sony_master_sw_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),
+        },
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
@@ -7194,17 +7784,17 @@ static struct hda_verb alc262_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x0c - 0x0e)
@@ -7285,34 +7875,26 @@ static struct hda_verb alc262_sony_unsol_verbs[] = {
 };
 
 /* mute/unmute internal speaker according to the hp jack and mute state */
-static void alc262_hippo_automute(struct hda_codec *codec, int force)
+static void alc262_hippo_automute(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         unsigned int mute;
+        unsigned int present;
 
-        if (force || !spec->sense_updated) {
-                unsigned int present;
-                /* need to execute and sync at first */
-                snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0);
-                present = snd_hda_codec_read(codec, 0x15, 0,
-                                         AC_VERB_GET_PIN_SENSE, 0);
-                spec->jack_present = (present & 0x80000000) != 0;
-                spec->sense_updated = 1;
-        }
+        /* need to execute and sync at first */
+        snd_hda_codec_read(codec, 0x15, 0, AC_VERB_SET_PIN_SENSE, 0);
+        present = snd_hda_codec_read(codec, 0x15, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0);
+        spec->jack_present = (present & 0x80000000) != 0;
         if (spec->jack_present) {
                 /* mute internal speaker */
-                snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
-                snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
         } else {
                 /* unmute internal speaker if necessary */
                 mute = snd_hda_codec_amp_read(codec, 0x15, 0, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
-                mute = snd_hda_codec_amp_read(codec, 0x15, 1, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
         }
 }
 
@@ -7322,37 +7904,27 @@ static void alc262_hippo_unsol_event(struct hda_codec *codec,
 {
         if ((res >> 26) != ALC880_HP_EVENT)
                 return;
-        alc262_hippo_automute(codec, 1);
+        alc262_hippo_automute(codec);
 }
 
-static void alc262_hippo1_automute(struct hda_codec *codec, int force)
+static void alc262_hippo1_automute(struct hda_codec *codec)
 {
-        struct alc_spec *spec = codec->spec;
         unsigned int mute;
+        unsigned int present;
 
-        if (force || !spec->sense_updated) {
-                unsigned int present;
-                /* need to execute and sync at first */
-                snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
-                present = snd_hda_codec_read(codec, 0x1b, 0,
-                                         AC_VERB_GET_PIN_SENSE, 0);
-                spec->jack_present = (present & 0x80000000) != 0;
-                spec->sense_updated = 1;
-        }
-        if (spec->jack_present) {
+        snd_hda_codec_read(codec, 0x1b, 0, AC_VERB_SET_PIN_SENSE, 0);
+        present = snd_hda_codec_read(codec, 0x1b, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0);
+        present = (present & 0x80000000) != 0;
+        if (present) {
                 /* mute internal speaker */
-                snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
-                snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
         } else {
                 /* unmute internal speaker if necessary */
                 mute = snd_hda_codec_amp_read(codec, 0x1b, 0, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
-                mute = snd_hda_codec_amp_read(codec, 0x1b, 1, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
         }
 }
 
@@ -7362,7 +7934,7 @@ static void alc262_hippo1_unsol_event(struct hda_codec *codec,
 {
         if ((res >> 26) != ALC880_HP_EVENT)
                 return;
-        alc262_hippo1_automute(codec, 1);
+        alc262_hippo1_automute(codec);
 }
 
 /*
@@ -7379,9 +7951,10 @@ static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
 };
 
 static struct hda_input_mux alc262_fujitsu_capture_source = {
-        .num_items = 2,
+        .num_items = 3,
         .items = {
                 { "Mic", 0x0 },
+                { "Int Mic", 0x1 },
                 { "CD", 0x4 },
         },
 };
@@ -7390,13 +7963,23 @@ static struct hda_input_mux alc262_HP_capture_source = {
         .num_items = 5,
         .items = {
                 { "Mic", 0x0 },
-                { "Front Mic", 0x3 },
+                { "Front Mic", 0x1 },
                 { "Line", 0x2 },
                 { "CD", 0x4 },
                 { "AUX IN", 0x6 },
         },
 };
 
+static struct hda_input_mux alc262_HP_D7000_capture_source = {
+        .num_items = 4,
+        .items = {
+                { "Mic", 0x0 },
+                { "Front Mic", 0x2 },
+                { "Line", 0x1 },
+                { "CD", 0x4 },
+        },
+};
+
 /* mute/unmute internal speaker according to the hp jack and mute state */
 static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
 {
@@ -7414,18 +7997,13 @@ static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
         }
         if (spec->jack_present) {
                 /* mute internal speaker */
-                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
-                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                         0x80, 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, HDA_AMP_MUTE);
         } else {
                 /* unmute internal speaker if necessary */
                 mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
-                mute = snd_hda_codec_amp_read(codec, 0x14, 1, HDA_OUTPUT, 0);
-                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                         0x80, mute & 0x80);
+                snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                         HDA_AMP_MUTE, mute);
         }
 }
 
@@ -7439,23 +8017,14 @@ static void alc262_fujitsu_unsol_event(struct hda_codec *codec,
 }
 
 /* bind volumes of both NID 0x0c and 0x0d */
-static int alc262_fujitsu_master_vol_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls alc262_fujitsu_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x0d, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* bind hp and internal speaker mute (with plug check) */
 static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
@@ -7466,24 +8035,18 @@ static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
         int change;
 
         change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                          0x80, valp[0] ? 0 : 0x80);
+                                          HDA_AMP_MUTE,
+                                          valp[0] ? 0 : HDA_AMP_MUTE);
         change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                           0x80, valp[1] ? 0 : 0x80);
-        if (change || codec->in_resume)
-                alc262_fujitsu_automute(codec, codec->in_resume);
+                                           HDA_AMP_MUTE,
+                                           valp[1] ? 0 : HDA_AMP_MUTE);
+        if (change)
+                alc262_fujitsu_automute(codec, 0);
         return change;
 }
 
 static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = alc262_fujitsu_master_vol_put,
-                .tlv = { .c = snd_hda_mixer_amp_tlv },
-                .private_value = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -7497,6 +8060,9 @@ static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
         HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         { } /* end */
 };
 
@@ -7611,17 +8177,17 @@ static struct hda_verb alc262_volume_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x0c - 0x0f)
@@ -7672,19 +8238,19 @@ static struct hda_verb alc262_HP_BPC_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for
          * front panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
         
         /*
          * Set up output mixers (0x0c - 0x0e)
@@ -7759,20 +8325,20 @@ static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          * Note: PASD motherboards uses the Line In 2 as the input for front
          * panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)},
         /*
          * Set up output mixers (0x0c - 0x0e)
          */
@@ -7842,6 +8408,10 @@ static struct hda_verb alc262_HP_BPC_WildWest_init_verbs[] = {
         { }
 };
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define alc262_loopbacks        alc880_loopbacks
+#endif
+
 /* pcm configuration: identiacal with ALC880 */
 #define alc262_pcm_analog_playback      alc880_pcm_analog_playback
 #define alc262_pcm_analog_capture       alc880_pcm_analog_capture
@@ -7884,6 +8454,10 @@ static int alc262_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux;
 
+        err = alc_auto_add_mic_boost(codec);
+        if (err < 0)
+                return err;
+
         return 1;
 }
 
@@ -7939,6 +8513,7 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17ff, 0x058f, "Benq Hippo", ALC262_HIPPO_1),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
         SND_PCI_QUIRK(0x17ff, 0x058d, "Benq T31-16", ALC262_BENQ_T31),
+        SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD),
         SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
@@ -7967,6 +8542,7 @@ static struct alc_config_preset alc262_presets[] = {
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
                 .unsol_event = alc262_hippo_unsol_event,
+                .init_hook = alc262_hippo_automute,
         },
         [ALC262_HIPPO_1] = {
                 .mixers = { alc262_hippo1_mixer },
@@ -7979,10 +8555,12 @@ static struct alc_config_preset alc262_presets[] = {
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
                 .unsol_event = alc262_hippo1_unsol_event,
+                .init_hook = alc262_hippo1_automute,
         },
         [ALC262_FUJITSU] = {
                 .mixers = { alc262_fujitsu_mixer },
-                .init_verbs = { alc262_init_verbs, alc262_fujitsu_unsol_verbs },
+                .init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,
+                                alc262_fujitsu_unsol_verbs },
                 .num_dacs = ARRAY_SIZE(alc262_dac_nids),
                 .dac_nids = alc262_dac_nids,
                 .hp_nid = 0x03,
@@ -8010,7 +8588,7 @@ static struct alc_config_preset alc262_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
-                .input_mux = &alc262_HP_capture_source,
+                .input_mux = &alc262_HP_D7000_capture_source,
         },
         [ALC262_HP_BPC_D7000_WL] = {
                 .mixers = { alc262_HP_BPC_WildWest_mixer,
@@ -8021,7 +8599,7 @@ static struct alc_config_preset alc262_presets[] = {
                 .hp_nid = 0x03,
                 .num_channel_mode = ARRAY_SIZE(alc262_modes),
                 .channel_mode = alc262_modes,
-                .input_mux = &alc262_HP_capture_source,
+                .input_mux = &alc262_HP_D7000_capture_source,
         },
         [ALC262_BENQ_ED8] = {
                 .mixers = { alc262_base_mixer },
@@ -8043,6 +8621,7 @@ static struct alc_config_preset alc262_presets[] = {
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
                 .unsol_event = alc262_hippo_unsol_event,
+                .init_hook = alc262_hippo_automute,
         },
         [ALC262_BENQ_T31] = {
                 .mixers = { alc262_benq_t31_mixer },
@@ -8054,6 +8633,7 @@ static struct alc_config_preset alc262_presets[] = {
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
                 .unsol_event = alc262_hippo_unsol_event,
+                .init_hook = alc262_hippo_automute,
         },      
 };
 
@@ -8139,6 +8719,10 @@ static int patch_alc262(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC262_AUTO)
                 spec->init_hook = alc262_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc262_loopbacks;
+#endif
                 
         return 0;
 }
@@ -8170,9 +8754,125 @@ static struct snd_kcontrol_new alc268_base_mixer[] = {
         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),
+        { }
+};
+
+static struct hda_verb alc268_eapd_verbs[] = {
+        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
+        {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
+        { }
+};
+
+/* Toshiba specific */
+#define alc268_toshiba_automute alc262_hippo_automute
+
+static struct hda_verb alc268_toshiba_verbs[] = {
+        {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        { } /* end */
+};
+
+/* Acer specific */
+/* bind volumes of both NID 0x02 and 0x03 */
+static struct hda_bind_ctls alc268_acer_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
+
+/* mute/unmute internal speaker according to the hp jack and mute state */
+static void alc268_acer_automute(struct hda_codec *codec, int force)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int mute;
+
+        if (force || !spec->sense_updated) {
+                unsigned int present;
+                present = snd_hda_codec_read(codec, 0x14, 0,
+                                         AC_VERB_GET_PIN_SENSE, 0);
+                spec->jack_present = (present & 0x80000000) != 0;
+                spec->sense_updated = 1;
+        }
+        if (spec->jack_present)
+                mute = HDA_AMP_MUTE; /* mute internal speaker */
+        else /* unmute internal speaker if necessary */
+                mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
+        snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, mute);
+}
+
+
+/* bind hp and internal speaker mute (with plug check) */
+static int alc268_acer_master_sw_put(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        long *valp = ucontrol->value.integer.value;
+        int change;
+
+        change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
+                                          HDA_AMP_MUTE,
+                                          valp[0] ? 0 : HDA_AMP_MUTE);
+        change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
+                                           HDA_AMP_MUTE,
+                                           valp[1] ? 0 : HDA_AMP_MUTE);
+        if (change)
+                alc268_acer_automute(codec, 0);
+        return change;
+}
+
+static struct snd_kcontrol_new alc268_acer_mixer[] = {
+        /* output mixer control */
+        HDA_BIND_VOL("Master Playback Volume", &alc268_acer_bind_master_vol),
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Switch",
+                .info = snd_hda_mixer_amp_switch_info,
+                .get = snd_hda_mixer_amp_switch_get,
+                .put = alc268_acer_master_sw_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+        },
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Line In Boost", 0x1a, 0, HDA_INPUT),
         { }
 };
 
+static struct hda_verb alc268_acer_verbs[] = {
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN},
+        { }
+};
+
+/* unsolicited event for HP jack sensing */
+static void alc268_toshiba_unsol_event(struct hda_codec *codec,
+                                       unsigned int res)
+{
+        if ((res >> 26) != ALC880_HP_EVENT)
+                return;
+        alc268_toshiba_automute(codec);
+}
+
+static void alc268_acer_unsol_event(struct hda_codec *codec,
+                                       unsigned int res)
+{
+        if ((res >> 26) != ALC880_HP_EVENT)
+                return;
+        alc268_acer_automute(codec, 1);
+}
+
+static void alc268_acer_init_hook(struct hda_codec *codec)
+{
+        alc268_acer_automute(codec, 1);
+}
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -8282,14 +8982,16 @@ static int alc268_mux_enum_put(struct snd_kcontrol *kcontrol,
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
         for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL,
-                                    idx );
+                unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
+                                         imux->items[i].index,
+                                         HDA_AMP_MUTE, v);
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_CONNECT_SEL,
+                                          idx );
         }
         *cur_val = idx;
         return 1;
@@ -8530,6 +9232,10 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux;
 
+        err = alc_auto_add_mic_boost(codec);
+        if (err < 0)
+                return err;
+
         return 1;
 }
 
@@ -8551,11 +9257,19 @@ static void alc268_auto_init(struct hda_codec *codec)
  */
 static const char *alc268_models[ALC268_MODEL_LAST] = {
         [ALC268_3ST]            = "3stack",
+        [ALC268_TOSHIBA]        = "toshiba",
+        [ALC268_ACER]           = "acer",
         [ALC268_AUTO]           = "auto",
 };
 
 static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
+        SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
+        SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),
+        SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
+        SND_PCI_QUIRK(0x1025, 0x0126, "Acer", ALC268_ACER),
+        SND_PCI_QUIRK(0x1025, 0x0130, "Acer Extensa 5210", ALC268_ACER),
+        SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),
         {}
 };
 
@@ -8573,6 +9287,37 @@ static struct alc_config_preset alc268_presets[] = {
                 .channel_mode = alc268_modes,
                 .input_mux = &alc268_capture_source,
         },
+        [ALC268_TOSHIBA] = {
+                .mixers = { alc268_base_mixer, alc268_capture_alt_mixer },
+                .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
+                                alc268_toshiba_verbs },
+                .num_dacs = ARRAY_SIZE(alc268_dac_nids),
+                .dac_nids = alc268_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
+                .adc_nids = alc268_adc_nids_alt,
+                .hp_nid = 0x03,
+                .num_channel_mode = ARRAY_SIZE(alc268_modes),
+                .channel_mode = alc268_modes,
+                .input_mux = &alc268_capture_source,
+                .input_mux = &alc268_capture_source,
+                .unsol_event = alc268_toshiba_unsol_event,
+                .init_hook = alc268_toshiba_automute,
+        },
+        [ALC268_ACER] = {
+                .mixers = { alc268_acer_mixer, alc268_capture_alt_mixer },
+                .init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
+                                alc268_acer_verbs },
+                .num_dacs = ARRAY_SIZE(alc268_dac_nids),
+                .dac_nids = alc268_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),
+                .adc_nids = alc268_adc_nids_alt,
+                .hp_nid = 0x02,
+                .num_channel_mode = ARRAY_SIZE(alc268_modes),
+                .channel_mode = alc268_modes,
+                .input_mux = &alc268_capture_source,
+                .unsol_event = alc268_acer_unsol_event,
+                .init_hook = alc268_acer_init_hook,
+        },
 };
 
 static int patch_alc268(struct hda_codec *codec)
@@ -9279,14 +10024,10 @@ static void alc861_toshiba_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x0f, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x16, 0, HDA_INPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x16, 1, HDA_INPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_INPUT, 3,
-                                 0x80, present ? 0 : 0x80);
-        snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_INPUT, 3,
-                                 0x80, present ? 0 : 0x80);
+        snd_hda_codec_amp_stereo(codec, 0x16, HDA_INPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
+        snd_hda_codec_amp_stereo(codec, 0x1a, HDA_INPUT, 3,
+                                 HDA_AMP_MUTE, present ? 0 : HDA_AMP_MUTE);
 }
 
 static void alc861_toshiba_unsol_event(struct hda_codec *codec,
@@ -9599,6 +10340,16 @@ static void alc861_auto_init(struct hda_codec *codec)
         alc861_auto_init_analog_input(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list alc861_loopbacks[] = {
+        { 0x15, HDA_INPUT, 0 },
+        { 0x15, HDA_INPUT, 1 },
+        { 0x15, HDA_INPUT, 2 },
+        { 0x15, HDA_INPUT, 3 },
+        { } /* end */
+};
+#endif
+
 
 /*
  * configuration and preset
@@ -9796,6 +10547,10 @@ static int patch_alc861(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC861_AUTO)
                 spec->init_hook = alc861_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc861_loopbacks;
+#endif
                 
         return 0;
 }
@@ -9852,6 +10607,14 @@ static struct hda_input_mux alc861vd_dallas_capture_source = {
         },
 };
 
+static struct hda_input_mux alc861vd_hp_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "Front Mic", 0x0 },
+                { "ATAPI Mic", 0x1 },
+        },
+};
+
 #define alc861vd_mux_enum_info alc_mux_enum_info
 #define alc861vd_mux_enum_get alc_mux_enum_get
 
@@ -9870,12 +10633,13 @@ static int alc861vd_mux_enum_put(struct snd_kcontrol *kcontrol,
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
         for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
+                unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
+                                         imux->items[i].index,
+                                         HDA_AMP_MUTE, v);
         }
         *cur_val = idx;
         return 1;
@@ -10049,17 +10813,22 @@ static struct snd_kcontrol_new alc861vd_dallas_mixer[] = {
         HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
         HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x05, HDA_INPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                /* .name = "Capture Source", */
-                .name = "Input Source",
-                .count = 1,
-                .info = alc882_mux_enum_info,
-                .get = alc882_mux_enum_get,
-                .put = alc882_mux_enum_put,
-        },
+        { } /* end */
+};
+
+/* Pin assignment: Speaker=0x14, Line-out = 0x15,
+ *                 Front Mic=0x18, ATAPI Mic = 0x19,
+ */
+static struct snd_kcontrol_new alc861vd_hp_mixer[] = {
+        HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Headphone Playback Switch", 0x0d, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME("ATAPI Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("ATAPI Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        
         { } /* end */
 };
 
@@ -10077,11 +10846,11 @@ static struct hda_verb alc861vd_volume_init_verbs[] = {
          * the analog-loopback mixer widget
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /* Capture mixer: unmute Mic, F-Mic, Line, CD inputs */
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -10210,11 +10979,9 @@ static void alc861vd_lenovo_hp_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc861vd_lenovo_mic_automute(struct hda_codec *codec)
@@ -10224,11 +10991,9 @@ static void alc861vd_lenovo_mic_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x18, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x0b, 0, HDA_INPUT, 1,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x0b, 1, HDA_INPUT, 1,
-                                 0x80, bits);
+        bits = present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1,
+                                 HDA_AMP_MUTE, bits);
 }
 
 static void alc861vd_lenovo_automute(struct hda_codec *codec)
@@ -10302,10 +11067,8 @@ static void alc861vd_dallas_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x15, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, present ? 0x80 : 0);
+        snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0);
 }
 
 static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int res)
@@ -10314,6 +11077,10 @@ static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int re
                 alc861vd_dallas_automute(codec);
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define alc861vd_loopbacks      alc880_loopbacks
+#endif
+
 /* pcm configuration: identiacal with ALC880 */
 #define alc861vd_pcm_analog_playback    alc880_pcm_analog_playback
 #define alc861vd_pcm_analog_capture     alc880_pcm_analog_capture
@@ -10325,12 +11092,13 @@ static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int re
  */
 static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {
         [ALC660VD_3ST]          = "3stack-660",
-        [ALC660VD_3ST_DIG]= "3stack-660-digout",
+        [ALC660VD_3ST_DIG]      = "3stack-660-digout",
         [ALC861VD_3ST]          = "3stack",
         [ALC861VD_3ST_DIG]      = "3stack-digout",
         [ALC861VD_6ST_DIG]      = "6stack-digout",
         [ALC861VD_LENOVO]       = "lenovo",
         [ALC861VD_DALLAS]       = "dallas",
+        [ALC861VD_HP]           = "hp",
         [ALC861VD_AUTO]         = "auto",
 };
 
@@ -10341,11 +11109,15 @@ static struct snd_pci_quirk alc861vd_cfg_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0x03f0, "Realtek ALC660 demo", ALC660VD_3ST),
         SND_PCI_QUIRK(0x1019, 0xa88d, "Realtek ALC660 demo", ALC660VD_3ST),
 
-        SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),
+        /*SND_PCI_QUIRK(0x1179, 0xff00, "DALLAS", ALC861VD_DALLAS),*/ /*lenovo*/
         SND_PCI_QUIRK(0x1179, 0xff01, "DALLAS", ALC861VD_DALLAS),
         SND_PCI_QUIRK(0x17aa, 0x3802, "Lenovo 3000 C200", ALC861VD_LENOVO),
         SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO),
         SND_PCI_QUIRK(0x1179, 0xff00, "Toshiba A135", ALC861VD_LENOVO),
+        SND_PCI_QUIRK(0x1179, 0xff03, "Toshiba P205", ALC861VD_LENOVO),
+        SND_PCI_QUIRK(0x1565, 0x820d, "Biostar NF61S SE", ALC861VD_6ST_DIG),
+        SND_PCI_QUIRK(0x1849, 0x0862, "ASRock K8NF6G-VSTA", ALC861VD_6ST_DIG),
+        SND_PCI_QUIRK(0x103c, 0x30bf, "HP TX1000", ALC861VD_HP),
         {}
 };
 
@@ -10435,7 +11207,21 @@ static struct alc_config_preset alc861vd_presets[] = {
                 .input_mux = &alc861vd_dallas_capture_source,
                 .unsol_event = alc861vd_dallas_unsol_event,
                 .init_hook = alc861vd_dallas_automute,
-        },      
+        },
+        [ALC861VD_HP] = {
+                .mixers = { alc861vd_hp_mixer },
+                .init_verbs = { alc861vd_dallas_verbs, alc861vd_eapd_verbs },
+                .num_dacs = ARRAY_SIZE(alc861vd_dac_nids),
+                .dac_nids = alc861vd_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids),
+                .dig_out_nid = ALC861VD_DIGOUT_NID,
+                .adc_nids = alc861vd_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc861vd_3stack_2ch_modes),
+                .channel_mode = alc861vd_3stack_2ch_modes,
+                .input_mux = &alc861vd_hp_capture_source,
+                .unsol_event = alc861vd_dallas_unsol_event,
+                .init_hook = alc861vd_dallas_automute,
+        },              
 };
 
 /*
@@ -10668,6 +11454,10 @@ static int alc861vd_parse_auto_config(struct hda_codec *codec)
         spec->num_mux_defs = 1;
         spec->input_mux = &spec->private_imux;
 
+        err = alc_auto_add_mic_boost(codec);
+        if (err < 0)
+                return err;
+
         return 1;
 }
 
@@ -10735,6 +11525,10 @@ static int patch_alc861vd(struct hda_codec *codec)
 
         if (board_config == ALC861VD_AUTO)
                 spec->init_hook = alc861vd_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc861vd_loopbacks;
+#endif
 
         return 0;
 }
@@ -10782,6 +11576,15 @@ static struct hda_input_mux alc662_lenovo_101e_capture_source = {
                 { "Line", 0x2 },
         },
 };
+
+static struct hda_input_mux alc662_eeepc_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "i-Mic", 0x1 },
+                { "e-Mic", 0x0 },
+        },
+};
+
 #define alc662_mux_enum_info alc_mux_enum_info
 #define alc662_mux_enum_get alc_mux_enum_get
 
@@ -10792,7 +11595,7 @@ static int alc662_mux_enum_put(struct snd_kcontrol *kcontrol,
         struct alc_spec *spec = codec->spec;
         const struct hda_input_mux *imux = spec->input_mux;
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
+        static hda_nid_t capture_mixers[2] = { 0x23, 0x22 };
         hda_nid_t nid = capture_mixers[adc_idx];
         unsigned int *cur_val = &spec->cur_mux[adc_idx];
         unsigned int i, idx;
@@ -10800,12 +11603,13 @@ static int alc662_mux_enum_put(struct snd_kcontrol *kcontrol,
         idx = ucontrol->value.enumerated.item[0];
         if (idx >= imux->num_items)
                 idx = imux->num_items - 1;
-        if (*cur_val == idx && !codec->in_resume)
+        if (*cur_val == idx)
                 return 0;
         for (i = 0; i < imux->num_items; i++) {
-                unsigned int v = (i == idx) ? 0x7000 : 0x7080;
-                snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
-                                    v | (imux->items[i].index << 8));
+                unsigned int v = (i == idx) ? 0 : HDA_AMP_MUTE;
+                snd_hda_codec_amp_stereo(codec, nid, HDA_INPUT,
+                                         imux->items[i].index,
+                                         HDA_AMP_MUTE, v);
         }
         *cur_val = idx;
         return 1;
@@ -10997,6 +11801,22 @@ static struct snd_kcontrol_new alc662_lenovo_101e_mixer[] = {
         { } /* end */
 };
 
+static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = {
+        HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("LineOut Playback Volume", 0x02, 0x0, HDA_OUTPUT),
+        HDA_CODEC_MUTE("LineOut Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("e-Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+
+        HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+        HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+        { } /* end */
+};
+
 static struct snd_kcontrol_new alc662_chmode_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -11014,18 +11834,18 @@ static struct hda_verb alc662_init_verbs[] = {
         {0x09, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* Front mixer: unmute input/output amp left and right (volume = 0) */
 
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
         /* Front Pin: output 0 (0x0c) */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -11062,13 +11882,24 @@ static struct hda_verb alc662_init_verbs[] = {
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
         { }
 };
 
 static struct hda_verb alc662_sue_init_verbs[] = {
         {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_FRONT_EVENT},
         {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|ALC880_HP_EVENT},
-        {}
+        {}
+};
+
+static struct hda_verb alc662_eeepc_sue_init_verbs[] = {
+        {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
+        {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
+        {}
 };
 
 /*
@@ -11087,11 +11918,11 @@ static struct hda_verb alc662_auto_init_verbs[] = {
          * panel mic (mic 2)
          */
         /* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x0c - 0x0f)
@@ -11103,23 +11934,19 @@ static struct hda_verb alc662_auto_init_verbs[] = {
 
         /* set up input amps for analog loopback */
         /* Amp Indices: DAC = 0, mixer = 1 */
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
 
 
         /* FIXME: use matrix-type input source selection */
         /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
         /* Input mixer */
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        /*{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},*/
-        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
-
+        {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { }
 };
 
@@ -11150,11 +11977,9 @@ static void alc662_lenovo_101e_ispeaker_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x14, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        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)
@@ -11164,15 +11989,11 @@ static void alc662_lenovo_101e_all_automute(struct hda_codec *codec)
 
         present = snd_hda_codec_read(codec, 0x1b, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
-        bits = present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
-                                 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
-                                 0x80, bits);
+        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,
@@ -11184,6 +12005,43 @@ static void alc662_lenovo_101e_unsol_event(struct hda_codec *codec,
                 alc662_lenovo_101e_ispeaker_automute(codec);
 }
 
+static void alc662_eeepc_mic_automute(struct hda_codec *codec)
+{
+        unsigned int present;
+
+        present = snd_hda_codec_read(codec, 0x18, 0,
+                                     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+        snd_hda_codec_write(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
+        snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            0x7000 | (0x00 << 8) | (present ? 0 : 0x80));
+        snd_hda_codec_write(codec, 0x22, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            0x7000 | (0x01 << 8) | (present ? 0x80 : 0));
+        snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+                            0x7000 | (0x01 << 8) | (present ? 0x80 : 0));
+}
+
+/* unsolicited event for HP jack sensing */
+static void alc662_eeepc_unsol_event(struct hda_codec *codec,
+                                     unsigned int res)
+{
+        if ((res >> 26) == ALC880_HP_EVENT)
+                alc262_hippo1_automute( codec );
+
+        if ((res >> 26) == ALC880_MIC_EVENT)
+                alc662_eeepc_mic_automute(codec);
+}
+
+static void alc662_eeepc_inithook(struct hda_codec *codec)
+{
+        alc262_hippo1_automute( codec );
+        alc662_eeepc_mic_automute(codec);
+}
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+#define alc662_loopbacks        alc880_loopbacks
+#endif
+
 
 /* pcm configuration: identiacal with ALC880 */
 #define alc662_pcm_analog_playback      alc880_pcm_analog_playback
@@ -11205,12 +12063,13 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
 
 static struct snd_pci_quirk alc662_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo", ALC662_LENOVO_101E),
+        SND_PCI_QUIRK(0x1043, 0x82a1, "ASUS Eeepc", ALC662_ASUS_EEEPC_P701),
         {}
 };
 
 static struct alc_config_preset alc662_presets[] = {
         [ALC662_3ST_2ch_DIG] = {
-                .mixers = { alc662_3ST_2ch_mixer },
+                .mixers = { alc662_3ST_2ch_mixer, alc662_capture_mixer },
                 .init_verbs = { alc662_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
@@ -11223,7 +12082,8 @@ static struct alc_config_preset alc662_presets[] = {
                 .input_mux = &alc662_capture_source,
         },
         [ALC662_3ST_6ch_DIG] = {
-                .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },
+                .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer,
+                            alc662_capture_mixer },
                 .init_verbs = { alc662_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
@@ -11237,7 +12097,8 @@ static struct alc_config_preset alc662_presets[] = {
                 .input_mux = &alc662_capture_source,
         },
         [ALC662_3ST_6ch] = {
-                .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer },
+                .mixers = { alc662_3ST_6ch_mixer, alc662_chmode_mixer,
+                            alc662_capture_mixer },
                 .init_verbs = { alc662_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
@@ -11249,7 +12110,8 @@ static struct alc_config_preset alc662_presets[] = {
                 .input_mux = &alc662_capture_source,
         },
         [ALC662_5ST_DIG] = {
-                .mixers = { alc662_base_mixer, alc662_chmode_mixer },
+                .mixers = { alc662_base_mixer, alc662_chmode_mixer,
+                            alc662_capture_mixer },
                 .init_verbs = { alc662_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
@@ -11262,7 +12124,7 @@ static struct alc_config_preset alc662_presets[] = {
                 .input_mux = &alc662_capture_source,
         },
         [ALC662_LENOVO_101E] = {
-                .mixers = { alc662_lenovo_101e_mixer },
+                .mixers = { alc662_lenovo_101e_mixer, alc662_capture_mixer },
                 .init_verbs = { alc662_init_verbs, alc662_sue_init_verbs },
                 .num_dacs = ARRAY_SIZE(alc662_dac_nids),
                 .dac_nids = alc662_dac_nids,
@@ -11274,6 +12136,20 @@ static struct alc_config_preset alc662_presets[] = {
                 .unsol_event = alc662_lenovo_101e_unsol_event,
                 .init_hook = alc662_lenovo_101e_all_automute,
         },
+        [ALC662_ASUS_EEEPC_P701] = {
+                .mixers = { alc662_eeepc_p701_mixer, alc662_capture_mixer },
+                .init_verbs = { alc662_init_verbs,
+                                alc662_eeepc_sue_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc662_dac_nids),
+                .dac_nids = alc662_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc861vd_adc_nids),
+                .adc_nids = alc662_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
+                .channel_mode = alc662_3ST_2ch_modes,
+                .input_mux = &alc662_eeepc_capture_source,
+                .unsol_event = alc662_eeepc_unsol_event,
+                .init_hook = alc662_eeepc_inithook,
+        },
 
 };
 
@@ -11296,7 +12172,7 @@ static int alc662_auto_create_multi_out_ctls(struct alc_spec *spec,
         for (i = 0; i < cfg->line_outs; i++) {
                 if (!spec->multiout.dac_nids[i])
                         continue;
-                nid = alc880_idx_to_mixer(i);
+                nid = alc880_idx_to_dac(i);
                 if (i == 2) {
                         /* Center/LFE */
                         err = add_control(spec, ALC_CTL_WIDGET_VOL,
@@ -11586,6 +12462,10 @@ static int patch_alc662(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC662_AUTO)
                 spec->init_hook = alc662_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        if (!spec->loopback.amplist)
+                spec->loopback.amplist = alc662_loopbacks;
+#endif
 
         return 0;
 }
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index 6d2ecc38905c..2a4b9609aa5c 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -78,6 +78,8 @@
 /* si3054 codec registers (nodes) access macros */
 #define GET_REG(codec,reg) (snd_hda_codec_read(codec,reg,0,SI3054_VERB_READ_NODE,0))
 #define SET_REG(codec,reg,val) (snd_hda_codec_write(codec,reg,0,SI3054_VERB_WRITE_NODE,val))
+#define SET_REG_CACHE(codec,reg,val) \
+        snd_hda_codec_write_cache(codec,reg,0,SI3054_VERB_WRITE_NODE,val)
 
 
 struct si3054_spec {
@@ -94,15 +96,7 @@ struct si3054_spec {
 #define PRIVATE_REG(val) ((val>>16)&0xffff)
 #define PRIVATE_MASK(val) (val&0xffff)
 
-static int si3054_switch_info(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define si3054_switch_info      snd_ctl_boolean_mono_info
 
 static int si3054_switch_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *uvalue)
@@ -121,9 +115,9 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
         u16 reg  = PRIVATE_REG(kcontrol->private_value);
         u16 mask = PRIVATE_MASK(kcontrol->private_value);
         if (uvalue->value.integer.value[0])
-                SET_REG(codec, reg, (GET_REG(codec, reg)) | mask);
+                SET_REG_CACHE(codec, reg, (GET_REG(codec, reg)) | mask);
         else
-                SET_REG(codec, reg, (GET_REG(codec, reg)) & ~mask);
+                SET_REG_CACHE(codec, reg, (GET_REG(codec, reg)) & ~mask);
         return 0;
 }
 
@@ -275,10 +269,6 @@ static struct hda_codec_ops si3054_patch_ops = {
         .build_pcms = si3054_build_pcms,
         .init = si3054_init,
         .free = si3054_free,
-#ifdef CONFIG_PM
-        //.suspend = si3054_suspend,
-        .resume = si3054_init,
-#endif
 };
 
 static int patch_si3054(struct hda_codec *codec)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3f25de72966b..bf950195107c 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -39,12 +39,25 @@
 
 enum {
         STAC_REF,
+        STAC_9200_DELL_D21,
+        STAC_9200_DELL_D22,
+        STAC_9200_DELL_D23,
+        STAC_9200_DELL_M21,
+        STAC_9200_DELL_M22,
+        STAC_9200_DELL_M23,
+        STAC_9200_DELL_M24,
+        STAC_9200_DELL_M25,
+        STAC_9200_DELL_M26,
+        STAC_9200_DELL_M27,
+        STAC_9200_GATEWAY,
         STAC_9200_MODELS
 };
 
 enum {
         STAC_9205_REF,
-        STAC_M43xx,
+        STAC_9205_DELL_M42,
+        STAC_9205_DELL_M43,
+        STAC_9205_DELL_M44,
         STAC_9205_MODELS
 };
 
@@ -60,19 +73,22 @@ enum {
         STAC_D945_REF,
         STAC_D945GTP3,
         STAC_D945GTP5,
-        STAC_922X_DELL,
         STAC_INTEL_MAC_V1,
         STAC_INTEL_MAC_V2,
         STAC_INTEL_MAC_V3,
         STAC_INTEL_MAC_V4,
         STAC_INTEL_MAC_V5,
-        /* for backward compitability */
+        /* for backward compatibility */
         STAC_MACMINI,
         STAC_MACBOOK,
         STAC_MACBOOK_PRO_V1,
         STAC_MACBOOK_PRO_V2,
         STAC_IMAC_INTEL,
         STAC_IMAC_INTEL_20,
+        STAC_922X_DELL_D81,
+        STAC_922X_DELL_D82,
+        STAC_922X_DELL_M81,
+        STAC_922X_DELL_M82,
         STAC_922X_MODELS
 };
 
@@ -80,6 +96,7 @@ enum {
         STAC_D965_REF,
         STAC_D965_3ST,
         STAC_D965_5ST,
+        STAC_DELL_3ST,
         STAC_927X_MODELS
 };
 
@@ -95,6 +112,8 @@ struct sigmatel_spec {
         unsigned int hp_detect: 1;
         unsigned int gpio_mute: 1;
 
+        unsigned int gpio_mask, gpio_data;
+
         /* playback */
         struct hda_multi_out multiout;
         hda_nid_t dac_nids[5];
@@ -127,6 +146,8 @@ struct sigmatel_spec {
 
         /* i/o switches */
         unsigned int io_switch[2];
+        unsigned int clfe_swap;
+        unsigned int aloopback;
 
         struct hda_pcm pcm_rec[2];      /* PCM information */
 
@@ -162,8 +183,9 @@ static hda_nid_t stac925x_dac_nids[1] = {
         0x02,
 };
 
-static hda_nid_t stac925x_dmic_nids[1] = {
-        0x15, 
+#define STAC925X_NUM_DMICS      1
+static hda_nid_t stac925x_dmic_nids[STAC925X_NUM_DMICS + 1] = {
+        0x15, 0
 };
 
 static hda_nid_t stac922x_adc_nids[2] = {
@@ -190,8 +212,9 @@ static hda_nid_t stac9205_mux_nids[2] = {
         0x19, 0x1a
 };
 
-static hda_nid_t stac9205_dmic_nids[2] = {
-        0x17, 0x18,
+#define STAC9205_NUM_DMICS      2
+static hda_nid_t stac9205_dmic_nids[STAC9205_NUM_DMICS + 1] = {
+        0x17, 0x18, 0
 };
 
 static hda_nid_t stac9200_pin_nids[8] = {
@@ -276,12 +299,97 @@ static int stac92xx_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
                                      spec->mux_nids[adc_idx], &spec->cur_mux[adc_idx]);
 }
 
+#define stac92xx_aloopback_info snd_ctl_boolean_mono_info
+
+static int stac92xx_aloopback_get(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+
+        ucontrol->value.integer.value[0] = spec->aloopback;
+        return 0;
+}
+
+static int stac92xx_aloopback_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int dac_mode;
+
+        if (spec->aloopback == ucontrol->value.integer.value[0])
+                return 0;
+
+        spec->aloopback = ucontrol->value.integer.value[0];
+
+
+        dac_mode = snd_hda_codec_read(codec, codec->afg, 0,
+                kcontrol->private_value & 0xFFFF, 0x0);
+
+        if (spec->aloopback) {
+                snd_hda_power_up(codec);
+                dac_mode |= 0x40;
+        } else {
+                snd_hda_power_down(codec);
+                dac_mode &= ~0x40;
+        }
+
+        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                kcontrol->private_value >> 16, dac_mode);
+
+        return 1;
+}
+
+static int stac92xx_volknob_info(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 127;
+        return 0;
+}
+
+static int stac92xx_volknob_get(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        ucontrol->value.integer.value[0] = kcontrol->private_value & 0xff;
+        return 0;
+}
+
+static int stac92xx_volknob_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        unsigned int val = kcontrol->private_value & 0xff;
+
+        if (val == ucontrol->value.integer.value[0])
+                return 0;
+
+        val = ucontrol->value.integer.value[0];
+        kcontrol->private_value &= ~0xff;
+        kcontrol->private_value |= val;
+
+        snd_hda_codec_write_cache(codec, kcontrol->private_value >> 16, 0,
+                AC_VERB_SET_VOLUME_KNOB_CONTROL, val | 0x80);
+        return 1;
+}
+
+
 static struct hda_verb stac9200_core_init[] = {
         /* set dac0mux for dac converter */
         { 0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
         {}
 };
 
+static struct hda_verb stac9200_eapd_init[] = {
+        /* set dac0mux for dac converter */
+        {0x07, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x08, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
+        {}
+};
+
 static struct hda_verb stac925x_core_init[] = {
         /* set dac0mux for dac converter */
         { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
@@ -316,17 +424,43 @@ static struct hda_verb stac9205_core_init[] = {
         {}
 };
 
+#define STAC_INPUT_SOURCE(cnt) \
+        { \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name = "Input Source", \
+                .count = cnt, \
+                .info = stac92xx_mux_enum_info, \
+                .get = stac92xx_mux_enum_get, \
+                .put = stac92xx_mux_enum_put, \
+        }
+
+#define STAC_ANALOG_LOOPBACK(verb_read,verb_write) \
+        { \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name  = "Analog Loopback", \
+                .count = 1, \
+                .info  = stac92xx_aloopback_info, \
+                .get   = stac92xx_aloopback_get, \
+                .put   = stac92xx_aloopback_put, \
+                .private_value = verb_read | (verb_write << 16), \
+        }
+
+#define STAC_VOLKNOB(knob_nid)  \
+        { \
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+                .name  = "Master Playback Volume", \
+                .count = 1, \
+                .info  = stac92xx_volknob_info, \
+                .get   = stac92xx_volknob_get, \
+                .put   = stac92xx_volknob_put, \
+                        .private_value = 127 | (knob_nid << 16), \
+        }
+
+
 static struct snd_kcontrol_new stac9200_mixer[] = {
         HDA_CODEC_VOLUME("Master Playback Volume", 0xb, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Master Playback Switch", 0xb, 0, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
+        STAC_INPUT_SOURCE(1),
         HDA_CODEC_VOLUME("Capture Volume", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Mux Volume", 0x0c, 0, HDA_OUTPUT),
@@ -334,86 +468,68 @@ static struct snd_kcontrol_new stac9200_mixer[] = {
 };
 
 static struct snd_kcontrol_new stac925x_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
+        STAC_INPUT_SOURCE(1),
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_OUTPUT),
         HDA_CODEC_VOLUME("Capture Mux Volume", 0x0f, 0, HDA_OUTPUT),
         { } /* end */
 };
 
-/* This needs to be generated dynamically based on sequence */
-static struct snd_kcontrol_new stac922x_mixer[] = {
+static struct snd_kcontrol_new stac9205_mixer[] = {
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
+                .name = "Digital Input Source",
                 .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
+                .info = stac92xx_dmux_enum_info,
+                .get = stac92xx_dmux_enum_get,
+                .put = stac92xx_dmux_enum_put,
         },
-        HDA_CODEC_VOLUME("Capture Volume", 0x17, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x17, 0x0, HDA_INPUT),
-        HDA_CODEC_VOLUME("Mux Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+        STAC_INPUT_SOURCE(2),
+        STAC_ANALOG_LOOPBACK(0xFE0, 0x7E0),
+        STAC_VOLKNOB(0x24),
+
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x19, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x1c, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1e, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x1A, 0x0, HDA_OUTPUT),
+
         { } /* end */
 };
 
 /* This needs to be generated dynamically based on sequence */
-static struct snd_kcontrol_new stac9227_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
-        HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
+static struct snd_kcontrol_new stac922x_mixer[] = {
+        STAC_INPUT_SOURCE(2),
+        STAC_VOLKNOB(0x16),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x17, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x12, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x13, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
+
 static struct snd_kcontrol_new stac927x_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
-        HDA_CODEC_VOLUME("InMux Capture Volume", 0x15, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("InVol Capture Volume", 0x18, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
-        { } /* end */
-};
+        STAC_INPUT_SOURCE(3),
+        STAC_VOLKNOB(0x24),
+        STAC_ANALOG_LOOPBACK(0xFEB, 0x7EB),
 
-static struct snd_kcontrol_new stac9205_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Digital Input Source",
-                .count = 1,
-                .info = stac92xx_dmux_enum_info,
-                .get = stac92xx_dmux_enum_get,
-                .put = stac92xx_dmux_enum_put,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Input Source",
-                .count = 1,
-                .info = stac92xx_mux_enum_info,
-                .get = stac92xx_mux_enum_get,
-                .put = stac92xx_mux_enum_put,
-        },
-        HDA_CODEC_VOLUME("InMux Capture Volume", 0x19, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("InVol Capture Volume", 0x1b, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x18, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1b, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x0, 0x15, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x1, 0x19, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1c, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x16, 0x0, HDA_OUTPUT),
+
+        HDA_CODEC_VOLUME_IDX("Capture Volume", 0x2, 0x1A, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE_IDX("Capture Switch", 0x2, 0x1d, 0x0, HDA_OUTPUT),
+        HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x2, 0x17, 0x0, HDA_OUTPUT),
         { } /* end */
 };
 
@@ -451,12 +567,145 @@ static unsigned int ref9200_pin_configs[8] = {
         0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
 };
 
+/* 
+    STAC 9200 pin configs for
+    102801A8
+    102801DE
+    102801E8
+*/
+static unsigned int dell9200_d21_pin_configs[8] = {
+        0x400001f0, 0x400001f1, 0x02214030, 0x01014010, 
+        0x02a19020, 0x01a19021, 0x90100140, 0x01813122,
+};
+
+/* 
+    STAC 9200 pin configs for
+    102801C0
+    102801C1
+*/
+static unsigned int dell9200_d22_pin_configs[8] = {
+        0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
+        0x01813020, 0x02a19021, 0x90100140, 0x400001f2,
+};
+
+/* 
+    STAC 9200 pin configs for
+    102801C4 (Dell Dimension E310)
+    102801C5
+    102801C7
+    102801D9
+    102801DA
+    102801E3
+*/
+static unsigned int dell9200_d23_pin_configs[8] = {
+        0x400001f0, 0x400001f1, 0x0221401f, 0x01014010, 
+        0x01813020, 0x01a19021, 0x90100140, 0x400001f2, 
+};
+
+
+/* 
+    STAC 9200-32 pin configs for
+    102801B5 (Dell Inspiron 630m)
+    102801D8 (Dell Inspiron 640m)
+*/
+static unsigned int dell9200_m21_pin_configs[8] = {
+        0x40c003fa, 0x03441340, 0x0321121f, 0x90170310,
+        0x408003fb, 0x03a11020, 0x401003fc, 0x403003fd,
+};
+
+/* 
+    STAC 9200-32 pin configs for
+    102801C2 (Dell Latitude D620)
+    102801C8 
+    102801CC (Dell Latitude D820)
+    102801D4 
+    102801D6 
+*/
+static unsigned int dell9200_m22_pin_configs[8] = {
+        0x40c003fa, 0x0144131f, 0x0321121f, 0x90170310, 
+        0x90a70321, 0x03a11020, 0x401003fb, 0x40f000fc,
+};
+
+/* 
+    STAC 9200-32 pin configs for
+    102801CE (Dell XPS M1710)
+    102801CF (Dell Precision M90)
+*/
+static unsigned int dell9200_m23_pin_configs[8] = {
+        0x40c003fa, 0x01441340, 0x0421421f, 0x90170310,
+        0x408003fb, 0x04a1102e, 0x90170311, 0x403003fc,
+};
+
+/*
+    STAC 9200-32 pin configs for 
+    102801C9
+    102801CA
+    102801CB (Dell Latitude 120L)
+    102801D3
+*/
+static unsigned int dell9200_m24_pin_configs[8] = {
+        0x40c003fa, 0x404003fb, 0x0321121f, 0x90170310, 
+        0x408003fc, 0x03a11020, 0x401003fd, 0x403003fe, 
+};
+
+/*
+    STAC 9200-32 pin configs for
+    102801BD (Dell Inspiron E1505n)
+    102801EE
+    102801EF
+*/
+static unsigned int dell9200_m25_pin_configs[8] = {
+        0x40c003fa, 0x01441340, 0x0421121f, 0x90170310, 
+        0x408003fb, 0x04a11020, 0x401003fc, 0x403003fd,
+};
+
+/*
+    STAC 9200-32 pin configs for
+    102801F5 (Dell Inspiron 1501)
+    102801F6
+*/
+static unsigned int dell9200_m26_pin_configs[8] = {
+        0x40c003fa, 0x404003fb, 0x0421121f, 0x90170310, 
+        0x408003fc, 0x04a11020, 0x401003fd, 0x403003fe,
+};
+
+/*
+    STAC 9200-32
+    102801CD (Dell Inspiron E1705/9400)
+*/
+static unsigned int dell9200_m27_pin_configs[8] = {
+        0x40c003fa, 0x01441340, 0x0421121f, 0x90170310,
+        0x90170310, 0x04a11020, 0x90170310, 0x40f003fc,
+};
+
+
 static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
         [STAC_REF] = ref9200_pin_configs,
+        [STAC_9200_DELL_D21] = dell9200_d21_pin_configs,
+        [STAC_9200_DELL_D22] = dell9200_d22_pin_configs,
+        [STAC_9200_DELL_D23] = dell9200_d23_pin_configs,
+        [STAC_9200_DELL_M21] = dell9200_m21_pin_configs,
+        [STAC_9200_DELL_M22] = dell9200_m22_pin_configs,
+        [STAC_9200_DELL_M23] = dell9200_m23_pin_configs,
+        [STAC_9200_DELL_M24] = dell9200_m24_pin_configs,
+        [STAC_9200_DELL_M25] = dell9200_m25_pin_configs,
+        [STAC_9200_DELL_M26] = dell9200_m26_pin_configs,
+        [STAC_9200_DELL_M27] = dell9200_m27_pin_configs,
 };
 
 static const char *stac9200_models[STAC_9200_MODELS] = {
         [STAC_REF] = "ref",
+        [STAC_9200_DELL_D21] = "dell-d21",
+        [STAC_9200_DELL_D22] = "dell-d22",
+        [STAC_9200_DELL_D23] = "dell-d23",
+        [STAC_9200_DELL_M21] = "dell-m21",
+        [STAC_9200_DELL_M22] = "dell-m22",
+        [STAC_9200_DELL_M23] = "dell-m23",
+        [STAC_9200_DELL_M24] = "dell-m24",
+        [STAC_9200_DELL_M25] = "dell-m25",
+        [STAC_9200_DELL_M26] = "dell-m26",
+        [STAC_9200_DELL_M27] = "dell-m27",
+        [STAC_9200_GATEWAY] = "gateway",
 };
 
 static struct snd_pci_quirk stac9200_cfg_tbl[] = {
@@ -464,30 +713,72 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_REF),
         /* Dell laptops have BIOS problem */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a8,
+                      "unknown Dell", STAC_9200_DELL_D21),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01b5,
-                      "Dell Inspiron 630m", STAC_REF),
+                      "Dell Inspiron 630m", STAC_9200_DELL_M21),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bd,
+                      "Dell Inspiron E1505n", STAC_9200_DELL_M25),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c0,
+                      "unknown Dell", STAC_9200_DELL_D22),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c1,
+                      "unknown Dell", STAC_9200_DELL_D22),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c2,
-                      "Dell Latitude D620", STAC_REF),
+                      "Dell Latitude D620", STAC_9200_DELL_M22),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c5,
+                      "unknown Dell", STAC_9200_DELL_D23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c7,
+                      "unknown Dell", STAC_9200_DELL_D23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c8,
+                      "unknown Dell", STAC_9200_DELL_M22),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01c9,
+                      "unknown Dell", STAC_9200_DELL_M24),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ca,
+                      "unknown Dell", STAC_9200_DELL_M24),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cb,
-                      "Dell Latitude 120L", STAC_REF),
+                      "Dell Latitude 120L", STAC_9200_DELL_M24),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cc,
-                      "Dell Latitude D820", STAC_REF),
+                      "Dell Latitude D820", STAC_9200_DELL_M22),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cd,
-                      "Dell Inspiron E1705/9400", STAC_REF),
+                      "Dell Inspiron E1705/9400", STAC_9200_DELL_M27),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ce,
-                      "Dell XPS M1710", STAC_REF),
+                      "Dell XPS M1710", STAC_9200_DELL_M23),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf,
-                      "Dell Precision M90", STAC_REF),
+                      "Dell Precision M90", STAC_9200_DELL_M23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d3,
+                      "unknown Dell", STAC_9200_DELL_M22),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d4,
+                      "unknown Dell", STAC_9200_DELL_M22),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d6,
-                      "unknown Dell", STAC_REF),
+                      "unknown Dell", STAC_9200_DELL_M22),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d8,
-                      "Dell Inspiron 640m", STAC_REF),
+                      "Dell Inspiron 640m", STAC_9200_DELL_M21),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d9,
+                      "unknown Dell", STAC_9200_DELL_D23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01da,
+                      "unknown Dell", STAC_9200_DELL_D23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01de,
+                      "unknown Dell", STAC_9200_DELL_D21),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e3,
+                      "unknown Dell", STAC_9200_DELL_D23),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01e8,
+                      "unknown Dell", STAC_9200_DELL_D21),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ee,
+                      "unknown Dell", STAC_9200_DELL_M25),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ef,
+                      "unknown Dell", STAC_9200_DELL_M25),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f5,
-                      "Dell Inspiron 1501", STAC_REF),
-
+                      "Dell Inspiron 1501", STAC_9200_DELL_M26),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6,
+                      "unknown Dell", STAC_9200_DELL_M26),
         /* Panasonic */
         SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_REF),
-
+        /* Gateway machines needs EAPD to be set on resume */
+        SND_PCI_QUIRK(0x107b, 0x0205, "Gateway S-7110M", STAC_9200_GATEWAY),
+        SND_PCI_QUIRK(0x107b, 0x0317, "Gateway MT3423, MX341*",
+                      STAC_9200_GATEWAY),
+        SND_PCI_QUIRK(0x107b, 0x0318, "Gateway ML3019, MT3707",
+                      STAC_9200_GATEWAY),
         {} /* terminator */
 };
 
@@ -543,6 +834,51 @@ static unsigned int ref922x_pin_configs[10] = {
         0x40000100, 0x40000100,
 };
 
+/*
+    STAC 922X pin configs for
+    102801A7
+    102801AB
+    102801A9
+    102801D1
+    102801D2
+*/
+static unsigned int dell_922x_d81_pin_configs[10] = {
+        0x02214030, 0x01a19021, 0x01111012, 0x01114010,
+        0x02a19020, 0x01117011, 0x400001f0, 0x400001f1,
+        0x01813122, 0x400001f2,
+};
+
+/*
+    STAC 922X pin configs for
+    102801AC
+    102801D0
+*/
+static unsigned int dell_922x_d82_pin_configs[10] = {
+        0x02214030, 0x01a19021, 0x01111012, 0x01114010,
+        0x02a19020, 0x01117011, 0x01451140, 0x400001f0,
+        0x01813122, 0x400001f1,
+};
+
+/*
+    STAC 922X pin configs for
+    102801BF
+*/
+static unsigned int dell_922x_m81_pin_configs[10] = {
+        0x0321101f, 0x01112024, 0x01111222, 0x91174220,
+        0x03a11050, 0x01116221, 0x90a70330, 0x01452340, 
+        0x40C003f1, 0x405003f0,
+};
+
+/*
+    STAC 9221 A1 pin configs for
+    102801D7 (Dell XPS M1210)
+*/
+static unsigned int dell_922x_m82_pin_configs[10] = {
+        0x0221121f, 0x408103ff, 0x02111212, 0x90100310, 
+        0x408003f1, 0x02111211, 0x03451340, 0x40c003f2, 
+        0x508003f3, 0x405003f4, 
+};
+
 static unsigned int d945gtp3_pin_configs[10] = {
         0x0221401f, 0x01a19022, 0x01813021, 0x01014010,
         0x40000100, 0x40000100, 0x40000100, 0x40000100,
@@ -585,48 +921,49 @@ static unsigned int intel_mac_v5_pin_configs[10] = {
         0x400000fc, 0x400000fb,
 };
 
-static unsigned int stac922x_dell_pin_configs[10] = {
-        0x0221121e, 0x408103ff, 0x02a1123e, 0x90100310,
-        0x408003f1, 0x0221122f, 0x03451340, 0x40c003f2,
-        0x50a003f3, 0x405003f4
-};
 
 static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
         [STAC_D945_REF] = ref922x_pin_configs,
         [STAC_D945GTP3] = d945gtp3_pin_configs,
         [STAC_D945GTP5] = d945gtp5_pin_configs,
-        [STAC_922X_DELL] = stac922x_dell_pin_configs,
         [STAC_INTEL_MAC_V1] = intel_mac_v1_pin_configs,
         [STAC_INTEL_MAC_V2] = intel_mac_v2_pin_configs,
         [STAC_INTEL_MAC_V3] = intel_mac_v3_pin_configs,
         [STAC_INTEL_MAC_V4] = intel_mac_v4_pin_configs,
         [STAC_INTEL_MAC_V5] = intel_mac_v5_pin_configs,
-        /* for backward compitability */
+        /* for backward compatibility */
         [STAC_MACMINI] = intel_mac_v3_pin_configs,
         [STAC_MACBOOK] = intel_mac_v5_pin_configs,
         [STAC_MACBOOK_PRO_V1] = intel_mac_v3_pin_configs,
         [STAC_MACBOOK_PRO_V2] = intel_mac_v3_pin_configs,
         [STAC_IMAC_INTEL] = intel_mac_v2_pin_configs,
         [STAC_IMAC_INTEL_20] = intel_mac_v3_pin_configs,
+        [STAC_922X_DELL_D81] = dell_922x_d81_pin_configs,
+        [STAC_922X_DELL_D82] = dell_922x_d82_pin_configs,       
+        [STAC_922X_DELL_M81] = dell_922x_m81_pin_configs,
+        [STAC_922X_DELL_M82] = dell_922x_m82_pin_configs,       
 };
 
 static const char *stac922x_models[STAC_922X_MODELS] = {
         [STAC_D945_REF] = "ref",
         [STAC_D945GTP5] = "5stack",
         [STAC_D945GTP3] = "3stack",
-        [STAC_922X_DELL] = "dell",
         [STAC_INTEL_MAC_V1] = "intel-mac-v1",
         [STAC_INTEL_MAC_V2] = "intel-mac-v2",
         [STAC_INTEL_MAC_V3] = "intel-mac-v3",
         [STAC_INTEL_MAC_V4] = "intel-mac-v4",
         [STAC_INTEL_MAC_V5] = "intel-mac-v5",
-        /* for backward compitability */
+        /* for backward compatibility */
         [STAC_MACMINI]  = "macmini",
         [STAC_MACBOOK]  = "macbook",
         [STAC_MACBOOK_PRO_V1]   = "macbook-pro-v1",
         [STAC_MACBOOK_PRO_V2]   = "macbook-pro",
         [STAC_IMAC_INTEL] = "imac-intel",
         [STAC_IMAC_INTEL_20] = "imac-intel-20",
+        [STAC_922X_DELL_D81] = "dell-d81",
+        [STAC_922X_DELL_D82] = "dell-d82",
+        [STAC_922X_DELL_M81] = "dell-m81",
+        [STAC_922X_DELL_M82] = "dell-m82",
 };
 
 static struct snd_pci_quirk stac922x_cfg_tbl[] = {
@@ -690,9 +1027,25 @@ static struct snd_pci_quirk stac922x_cfg_tbl[] = {
         /* Apple Mac Mini (early 2006) */
         SND_PCI_QUIRK(0x8384, 0x7680,
                       "Mac Mini", STAC_INTEL_MAC_V3),
-        /* Dell */
-        SND_PCI_QUIRK(0x1028, 0x01d7, "Dell XPS M1210", STAC_922X_DELL),
-
+        /* Dell systems  */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a7,
+                      "unknown Dell", STAC_922X_DELL_D81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01a9,
+                      "unknown Dell", STAC_922X_DELL_D81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ab,
+                      "unknown Dell", STAC_922X_DELL_D81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ac,
+                      "unknown Dell", STAC_922X_DELL_D82),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01bf,
+                      "unknown Dell", STAC_922X_DELL_M81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d0,
+                      "unknown Dell", STAC_922X_DELL_D82),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d1,
+                      "unknown Dell", STAC_922X_DELL_D81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d2,
+                      "unknown Dell", STAC_922X_DELL_D81),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d7,
+                      "Dell XPS M1210", STAC_922X_DELL_M82),
         {} /* terminator */
 };
 
@@ -717,16 +1070,25 @@ static unsigned int d965_5st_pin_configs[14] = {
         0x40000100, 0x40000100
 };
 
+static unsigned int dell_3st_pin_configs[14] = {
+        0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
+        0x01111212, 0x01116211, 0x01813050, 0x01112214,
+        0x403003fa, 0x40000100, 0x40000100, 0x404003fb,
+        0x40c003fc, 0x40000100
+};
+
 static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
         [STAC_D965_REF] = ref927x_pin_configs,
         [STAC_D965_3ST] = d965_3st_pin_configs,
         [STAC_D965_5ST] = d965_5st_pin_configs,
+        [STAC_DELL_3ST] = dell_3st_pin_configs,
 };
 
 static const char *stac927x_models[STAC_927X_MODELS] = {
         [STAC_D965_REF] = "ref",
         [STAC_D965_3ST] = "3stack",
         [STAC_D965_5ST] = "5stack",
+        [STAC_DELL_3ST] = "dell-3stack",
 };
 
 static struct snd_pci_quirk stac927x_cfg_tbl[] = {
@@ -753,7 +1115,13 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_D965_3ST),
+        /* Dell 3 stack systems */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01dd, "Dell Dimension E520", STAC_DELL_3ST),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01ed, "Dell     ", STAC_DELL_3ST),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f4, "Dell     ", STAC_DELL_3ST),
         /* 965 based 5 stack systems */
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0209, "Dell XPS 1330", STAC_D965_5ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2303, "Intel D965", STAC_D965_5ST),
@@ -772,23 +1140,97 @@ static unsigned int ref9205_pin_configs[12] = {
         0x90a000f0, 0x90a000f0, 0x01441030, 0x01c41030
 };
 
+/*
+    STAC 9205 pin configs for
+    102801F1
+    102801F2
+    102801FC
+    102801FD
+    10280204
+    1028021F
+*/
+static unsigned int dell_9205_m42_pin_configs[12] = {
+        0x0321101F, 0x03A11020, 0x400003FA, 0x90170310,
+        0x400003FB, 0x400003FC, 0x400003FD, 0x40F000F9,
+        0x90A60330, 0x400003FF, 0x0144131F, 0x40C003FE,
+};
+
+/*
+    STAC 9205 pin configs for
+    102801F9
+    102801FA
+    102801FE
+    102801FF (Dell Precision M4300)
+    10280206
+    10280200
+    10280201
+*/
+static unsigned int dell_9205_m43_pin_configs[12] = {
+        0x0321101f, 0x03a11020, 0x90a70330, 0x90170310,
+        0x400000fe, 0x400000ff, 0x400000fd, 0x40f000f9,
+        0x400000fa, 0x400000fc, 0x0144131f, 0x40c003f8,
+};
+
+static unsigned int dell_9205_m44_pin_configs[12] = {
+        0x0421101f, 0x04a11020, 0x400003fa, 0x90170310,
+        0x400003fb, 0x400003fc, 0x400003fd, 0x400003f9,
+        0x90a60330, 0x400003ff, 0x01441340, 0x40c003fe,
+};
+
 static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
-        [STAC_REF] = ref9205_pin_configs,
-        [STAC_M43xx] = NULL,
+        [STAC_9205_REF] = ref9205_pin_configs,
+        [STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
+        [STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
+        [STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,
 };
 
 static const char *stac9205_models[STAC_9205_MODELS] = {
         [STAC_9205_REF] = "ref",
+        [STAC_9205_DELL_M42] = "dell-m42",
+        [STAC_9205_DELL_M43] = "dell-m43",
+        [STAC_9205_DELL_M44] = "dell-m44",
 };
 
 static struct snd_pci_quirk stac9205_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_9205_REF),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x01f8,
-                      "Dell Precision", STAC_M43xx),
-        SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x01ff,
-                      "Dell Precision", STAC_M43xx),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,
+                      "unknown Dell", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
+                      "unknown Dell", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,
+                          "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fa,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fc,
+                      "unknown Dell", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,
+                      "unknown Dell", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fe,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ff,
+                      "Dell Precision M4300", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0206,
+                      "Dell Precision", STAC_9205_DELL_M43),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f1,
+                      "Dell Inspiron", STAC_9205_DELL_M44),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
+                      "Dell Inspiron", STAC_9205_DELL_M44),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fc,
+                      "Dell Inspiron", STAC_9205_DELL_M44),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01fd,
+                      "Dell Inspiron", STAC_9205_DELL_M44),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0204,
+                      "unknown Dell", STAC_9205_DELL_M42),
+        SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021f,
+                      "Dell Inspiron", STAC_9205_DELL_M44),
         {} /* terminator */
 };
 
@@ -854,20 +1296,20 @@ static void stac92xx_set_config_regs(struct hda_codec *codec)
                                         spec->pin_configs[i]);
 }
 
-static void stac92xx_enable_gpio_mask(struct hda_codec *codec,
-                                      int gpio_mask, int gpio_data)
+static void stac92xx_enable_gpio_mask(struct hda_codec *codec)
 {
+        struct sigmatel_spec *spec = codec->spec;
         /* Configure GPIOx as output */
-        snd_hda_codec_write(codec, codec->afg, 0,
-                            AC_VERB_SET_GPIO_DIRECTION, gpio_mask);
+        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                                  AC_VERB_SET_GPIO_DIRECTION, spec->gpio_mask);
         /* Configure GPIOx as CMOS */
-        snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0x00000000);
+        snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7e7, 0x00000000);
         /* Assert GPIOx */
-        snd_hda_codec_write(codec, codec->afg, 0,
-                            AC_VERB_SET_GPIO_DATA, gpio_data);
+        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                                  AC_VERB_SET_GPIO_DATA, spec->gpio_data);
         /* Enable GPIOx */
-        snd_hda_codec_write(codec, codec->afg, 0,
-                            AC_VERB_SET_GPIO_MASK, gpio_mask);
+        snd_hda_codec_write_cache(codec, codec->afg, 0,
+                                  AC_VERB_SET_GPIO_MASK, spec->gpio_mask);
 }
 
 /*
@@ -1000,10 +1442,9 @@ static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
 };
 
 static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
-        .substreams = 2,
         .channels_min = 2,
         .channels_max = 2,
-        /* NID is set in stac92xx_build_pcms */
+        /* NID + .substreams is set in stac92xx_build_pcms */
         .ops = {
                 .prepare = stac92xx_capture_pcm_prepare,
                 .cleanup = stac92xx_capture_pcm_cleanup
@@ -1022,6 +1463,7 @@ static int stac92xx_build_pcms(struct hda_codec *codec)
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adcs;
 
         if (spec->alt_switch) {
                 codec->num_pcms++;
@@ -1066,17 +1508,11 @@ static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid)
 static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type)
 
 {
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
+        snd_hda_codec_write_cache(codec, nid, 0,
+                                  AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type);
 }
 
-static int stac92xx_io_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define stac92xx_io_switch_info         snd_ctl_boolean_mono_info
 
 static int stac92xx_io_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1109,6 +1545,36 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
         return 1;
 }
 
+#define stac92xx_clfe_switch_info snd_ctl_boolean_mono_info
+
+static int stac92xx_clfe_switch_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+
+        ucontrol->value.integer.value[0] = spec->clfe_swap;
+        return 0;
+}
+
+static int stac92xx_clfe_switch_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct sigmatel_spec *spec = codec->spec;
+        hda_nid_t nid = kcontrol->private_value & 0xff;
+
+        if (spec->clfe_swap == ucontrol->value.integer.value[0])
+                return 0;
+
+        spec->clfe_swap = ucontrol->value.integer.value[0];
+
+        snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE,
+                spec->clfe_swap ? 0x4 : 0x0);
+
+        return 1;
+}
+
 #define STAC_CODEC_IO_SWITCH(xname, xpval) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
           .name = xname, \
@@ -1119,17 +1585,28 @@ static int stac92xx_io_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
           .private_value = xpval, \
         }
 
+#define STAC_CODEC_CLFE_SWITCH(xname, xpval) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+          .name = xname, \
+          .index = 0, \
+          .info = stac92xx_clfe_switch_info, \
+          .get = stac92xx_clfe_switch_get, \
+          .put = stac92xx_clfe_switch_put, \
+          .private_value = xpval, \
+        }
 
 enum {
         STAC_CTL_WIDGET_VOL,
         STAC_CTL_WIDGET_MUTE,
         STAC_CTL_WIDGET_IO_SWITCH,
+        STAC_CTL_WIDGET_CLFE_SWITCH
 };
 
 static struct snd_kcontrol_new stac92xx_control_templates[] = {
         HDA_CODEC_VOLUME(NULL, 0, 0, 0),
         HDA_CODEC_MUTE(NULL, 0, 0, 0),
         STAC_CODEC_IO_SWITCH(NULL, 0),
+        STAC_CODEC_CLFE_SWITCH(NULL, 0),
 };
 
 /* add dynamic controls */
@@ -1182,7 +1659,8 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
         case 3:
                 /* add line-in as side */
                 if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 3) {
-                        cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_LINE];
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
                         spec->line_switch = 1;
                         cfg->line_outs++;
                 }
@@ -1190,12 +1668,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
         case 2:
                 /* add line-in as clfe and mic as side */
                 if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 2) {
-                        cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_LINE];
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
                         spec->line_switch = 1;
                         cfg->line_outs++;
                 }
                 if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 3) {
-                        cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_MIC];
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_MIC];
                         spec->mic_switch = 1;
                         cfg->line_outs++;
                 }
@@ -1203,12 +1683,14 @@ static int stac92xx_add_dyn_out_pins(struct hda_codec *codec, struct auto_pin_cf
         case 1:
                 /* add line-in as surr and mic as clfe */
                 if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 1) {
-                        cfg->line_out_pins[1] = cfg->input_pins[AUTO_PIN_LINE];
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_LINE];
                         spec->line_switch = 1;
                         cfg->line_outs++;
                 }
                 if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 2) {
-                        cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_MIC];
+                        cfg->line_out_pins[cfg->line_outs] =
+                                cfg->input_pins[AUTO_PIN_MIC];
                         spec->mic_switch = 1;
                         cfg->line_outs++;
                 }
@@ -1282,8 +1764,8 @@ static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec,
                 spec->multiout.num_dacs++;
                 if (conn_len > 1) {
                         /* select this DAC in the pin's input mux */
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_CONNECT_SEL, j);
+                        snd_hda_codec_write_cache(codec, nid, 0,
+                                                  AC_VERB_SET_CONNECT_SEL, j);
 
                 }
         }
@@ -1318,7 +1800,7 @@ static int create_controls(struct sigmatel_spec *spec, const char *pfx, hda_nid_
 }
 
 /* add playback controls from the parsed DAC table */
-static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
+static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
                                                const struct auto_pin_cfg *cfg)
 {
         static const char *chname[4] = {
@@ -1327,6 +1809,10 @@ static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
         hda_nid_t nid;
         int i, err;
 
+        struct sigmatel_spec *spec = codec->spec;
+        unsigned int wid_caps;
+
+
         for (i = 0; i < cfg->line_outs; i++) {
                 if (!spec->multiout.dac_nids[i])
                         continue;
@@ -1341,6 +1827,18 @@ static int stac92xx_auto_create_multi_out_ctls(struct sigmatel_spec *spec,
                         err = create_controls(spec, "LFE", nid, 2);
                         if (err < 0)
                                 return err;
+
+                        wid_caps = get_wcaps(codec, nid);
+
+                        if (wid_caps & AC_WCAP_LR_SWAP) {
+                                err = stac92xx_add_control(spec,
+                                        STAC_CTL_WIDGET_CLFE_SWITCH,
+                                        "Swap Center/LFE Playback Switch", nid);
+
+                                if (err < 0)
+                                        return err;
+                        }
+
                 } else {
                         err = create_controls(spec, chname[i], nid, 3);
                         if (err < 0)
@@ -1536,9 +2034,9 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
                  * NID lists.  Hopefully this won't get confused.
                  */
                 for (i = 0; i < spec->num_muxes; i++) {
-                        snd_hda_codec_write(codec, spec->mux_nids[i], 0,
-                                            AC_VERB_SET_CONNECT_SEL,
-                                            imux->items[0].index);
+                        snd_hda_codec_write_cache(codec, spec->mux_nids[i], 0,
+                                                  AC_VERB_SET_CONNECT_SEL,
+                                                  imux->items[0].index);
                 }
         }
 
@@ -1593,9 +2091,19 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
                 if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
                         return err;
 
-        if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg)) < 0 ||
-            (err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg)) < 0)
+        err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
+
+        if (err < 0)
+                return err;
+
+        err = stac92xx_auto_create_hp_ctls(codec, &spec->autocfg);
+
+        if (err < 0)
+                return err;
+
+        err = stac92xx_auto_create_analog_input_ctls(codec, &spec->autocfg);
+
+        if (err < 0)
                 return err;
 
         if (spec->num_dmics > 0)
@@ -1764,9 +2272,9 @@ static void enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
                               unsigned int event)
 {
         if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP)
-                snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_UNSOLICITED_ENABLE,
-                                    (AC_USRSP_EN | event));
+                snd_hda_codec_write_cache(codec, nid, 0,
+                                          AC_VERB_SET_UNSOLICITED_ENABLE,
+                                          (AC_USRSP_EN | event));
 }
 
 static int stac92xx_init(struct hda_codec *codec)
@@ -1870,7 +2378,7 @@ static void stac92xx_set_pinctl(struct hda_codec *codec, hda_nid_t nid,
         if (flag & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN))
                 pin_ctl &= ~(AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN);
         
-        snd_hda_codec_write(codec, nid, 0,
+        snd_hda_codec_write_cache(codec, nid, 0,
                         AC_VERB_SET_PIN_WIDGET_CONTROL,
                         pin_ctl | flag);
 }
@@ -1880,7 +2388,7 @@ static void stac92xx_reset_pinctl(struct hda_codec *codec, hda_nid_t nid,
 {
         unsigned int pin_ctl = snd_hda_codec_read(codec, nid,
                         0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0x00);
-        snd_hda_codec_write(codec, nid, 0,
+        snd_hda_codec_write_cache(codec, nid, 0,
                         AC_VERB_SET_PIN_WIDGET_CONTROL,
                         pin_ctl & ~flag);
 }
@@ -1936,22 +2444,22 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
-#ifdef CONFIG_PM
+#ifdef SND_HDA_NEEDS_RESUME
 static int stac92xx_resume(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
-        int i;
 
-        stac92xx_init(codec);
         stac92xx_set_config_regs(codec);
-        snd_hda_resume_ctls(codec, spec->mixer);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-
+        snd_hda_sequence_write(codec, spec->init);
+        if (spec->gpio_mute) {
+                stac922x_gpio_mute(codec, 0, 0);
+                stac922x_gpio_mute(codec, 1, 0);
+        }
+        snd_hda_codec_resume_amp(codec);
+        snd_hda_codec_resume_cache(codec);
+        /* invoke unsolicited event to reset the HP state */
+        if (spec->hp_detect)
+                codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
         return 0;
 }
 #endif
@@ -1962,7 +2470,7 @@ static struct hda_codec_ops stac92xx_patch_ops = {
         .init = stac92xx_init,
         .free = stac92xx_free,
         .unsol_event = stac92xx_unsol_event,
-#ifdef CONFIG_PM
+#ifdef SND_HDA_NEEDS_RESUME
         .resume = stac92xx_resume,
 #endif
 };
@@ -2002,8 +2510,12 @@ static int patch_stac9200(struct hda_codec *codec)
         spec->mux_nids = stac9200_mux_nids;
         spec->num_muxes = 1;
         spec->num_dmics = 0;
+        spec->num_adcs = 1;
 
-        spec->init = stac9200_core_init;
+        if (spec->board_config == STAC_9200_GATEWAY)
+                spec->init = stac9200_eapd_init;
+        else
+                spec->init = stac9200_core_init;
         spec->mixer = stac9200_mixer;
 
         err = stac9200_parse_auto_config(codec);
@@ -2053,12 +2565,13 @@ static int patch_stac925x(struct hda_codec *codec)
         spec->adc_nids = stac925x_adc_nids;
         spec->mux_nids = stac925x_mux_nids;
         spec->num_muxes = 1;
+        spec->num_adcs = 1;
         switch (codec->vendor_id) {
         case 0x83847632: /* STAC9202  */
         case 0x83847633: /* STAC9202D */
         case 0x83847636: /* STAC9251  */
         case 0x83847637: /* STAC9251D */
-                spec->num_dmics = 1;
+                spec->num_dmics = STAC925X_NUM_DMICS;
                 spec->dmic_nids = stac925x_dmic_nids;
                 break;
         default:
@@ -2156,6 +2669,7 @@ static int patch_stac922x(struct hda_codec *codec)
         spec->adc_nids = stac922x_adc_nids;
         spec->mux_nids = stac922x_mux_nids;
         spec->num_muxes = ARRAY_SIZE(stac922x_mux_nids);
+        spec->num_adcs = ARRAY_SIZE(stac922x_adc_nids);
         spec->num_dmics = 0;
 
         spec->init = stac922x_core_init;
@@ -2224,22 +2738,25 @@ static int patch_stac927x(struct hda_codec *codec)
                 spec->adc_nids = stac927x_adc_nids;
                 spec->mux_nids = stac927x_mux_nids;
                 spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids);
+                spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids);
                 spec->num_dmics = 0;
                 spec->init = d965_core_init;
-                spec->mixer = stac9227_mixer;
+                spec->mixer = stac927x_mixer;
                 break;
         case STAC_D965_5ST:
                 spec->adc_nids = stac927x_adc_nids;
                 spec->mux_nids = stac927x_mux_nids;
                 spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids);
+                spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids);
                 spec->num_dmics = 0;
                 spec->init = d965_core_init;
-                spec->mixer = stac9227_mixer;
+                spec->mixer = stac927x_mixer;
                 break;
         default:
                 spec->adc_nids = stac927x_adc_nids;
                 spec->mux_nids = stac927x_mux_nids;
                 spec->num_muxes = ARRAY_SIZE(stac927x_mux_nids);
+                spec->num_adcs = ARRAY_SIZE(stac927x_adc_nids);
                 spec->num_dmics = 0;
                 spec->init = stac927x_core_init;
                 spec->mixer = stac927x_mixer;
@@ -2247,7 +2764,8 @@ static int patch_stac927x(struct hda_codec *codec)
 
         spec->multiout.dac_nids = spec->dac_nids;
         /* GPIO0 High = Enable EAPD */
-        stac92xx_enable_gpio_mask(codec, 0x00000001, 0x00000001);
+        spec->gpio_mask = spec->gpio_data = 0x00000001;
+        stac92xx_enable_gpio_mask(codec); 
         
         err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
         if (!err) {
@@ -2272,7 +2790,7 @@ static int patch_stac927x(struct hda_codec *codec)
 static int patch_stac9205(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec;
-        int err, gpio_mask, gpio_data;
+        int err;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -2299,10 +2817,11 @@ static int patch_stac9205(struct hda_codec *codec)
         }
 
         spec->adc_nids = stac9205_adc_nids;
+        spec->num_adcs = ARRAY_SIZE(stac9205_adc_nids);
         spec->mux_nids = stac9205_mux_nids;
         spec->num_muxes = ARRAY_SIZE(stac9205_mux_nids);
         spec->dmic_nids = stac9205_dmic_nids;
-        spec->num_dmics = ARRAY_SIZE(stac9205_dmic_nids);
+        spec->num_dmics = STAC9205_NUM_DMICS;
         spec->dmux_nid = 0x1d;
 
         spec->init = stac9205_core_init;
@@ -2310,20 +2829,25 @@ static int patch_stac9205(struct hda_codec *codec)
 
         spec->multiout.dac_nids = spec->dac_nids;
         
-        if (spec->board_config == STAC_M43xx) {
+        switch (spec->board_config){
+        case STAC_9205_DELL_M43:
                 /* Enable SPDIF in/out */
                 stac92xx_set_config_reg(codec, 0x1f, 0x01441030);
                 stac92xx_set_config_reg(codec, 0x20, 0x1c410030);
 
-                gpio_mask = 0x00000007; /* GPIO0-2 */
+                spec->gpio_mask = 0x00000007; /* GPIO0-2 */
                 /* GPIO0 High = EAPD, GPIO1 Low = DRM,
                  * GPIO2 High = Headphone Mute
                  */
-                gpio_data = 0x00000005;
-        } else
-                gpio_mask = gpio_data = 0x00000001; /* GPIO0 High = EAPD */
+                spec->gpio_data = 0x00000005;
+                break;
+        default:
+                /* GPIO0 High = EAPD */
+                spec->gpio_mask = spec->gpio_data = 0x00000001;
+                break;
+        }
 
-        stac92xx_enable_gpio_mask(codec, gpio_mask, gpio_data);
+        stac92xx_enable_gpio_mask(codec);
         err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);
         if (!err) {
                 if (spec->board_config < 0) {
@@ -2355,7 +2879,7 @@ static hda_nid_t vaio_adcs[] = { 0x8 /*,0x6*/ };
 static hda_nid_t vaio_mux_nids[] = { 0x15 };
 
 static struct hda_input_mux vaio_mux = {
-        .num_items = 2,
+        .num_items = 3,
         .items = {
                 /* { "HP", 0x0 }, */
                 { "Mic Jack", 0x1 },
@@ -2366,6 +2890,7 @@ static struct hda_input_mux vaio_mux = {
 
 static struct hda_verb vaio_init[] = {
         {0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
+        {0x0a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | STAC_HP_EVENT},
         {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
         {0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
         {0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
@@ -2397,61 +2922,28 @@ static struct hda_verb vaio_ar_init[] = {
 };
 
 /* bind volumes of both NID 0x02 and 0x05 */
-static int vaio_master_vol_put(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls vaio_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* bind volumes of both NID 0x02 and 0x05 */
-static int vaio_master_sw_put(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
-                                          0x80, (valp[0] ? 0 : 0x80));
-        change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
-                                           0x80, (valp[1] ? 0 : 0x80));
-        snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
-                                 0x80, (valp[0] ? 0 : 0x80));
-        snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
-                                 0x80, (valp[1] ? 0 : 0x80));
-        return change;
-}
+static struct hda_bind_ctls vaio_bind_master_sw = {
+        .ops = &snd_hda_bind_sw,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+                0,
+        },
+};
 
 static struct snd_kcontrol_new vaio_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = vaio_master_vol_put,
-                .tlv = { .c = snd_hda_mixer_amp_tlv },
-                .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Switch",
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
-                .put = vaio_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
         /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
@@ -2467,22 +2959,8 @@ static struct snd_kcontrol_new vaio_mixer[] = {
 };
 
 static struct snd_kcontrol_new vaio_ar_mixer[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = vaio_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Switch",
-                .info = snd_hda_mixer_amp_switch_info,
-                .get = snd_hda_mixer_amp_switch_get,
-                .put = vaio_master_sw_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &vaio_bind_master_vol),
+        HDA_BIND_SW("Master Playback Switch", &vaio_bind_master_sw),
         /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
         HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
         HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
@@ -2504,6 +2982,49 @@ static struct hda_codec_ops stac9872_patch_ops = {
         .build_pcms = stac92xx_build_pcms,
         .init = stac92xx_init,
         .free = stac92xx_free,
+#ifdef SND_HDA_NEEDS_RESUME
+        .resume = stac92xx_resume,
+#endif
+};
+
+static int stac9872_vaio_init(struct hda_codec *codec)
+{
+        int err;
+
+        err = stac92xx_init(codec);
+        if (err < 0)
+                return err;
+        if (codec->patch_ops.unsol_event)
+                codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
+        return 0;
+}
+
+static void stac9872_vaio_hp_detect(struct hda_codec *codec, unsigned int res)
+{
+        if (get_pin_presence(codec, 0x0a)) {
+                stac92xx_reset_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
+                stac92xx_set_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
+        } else {
+                stac92xx_reset_pinctl(codec, 0x0a, AC_PINCTL_OUT_EN);
+                stac92xx_set_pinctl(codec, 0x0f, AC_PINCTL_OUT_EN);
+        }
+} 
+
+static void stac9872_vaio_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        switch (res >> 26) {
+        case STAC_HP_EVENT:
+                stac9872_vaio_hp_detect(codec, res);
+                break;
+        }
+}
+
+static struct hda_codec_ops stac9872_vaio_patch_ops = {
+        .build_controls = stac92xx_build_controls,
+        .build_pcms = stac92xx_build_pcms,
+        .init = stac9872_vaio_init,
+        .free = stac92xx_free,
+        .unsol_event = stac9872_vaio_unsol_event,
 #ifdef CONFIG_PM
         .resume = stac92xx_resume,
 #endif
@@ -2564,6 +3085,7 @@ static int patch_stac9872(struct hda_codec *codec)
                 spec->adc_nids = vaio_adcs;
                 spec->input_mux = &vaio_mux;
                 spec->mux_nids = vaio_mux_nids;
+                codec->patch_ops = stac9872_vaio_patch_ops;
                 break;
         
         case CXD9872AKD_VAIO:
@@ -2577,10 +3099,10 @@ static int patch_stac9872(struct hda_codec *codec)
                 spec->adc_nids = vaio_adcs;
                 spec->input_mux = &vaio_mux;
                 spec->mux_nids = vaio_mux_nids;
+                codec->patch_ops = stac9872_patch_ops;
                 break;
         }
 
-        codec->patch_ops = stac9872_patch_ops;
         return 0;
 }
 
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index ba32d1e52cb8..33b5e1ffa817 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -115,6 +115,10 @@ struct via_spec {
         struct snd_kcontrol_new *kctl_alloc;
         struct hda_input_mux private_imux;
         hda_nid_t private_dac_nids[4];  
+
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        struct hda_loopback_check loopback;
+#endif
 };
 
 static hda_nid_t vt1708_adc_nids[2] = {
@@ -305,15 +309,15 @@ static struct hda_verb vt1708_volume_init_verbs[] = {
         {0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          */
         /* Amp Indices: CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* master */
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output mixers (0x19 - 0x1b)
@@ -543,24 +547,11 @@ static int via_init(struct hda_codec *codec)
         return 0;
 }
 
-#ifdef CONFIG_PM
-/*
- * resume
- */
-static int via_resume(struct hda_codec *codec)
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static int via_check_power_status(struct hda_codec *codec, hda_nid_t nid)
 {
         struct via_spec *spec = codec->spec;
-        int i;
-
-        via_init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-
-        return 0;
+        return snd_hda_check_amp_list_power(codec, &spec->loopback, nid);
 }
 #endif
 
@@ -571,8 +562,8 @@ static struct hda_codec_ops via_patch_ops = {
         .build_pcms = via_build_pcms,
         .init = via_init,
         .free = via_free,
-#ifdef CONFIG_PM
-        .resume = via_resume,
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        .check_power_status = via_check_power_status,
 #endif
 };
 
@@ -762,6 +753,16 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
         return 0;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1708_loopbacks[] = {
+        { 0x17, HDA_INPUT, 1 },
+        { 0x17, HDA_INPUT, 2 },
+        { 0x17, HDA_INPUT, 3 },
+        { 0x17, HDA_INPUT, 4 },
+        { } /* end */
+};
+#endif
+
 static int vt1708_parse_auto_config(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
@@ -855,6 +856,9 @@ static int patch_vt1708(struct hda_codec *codec)
         codec->patch_ops = via_patch_ops;
 
         codec->patch_ops.init = via_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1708_loopbacks;
+#endif
 
         return 0;
 }
@@ -895,15 +899,15 @@ static struct hda_verb vt1709_10ch_volume_init_verbs[] = {
         {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
 
 
-        /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
+        /* Mute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
          */
         /* Amp Indices: AOW0=0, CD = 1, Mic1 = 2, Line = 3, Mic2 = 4 */
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
-        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* unmute master */
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
+        {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
 
         /*
          * Set up output selector (0x1a, 0x1b, 0x29)
@@ -1251,6 +1255,16 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
         return 1;
 }
 
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+static struct hda_amp_list vt1709_loopbacks[] = {
+        { 0x18, HDA_INPUT, 1 },
+        { 0x18, HDA_INPUT, 2 },
+        { 0x18, HDA_INPUT, 3 },
+        { 0x18, HDA_INPUT, 4 },
+        { } /* end */
+};
+#endif
+
 static int patch_vt1709_10ch(struct hda_codec *codec)
 {
         struct via_spec *spec;
@@ -1293,6 +1307,9 @@ static int patch_vt1709_10ch(struct hda_codec *codec)
         codec->patch_ops = via_patch_ops;
 
         codec->patch_ops.init = via_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1709_loopbacks;
+#endif
 
         return 0;
 }
@@ -1383,6 +1400,9 @@ static int patch_vt1709_6ch(struct hda_codec *codec)
         codec->patch_ops = via_patch_ops;
 
         codec->patch_ops.init = via_auto_init;
+#ifdef CONFIG_SND_HDA_POWER_SAVE
+        spec->loopback.amplist = vt1709_loopbacks;
+#endif
 
         return 0;
 }
diff --git a/sound/pci/ice1712/Makefile b/sound/pci/ice1712/Makefile
index 6efdd62f6837..65ce66adba5a 100644
--- a/sound/pci/ice1712/Makefile
+++ b/sound/pci/ice1712/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ice17xx-ak4xxx-objs := ak4xxx.o
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index ab00cce2c39f..a1aba0d7d0e4 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -3,7 +3,7 @@
  *
  *   AK4524 / AK4528 / AK4529 / AK4355 / AK4381 interface
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -30,7 +30,7 @@
 #include <sound/initval.h>
 #include "ice1712.h"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ICEnsemble ICE17xx <-> AK4xxx AD/DA chip interface");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index 44bbb630b949..6e13d758bb5d 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -3,7 +3,7 @@
  *
  *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/amp.h b/sound/pci/ice1712/amp.h
index a0fc89b48122..bf81d30d9150 100644
--- a/sound/pci/ice1712/amp.h
+++ b/sound/pci/ice1712/amp.h
@@ -6,7 +6,7 @@
  *
  *   Lowlevel functions for Advanced Micro Peripherals Ltd AUDIO2000
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 66bacde1ead3..ec0699c89952 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -394,7 +394,7 @@ static int aureon_ac97_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ele
 /*
  * AC'97 mute controls
  */
-#define aureon_ac97_mute_info   aureon_mono_bool_info
+#define aureon_ac97_mute_info   snd_ctl_boolean_mono_info
 
 static int aureon_ac97_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -430,7 +430,7 @@ static int aureon_ac97_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 /*
  * AC'97 mute controls
  */
-#define aureon_ac97_micboost_info       aureon_mono_bool_info
+#define aureon_ac97_micboost_info       snd_ctl_boolean_mono_info
 
 static int aureon_ac97_micboost_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -621,19 +621,12 @@ static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val)
 
 /*
  */
-static int aureon_mono_bool_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define aureon_mono_bool_info           snd_ctl_boolean_mono_info
 
 /*
  * AC'97 master playback mute controls (Mute on WM8770 chip)
  */
-#define aureon_ac97_mmute_info  aureon_mono_bool_info
+#define aureon_ac97_mmute_info          snd_ctl_boolean_mono_info
 
 static int aureon_ac97_mmute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -708,7 +701,7 @@ static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index, unsigned sho
 /*
  * DAC mute control
  */
-#define wm_pcm_mute_info        aureon_mono_bool_info
+#define wm_pcm_mute_info        snd_ctl_boolean_mono_info
 
 static int wm_pcm_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -879,13 +872,7 @@ static int wm_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
 /*
  * WM8770 master mute control
  */
-static int wm_master_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_master_mute_info             snd_ctl_boolean_stereo_info
 
 static int wm_master_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -969,14 +956,7 @@ static int wm_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
 /*
  * ADC mute control
  */
-static int wm_adc_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_adc_mute_info                snd_ctl_boolean_stereo_info
 
 static int wm_adc_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1210,12 +1190,7 @@ static int aureon_cs8415_rate_get (struct snd_kcontrol *kcontrol, struct snd_ctl
 /*
  * CS8415A Mute
  */
-static int aureon_cs8415_mute_info (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        return 0;
-}
+#define aureon_cs8415_mute_info         snd_ctl_boolean_mono_info
 
 static int aureon_cs8415_mute_get (struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1316,7 +1291,7 @@ static int aureon_get_headphone_amp(struct snd_ice1712 *ice)
         return ( tmp & AUREON_HP_SEL )!= 0;
 }
 
-#define aureon_hpamp_info       aureon_mono_bool_info
+#define aureon_hpamp_info       snd_ctl_boolean_mono_info
 
 static int aureon_hpamp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1338,7 +1313,7 @@ static int aureon_hpamp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
  * Deemphasis
  */
 
-#define aureon_deemp_info       aureon_mono_bool_info
+#define aureon_deemp_info       snd_ctl_boolean_mono_info
 
 static int aureon_deemp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index af659800c9b0..371f78461db4 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -4,7 +4,7 @@
  *   Lowlevel functions for M-Audio Delta 1010, 44, 66, Dio2496, Audiophile
  *                          Digigram VX442
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -393,15 +393,8 @@ static void delta_setup_spdif(struct snd_ice1712 *ice, int rate)
         snd_ice1712_delta_cs8403_spdif_write(ice, tmp);
 }
 
-static int snd_ice1712_delta1010lt_wordclock_status_info(struct snd_kcontrol *kcontrol,
-                          struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_delta1010lt_wordclock_status_info \
+        snd_ctl_boolean_mono_info
 
 static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h
index 2697156607e4..26ea05a32f56 100644
--- a/sound/pci/ice1712/delta.h
+++ b/sound/pci/ice1712/delta.h
@@ -7,7 +7,7 @@
  *   Lowlevel functions for M-Audio Delta 1010, 44, 66, Dio2496, Audiophile
  *                          Digigram VX442
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/envy24ht.h b/sound/pci/ice1712/envy24ht.h
index b58afcda9ed6..43b9e3e858be 100644
--- a/sound/pci/ice1712/envy24ht.h
+++ b/sound/pci/ice1712/envy24ht.h
@@ -4,7 +4,7 @@
 /*
  *   ALSA driver for ICEnsemble VT1724 (Envy24)
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index b135389fec6c..75e4e5e0f1e4 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -3,7 +3,7 @@
  *
  *   Lowlevel functions for Terratec EWS88MT/D, EWX24/96, DMX 6Fire
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *                    2002 Takashi Iwai <tiwai@suse.de>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -700,14 +700,7 @@ static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense __devinitdata =
  * EWS88D specific controls
  */
 
-static int snd_ice1712_ews88d_control_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_ews88d_control_info         snd_ctl_boolean_mono_info
 
 static int snd_ice1712_ews88d_control_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -812,14 +805,7 @@ static int snd_ice1712_6fire_write_pca(struct snd_ice1712 *ice, unsigned char re
         return 0;
 }
 
-static int snd_ice1712_6fire_control_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_6fire_control_info          snd_ctl_boolean_mono_info
 
 static int snd_ice1712_6fire_control_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/ice1712/ews.h b/sound/pci/ice1712/ews.h
index a12a0b053558..e4ed1b475b08 100644
--- a/sound/pci/ice1712/ews.h
+++ b/sound/pci/ice1712/ews.h
@@ -6,7 +6,7 @@
  *
  *   Lowlevel functions for Terratec EWS88MT/D, EWX24/96, DMX 6Fire
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *                    2002 Takashi Iwai <tiwai@suse.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c
index 8203562ef7e7..abcfd1da6587 100644
--- a/sound/pci/ice1712/hoontech.c
+++ b/sound/pci/ice1712/hoontech.c
@@ -3,7 +3,7 @@
  *
  *   Lowlevel functions for Hoontech STDSP24
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/hoontech.h b/sound/pci/ice1712/hoontech.h
index 1ee538b20fbf..cc1da1e69ad1 100644
--- a/sound/pci/ice1712/hoontech.h
+++ b/sound/pci/ice1712/hoontech.h
@@ -6,7 +6,7 @@
  *
  *   Lowlevel functions for Hoontech STDSP24
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 6630a0ae9527..052fc3cb3272 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA driver for ICEnsemble ICE1712 (Envy24)
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -73,7 +73,7 @@
 #include "ews.h"
 #include "hoontech.h"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("ICEnsemble ICE1712 (Envy24)");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{"
@@ -256,14 +256,7 @@ static unsigned short snd_ice1712_pro_ac97_read(struct snd_ac97 *ac97,
 /*
  * consumer ac97 digital mix
  */
-static int snd_ice1712_digmix_route_ac97_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_digmix_route_ac97_info      snd_ctl_boolean_mono_info
 
 static int snd_ice1712_digmix_route_ac97_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1300,14 +1293,7 @@ static void snd_ice1712_update_volume(struct snd_ice1712 *ice, int index)
         outw(val, ICEMT(ice, MONITOR_VOLUME));
 }
 
-static int snd_ice1712_pro_mixer_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_pro_mixer_switch_info       snd_ctl_boolean_stereo_info
 
 static int snd_ice1712_pro_mixer_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1759,16 +1745,6 @@ static struct snd_kcontrol_new snd_ice1712_spdif_stream __devinitdata =
         .put =          snd_ice1712_spdif_stream_put
 };
 
-int snd_ice1712_gpio_info(struct snd_kcontrol *kcontrol,
-                          struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
 int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
@@ -1968,15 +1944,7 @@ static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default __devinitd
         .put = snd_ice1712_pro_internal_clock_default_put
 };
 
-static int snd_ice1712_pro_rate_locking_info(struct snd_kcontrol *kcontrol,
-                                             struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_pro_rate_locking_info       snd_ctl_boolean_mono_info
 
 static int snd_ice1712_pro_rate_locking_get(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_value *ucontrol)
@@ -2007,15 +1975,7 @@ static struct snd_kcontrol_new snd_ice1712_pro_rate_locking __devinitdata = {
         .put = snd_ice1712_pro_rate_locking_put
 };
 
-static int snd_ice1712_pro_rate_reset_info(struct snd_kcontrol *kcontrol,
-                                           struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ice1712_pro_rate_reset_info         snd_ctl_boolean_mono_info
 
 static int snd_ice1712_pro_rate_reset_get(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 6ac486d9c138..58640afa5404 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -4,7 +4,7 @@
 /*
  *   ALSA driver for ICEnsemble ICE1712 (Envy24)
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -451,11 +451,10 @@ static inline void snd_ice1712_restore_gpio_status(struct snd_ice1712 *ice)
 
 /* for bit controls */
 #define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \
-{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ice1712_gpio_info, \
+{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ctl_boolean_mono_info, \
   .get = snd_ice1712_gpio_get, .put = snd_ice1712_gpio_put, \
   .private_value = mask | (invert << 24) }
 
-int snd_ice1712_gpio_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
 int snd_ice1712_gpio_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
 int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
 
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index ee620dea7ef3..0b0bbb0d96b9 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2,7 +2,7 @@
  *   ALSA driver for VT1724 ICEnsemble ICE1724 / VIA VT1724 (Envy24HT)
  *                   VIA VT1720 (Envy24PT)
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *                    2002 James Stafford <jstafford@ampltd.com>
  *                    2003 Takashi Iwai <tiwai@suse.de>
  *
@@ -52,7 +52,7 @@
 #include "phase.h"
 #include "wtm.h"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("VIA ICEnsemble ICE1724/1720 (Envy24HT/PT)");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{"
@@ -341,10 +341,12 @@ static int snd_vt1724_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 
         what = 0;
         snd_pcm_group_for_each_entry(s, substream) {
-                const struct vt1724_pcm_reg *reg;
-                reg = s->runtime->private_data;
-                what |= reg->start;
-                snd_pcm_trigger_done(s, substream);
+                if (snd_pcm_substream_chip(s) == ice) {
+                        const struct vt1724_pcm_reg *reg;
+                        reg = s->runtime->private_data;
+                        what |= reg->start;
+                        snd_pcm_trigger_done(s, substream);
+                }
         }
 
         switch (cmd) {
@@ -1479,15 +1481,7 @@ static struct snd_kcontrol_new snd_vt1724_spdif_maskp __devinitdata =
         .get =          snd_vt1724_spdif_maskp_get,
 };
 
-static int snd_vt1724_spdif_sw_info(struct snd_kcontrol *kcontrol,
-                                    struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_vt1724_spdif_sw_info                snd_ctl_boolean_mono_info
 
 static int snd_vt1724_spdif_sw_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
@@ -1532,15 +1526,7 @@ static struct snd_kcontrol_new snd_vt1724_spdif_switch __devinitdata =
  * GPIO access from extern
  */
 
-int snd_vt1724_gpio_info(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_vt1724_gpio_info            snd_ctl_boolean_mono_info
 
 int snd_vt1724_gpio_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
@@ -1706,15 +1692,7 @@ static struct snd_kcontrol_new snd_vt1724_pro_internal_clock __devinitdata = {
         .put = snd_vt1724_pro_internal_clock_put
 };
 
-static int snd_vt1724_pro_rate_locking_info(struct snd_kcontrol *kcontrol,
-                                            struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_vt1724_pro_rate_locking_info        snd_ctl_boolean_mono_info
 
 static int snd_vt1724_pro_rate_locking_get(struct snd_kcontrol *kcontrol,
                                            struct snd_ctl_elem_value *ucontrol)
@@ -1745,15 +1723,7 @@ static struct snd_kcontrol_new snd_vt1724_pro_rate_locking __devinitdata = {
         .put = snd_vt1724_pro_rate_locking_put
 };
 
-static int snd_vt1724_pro_rate_reset_info(struct snd_kcontrol *kcontrol,
-                                          struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_vt1724_pro_rate_reset_info          snd_ctl_boolean_mono_info
 
 static int snd_vt1724_pro_rate_reset_get(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 3d8e74e493d7..1fbe3ef8e60a 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -3,7 +3,7 @@
  *
  *   Lowlevel functions for ESI Juli@ cards
  *
- *      Copyright (c) 2004 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2004 Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pci/ice1712/phase.c b/sound/pci/ice1712/phase.c
index 40a9098af777..3ac25058bb58 100644
--- a/sound/pci/ice1712/phase.c
+++ b/sound/pci/ice1712/phase.c
@@ -270,7 +270,7 @@ static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index, unsigned sho
 /*
  * DAC mute control
  */
-#define wm_pcm_mute_info        phase28_mono_bool_info
+#define wm_pcm_mute_info        snd_ctl_boolean_mono_info
 
 static int wm_pcm_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -527,13 +527,7 @@ static int wm_mute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value
 /*
  * WM8770 master mute control
  */
-static int wm_master_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_master_mute_info             snd_ctl_boolean_stereo_info
 
 static int wm_master_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -615,20 +609,9 @@ static int wm_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
 }
 
 /*
- */
-static int phase28_mono_bool_info(struct snd_kcontrol *k, 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;
-}
-
-/*
  * Deemphasis
  */
-#define phase28_deemp_info      phase28_mono_bool_info
+#define phase28_deemp_info      snd_ctl_boolean_mono_info
 
 static int phase28_deemp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 01c69453ddeb..faefd52c1b80 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -216,14 +216,7 @@ static int wm_adc_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
 /*
  * ADC input mux mixer control
  */
-static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_adc_mux_info         snd_ctl_boolean_mono_info
 
 static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -260,14 +253,7 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_val
 /*
  * Analog bypass (In -> Out)
  */
-static int wm_bypass_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_bypass_info          snd_ctl_boolean_mono_info
 
 static int wm_bypass_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -302,14 +288,7 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu
 /*
  * Left/Right swap
  */
-static int wm_chswap_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define wm_chswap_info          snd_ctl_boolean_mono_info
 
 static int wm_chswap_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c
index 4bae7305a79b..4180f9739ecb 100644
--- a/sound/pci/ice1712/prodigy192.c
+++ b/sound/pci/ice1712/prodigy192.c
@@ -81,14 +81,7 @@ static inline unsigned char stac9460_get(struct snd_ice1712 *ice, int reg)
 /*
  * DAC mute control
  */
-static int stac9460_dac_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define stac9460_dac_mute_info          snd_ctl_boolean_mono_info
 
 static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -177,14 +170,7 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
 /*
  * ADC mute control
  */
-static int stac9460_adc_mute_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define stac9460_adc_mute_info          snd_ctl_boolean_stereo_info
 
 static int stac9460_adc_mute_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -292,14 +278,7 @@ static int aureon_get_headphone_amp(struct snd_ice1712 *ice)
         return ( tmp & AUREON_HP_SEL )!= 0;
 }
 
-static int aureon_bool_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define aureon_bool_info        snd_ctl_boolean_mono_info
 
 static int aureon_hpamp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/ice1712/wtm.c b/sound/pci/ice1712/wtm.c
index 04e535c8542b..7fcce0a506d6 100644
--- a/sound/pci/ice1712/wtm.c
+++ b/sound/pci/ice1712/wtm.c
@@ -71,14 +71,7 @@ static inline unsigned char stac9460_2_get(struct snd_ice1712 *ice, int reg)
 /*
  *      DAC mute control
  */
-static int stac9460_dac_mute_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        return 0;
-}
+#define stac9460_dac_mute_info          snd_ctl_boolean_mono_info
 
 static int stac9460_dac_mute_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
@@ -218,15 +211,7 @@ static int stac9460_dac_vol_put(struct snd_kcontrol *kcontrol,
 /*
  * ADC mute control
  */
-static int stac9460_adc_mute_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define stac9460_adc_mute_info          snd_ctl_boolean_stereo_info
 
 static int stac9460_adc_mute_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
@@ -357,15 +342,7 @@ static int stac9460_adc_vol_put(struct snd_kcontrol *kcontrol,
  * MIC / LINE switch fonction
  */
 
-static int stac9460_mic_sw_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define stac9460_mic_sw_info            snd_ctl_boolean_mono_info
 
 static int stac9460_mic_sw_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index da9734073dba..b4a38a3d855b 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA driver for Intel ICH (i8x0) chipsets
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This code also contains alpha support for SiS 735 chipsets provided
@@ -43,7 +43,7 @@
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH},"
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index c155e1f3a0e5..fad806e60f36 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1,7 +1,7 @@
 /*
  *   ALSA modem driver for Intel ICH (i8x0) chipsets
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   This is modified (by Sasha Khapyorsky <sashak@alsa-project.org>) version
  *   of ALSA ICH sound driver intel8x0.c .
@@ -37,7 +37,7 @@
 #include <sound/info.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; "
                    "SiS 7013; NVidia MCP/2/2S/3 modems");
 MODULE_LICENSE("GPL");
diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile
index 78c9dc6eeb2d..f11ce1b1b3d4 100644
--- a/sound/pci/korg1212/Makefile
+++ b/sound/pci/korg1212/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-korg1212-objs := korg1212.o
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 5338243fb035..c4af57fb5af1 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -1391,8 +1391,6 @@ static int snd_korg1212_playback_open(struct snd_pcm_substream *substream)
         K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_playback_open [%s]\n",
                            stateName[korg1212->cardState]);
 
-        snd_pcm_set_sync(substream);    // ???
-
         snd_korg1212_OpenCard(korg1212);
 
         runtime->hw = snd_korg1212_playback_info;
@@ -1422,8 +1420,6 @@ static int snd_korg1212_capture_open(struct snd_pcm_substream *substream)
         K1212_DEBUG_PRINTK("K1212_DEBUG: snd_korg1212_capture_open [%s]\n",
                            stateName[korg1212->cardState]);
 
-        snd_pcm_set_sync(substream);
-
         snd_korg1212_OpenCard(korg1212);
 
         runtime->hw = snd_korg1212_capture_info;
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 8a5ff1cb5362..32245770595e 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1821,7 +1821,6 @@ snd_m3_playback_open(struct snd_pcm_substream *subs)
                 return err;
 
         runtime->hw = snd_m3_playback;
-        snd_pcm_set_sync(subs);
 
         return 0;
 }
@@ -1846,7 +1845,6 @@ snd_m3_capture_open(struct snd_pcm_substream *subs)
                 return err;
 
         runtime->hw = snd_m3_capture;
-        snd_pcm_set_sync(subs);
 
         return 0;
 }
diff --git a/sound/pci/mixart/Makefile b/sound/pci/mixart/Makefile
index fe6ba0c4b567..cce159ec5624 100644
--- a/sound/pci/mixart/Makefile
+++ b/sound/pci/mixart/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-mixart-objs := mixart.o mixart_core.o mixart_hwdep.o mixart_mixer.o
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index ac007cec0879..880b824e24cd 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -652,7 +652,7 @@ static int snd_mixart_hw_free(struct snd_pcm_substream *subs)
 static struct snd_pcm_hardware snd_mixart_analog_caps =
 {
         .info             = ( SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                              SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
+                              SNDRV_PCM_INFO_MMAP_VALID |
                               SNDRV_PCM_INFO_PAUSE),
         .formats          = ( SNDRV_PCM_FMTBIT_U8 |
                               SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -673,7 +673,7 @@ static struct snd_pcm_hardware snd_mixart_analog_caps =
 static struct snd_pcm_hardware snd_mixart_digital_caps =
 {
         .info             = ( SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                              SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
+                              SNDRV_PCM_INFO_MMAP_VALID |
                               SNDRV_PCM_INFO_PAUSE),
         .formats          = ( SNDRV_PCM_FMTBIT_U8 |
                               SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |
@@ -1317,6 +1317,12 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
                 mgr->mem[i].phys = pci_resource_start(pci, i);
                 mgr->mem[i].virt = ioremap_nocache(mgr->mem[i].phys,
                                                    pci_resource_len(pci, i));
+                if (!mgr->mem[i].virt) {
+                        printk(KERN_ERR "unable to remap resource 0x%lx\n",
+                               mgr->mem[i].phys);
+                        snd_mixart_free(mgr);
+                        return -EBUSY;
+                }
         }
 
         if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
diff --git a/sound/pci/mixart/mixart_mixer.c b/sound/pci/mixart/mixart_mixer.c
index d7d15c036e02..0e16512d25f7 100644
--- a/sound/pci/mixart/mixart_mixer.c
+++ b/sound/pci/mixart/mixart_mixer.c
@@ -403,14 +403,7 @@ static struct snd_kcontrol_new mixart_control_analog_level = {
 };
 
 /* shared */
-static int mixart_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define mixart_sw_info          snd_ctl_boolean_stereo_info
 
 static int mixart_audio_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/nm256/Makefile b/sound/pci/nm256/Makefile
index d91d8c519212..a1bd44ff850e 100644
--- a/sound/pci/nm256/Makefile
+++ b/sound/pci/nm256/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-nm256-objs := nm256.o
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index c7621bd770a6..276c5763f0e5 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -842,7 +842,6 @@ static void snd_nm256_setup_stream(struct nm256 *chip, struct nm256_stream *s,
         runtime->private_data = s;
         s->substream = substream;
 
-        snd_pcm_set_sync(substream);
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                    &constraints_rates);
 }
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index f7f6a687f033..2d618bd7e62b 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -646,6 +646,8 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
                 if (snd_pcm_stream_linked(subs)) {
                         struct snd_pcxhr *chip = snd_pcm_substream_chip(subs);
                         snd_pcm_group_for_each_entry(s, subs) {
+                                if (snd_pcm_substream_chip(s) != chip)
+                                        continue;
                                 stream = s->runtime->private_data;
                                 stream->status =
                                         PCXHR_STREAM_STATUS_SCHEDULE_RUN;
@@ -662,6 +664,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
                         if (pcxhr_update_r_buffer(stream))
                                 return -EINVAL;
 
+                        stream->status = PCXHR_STREAM_STATUS_SCHEDULE_RUN;
                         if (pcxhr_set_stream_state(stream))
                                 return -EINVAL;
                         stream->status = PCXHR_STREAM_STATUS_RUNNING;
@@ -902,6 +905,8 @@ static int pcxhr_open(struct snd_pcm_substream *subs)
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 4);
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 4);
 
+        snd_pcm_set_sync(subs);
+
         mgr->ref_count_rate++;
 
         mutex_unlock(&mgr->setup_mutex);
diff --git a/sound/pci/pcxhr/pcxhr_mixer.c b/sound/pci/pcxhr/pcxhr_mixer.c
index d9cc8d2beb6d..5f8d42633b04 100644
--- a/sound/pci/pcxhr/pcxhr_mixer.c
+++ b/sound/pci/pcxhr/pcxhr_mixer.c
@@ -44,8 +44,8 @@
 #define PCXHR_ANALOG_PLAYBACK_LEVEL_MAX  128    /*    0.0 dB */
 #define PCXHR_ANALOG_PLAYBACK_ZERO_LEVEL 104    /*  -24.0 dB ( 0.0 dB - fix level +24.0 dB ) */
 
-static const DECLARE_TLV_DB_SCALE(db_scale_analog_capture, -9600, 50, 0);
-static const DECLARE_TLV_DB_SCALE(db_scale_analog_playback, -12800, 100, 0);
+static const DECLARE_TLV_DB_SCALE(db_scale_analog_capture, -9600, 50, 3150);
+static const DECLARE_TLV_DB_SCALE(db_scale_analog_playback, -10400, 100, 2400);
 
 static int pcxhr_update_analog_audio_level(struct snd_pcxhr *chip, int is_capture, int channel)
 {
@@ -144,14 +144,7 @@ static struct snd_kcontrol_new pcxhr_control_analog_level = {
 };
 
 /* shared */
-static int pcxhr_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define pcxhr_sw_info           snd_ctl_boolean_stereo_info
 
 static int pcxhr_audio_sw_get(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
@@ -195,7 +188,7 @@ static struct snd_kcontrol_new pcxhr_control_output_switch = {
 #define PCXHR_DIGITAL_LEVEL_MAX         0x1ff   /* +18 dB */
 #define PCXHR_DIGITAL_ZERO_LEVEL        0x1b7   /*  0 dB */
 
-static const DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);
+static const DECLARE_TLV_DB_SCALE(db_scale_digital, -10975, 25, 1800);
 
 #define MORE_THAN_ONE_STREAM_LEVEL      0x000001
 #define VALID_STREAM_PAN_LEVEL_MASK     0x800000
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 618653e22561..1475912588e9 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -258,19 +258,6 @@ static inline unsigned int snd_rme32_pcm_byteptr(struct rme32 * rme32)
                 & RME32_RCR_AUDIO_ADDR_MASK);
 }
 
-static int snd_rme32_ratecode(int rate)
-{
-        switch (rate) {
-        case 32000: return SNDRV_PCM_RATE_32000;
-        case 44100: return SNDRV_PCM_RATE_44100;
-        case 48000: return SNDRV_PCM_RATE_48000;
-        case 64000: return SNDRV_PCM_RATE_64000;
-        case 88200: return SNDRV_PCM_RATE_88200;
-        case 96000: return SNDRV_PCM_RATE_96000;
-        }
-        return 0;
-}
-
 /* silence callback for halfduplex mode */
 static int snd_rme32_playback_silence(struct snd_pcm_substream *substream, int channel, /* not used (interleaved data) */
                                       snd_pcm_uframes_t pos,
@@ -887,7 +874,7 @@ static int snd_rme32_playback_spdif_open(struct snd_pcm_substream *substream)
         if ((rme32->rcreg & RME32_RCR_KMODE) &&
             (rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {
                 /* AutoSync */
-                runtime->hw.rates = snd_rme32_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }       
@@ -929,7 +916,7 @@ static int snd_rme32_capture_spdif_open(struct snd_pcm_substream *substream)
                 if (isadat) {
                         return -EIO;
                 }
-                runtime->hw.rates = snd_rme32_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }
@@ -965,7 +952,7 @@ snd_rme32_playback_adat_open(struct snd_pcm_substream *substream)
         if ((rme32->rcreg & RME32_RCR_KMODE) &&
             (rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {
                 /* AutoSync */
-                runtime->hw.rates = snd_rme32_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }        
@@ -989,7 +976,7 @@ snd_rme32_capture_adat_open(struct snd_pcm_substream *substream)
                 if (!isadat) {
                         return -EIO;
                 }
-                runtime->hw.rates = snd_rme32_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }
@@ -1582,16 +1569,8 @@ static void __devinit snd_rme32_proc_init(struct rme32 * rme32)
  * control interface
  */
 
-static int
-snd_rme32_info_loopback_control(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_rme32_info_loopback_control         snd_ctl_boolean_mono_info
+
 static int
 snd_rme32_get_loopback_control(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index e3304b7ccbcb..0b3c532c4014 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -301,20 +301,6 @@ snd_rme96_capture_ptr(struct rme96 *rme96)
 }
 
 static int
-snd_rme96_ratecode(int rate)
-{
-    switch (rate) {
-    case 32000: return SNDRV_PCM_RATE_32000;
-    case 44100: return SNDRV_PCM_RATE_44100;
-    case 48000: return SNDRV_PCM_RATE_48000;
-    case 64000: return SNDRV_PCM_RATE_64000;
-    case 88200: return SNDRV_PCM_RATE_88200;
-    case 96000: return SNDRV_PCM_RATE_96000;
-    }
-    return 0;
-}
-
-static int
 snd_rme96_playback_silence(struct snd_pcm_substream *substream,
                            int channel, /* not used (interleaved data) */
                            snd_pcm_uframes_t pos,
@@ -1176,8 +1162,6 @@ snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
         struct rme96 *rme96 = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        snd_pcm_set_sync(substream);
-
         spin_lock_irq(&rme96->lock);    
         if (rme96->playback_substream != NULL) {
                 spin_unlock_irq(&rme96->lock);
@@ -1194,7 +1178,7 @@ snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
             (rate = snd_rme96_capture_getrate(rme96, &dummy)) > 0)
         {
                 /* slave clock */
-                runtime->hw.rates = snd_rme96_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }        
@@ -1214,8 +1198,6 @@ snd_rme96_capture_spdif_open(struct snd_pcm_substream *substream)
         struct rme96 *rme96 = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        snd_pcm_set_sync(substream);
-
         runtime->hw = snd_rme96_capture_spdif_info;
         if (snd_rme96_getinputtype(rme96) != RME96_INPUT_ANALOG &&
             (rate = snd_rme96_capture_getrate(rme96, &isadat)) > 0)
@@ -1223,7 +1205,7 @@ snd_rme96_capture_spdif_open(struct snd_pcm_substream *substream)
                 if (isadat) {
                         return -EIO;
                 }
-                runtime->hw.rates = snd_rme96_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }
@@ -1247,8 +1229,6 @@ snd_rme96_playback_adat_open(struct snd_pcm_substream *substream)
         struct rme96 *rme96 = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;        
         
-        snd_pcm_set_sync(substream);
-
         spin_lock_irq(&rme96->lock);    
         if (rme96->playback_substream != NULL) {
                 spin_unlock_irq(&rme96->lock);
@@ -1265,7 +1245,7 @@ snd_rme96_playback_adat_open(struct snd_pcm_substream *substream)
             (rate = snd_rme96_capture_getrate(rme96, &dummy)) > 0)
         {
                 /* slave clock */
-                runtime->hw.rates = snd_rme96_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }        
@@ -1280,8 +1260,6 @@ snd_rme96_capture_adat_open(struct snd_pcm_substream *substream)
         struct rme96 *rme96 = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        snd_pcm_set_sync(substream);
-
         runtime->hw = snd_rme96_capture_adat_info;
         if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
                 /* makes no sense to use analog input. Note that analog
@@ -1292,7 +1270,7 @@ snd_rme96_capture_adat_open(struct snd_pcm_substream *substream)
                 if (!isadat) {
                         return -EIO;
                 }
-                runtime->hw.rates = snd_rme96_ratecode(rate);
+                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
                 runtime->hw.rate_min = rate;
                 runtime->hw.rate_max = rate;
         }
@@ -1826,15 +1804,8 @@ snd_rme96_proc_init(struct rme96 *rme96)
  * control interface
  */
 
-static int
-snd_rme96_info_loopback_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_rme96_info_loopback_control         snd_ctl_boolean_mono_info
+
 static int
 snd_rme96_get_loopback_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/rme9652/Makefile b/sound/pci/rme9652/Makefile
index d2c294e136f9..dcba56040205 100644
--- a/sound/pci/rme9652/Makefile
+++ b/sound/pci/rme9652/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-rme9652-objs := rme9652.o
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 3b3ef657f73e..ff26a3672d40 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -606,28 +606,28 @@ static void snd_hdsp_9652_enable_mixer (struct hdsp *hdsp);
 
 static int hdsp_playback_to_output_key (struct hdsp *hdsp, int in, int out)
 {
-        switch (hdsp->firmware_rev) {
-        case 0xa:
+        switch (hdsp->io_type) {
+        case Multiface:
+        case Digiface:
+        default:
                 return (64 * out) + (32 + (in));
-        case 0x96:
-        case 0x97:
-        case 0x98:
+        case H9632:
                 return (32 * out) + (16 + (in));
-        default:
+        case H9652:
                 return (52 * out) + (26 + (in));
         }
 }
 
 static int hdsp_input_to_output_key (struct hdsp *hdsp, int in, int out)
 {
-        switch (hdsp->firmware_rev) {
-        case 0xa:
+        switch (hdsp->io_type) {
+        case Multiface:
+        case Digiface:
+        default:
                 return (64 * out) + in;
-        case 0x96:
-        case 0x97:
-        case 0x98:
+        case H9632:
                 return (32 * out) + in;
-        default:
+        case H9652:
                 return (52 * out) + in;
         }
 }
@@ -1623,14 +1623,7 @@ static int hdsp_set_spdif_output(struct hdsp *hdsp, int out)
         return 0;
 }
 
-static int snd_hdsp_info_spdif_bits(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_spdif_bits        snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_spdif_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2111,14 +2104,7 @@ static int snd_hdsp_put_clock_source(struct snd_kcontrol *kcontrol, struct snd_c
         return change;
 }
 
-static int snd_hdsp_info_clock_source_lock(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_clock_source_lock         snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_clock_source_lock(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2420,14 +2406,7 @@ static int hdsp_set_xlr_breakout_cable(struct hdsp *hdsp, int mode)
         return 0;
 }
 
-static int snd_hdsp_info_xlr_breakout_cable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_xlr_breakout_cable        snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_xlr_breakout_cable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2483,14 +2462,7 @@ static int hdsp_set_aeb(struct hdsp *hdsp, int mode)
         return 0;
 }
 
-static int snd_hdsp_info_aeb(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_aeb               snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_aeb(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2729,14 +2701,7 @@ static int hdsp_set_line_output(struct hdsp *hdsp, int out)
         return 0;
 }
 
-static int snd_hdsp_info_line_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_line_out          snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_line_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2782,14 +2747,7 @@ static int hdsp_set_precise_pointer(struct hdsp *hdsp, int precise)
         return 0;
 }
 
-static int snd_hdsp_info_precise_pointer(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_precise_pointer           snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_precise_pointer(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -2835,14 +2793,7 @@ static int hdsp_set_use_midi_tasklet(struct hdsp *hdsp, int use_tasklet)
         return 0;
 }
 
-static int snd_hdsp_info_use_midi_tasklet(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdsp_info_use_midi_tasklet          snd_ctl_boolean_mono_info
 
 static int snd_hdsp_get_use_midi_tasklet(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -3108,6 +3059,9 @@ static int hdsp_dds_offset(struct hdsp *hdsp)
         unsigned int dds_value = hdsp->dds_value;
         int system_sample_rate = hdsp->system_sample_rate;
 
+        if (!dds_value)
+                return 0;
+
         n = DDS_NUMERATOR;
         /*
          * dds_value = n / rate
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 143185e7e4dc..f1bdda6cbcff 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1,5 +1,4 @@
-/*   -*- linux-c -*-
- *
+/*
  *   ALSA driver for RME Hammerfall DSP MADI audio interface(s)
  *
  *      Copyright (c) 2003 Winfried Ritsch (IEM)
@@ -78,7 +77,8 @@ 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>, "
+      ("Winfried Ritsch <ritsch_AT_iem.at>, "
+       "Paul Davis <paul@linuxaudiosystems.com>, "
        "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>, "
        "Remy Bruno <remy.bruno@trinnov.com>");
 MODULE_DESCRIPTION("RME HDSPM");
@@ -161,7 +161,9 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
                                      0=off, 1=on  */ /* MADI ONLY */
 #define HDSPM_Dolby       (1<<11) /* Dolby = "NonAudio" ?? */ /* AES32 ONLY */
 
-#define HDSPM_InputSelect0 (1<<14) /* Input select 0= optical, 1=coax */ /* MADI ONLY*/
+#define HDSPM_InputSelect0 (1<<14) /* Input select 0= optical, 1=coax
+                                    * -- MADI ONLY
+                                    */
 #define HDSPM_InputSelect1 (1<<15) /* should be 0 */
 
 #define HDSPM_SyncRef0     (1<<16) /* 0=WOrd, 1=MADI */
@@ -189,11 +191,13 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
 /* --- bit helper defines */
 #define HDSPM_LatencyMask    (HDSPM_Latency0|HDSPM_Latency1|HDSPM_Latency2)
-#define HDSPM_FrequencyMask  (HDSPM_Frequency0|HDSPM_Frequency1|HDSPM_DoubleSpeed|HDSPM_QuadSpeed)
+#define HDSPM_FrequencyMask  (HDSPM_Frequency0|HDSPM_Frequency1|\
+                              HDSPM_DoubleSpeed|HDSPM_QuadSpeed)
 #define HDSPM_InputMask      (HDSPM_InputSelect0|HDSPM_InputSelect1)
 #define HDSPM_InputOptical   0
 #define HDSPM_InputCoaxial   (HDSPM_InputSelect0)
-#define HDSPM_SyncRefMask    (HDSPM_SyncRef0|HDSPM_SyncRef1|HDSPM_SyncRef2|HDSPM_SyncRef3)
+#define HDSPM_SyncRefMask    (HDSPM_SyncRef0|HDSPM_SyncRef1|\
+                              HDSPM_SyncRef2|HDSPM_SyncRef3)
 #define HDSPM_SyncRef_Word   0
 #define HDSPM_SyncRef_MADI   (HDSPM_SyncRef0)
 
@@ -205,10 +209,12 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_Frequency48KHz   (HDSPM_Frequency1|HDSPM_Frequency0)
 #define HDSPM_Frequency64KHz   (HDSPM_DoubleSpeed|HDSPM_Frequency0)
 #define HDSPM_Frequency88_2KHz (HDSPM_DoubleSpeed|HDSPM_Frequency1)
-#define HDSPM_Frequency96KHz   (HDSPM_DoubleSpeed|HDSPM_Frequency1|HDSPM_Frequency0)
+#define HDSPM_Frequency96KHz   (HDSPM_DoubleSpeed|HDSPM_Frequency1|\
+                                HDSPM_Frequency0)
 #define HDSPM_Frequency128KHz   (HDSPM_QuadSpeed|HDSPM_Frequency0)
 #define HDSPM_Frequency176_4KHz   (HDSPM_QuadSpeed|HDSPM_Frequency1)
-#define HDSPM_Frequency192KHz   (HDSPM_QuadSpeed|HDSPM_Frequency1|HDSPM_Frequency0)
+#define HDSPM_Frequency192KHz   (HDSPM_QuadSpeed|HDSPM_Frequency1|\
+                                 HDSPM_Frequency0)
 
 /* --- for internal discrimination */
 #define HDSPM_CLOCK_SOURCE_AUTOSYNC          0  /* Sample Clock Sources */
@@ -256,10 +262,14 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_RD_MULTIPLE     (1<<10)
 
 /* --- Status Register bits --- */ /* MADI ONLY */ /* Bits defined here and
-     that do not conflict with specific bits for AES32 seem to be valid also for the AES32 */
+     that do not conflict with specific bits for AES32 seem to be valid also
+     for the AES32
+ */
 #define HDSPM_audioIRQPending    (1<<0) /* IRQ is high and pending */
-#define HDSPM_RX_64ch            (1<<1) /* Input 64chan. MODE=1, 56chn. MODE=0 */
-#define HDSPM_AB_int             (1<<2) /* InputChannel Opt=0, Coax=1 (like inp0) */
+#define HDSPM_RX_64ch            (1<<1) /* Input 64chan. MODE=1, 56chn MODE=0 */
+#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_BufferPositionMask 0x000FFC0 /* Bit 6..15 : h/w buffer pointer */
@@ -274,12 +284,15 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_madiFreq2         (1<<24) /* 4=64, 5=88.2 6=96 */
 #define HDSPM_madiFreq3         (1<<25) /* 7=128, 8=176.4 9=192 */
 
-#define HDSPM_BufferID          (1<<26) /* (Double)Buffer ID toggles with Interrupt */
+#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 */
 
 /* --- status bit helpers */
-#define HDSPM_madiFreqMask  (HDSPM_madiFreq0|HDSPM_madiFreq1|HDSPM_madiFreq2|HDSPM_madiFreq3)
+#define HDSPM_madiFreqMask  (HDSPM_madiFreq0|HDSPM_madiFreq1|\
+                             HDSPM_madiFreq2|HDSPM_madiFreq3)
 #define HDSPM_madiFreq32    (HDSPM_madiFreq0)
 #define HDSPM_madiFreq44_1  (HDSPM_madiFreq1)
 #define HDSPM_madiFreq48    (HDSPM_madiFreq0|HDSPM_madiFreq1)
@@ -319,10 +332,12 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
 
 
-#define HDSPM_SelSyncRefMask       (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|HDSPM_SelSyncRef2)
+#define HDSPM_SelSyncRefMask       (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
+                                    HDSPM_SelSyncRef2)
 #define HDSPM_SelSyncRef_WORD      0
 #define HDSPM_SelSyncRef_MADI      (HDSPM_SelSyncRef0)
-#define HDSPM_SelSyncRef_NVALID    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|HDSPM_SelSyncRef2)
+#define HDSPM_SelSyncRef_NVALID    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
+                                    HDSPM_SelSyncRef2)
 
 /*
    For AES32, bits for status, status2 and timecode are different
@@ -344,7 +359,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_AES32_AUTOSYNC_FROM_AES6 6
 #define HDSPM_AES32_AUTOSYNC_FROM_AES7 7
 #define HDSPM_AES32_AUTOSYNC_FROM_AES8 8
-#define HDSPM_AES32_AUTOSYNC_FROM_NONE -1
+#define HDSPM_AES32_AUTOSYNC_FROM_NONE 9
 
 /*  status2 */
 /* HDSPM_LockAES_bit is given by HDSPM_LockAES >> (AES# - 1) */
@@ -398,6 +413,13 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 /* revisions >= 230 indicate AES32 card */
 #define HDSPM_AESREVISION 230
 
+/* 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" };
+
 struct hdspm_midi {
         struct hdspm *hdspm;
         int id;
@@ -412,8 +434,9 @@ struct hdspm_midi {
 
 struct hdspm {
         spinlock_t lock;
-        struct snd_pcm_substream *capture_substream;     /* only one playback */
-        struct snd_pcm_substream *playback_substream; /* and/or capture stream */
+        /* only one playback and/or capture stream */
+        struct snd_pcm_substream *capture_substream;
+        struct snd_pcm_substream *playback_substream;
 
         char *card_name;             /* for procinfo */
         unsigned short firmware_rev; /* dont know if relevant (yes if AES32)*/
@@ -460,9 +483,12 @@ struct hdspm {
         struct pci_dev *pci;    /* and an pci info */
 
         /* Mixer vars */
-        struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];   /* fast alsa mixer */
-        struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];      /* but input to much, so not used */
-        struct hdspm_mixer *mixer;      /* full mixer accessable over mixer ioctl or hwdep-device */
+        /* fast alsa mixer */
+        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 */
+        struct hdspm_mixer *mixer;
 
 };
 
@@ -616,13 +642,15 @@ static inline 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 timecode =
+                        hdspm_read(hdspm, HDSPM_timecodeRegister);
 
                 int 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 >>
@@ -668,7 +696,9 @@ static inline int hdspm_external_sample_rate(struct hdspm * hdspm)
                         }
                 }
 
-                /* if rate detected and Syncref is Word than have it, word has priority to MADI */
+                /* if rate detected and Syncref is Word than have it,
+                 * word has priority to MADI
+                 */
                 if (rate != 0 &&
                     (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
                         return rate;
@@ -727,12 +757,12 @@ static snd_pcm_uframes_t hdspm_hw_pointer(struct hdspm * hdspm)
 
         position = hdspm_read(hdspm, HDSPM_statusRegister);
 
-        if (!hdspm->precise_ptr) {
-                return (position & HDSPM_BufferID) ? (hdspm->period_bytes /
-                                                      4) : 0;
-        }
+        if (!hdspm->precise_ptr)
+                return (position & HDSPM_BufferID) ?
+                        (hdspm->period_bytes / 4) : 0;
 
-        /* hwpointer comes in bytes and is 64Bytes accurate (by docu since PCI Burst)
+        /* 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
@@ -811,7 +841,7 @@ static void hdspm_set_dds_value(struct hdspm *hdspm, int rate)
 //      return 104857600000000 / rate; // 100 MHz
         return 110100480000000 / rate; // 105 MHz
         */         
-        //n = 104857600000000ULL;  /*  =  2^20 * 10^8 */
+        /* n = 104857600000000ULL; */ /*  =  2^20 * 10^8 */
         n = 110100480000000ULL;    /* Value checked for AES32 and MADI */
         div64_32(&n, rate, &r);
         /* n should be less than 2^32 for being written to FREQ register */
@@ -822,11 +852,10 @@ static void hdspm_set_dds_value(struct hdspm *hdspm, int rate)
 /* dummy set rate lets see what happens */
 static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 {
-        int reject_if_open = 0;
         int current_rate;
         int rate_bits;
         int not_set = 0;
-        int is_single, is_double, is_quad;
+        int current_speed, target_speed;
 
         /* ASSUMPTION: hdspm->lock is either set, or there is no need for
            it (e.g. during module initialization).
@@ -841,8 +870,9 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
                      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");
+                        snd_printk(KERN_WARNING "HDSPM: "
+                                   "Warning: device is not running "
+                                   "as a clock master.\n");
                         not_set = 1;
                 } else {
 
@@ -850,16 +880,18 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
                         int external_freq =
                             hdspm_external_sample_rate(hdspm);
 
-                        if ((hdspm_autosync_ref(hdspm) ==
-                             HDSPM_AUTOSYNC_FROM_NONE)) {
+                        if (hdspm_autosync_ref(hdspm) ==
+                            HDSPM_AUTOSYNC_FROM_NONE) {
 
-                                snd_printk(KERN_WARNING "HDSPM: Detected no Externel Sync \n");
+                                snd_printk(KERN_WARNING "HDSPM: "
+                                           "Detected no Externel Sync \n");
                                 not_set = 1;
 
                         } else if (rate != external_freq) {
 
-                                snd_printk
-                                    (KERN_WARNING "HDSPM: Warning: No AutoSync source for requested rate\n");
+                                snd_printk(KERN_WARNING "HDSPM: "
+                                           "Warning: No AutoSync source for "
+                                           "requested rate\n");
                                 not_set = 1;
                         }
                 }
@@ -877,64 +909,60 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
            changes in the read/write routines.  
          */
 
-        is_single = (current_rate <= 48000);
-        is_double = (current_rate > 48000 && current_rate <= 96000);
-        is_quad = (current_rate > 96000);
+        if (current_rate <= 48000)
+                current_speed = HDSPM_SPEED_SINGLE;
+        else if (current_rate <= 96000)
+                current_speed = HDSPM_SPEED_DOUBLE;
+        else
+                current_speed = HDSPM_SPEED_QUAD;
+
+        if (rate <= 48000)
+                target_speed = HDSPM_SPEED_SINGLE;
+        else if (rate <= 96000)
+                target_speed = HDSPM_SPEED_DOUBLE;
+        else
+                target_speed = HDSPM_SPEED_QUAD;
 
         switch (rate) {
         case 32000:
-                if (!is_single)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency32KHz;
                 break;
         case 44100:
-                if (!is_single)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency44_1KHz;
                 break;
         case 48000:
-                if (!is_single)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency48KHz;
                 break;
         case 64000:
-                if (!is_double)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency64KHz;
                 break;
         case 88200:
-                if (!is_double)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency88_2KHz;
                 break;
         case 96000:
-                if (!is_double)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency96KHz;
                 break;
         case 128000:
-                if (!is_quad)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency128KHz;
                 break;
         case 176400:
-                if (!is_quad)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency176_4KHz;
                 break;
         case 192000:
-                if (!is_quad)
-                        reject_if_open = 1;
                 rate_bits = HDSPM_Frequency192KHz;
                 break;
         default:
                 return -EINVAL;
         }
 
-        if (reject_if_open
+        if (current_speed != target_speed
             && (hdspm->capture_pid >= 0 || hdspm->playback_pid >= 0)) {
                 snd_printk
-                    (KERN_ERR "HDSPM: cannot change between single- and double-speed mode (capture PID = %d, playback PID = %d)\n",
+                    (KERN_ERR "HDSPM: "
+                     "cannot change from %s speed to %s speed mode "
+                     "(capture PID = %d, playback PID = %d)\n",
+                     hdspm_speed_names[current_speed],
+                     hdspm_speed_names[target_speed],
                      hdspm->capture_pid, hdspm->playback_pid);
                 return -EBUSY;
         }
@@ -966,8 +994,14 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 static void all_in_all_mixer(struct hdspm * hdspm, int sgain)
 {
         int i, j;
-        unsigned int gain =
-            (sgain > UNITY_GAIN) ? UNITY_GAIN : (sgain < 0) ? 0 : sgain;
+        unsigned int gain;
+
+        if (sgain > UNITY_GAIN)
+                gain = UNITY_GAIN;
+        else if (sgain < 0)
+                gain = 0;
+        else
+                gain = sgain;
 
         for (i = 0; i < HDSPM_MIXER_CHANNELS; i++)
                 for (j = 0; j < HDSPM_MIXER_CHANNELS; j++) {
@@ -980,7 +1014,8 @@ static void all_in_all_mixer(struct hdspm * hdspm, int sgain)
    MIDI
   ----------------------------------------------------------------------------*/
 
-static inline unsigned char snd_hdspm_midi_read_byte (struct hdspm *hdspm, int id)
+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)
@@ -989,7 +1024,8 @@ static inline unsigned char snd_hdspm_midi_read_byte (struct hdspm *hdspm, int i
                 return hdspm_read(hdspm, HDSPM_midiDataIn0);
 }
 
-static inline void snd_hdspm_midi_write_byte (struct hdspm *hdspm, int id, int val)
+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)
@@ -1011,9 +1047,10 @@ 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) & 0xff;
+                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut1);
         else
-                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xff;
+                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut0);
+        fifo_bytes_used &= 0xff;
 
         if (fifo_bytes_used < 128)
                 return  128 - fifo_bytes_used;
@@ -1038,16 +1075,21 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
         /* Output is not interrupt driven */
                 
         spin_lock_irqsave (&hmidi->lock, flags);
-        if (hmidi->output) {
-                if (!snd_rawmidi_transmit_empty (hmidi->output)) {
-                        if ((n_pending = snd_hdspm_midi_output_possible (hmidi->hdspm, hmidi->id)) > 0) {
-                                if (n_pending > (int)sizeof (buf))
-                                        n_pending = sizeof (buf);
-                                
-                                if ((to_write = snd_rawmidi_transmit (hmidi->output, buf, n_pending)) > 0) {
-                                        for (i = 0; i < to_write; ++i) 
-                                                snd_hdspm_midi_write_byte (hmidi->hdspm, hmidi->id, buf[i]);
-                                }
+        if (hmidi->output &&
+            !snd_rawmidi_transmit_empty (hmidi->output)) {
+                n_pending = snd_hdspm_midi_output_possible (hmidi->hdspm,
+                                                            hmidi->id);
+                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) 
+                                        snd_hdspm_midi_write_byte (hmidi->hdspm,
+                                                                   hmidi->id,
+                                                                   buf[i]);
                         }
                 }
         }
@@ -1057,51 +1099,55 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
 
 static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
 {
-        unsigned char buf[128]; /* this buffer is designed to match the MIDI input FIFO size */
+        unsigned char buf[128]; /* this buffer is designed to match the MIDI
+                                 * input FIFO size
+                                 */
         unsigned long flags;
         int n_pending;
         int i;
 
         spin_lock_irqsave (&hmidi->lock, flags);
-        if ((n_pending = snd_hdspm_midi_input_available (hmidi->hdspm, hmidi->id)) > 0) {
+        n_pending = snd_hdspm_midi_input_available (hmidi->hdspm, hmidi->id);
+        if (n_pending > 0) {
                 if (hmidi->input) {
-                        if (n_pending > (int)sizeof (buf)) {
+                        if (n_pending > (int)sizeof (buf))
                                 n_pending = sizeof (buf);
-                        }
-                        for (i = 0; i < n_pending; ++i) {
-                                buf[i] = snd_hdspm_midi_read_byte (hmidi->hdspm, hmidi->id);
-                        }
-                        if (n_pending) {
-                                snd_rawmidi_receive (hmidi->input, buf, n_pending);
-                        }
+                        for (i = 0; i < n_pending; ++i)
+                                buf[i] = snd_hdspm_midi_read_byte (hmidi->hdspm,
+                                                                   hmidi->id);
+                        if (n_pending)
+                                snd_rawmidi_receive (hmidi->input, buf,
+                                                     n_pending);
                 } else {
                         /* flush the MIDI input FIFO */
-                        while (n_pending--) {
-                                snd_hdspm_midi_read_byte (hmidi->hdspm, hmidi->id);
-                        }
+                        while (n_pending--)
+                                snd_hdspm_midi_read_byte (hmidi->hdspm,
+                                                          hmidi->id);
                 }
         }
         hmidi->pending = 0;
-        if (hmidi->id) {
+        if (hmidi->id)
                 hmidi->hdspm->control_register |= HDSPM_Midi1InterruptEnable;
-        } else {
+        else
                 hmidi->hdspm->control_register |= HDSPM_Midi0InterruptEnable;
-        }
-        hdspm_write(hmidi->hdspm, HDSPM_controlRegister, hmidi->hdspm->control_register);
+        hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
+                    hmidi->hdspm->control_register);
         spin_unlock_irqrestore (&hmidi->lock, flags);
         return snd_hdspm_midi_output_write (hmidi);
 }
 
-static void snd_hdspm_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
+static void
+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 = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         hdspm = hmidi->hdspm;
-        ie = hmidi->id ? HDSPM_Midi1InterruptEnable : HDSPM_Midi0InterruptEnable;
+        ie = hmidi->id ?
+                HDSPM_Midi1InterruptEnable : HDSPM_Midi0InterruptEnable;
         spin_lock_irqsave (&hdspm->lock, flags);
         if (up) {
                 if (!(hdspm->control_register & ie)) {
@@ -1138,12 +1184,13 @@ static void snd_hdspm_midi_output_timer(unsigned long data)
         spin_unlock_irqrestore (&hmidi->lock, flags);
 }
 
-static void snd_hdspm_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
+static void
+snd_hdspm_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
 {
         struct hdspm_midi *hmidi;
         unsigned long flags;
 
-        hmidi = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         spin_lock_irqsave (&hmidi->lock, flags);
         if (up) {
                 if (!hmidi->istimer) {
@@ -1155,9 +1202,8 @@ static void snd_hdspm_midi_output_trigger(struct snd_rawmidi_substream *substrea
                         hmidi->istimer++;
                 }
         } else {
-                if (hmidi->istimer && --hmidi->istimer <= 0) {
+                if (hmidi->istimer && --hmidi->istimer <= 0)
                         del_timer (&hmidi->timer);
-                }
         }
         spin_unlock_irqrestore (&hmidi->lock, flags);
         if (up)
@@ -1168,7 +1214,7 @@ static int snd_hdspm_midi_input_open(struct snd_rawmidi_substream *substream)
 {
         struct hdspm_midi *hmidi;
 
-        hmidi = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         spin_lock_irq (&hmidi->lock);
         snd_hdspm_flush_midi_input (hmidi->hdspm, hmidi->id);
         hmidi->input = substream;
@@ -1181,7 +1227,7 @@ static int snd_hdspm_midi_output_open(struct snd_rawmidi_substream *substream)
 {
         struct hdspm_midi *hmidi;
 
-        hmidi = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         spin_lock_irq (&hmidi->lock);
         hmidi->output = substream;
         spin_unlock_irq (&hmidi->lock);
@@ -1195,7 +1241,7 @@ static int snd_hdspm_midi_input_close(struct snd_rawmidi_substream *substream)
 
         snd_hdspm_midi_input_trigger (substream, 0);
 
-        hmidi = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         spin_lock_irq (&hmidi->lock);
         hmidi->input = NULL;
         spin_unlock_irq (&hmidi->lock);
@@ -1209,7 +1255,7 @@ static int snd_hdspm_midi_output_close(struct snd_rawmidi_substream *substream)
 
         snd_hdspm_midi_output_trigger (substream, 0);
 
-        hmidi = (struct hdspm_midi *) substream->rmidi->private_data;
+        hmidi = substream->rmidi->private_data;
         spin_lock_irq (&hmidi->lock);
         hmidi->output = NULL;
         spin_unlock_irq (&hmidi->lock);
@@ -1231,29 +1277,28 @@ static struct snd_rawmidi_ops snd_hdspm_midi_input =
         .trigger =      snd_hdspm_midi_input_trigger,
 };
 
-static int __devinit snd_hdspm_create_midi (struct snd_card *card, struct hdspm *hdspm, int id)
+static int __devinit snd_hdspm_create_midi (struct snd_card *card,
+                                            struct hdspm *hdspm, int id)
 {
         int err;
         char buf[32];
 
         hdspm->midi[id].id = id;
-        hdspm->midi[id].rmidi = NULL;
-        hdspm->midi[id].input = NULL;
-        hdspm->midi[id].output = NULL;
         hdspm->midi[id].hdspm = hdspm;
-        hdspm->midi[id].istimer = 0;
-        hdspm->midi[id].pending = 0;
         spin_lock_init (&hdspm->midi[id].lock);
 
         sprintf (buf, "%s MIDI %d", card->shortname, id+1);
-        if ((err = snd_rawmidi_new (card, buf, id, 1, 1, &hdspm->midi[id].rmidi)) < 0)
+        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 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);
+        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 |
@@ -1558,8 +1603,8 @@ static int snd_hdspm_put_clock_source(struct snd_kcontrol *kcontrol,
         val = ucontrol->value.enumerated.item[0];
         if (val < 0)
                 val = 0;
-        if (val > 6)
-                val = 6;
+        if (val > 9)
+                val = 9;
         spin_lock_irq(&hdspm->lock);
         if (val != hdspm_clock_source(hdspm))
                 change = (hdspm_set_clock_source(hdspm, val) == 0) ? 1 : 0;
@@ -1637,7 +1682,8 @@ static int hdspm_set_pref_sync_ref(struct hdspm * hdspm, int pref)
                        hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef1;
                        break;
                 case 7:
-                       hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
+                       hdspm->control_register |=
+                               HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
                        break;
                 case 8:
                        hdspm->control_register |= HDSPM_SyncRef3;
@@ -1675,7 +1721,8 @@ static int snd_hdspm_info_pref_sync_ref(struct snd_kcontrol *kcontrol,
 
                 uinfo->value.enumerated.items = 9;
 
-                if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                if (uinfo->value.enumerated.item >=
+                    uinfo->value.enumerated.items)
                         uinfo->value.enumerated.item =
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
@@ -1688,7 +1735,8 @@ static int snd_hdspm_info_pref_sync_ref(struct snd_kcontrol *kcontrol,
 
                 uinfo->value.enumerated.items = 2;
 
-                if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                if (uinfo->value.enumerated.item >=
+                    uinfo->value.enumerated.items)
                         uinfo->value.enumerated.item =
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
@@ -1740,7 +1788,8 @@ static int hdspm_autosync_ref(struct hdspm * hdspm)
 {
         if (hdspm->is_aes32) {
                 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)
@@ -1777,20 +1826,20 @@ static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
                 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
                 uinfo->count = 1;
                 uinfo->value.enumerated.items = 10;
-                if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                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
-        {
+        } else {
                 static char *texts[] = { "WordClock", "MADI", "None" };
 
                 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
                 uinfo->count = 1;
                 uinfo->value.enumerated.items = 3;
-                if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                if (uinfo->value.enumerated.item >=
+                    uinfo->value.enumerated.items)
                         uinfo->value.enumerated.item =
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
@@ -1804,7 +1853,7 @@ static int snd_hdspm_get_autosync_ref(struct snd_kcontrol *kcontrol,
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] = hdspm_pref_sync_ref(hdspm);
+        ucontrol->value.enumerated.item[0] = hdspm_autosync_ref(hdspm);
         return 0;
 }
 
@@ -1834,15 +1883,7 @@ static int hdspm_set_line_output(struct hdspm * hdspm, int out)
         return 0;
 }
 
-static int snd_hdspm_info_line_out(struct snd_kcontrol *kcontrol,
-                                   struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_line_out         snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_line_out(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
@@ -1897,15 +1938,7 @@ static int hdspm_set_tx_64(struct hdspm * hdspm, int out)
         return 0;
 }
 
-static int snd_hdspm_info_tx_64(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_tx_64            snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_tx_64(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
@@ -1960,15 +1993,7 @@ static int hdspm_set_c_tms(struct hdspm * hdspm, int out)
         return 0;
 }
 
-static int snd_hdspm_info_c_tms(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_c_tms            snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_c_tms(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
@@ -2023,15 +2048,7 @@ static int hdspm_set_safe_mode(struct hdspm * hdspm, int out)
         return 0;
 }
 
-static int snd_hdspm_info_safe_mode(struct snd_kcontrol *kcontrol,
-                                    struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_safe_mode        snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_safe_mode(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
@@ -2086,15 +2103,7 @@ static int hdspm_set_emphasis(struct hdspm * hdspm, int emp)
         return 0;
 }
 
-static int snd_hdspm_info_emphasis(struct snd_kcontrol *kcontrol,
-                                   struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_emphasis         snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_emphasis(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
@@ -2149,15 +2158,7 @@ static int hdspm_set_dolby(struct hdspm * hdspm, int dol)
         return 0;
 }
 
-static int snd_hdspm_info_dolby(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_dolby            snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_dolby(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
@@ -2212,15 +2213,7 @@ static int hdspm_set_professional(struct hdspm * hdspm, int dol)
         return 0;
 }
 
-static int snd_hdspm_info_professional(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_hdspm_info_professional     snd_ctl_boolean_mono_info
 
 static int snd_hdspm_get_professional(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
@@ -2472,7 +2465,7 @@ static int snd_hdspm_put_qs_wire(struct snd_kcontrol *kcontrol,
         if (val > 2)
                 val = 2;
         spin_lock_irq(&hdspm->lock);
-        change = (int) val != hdspm_qs_wire(hdspm);
+        change = val != hdspm_qs_wire(hdspm);
         hdspm_set_qs_wire(hdspm, val);
         spin_unlock_irq(&hdspm->lock);
         return change;
@@ -2573,8 +2566,8 @@ static int snd_hdspm_put_mixer(struct snd_kcontrol *kcontrol,
                                                     source -
                                                     HDSPM_MAX_CHANNELS);
         else
-                change =
-                    gain != hdspm_read_in_gain(hdspm, destination, source);
+                change = gain != hdspm_read_in_gain(hdspm, destination,
+                                                    source);
 
         if (change) {
                 if (source >= HDSPM_MAX_CHANNELS)
@@ -2627,7 +2620,8 @@ static int snd_hdspm_get_playback_mixer(struct snd_kcontrol *kcontrol,
         snd_assert(channel >= 0
                    || channel < HDSPM_MAX_CHANNELS, return -EINVAL);
 
-        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+        mapped_channel = hdspm->channel_map[channel];
+        if (mapped_channel < 0)
                 return -EINVAL;
 
         spin_lock_irq(&hdspm->lock);
@@ -2635,10 +2629,12 @@ static int snd_hdspm_get_playback_mixer(struct snd_kcontrol *kcontrol,
             hdspm_read_pb_gain(hdspm, mapped_channel, mapped_channel);
         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]); 
-         */
-
+        /*
+        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;
 }
 
@@ -2659,7 +2655,8 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         snd_assert(channel >= 0
                    || channel < HDSPM_MAX_CHANNELS, return -EINVAL);
 
-        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+        mapped_channel = hdspm->channel_map[channel];
+        if (mapped_channel < 0)
                 return -EINVAL;
 
         gain = ucontrol->value.integer.value[0];
@@ -2909,28 +2906,26 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm
         }
 
         /* 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 */
+           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
+        */
 
         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 ...
+        /* 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 ...
          */
 
         for (idx = 0; idx < limit; ++idx) {
                 snd_hdspm_playback_mixer.index = idx + 1;
-                if ((err = snd_ctl_add(card,
-                                       kctl =
-                                       snd_ctl_new1
-                                       (&snd_hdspm_playback_mixer,
-                                        hdspm)))) {
+                kctl = snd_ctl_new1(&snd_hdspm_playback_mixer, hdspm);
+                err = snd_ctl_add(card, kctl);
+                if (err < 0)
                         return err;
-                }
                 hdspm->playback_mixer_ctls[idx] = kctl;
         }
 
@@ -2945,7 +2940,7 @@ static void
 snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                          struct snd_info_buffer *buffer)
 {
-        struct hdspm *hdspm = (struct hdspm *) entry->private_data;
+        struct hdspm *hdspm = entry->private_data;
         unsigned int status;
         unsigned int status2;
         char *pref_sync_ref;
@@ -2978,14 +2973,14 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                     (status & HDSPM_midi1IRQPending) ? 1 : 0,
                     hdspm->irq_count);
         snd_iprintf(buffer,
-                    "HW pointer: id = %d, rawptr = %d (%d->%d) estimated= %ld (bytes)\n",
+                    "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),
+                    (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,
@@ -2995,24 +2990,22 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                     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",
+                    "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));
+        x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
+                                           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",
-                    (hdspm->
-                     control_register & HDSPM_LineOut) ? "on " : "off",
+                    (hdspm->control_register & HDSPM_LineOut) ? "on " : "off",
                     (hdspm->precise_ptr) ? "on" : "off");
 
         switch (hdspm->control_register & HDSPM_InputMask) {
@@ -3040,7 +3033,8 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                     syncref);
 
         snd_iprintf(buffer,
-                    "ClearTrackMarker = %s, Transmit in %s Channel Mode, Auto Input %s\n",
+                    "ClearTrackMarker = %s, Transmit in %s Channel Mode, "
+                    "Auto Input %s\n",
                     (hdspm->
                      control_register & HDSPM_clr_tms) ? "on" : "off",
                     (hdspm->
@@ -3141,7 +3135,7 @@ static void
 snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                           struct snd_info_buffer *buffer)
 {
-        struct hdspm *hdspm = (struct hdspm *) entry->private_data;
+        struct hdspm *hdspm = entry->private_data;
         unsigned int status;
         unsigned int status2;
         unsigned int timecode;
@@ -3171,14 +3165,14 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                     (status & HDSPM_midi1IRQPending) ? 1 : 0,
                     hdspm->irq_count);
         snd_iprintf(buffer,
-                    "HW pointer: id = %d, rawptr = %d (%d->%d) estimated= %ld (bytes)\n",
+                    "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),
+                    (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,
@@ -3188,16 +3182,15 @@ 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",
+                    "Register: ctrl1=0x%x, status1=0x%x, status2=0x%x, "
+                    "timecode=0x%x\n",
                     hdspm->control_register,
                     status, status2, timecode);
 
         snd_iprintf(buffer, "--- Settings ---\n");
 
-        x = 1 << (6 +
-                  hdspm_decode_latency(hdspm->
-                                       control_register &
-                                       HDSPM_LatencyMask));
+        x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
+                                           HDSPM_LatencyMask));
 
         snd_iprintf(buffer,
                     "Size (Latency): %d samples (2 periods of %lu bytes)\n",
@@ -3280,14 +3273,15 @@ 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",
-                        HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF));
+                    (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",
-                                HDSPM_bit2freq((timecode >> (4*x)) & 0xF));
+                            x+1,
+                            (status2 & (HDSPM_LockAES >> x)) ?
+                            "Sync   ": "No Lock",
+                            HDSPM_bit2freq((timecode >> (4*x)) & 0xF));
         }
 
         switch (hdspm_autosync_ref(hdspm)) {
@@ -3313,12 +3307,11 @@ static void
 snd_hdspm_proc_read_debug(struct snd_info_entry * entry,
                           struct snd_info_buffer *buffer)
 {
-        struct hdspm *hdspm = (struct hdspm *)entry->private_data;
+        struct hdspm *hdspm = entry->private_data;
 
         int j,i;
 
-        for (i = 0; i < 256 /* 1024*64 */; i += j)
-        {
+        for (i = 0; i < 256 /* 1024*64 */; i += j) {
                 snd_iprintf(buffer, "0x%08X: ", i);
                 for (j = 0; j < 16; j += 4)
                         snd_iprintf(buffer, "%08X ", hdspm_read(hdspm, i + j));
@@ -3361,14 +3354,20 @@ static int snd_hdspm_set_defaults(struct hdspm * hdspm)
         /* set defaults:       */
 
         if (hdspm->is_aes32)
-                hdspm->control_register = HDSPM_ClockModeMaster |       /* Master Cloack Mode on */
-                        hdspm_encode_latency(7) |       /* latency maximum = 8192 samples */
+                hdspm->control_register =
+                        HDSPM_ClockModeMaster | /* Master Cloack Mode on */
+                        hdspm_encode_latency(7) | /* latency maximum =
+                                                   * 8192 samples
+                                                   */
                         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->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 */
@@ -3399,7 +3398,8 @@ static int snd_hdspm_set_defaults(struct hdspm * hdspm)
 
         if (line_outs_monitor[hdspm->dev]) {
 
-                snd_printk(KERN_INFO "HDSPM: sending all playback streams to line outs.\n");
+                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))
@@ -3448,20 +3448,16 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
         if (audio) {
 
                 if (hdspm->capture_substream)
-                        snd_pcm_period_elapsed(hdspm->pcm->
-                                               streams
-                                               [SNDRV_PCM_STREAM_CAPTURE].
-                                               substream);
+                        snd_pcm_period_elapsed(hdspm->capture_substream);
 
                 if (hdspm->playback_substream)
-                        snd_pcm_period_elapsed(hdspm->pcm->
-                                               streams
-                                               [SNDRV_PCM_STREAM_PLAYBACK].
-                                               substream);
+                        snd_pcm_period_elapsed(hdspm->playback_substream);
         }
 
         if (midi0 && midi0status) {
-                /* we disable interrupts for this input until processing is done */
+                /* we disable interrupts for this input until processing
+                 * is done
+                 */
                 hdspm->control_register &= ~HDSPM_Midi0InterruptEnable;
                 hdspm_write(hdspm, HDSPM_controlRegister,
                             hdspm->control_register);
@@ -3469,7 +3465,9 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
                 schedule = 1;
         }
         if (midi1 && midi1status) {
-                /* we disable interrupts for this input until processing is done */
+                /* we disable interrupts for this input until processing
+                 * is done
+                 */
                 hdspm->control_register &= ~HDSPM_Midi1InterruptEnable;
                 hdspm_write(hdspm, HDSPM_controlRegister,
                             hdspm->control_register);
@@ -3501,16 +3499,16 @@ static char *hdspm_channel_buffer_location(struct hdspm * hdspm,
         snd_assert(channel >= 0
                    || channel < HDSPM_MAX_CHANNELS, return NULL);
 
-        if ((mapped_channel = hdspm->channel_map[channel]) < 0)
+        mapped_channel = hdspm->channel_map[channel];
+        if (mapped_channel < 0)
                 return NULL;
 
-        if (stream == SNDRV_PCM_STREAM_CAPTURE) {
+        if (stream == SNDRV_PCM_STREAM_CAPTURE)
                 return hdspm->capture_buffer +
                     mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-        } else {
+        else
                 return hdspm->playback_buffer +
                     mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-        }
 }
 
 
@@ -3525,9 +3523,9 @@ static int snd_hdspm_playback_copy(struct snd_pcm_substream *substream,
         snd_assert(pos + count <= HDSPM_CHANNEL_BUFFER_BYTES / 4,
                    return -EINVAL);
 
-        channel_buf = hdspm_channel_buffer_location(hdspm,
-                                                    substream->pstr->
-                                                    stream, channel);
+        channel_buf =
+                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
+                                              channel);
 
         snd_assert(channel_buf != NULL, return -EIO);
 
@@ -3544,9 +3542,9 @@ static int snd_hdspm_capture_copy(struct snd_pcm_substream *substream,
         snd_assert(pos + count <= HDSPM_CHANNEL_BUFFER_BYTES / 4,
                    return -EINVAL);
 
-        channel_buf = hdspm_channel_buffer_location(hdspm,
-                                                    substream->pstr->
-                                                    stream, channel);
+        channel_buf =
+                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
+                                              channel);
         snd_assert(channel_buf != NULL, return -EIO);
         return copy_to_user(dst, channel_buf + pos * 4, count * 4);
 }
@@ -3559,8 +3557,8 @@ static int snd_hdspm_hw_silence(struct snd_pcm_substream *substream,
         char *channel_buf;
 
         channel_buf =
-            hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                          channel);
+                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
+                                              channel);
         snd_assert(channel_buf != NULL, return -EIO);
         memset(channel_buf + pos * 4, 0, count * 4);
         return 0;
@@ -3616,7 +3614,7 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                 other_pid = hdspm->playback_pid;
         }
 
-        if ((other_pid > 0) && (this_pid != other_pid)) {
+        if (other_pid > 0 && this_pid != other_pid) {
 
                 /* The other stream is open, and not by the same
                    task as this one. Make sure that the parameters
@@ -3633,7 +3631,7 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                 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;
                 }
 
@@ -3644,7 +3642,8 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         /* how to make sure that the rate matches an externally-set one ?   */
 
         spin_lock_irq(&hdspm->lock);
-        if ((err = hdspm_set_rate(hdspm, params_rate(params), 0)) < 0) {
+        err = hdspm_set_rate(hdspm, params_rate(params), 0);
+        if (err < 0) {
                 spin_unlock_irq(&hdspm->lock);
                 _snd_pcm_hw_param_setempty(params,
                                            SNDRV_PCM_HW_PARAM_RATE);
@@ -3652,16 +3651,17 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         }
         spin_unlock_irq(&hdspm->lock);
 
-        if ((err =
-             hdspm_set_interrupt_interval(hdspm,
-                                          params_period_size(params))) <
-            0) {
+        err = hdspm_set_interrupt_interval(hdspm,
+                                           params_period_size(params));
+        if (err < 0) {
                 _snd_pcm_hw_param_setempty(params,
                                            SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
                 return err;
         }
 
-        /* Memory allocation, takashi's method, dont know if we should spinlock  */
+        /* Memory allocation, takashi's method, dont know if we should
+         * spinlock
+         */
         /* 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 */
@@ -3746,7 +3746,8 @@ static int snd_hdspm_channel_info(struct snd_pcm_substream *substream,
 
         snd_assert(info->channel < HDSPM_MAX_CHANNELS, return -EINVAL);
 
-        if ((mapped_channel = hdspm->channel_map[info->channel]) < 0)
+        mapped_channel = hdspm->channel_map[info->channel];
+        if (mapped_channel < 0)
                 return -EINVAL;
 
         info->offset = mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
@@ -3760,15 +3761,13 @@ static int snd_hdspm_ioctl(struct snd_pcm_substream *substream,
 {
         switch (cmd) {
         case SNDRV_PCM_IOCTL1_RESET:
-                {
-                        return snd_hdspm_reset(substream);
-                }
+                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;
         }
@@ -3979,9 +3978,12 @@ static int snd_hdspm_hw_rule_channels(struct snd_pcm_hw_params *params,
 }
 
 
-static unsigned int hdspm_aes32_sample_rates[] = { 32000, 44100, 48000, 64000, 88200, 96000, 128000, 176400, 192000 };
+static unsigned int hdspm_aes32_sample_rates[] = {
+        32000, 44100, 48000, 64000, 88200, 96000, 128000, 176400, 192000
+};
 
-static struct snd_pcm_hw_constraint_list hdspm_hw_constraints_aes32_sample_rates = {
+static struct snd_pcm_hw_constraint_list
+hdspm_hw_constraints_aes32_sample_rates = {
         .count = ARRAY_SIZE(hdspm_aes32_sample_rates),
         .list = hdspm_aes32_sample_rates,
         .mask = 0
@@ -4107,7 +4109,7 @@ static int snd_hdspm_hwdep_dummy_op(struct snd_hwdep * hw, struct file *file)
 static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                                  unsigned int cmd, unsigned long arg)
 {
-        struct hdspm *hdspm = (struct hdspm *) hw->private_data;
+        struct hdspm *hdspm = hw->private_data;
         struct hdspm_mixer_ioctl mixer;
         struct hdspm_config_info info;
         struct hdspm_version hdspm_version;
@@ -4115,11 +4117,12 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
 
         switch (cmd) {
 
-                
         case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS:
                 if (copy_from_user(&rms, (void __user *)arg, sizeof(rms)))
                         return -EFAULT;
-                /* maybe there is a chance to memorymap in future so dont touch just copy */
+                /* 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 )
@@ -4131,21 +4134,16 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
         case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:
 
                 spin_lock_irq(&hdspm->lock);
-                info.pref_sync_ref =
-                    (unsigned char) hdspm_pref_sync_ref(hdspm);
-                info.wordclock_sync_check =
-                    (unsigned char) hdspm_wc_sync_check(hdspm);
+                info.pref_sync_ref = hdspm_pref_sync_ref(hdspm);
+                info.wordclock_sync_check = hdspm_wc_sync_check(hdspm);
 
                 info.system_sample_rate = hdspm->system_sample_rate;
                 info.autosync_sample_rate =
                     hdspm_external_sample_rate(hdspm);
-                info.system_clock_mode =
-                    (unsigned char) hdspm_system_clock_mode(hdspm);
-                info.clock_source =
-                    (unsigned char) hdspm_clock_source(hdspm);
-                info.autosync_ref =
-                    (unsigned char) hdspm_autosync_ref(hdspm);
-                info.line_out = (unsigned char) hdspm_line_out(hdspm);
+                info.system_clock_mode = hdspm_system_clock_mode(hdspm);
+                info.clock_source = hdspm_clock_source(hdspm);
+                info.autosync_ref = hdspm_autosync_ref(hdspm);
+                info.line_out = hdspm_line_out(hdspm);
                 info.passthru = 0;
                 spin_unlock_irq(&hdspm->lock);
                 if (copy_to_user((void __user *) arg, &info, sizeof(info)))
@@ -4162,8 +4160,8 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
         case SNDRV_HDSPM_IOCTL_GET_MIXER:
                 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)))
+                if (copy_to_user((void __user *)mixer.mixer, hdspm->mixer,
+                                 sizeof(struct hdspm_mixer)))
                         return -EFAULT;
                 break;
 
@@ -4206,7 +4204,8 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card,
         struct snd_hwdep *hw;
         int err;
 
-        if ((err = snd_hwdep_new(card, "HDSPM hwdep", 0, &hw)) < 0)
+        err = snd_hwdep_new(card, "HDSPM hwdep", 0, &hw);
+        if (err < 0)
                 return err;
 
         hdspm->hwdep = hw;
@@ -4232,15 +4231,15 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
 
         pcm = hdspm->pcm;
 
-/*      wanted = HDSPM_DMA_AREA_BYTES + 4096;*/ /* dont know why, but it works */
         wanted = HDSPM_DMA_AREA_BYTES;
 
-        if ((err =
+        err =
              snd_pcm_lib_preallocate_pages_for_all(pcm,
                                                    SNDRV_DMA_TYPE_DEV_SG,
                                                    snd_dma_pci_data(hdspm->pci),
                                                    wanted,
-                                                   wanted)) < 0) {
+                                                   wanted);
+        if (err < 0) {
                 snd_printdd("Could not preallocate %zd Bytes\n", wanted);
 
                 return err;
@@ -4256,8 +4255,7 @@ static void hdspm_set_sgbuf(struct hdspm * hdspm, struct snd_sg_buf *sgbuf,
         int i;
         for (i = 0; i < (channels * 16); i++)
                 hdspm_write(hdspm, reg + 4 * i,
-                            snd_pcm_sgbuf_get_addr(sgbuf,
-                                                   (size_t) 4096 * i));
+                            snd_pcm_sgbuf_get_addr(sgbuf, (size_t) 4096 * i));
 }
 
 /* ------------- ALSA Devices ---------------------------- */
@@ -4267,7 +4265,8 @@ static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
         struct snd_pcm *pcm;
         int err;
 
-        if ((err = snd_pcm_new(card, hdspm->card_name, 0, 1, 1, &pcm)) < 0)
+        err = snd_pcm_new(card, hdspm->card_name, 0, 1, 1, &pcm);
+        if (err < 0)
                 return err;
 
         hdspm->pcm = pcm;
@@ -4281,7 +4280,8 @@ static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
 
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
 
-        if ((err = snd_hdspm_preallocate_memory(hdspm)) < 0)
+        err = snd_hdspm_preallocate_memory(hdspm);
+        if (err < 0)
                 return err;
 
         return 0;
@@ -4299,19 +4299,24 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
         int err;
 
         snd_printdd("Create card...\n");
-        if ((err = snd_hdspm_create_pcm(card, hdspm)) < 0)
+        err = snd_hdspm_create_pcm(card, hdspm);
+        if (err < 0)
                 return err;
 
-        if ((err = snd_hdspm_create_midi(card, hdspm, 0)) < 0)
+        err = snd_hdspm_create_midi(card, hdspm, 0);
+        if (err < 0)
                 return err;
 
-        if ((err = snd_hdspm_create_midi(card, hdspm, 1)) < 0)
+        err = snd_hdspm_create_midi(card, hdspm, 1);
+        if (err < 0)
                 return err;
 
-        if ((err = snd_hdspm_create_controls(card, hdspm)) < 0)
+        err = snd_hdspm_create_controls(card, hdspm);
+        if (err < 0)
                 return err;
 
-        if ((err = snd_hdspm_create_hwdep(card, hdspm)) < 0)
+        err = snd_hdspm_create_hwdep(card, hdspm);
+        if (err < 0)
                 return err;
 
         snd_printdd("proc init...\n");
@@ -4326,7 +4331,8 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
         hdspm->playback_substream = NULL;
 
         snd_printdd("Set defaults...\n");
-        if ((err = snd_hdspm_set_defaults(hdspm)) < 0)
+        err = snd_hdspm_set_defaults(hdspm);
+        if (err < 0)
                 return err;
 
         snd_printdd("Update mixer controls...\n");
@@ -4334,7 +4340,8 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
 
         snd_printdd("Initializeing complete ???\n");
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_printk(KERN_ERR "HDSPM: error registering card\n");
                 return err;
         }
@@ -4344,36 +4351,18 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
         return 0;
 }
 
-static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdspm,
+static int __devinit snd_hdspm_create(struct snd_card *card,
+                                      struct hdspm *hdspm,
                                       int precise_ptr, int enable_monitor)
 {
         struct pci_dev *pci = hdspm->pci;
         int err;
-        int i;
-
         unsigned long io_extent;
 
         hdspm->irq = -1;
-        hdspm->irq_count = 0;
-
-        hdspm->midi[0].rmidi = NULL;
-        hdspm->midi[1].rmidi = NULL;
-        hdspm->midi[0].input = NULL;
-        hdspm->midi[1].input = NULL;
-        hdspm->midi[0].output = NULL;
-        hdspm->midi[1].output = NULL;
+
         spin_lock_init(&hdspm->midi[0].lock);
         spin_lock_init(&hdspm->midi[1].lock);
-        hdspm->iobase = NULL;
-        hdspm->control_register = 0;
-        hdspm->control2_register = 0;
-
-        hdspm->playback_buffer = NULL;
-        hdspm->capture_buffer = NULL;
-
-        for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
-                hdspm->playback_mixer_ctls[i] = NULL;
-        hdspm->mixer = NULL;
 
         hdspm->card = card;
 
@@ -4396,12 +4385,14 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
                 hdspm->card_name = "RME HDSPM MADI";
         }
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
         pci_set_master(hdspm->pci);
 
-        if ((err = pci_request_regions(pci, "hdspm")) < 0)
+        err = pci_request_regions(pci, "hdspm");
+        if (err < 0)
                 return err;
 
         hdspm->port = pci_resource_start(pci, 0);
@@ -4411,8 +4402,10 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
                    hdspm->port, hdspm->port + io_extent - 1);
 
 
-        if ((hdspm->iobase = ioremap_nocache(hdspm->port, io_extent)) == NULL) {
-                snd_printk(KERN_ERR "HDSPM: unable to remap region 0x%lx-0x%lx\n",
+        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);
                 return -EBUSY;
         }
@@ -4435,9 +4428,10 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
 
         snd_printdd("kmalloc Mixer memory of %zd Bytes\n",
                    sizeof(struct hdspm_mixer));
-        if ((hdspm->mixer = kmalloc(sizeof(struct hdspm_mixer), GFP_KERNEL))
-            == NULL) {
-                snd_printk(KERN_ERR "HDSPM: unable to kmalloc Mixer memory of %d Bytes\n",
+        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));
                 return err;
         }
@@ -4447,7 +4441,8 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
         hdspm->qs_channels = MADI_QS_CHANNELS;
 
         snd_printdd("create alsa devices.\n");
-        if ((err = snd_hdspm_create_alsa_devices(card, hdspm)) < 0)
+        err = snd_hdspm_create_alsa_devices(card, hdspm);
+        if (err < 0)
                 return err;
 
         snd_hdspm_initialize_midi_flush(hdspm);
@@ -4462,9 +4457,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_Start | HDSPM_AudioInterruptEnable |
+                      HDSPM_Midi0InterruptEnable | HDSPM_Midi1InterruptEnable);
                 hdspm_write(hdspm, HDSPM_controlRegister,
                             hdspm->control_register);
         }
@@ -4472,7 +4466,6 @@ static int snd_hdspm_free(struct hdspm * hdspm)
         if (hdspm->irq >= 0)
                 free_irq(hdspm->irq, (void *) hdspm);
 
-
         kfree(hdspm->mixer);
 
         if (hdspm->iobase)
@@ -4487,7 +4480,7 @@ static int snd_hdspm_free(struct hdspm * hdspm)
 
 static void snd_hdspm_card_free(struct snd_card *card)
 {
-        struct hdspm *hdspm = (struct hdspm *) card->private_data;
+        struct hdspm *hdspm = card->private_data;
 
         if (hdspm)
                 snd_hdspm_free(hdspm);
@@ -4508,20 +4501,21 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
                 return -ENOENT;
         }
 
-        if (!(card = snd_card_new(index[dev], id[dev],
-                                  THIS_MODULE, sizeof(struct hdspm))))
+        card = snd_card_new(index[dev], id[dev],
+                            THIS_MODULE, sizeof(struct hdspm));
+        if (!card)
                 return -ENOMEM;
 
-        hdspm = (struct hdspm *) card->private_data;
+        hdspm = card->private_data;
         card->private_free = snd_hdspm_card_free;
         hdspm->dev = dev;
         hdspm->pci = pci;
 
         snd_card_set_dev(card, &pci->dev);
 
-        if ((err =
-             snd_hdspm_create(card, hdspm, precise_ptr[dev],
-                              enable_monitor[dev])) < 0) {
+        err = snd_hdspm_create(card, hdspm, precise_ptr[dev],
+                               enable_monitor[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
@@ -4530,7 +4524,8 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
         sprintf(card->longname, "%s at 0x%lx, irq %d", hdspm->card_name,
                 hdspm->port, hdspm->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 2de27405a0bd..34f96f12e5bf 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -1067,14 +1067,7 @@ static int rme9652_set_spdif_output(struct snd_rme9652 *rme9652, int out)
         return 0;
 }
 
-static int snd_rme9652_info_spdif_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_rme9652_info_spdif_out      snd_ctl_boolean_mono_info
 
 static int snd_rme9652_get_spdif_out(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1338,14 +1331,7 @@ static int snd_rme9652_put_thru(struct snd_kcontrol *kcontrol, struct snd_ctl_el
   .put = snd_rme9652_put_passthru, \
   .get = snd_rme9652_get_passthru }
 
-static int snd_rme9652_info_passthru(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_rme9652_info_passthru       snd_ctl_boolean_mono_info
 
 static int snd_rme9652_get_passthru(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1445,14 +1431,7 @@ static int snd_rme9652_get_adat_sync(struct snd_kcontrol *kcontrol, struct snd_c
   .info = snd_rme9652_info_tc_valid, \
   .get = snd_rme9652_get_tc_valid }
 
-static int snd_rme9652_info_tc_valid(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_rme9652_info_tc_valid       snd_ctl_boolean_mono_info
 
 static int snd_rme9652_get_tc_valid(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 9f25d93cbec2..44a7f5fad573 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1,6 +1,6 @@
 /*
  *  Driver for S3 SonicVibes soundcard
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *  BUGS:
  *    It looks like 86c617 rev 3 doesn't supports DDMA buffers above 16MB?
@@ -42,7 +42,7 @@
 
 #include <asm/io.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("S3 SonicVibes PCI");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}");
diff --git a/sound/pci/trident/Makefile b/sound/pci/trident/Makefile
index 65bc5b703239..65f2c218324c 100644
--- a/sound/pci/trident/Makefile
+++ b/sound/pci/trident/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-trident-objs := trident.o trident_main.o trident_memory.o
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 9145f7c57fb0..84884567df6a 100644
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -30,7 +30,7 @@
 #include <sound/trident.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, <audio@tridentmicro.com>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>");
 MODULE_DESCRIPTION("Trident 4D-WaveDX/NX & SiS SI7018");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX},"
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 7ca606272460..a235e034a690 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -1,5 +1,5 @@
 /*
- *  Maintained by Jaroslav Kysela <perex@suse.cz>
+ *  Maintained by Jaroslav Kysela <perex@perex.cz>
  *  Originated by audio@tridentmicro.com
  *  Fri Feb 19 15:55:28 MST 1999
  *  Routines for control of Trident 4DWave (DX and NX) chip
@@ -2317,15 +2317,7 @@ int __devinit snd_trident_spdif_pcm(struct snd_trident * trident,
     Description: enable/disable S/PDIF out from ac97 mixer
   ---------------------------------------------------------------------------*/
 
-static int snd_trident_spdif_control_info(struct snd_kcontrol *kcontrol,
-                                          struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_trident_spdif_control_info  snd_ctl_boolean_mono_info
 
 static int snd_trident_spdif_control_get(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
@@ -2545,15 +2537,7 @@ static struct snd_kcontrol_new snd_trident_spdif_stream __devinitdata =
     Description: enable/disable rear path for ac97
   ---------------------------------------------------------------------------*/
 
-static int snd_trident_ac97_control_info(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_trident_ac97_control_info   snd_ctl_boolean_mono_info
 
 static int snd_trident_ac97_control_get(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c
index aff3f874131c..847b8c6d5c0a 100644
--- a/sound/pci/trident/trident_memory.c
+++ b/sound/pci/trident/trident_memory.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) by Takashi Iwai <tiwai@suse.de>
  *  Copyright (c) by Scott McNab <sdm@fractalgraphics.com.au>
  *
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 6ea09df0c73a..cf62d2ab8d7c 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -3,7 +3,7 @@
  *
  *   VT82C686A/B/C, VT8233A/C, VT8235
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *                         Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com>
  *                    2002 Takashi Iwai <tiwai@suse.de>
  *
@@ -68,7 +68,7 @@
 #define POINTER_DEBUG
 #endif
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("VIA VT82xx audio");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/C,8235}}");
@@ -1572,15 +1572,7 @@ static struct snd_kcontrol_new snd_via8233_capture_source __devinitdata = {
         .put = snd_via8233_capture_source_put,
 };
 
-static int snd_via8233_dxs3_spdif_info(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_via8233_dxs3_spdif_info     snd_ctl_boolean_mono_info
 
 static int snd_via8233_dxs3_spdif_get(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
@@ -2098,7 +2090,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
                 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                         break;
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -2117,7 +2109,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
                         chip->ac97_secondary = 1;
                         goto __ac97_ok2;
                 }
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (time_before(jiffies, end_time));
         /* This is ok, the most of motherboards have only one codec */
 
@@ -2371,6 +2363,7 @@ static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
         SND_PCI_QUIRK(0x1071, 0, "Diverse Notebook", VIA_DXS_NO_VRA),
         SND_PCI_QUIRK(0x10cf, 0x118e, "FSC Laptop", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1106, 0, "ASRock", VIA_DXS_SRC),
+        SND_PCI_QUIRK(0x1297, 0xa231, "Shuttle AK31v2", VIA_DXS_SRC),
         SND_PCI_QUIRK(0x1297, 0xa232, "Shuttle", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1297, 0xc160, "Shuttle Sk41G", VIA_DXS_ENABLE),
         SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte GA-7VAXP", VIA_DXS_ENABLE),
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 72425e73abae..57fb9ae22f93 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -3,7 +3,7 @@
  *
  *   VT82C686A/B/C, VT8233A/C, VT8235
  *
- *      Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *      Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *                         Tjeerd.Mulder <Tjeerd.Mulder@fujitsu-siemens.com>
  *                    2002 Takashi Iwai <tiwai@suse.de>
  *
@@ -50,7 +50,7 @@
 #define POINTER_DEBUG
 #endif
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("VIA VT82xx modem");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{VIA,VT82C686A/B/C modem,pci}}");
@@ -983,7 +983,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip)
                 pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);
                 if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */
                         break;
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (time_before(jiffies, end_time));
 
         if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -1001,7 +1001,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip)
                         chip->ac97_secondary = 1;
                         goto __ac97_ok2;
                 }
-                schedule_timeout(1);
+                schedule_timeout_uninterruptible(1);
         } while (time_before(jiffies, end_time));
         /* This is ok, the most of motherboards have only one codec */
 
diff --git a/sound/pci/vx222/Makefile b/sound/pci/vx222/Makefile
index 058c8bff7c11..a4d08d4de354 100644
--- a/sound/pci/vx222/Makefile
+++ b/sound/pci/vx222/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-vx222-objs := vx222.o vx222_ops.o
diff --git a/sound/pci/ymfpci/Makefile b/sound/pci/ymfpci/Makefile
index 8790c5f3ed02..bd3d514ed76b 100644
--- a/sound/pci/ymfpci/Makefile
+++ b/sound/pci/ymfpci/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-ymfpci-objs := ymfpci.o ymfpci_main.o
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index fd9b7b83a884..5c4256a4d4b9 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -1,6 +1,6 @@
 /*
  *  The driver for the Yamaha's DS1/DS1E cards
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <sound/opl3.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Yamaha DS-1 PCI");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724},"
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index ab7a81c35705..1fe39ed28765 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of YMF724/740/744/754 chips
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ static int snd_ymfpci_codec_ready(struct snd_ymfpci *chip, int secondary)
         do {
                 if ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0)
                         return 0;
-                set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout_uninterruptible(1);
         } while (time_before(jiffies, end_time));
         snd_printk(KERN_ERR "codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg));
@@ -171,17 +170,6 @@ static u32 snd_ymfpci_calc_lpfQ(u32 rate)
         return val[0];
 }
 
-static void snd_ymfpci_pcm_441_volume_set(struct snd_ymfpci_pcm *ypcm)
-{
-        unsigned int value;
-        struct snd_ymfpci_pcm_mixer *mixer;
-        
-        mixer = &ypcm->chip->pcm_mixer[ypcm->substream->number];
-        value = min_t(unsigned int, mixer->left, 0x7fff) >> 1;
-        value |= (min_t(unsigned int, mixer->right, 0x7fff) >> 1) << 16;
-        snd_ymfpci_writel(ypcm->chip, YDSXGR_BUF441OUTVOL, value);
-}
-
 /*
  *  Hardware start management
  */
@@ -389,6 +377,7 @@ static int snd_ymfpci_playback_trigger(struct snd_pcm_substream *substream,
 {
         struct snd_ymfpci *chip = snd_pcm_substream_chip(substream);
         struct snd_ymfpci_pcm *ypcm = substream->runtime->private_data;
+        struct snd_kcontrol *kctl = NULL;
         int result = 0;
 
         spin_lock(&chip->reg_lock);
@@ -406,6 +395,11 @@ static int snd_ymfpci_playback_trigger(struct snd_pcm_substream *substream,
                 ypcm->running = 1;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
+                if (substream->pcm == chip->pcm && !ypcm->use_441_slot) {
+                        kctl = chip->pcm_mixer[substream->number].ctl;
+                        kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                }
+                /* fall through */
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 chip->ctrl_playback[ypcm->voices[0]->number + 1] = 0;
@@ -419,6 +413,8 @@ static int snd_ymfpci_playback_trigger(struct snd_pcm_substream *substream,
         }
       __unlock:
         spin_unlock(&chip->reg_lock);
+        if (kctl)
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_INFO, &kctl->id);
         return result;
 }
 static int snd_ymfpci_capture_trigger(struct snd_pcm_substream *substream,
@@ -526,7 +522,6 @@ static void snd_ymfpci_pcm_init_voice(struct snd_ymfpci_pcm *ypcm, unsigned int
                 ypcm->chip->src441_used = voice->number;
                 ypcm->use_441_slot = 1;
                 format |= 0x10000000;
-                snd_ymfpci_pcm_441_volume_set(ypcm);
         }
         if (ypcm->chip->src441_used == voice->number &&
             (format & 0x10000000) == 0) {
@@ -667,6 +662,7 @@ static int snd_ymfpci_playback_prepare(struct snd_pcm_substream *substream)
         struct snd_ymfpci *chip = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_ymfpci_pcm *ypcm = runtime->private_data;
+        struct snd_kcontrol *kctl;
         unsigned int nvoice;
 
         ypcm->period_size = runtime->period_size;
@@ -676,6 +672,12 @@ static int snd_ymfpci_playback_prepare(struct snd_pcm_substream *substream)
         for (nvoice = 0; nvoice < runtime->channels; nvoice++)
                 snd_ymfpci_pcm_init_voice(ypcm, nvoice, runtime,
                                           substream->pcm == chip->pcm);
+
+        if (substream->pcm == chip->pcm && !ypcm->use_441_slot) {
+                kctl = chip->pcm_mixer[substream->number].ctl;
+                kctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+                snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_INFO, &kctl->id);
+        }
         return 0;
 }
 
@@ -926,7 +928,6 @@ static int snd_ymfpci_playback_open(struct snd_pcm_substream *substream)
         struct snd_ymfpci *chip = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_ymfpci_pcm *ypcm;
-        struct snd_kcontrol *kctl;
         int err;
         
         if ((err = snd_ymfpci_playback_open_1(substream)) < 0)
@@ -941,10 +942,6 @@ static int snd_ymfpci_playback_open(struct snd_pcm_substream *substream)
                 chip->rear_opened++;
         }
         spin_unlock_irq(&chip->reg_lock);
-
-        kctl = chip->pcm_mixer[substream->number].ctl;
-        kctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_INFO, &kctl->id);
         return 0;
 }
 
@@ -1039,7 +1036,6 @@ static int snd_ymfpci_playback_close(struct snd_pcm_substream *substream)
 {
         struct snd_ymfpci *chip = snd_pcm_substream_chip(substream);
         struct snd_ymfpci_pcm *ypcm = substream->runtime->private_data;
-        struct snd_kcontrol *kctl;
 
         spin_lock_irq(&chip->reg_lock);
         if (ypcm->output_rear && chip->rear_opened > 0) {
@@ -1047,9 +1043,6 @@ static int snd_ymfpci_playback_close(struct snd_pcm_substream *substream)
                 ymfpci_close_extension(chip);
         }
         spin_unlock_irq(&chip->reg_lock);
-        kctl = chip->pcm_mixer[substream->number].ctl;
-        kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-        snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_INFO, &kctl->id);
         return snd_ymfpci_playback_close_1(substream);
 }
 
@@ -1443,22 +1436,7 @@ static struct snd_kcontrol_new snd_ymfpci_drec_source __devinitdata = {
   .get = snd_ymfpci_get_single, .put = snd_ymfpci_put_single, \
   .private_value = ((reg) | ((shift) << 16)) }
 
-static int snd_ymfpci_info_single(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        int reg = kcontrol->private_value & 0xffff;
-
-        switch (reg) {
-        case YDSXGR_SPDIFOUTCTRL: break;
-        case YDSXGR_SPDIFINCTRL: break;
-        default: return -EINVAL;
-        }
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ymfpci_info_single          snd_ctl_boolean_mono_info
 
 static int snd_ymfpci_get_single(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
@@ -1567,17 +1545,30 @@ static int snd_ymfpci_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         return change;
 }
 
+static int snd_ymfpci_put_nativedacvol(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ymfpci *chip = snd_kcontrol_chip(kcontrol);
+        unsigned int reg = YDSXGR_NATIVEDACOUTVOL;
+        unsigned int reg2 = YDSXGR_BUF441OUTVOL;
+        int change;
+        unsigned int value, oval;
+        
+        value = ucontrol->value.integer.value[0] & 0x3fff;
+        value |= (ucontrol->value.integer.value[1] & 0x3fff) << 16;
+        spin_lock_irq(&chip->reg_lock);
+        oval = snd_ymfpci_readl(chip, reg);
+        change = value != oval;
+        snd_ymfpci_writel(chip, reg, value);
+        snd_ymfpci_writel(chip, reg2, value);
+        spin_unlock_irq(&chip->reg_lock);
+        return change;
+}
+
 /*
  * 4ch duplication
  */
-static int snd_ymfpci_info_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ymfpci_info_dup4ch          snd_ctl_boolean_mono_info
 
 static int snd_ymfpci_get_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1598,7 +1589,17 @@ static int snd_ymfpci_put_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_e
 
 
 static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = {
-YMFPCI_DOUBLE("Wave Playback Volume", 0, YDSXGR_NATIVEDACOUTVOL),
+{
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Wave Playback Volume",
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
+        .info = snd_ymfpci_info_double,
+        .get = snd_ymfpci_get_double,
+        .put = snd_ymfpci_put_nativedacvol,
+        .private_value = YDSXGR_NATIVEDACOUTVOL,
+        .tlv = { .p = db_scale_native },
+},
 YMFPCI_DOUBLE("Wave Capture Volume", 0, YDSXGR_NATIVEDACLOOPVOL),
 YMFPCI_DOUBLE("Digital Capture Volume", 0, YDSXGR_NATIVEDACINVOL),
 YMFPCI_DOUBLE("Digital Capture Volume", 1, YDSXGR_NATIVEADCINVOL),
@@ -1665,14 +1666,7 @@ static int snd_ymfpci_set_gpio_out(struct snd_ymfpci *chip, int pin, int enable)
         return 0;
 }
 
-static int snd_ymfpci_gpio_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_ymfpci_gpio_sw_info         snd_ctl_boolean_mono_info
 
 static int snd_ymfpci_gpio_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -1748,8 +1742,6 @@ static int snd_ymfpci_pcm_vol_put(struct snd_kcontrol *kcontrol,
                         struct snd_ymfpci_pcm *ypcm = substream->runtime->private_data;
                         if (!ypcm->use_441_slot)
                                 ypcm->update_pcm_vol = 2;
-                        else
-                                snd_ymfpci_pcm_441_volume_set(ypcm);
                 }
                 spin_unlock_irqrestore(&chip->voice_lock, flags);
                 return 1;
diff --git a/sound/pcmcia/Makefile b/sound/pcmcia/Makefile
index b6656d48becd..beef2e33b718 100644
--- a/sound/pcmcia/Makefile
+++ b/sound/pcmcia/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 obj-$(CONFIG_SND) += vx/ pdaudiocf/
diff --git a/sound/pcmcia/pdaudiocf/Makefile b/sound/pcmcia/pdaudiocf/Makefile
index 6e194f9b50e3..e892d7299abf 100644
--- a/sound/pcmcia/pdaudiocf/Makefile
+++ b/sound/pcmcia/pdaudiocf/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2004 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2004 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-pdaudiocf-objs := pdaudiocf.o pdaudiocf_core.o pdaudiocf_irq.o pdaudiocf_pcm.o
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 2d40cc72f236..de683b08fe03 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -1,7 +1,7 @@
 /*
  * Driver for Sound Core PDAudioCF soundcard
  *
- * Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
@@ -33,7 +33,7 @@
 
 #define CARD_NAME       "PDAudio-CF"
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Sound Core " CARD_NAME);
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Sound Core," CARD_NAME "}}");
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index 206e2f5a113f..b0601838112d 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h
@@ -1,7 +1,7 @@
 /*
  * Driver for Sound Cors PDAudioCF soundcard
  *
- * Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
index 1dfe29b863d3..484c8f9a6f1c 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -1,7 +1,7 @@
 /*
  * Driver for Sound Core PDAudioCF soundcard
  *
- * Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
index 5bd69206ba65..54543369949e 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -1,7 +1,7 @@
 /*
  * Driver for Sound Core PDAudioCF soundcard
  *
- * Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index 7f2a4de1d35d..10afcb262d5c 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -3,7 +3,7 @@
  *
  * PCM part
  *
- * Copyright (c) 2003 by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
  *
  *   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
diff --git a/sound/pcmcia/vx/Makefile b/sound/pcmcia/vx/Makefile
index 54971f01e968..2bb42ea12f3a 100644
--- a/sound/pcmcia/vx/Makefile
+++ b/sound/pcmcia/vx/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-vxpocket-objs := vxpocket.o vxp_ops.o vxp_mixer.o
diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c
index 2b1f996c898d..1eff158b8687 100644
--- a/sound/pcmcia/vx/vxp_mixer.c
+++ b/sound/pcmcia/vx/vxp_mixer.c
@@ -80,14 +80,7 @@ static struct snd_kcontrol_new vx_control_mic_level = {
 /*
  * mic boost level control (for VXP440)
  */
-static int vx_mic_boost_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define vx_mic_boost_info               snd_ctl_boolean_mono_info
 
 static int vx_mic_boost_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/ppc/Makefile b/sound/ppc/Makefile
index eacee2d0675c..679c45a8da2c 100644
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
index 57202b0f033e..c5a1f0be6a4d 100644
--- a/sound/ppc/daca.c
+++ b/sound/ppc/daca.c
@@ -91,15 +91,7 @@ static int daca_set_volume(struct pmac_daca *mix)
 
 
 /* deemphasis switch */
-static int daca_info_deemphasis(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define daca_info_deemphasis            snd_ctl_boolean_mono_info
 
 static int daca_get_deemphasis(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 7a22f0f3784a..4f9b19c90a43 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -490,35 +490,14 @@ static int snd_pmac_pcm_open(struct snd_pmac *chip, struct pmac_stream *rec,
                              struct snd_pcm_substream *subs)
 {
         struct snd_pcm_runtime *runtime = subs->runtime;
-        int i, j, fflags;
-        static int typical_freqs[] = {
-                44100,
-                22050,
-                11025,
-                0,
-        };
-        static int typical_freq_flags[] = {
-                SNDRV_PCM_RATE_44100,
-                SNDRV_PCM_RATE_22050,
-                SNDRV_PCM_RATE_11025,
-                0,
-        };
+        int i;
 
         /* look up frequency table and fill bit mask */
         runtime->hw.rates = 0;
-        fflags = chip->freqs_ok;
-        for (i = 0; typical_freqs[i]; i++) {
-                for (j = 0; j < chip->num_freqs; j++) {
-                        if ((chip->freqs_ok & (1 << j)) &&
-                            chip->freq_table[j] == typical_freqs[i]) {
-                                runtime->hw.rates |= typical_freq_flags[i];
-                                fflags &= ~(1 << j);
-                                break;
-                        }
-                }
-        }
-        if (fflags) /* rest */
-                runtime->hw.rates |= SNDRV_PCM_RATE_KNOT;
+        for (i = 0; i < chip->num_freqs; i++)
+                if (chip->freqs_ok & (1 << i))
+                        runtime->hw.rates |=
+                                snd_pcm_rate_to_rate_bit(chip->freq_table[i]);
 
         /* check for minimum and maximum rates */
         for (i = 0; i < chip->num_freqs; i++) {
@@ -551,9 +530,6 @@ static int snd_pmac_pcm_open(struct snd_pmac *chip, struct pmac_stream *rec,
 
         runtime->hw.periods_max = rec->cmd.size - 1;
 
-        if (chip->can_duplex)
-                snd_pcm_set_sync(subs);
-
         /* constraints to fix choppy sound */
         snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
         return 0;
@@ -1035,29 +1011,6 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
         return 0;
 }
 
-/*
- * exported - boolean info callbacks for ease of programming
- */
-int snd_pmac_boolean_stereo_info(struct snd_kcontrol *kcontrol,
-                                 struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 2;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
-int snd_pmac_boolean_mono_info(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
 #ifdef PMAC_SUPPORT_AUTOMUTE
 /*
  * auto-mute
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index 8394e66ceb00..25c512c2d74d 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -202,8 +202,8 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c);
 void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c);
 
 /* misc */
-int snd_pmac_boolean_stereo_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
-int snd_pmac_boolean_mono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
+#define snd_pmac_boolean_stereo_info    snd_ctl_boolean_stereo_info
+#define snd_pmac_boolean_mono_info      snd_ctl_boolean_mono_info
 
 int snd_pmac_add_automute(struct snd_pmac *chip);
 
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 1aa0b467599f..27b61899fe84 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -33,7 +33,6 @@
 #include <linux/dmapool.h>
 #include <linux/dma-mapping.h>
 #include <asm/firmware.h>
-#include <linux/io.h>
 #include <asm/dma.h>
 #include <asm/lv1call.h>
 #include <asm/ps3.h>
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 739786529ca5..131ec4812288 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -451,15 +451,7 @@ static int __init snd_aicapcmchip(struct snd_card_aica
 }
 
 /* Mixer controls */
-static int aica_pcmswitch_info(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define aica_pcmswitch_info             snd_ctl_boolean_mono_info
 
 static int aica_pcmswitch_get(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index e5fb437b86e8..78248808a9d8 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -17,3 +17,23 @@ config SND_SOC_WM8753
 config SND_SOC_WM9712
         tristate
         depends on SND_SOC
+
+# Cirrus Logic CS4270 Codec
+config SND_SOC_CS4270
+        tristate
+        depends on SND_SOC
+
+# Cirrus Logic CS4270 Codec Hardware Mute Support
+# Select if you have external muting circuitry attached to your CS4270.
+config SND_SOC_CS4270_HWMUTE
+        bool
+        depends on SND_SOC_CS4270
+
+# Cirrus Logic CS4270 Codec VD = 3.3V Errata
+# Select if you are affected by the errata where the part will not function
+# if MCLK divide-by-1.5 is selected and VD is set to 3.3V.  The driver will
+# not select any sample rates that require MCLK to be divided by 1.5.
+config SND_SOC_CS4270_VD33_ERRATA
+        bool
+        depends on SND_SOC_CS4270
+
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index e39a747a17cf..7ad78e36d506 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -3,9 +3,11 @@ snd-soc-wm8731-objs := wm8731.o
 snd-soc-wm8750-objs := wm8750.o
 snd-soc-wm8753-objs := wm8753.o
 snd-soc-wm9712-objs := wm9712.o
+snd-soc-cs4270-objs := cs4270.o
 
 obj-$(CONFIG_SND_SOC_AC97_CODEC)        += snd-soc-ac97.o
 obj-$(CONFIG_SND_SOC_WM8731)    += snd-soc-wm8731.o
 obj-$(CONFIG_SND_SOC_WM8750)    += snd-soc-wm8750.o
 obj-$(CONFIG_SND_SOC_WM8753)    += snd-soc-wm8753.o
 obj-$(CONFIG_SND_SOC_WM9712)    += snd-soc-wm9712.o
+obj-$(CONFIG_SND_SOC_CS4270)    += snd-soc-cs4270.o
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
new file mode 100644
index 000000000000..5d601ad6da70
--- /dev/null
+++ b/sound/soc/codecs/cs4270.c
@@ -0,0 +1,805 @@
+/*
+ * CS4270 ALSA SoC (ASoC) codec driver
+ *
+ * Author: Timur Tabi <timur@freescale.com>
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ * This is an ASoC device driver for the Cirrus Logic CS4270 codec.
+ *
+ * Current features/limitations:
+ *
+ * 1) Software mode is supported.  Stand-alone mode is automatically
+ *    selected if I2C is disabled or if a CS4270 is not found on the I2C
+ *    bus.  However, stand-alone mode is only partially implemented because
+ *    there is no mechanism yet for this driver and the machine driver to
+ *    communicate the values of the M0, M1, MCLK1, and MCLK2 pins.
+ * 2) Only I2C is supported, not SPI
+ * 3) Only Master mode is supported, not Slave.
+ * 4) The machine driver's 'startup' function must call
+ *    cs4270_set_dai_sysclk() with the value of MCLK.
+ * 5) Only I2S and left-justified modes are supported
+ * 6) Power management is not supported
+ * 7) The only supported control is volume and hardware mute (if enabled)
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <sound/driver.h>
+#include <sound/core.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+#include <linux/i2c.h>
+
+#include "cs4270.h"
+
+/* If I2C is defined, then we support software mode.  However, if we're
+   not compiled as module but I2C is, then we can't use I2C calls. */
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
+#define USE_I2C
+#endif
+
+/* Private data for the CS4270 */
+struct cs4270_private {
+        unsigned int mclk; /* Input frequency of the MCLK pin */
+        unsigned int mode; /* The mode (I2S or left-justified) */
+};
+
+/* The number of MCLK/LRCK ratios supported by the CS4270 */
+#define NUM_MCLK_RATIOS         9
+
+/* The actual MCLK/LRCK ratios, in increasing numerical order */
+static unsigned int mclk_ratios[NUM_MCLK_RATIOS] =
+        {64, 96, 128, 192, 256, 384, 512, 768, 1024};
+
+/*
+ * Determine the CS4270 samples rates.
+ *
+ * 'freq' is the input frequency to MCLK.  The other parameters are ignored.
+ *
+ * The value of MCLK is used to determine which sample rates are supported
+ * by the CS4270.  The ratio of MCLK / Fs must be equal to one of nine
+ * support values: 64, 96, 128, 192, 256, 384, 512, 768, and 1024.
+ *
+ * This function calculates the nine ratios and determines which ones match
+ * a standard sample rate.  If there's a match, then it is added to the list
+ * of support sample rates.
+ *
+ * This function must be called by the machine driver's 'startup' function,
+ * otherwise the list of supported sample rates will not be available in
+ * time for ALSA.
+ *
+ * Note that in stand-alone mode, the sample rate is determined by input
+ * pins M0, M1, MDIV1, and MDIV2.  Also in stand-alone mode, divide-by-3
+ * is not a programmable option.  However, divide-by-3 is not an available
+ * option in stand-alone mode.  This cases two problems: a ratio of 768 is
+ * not available (it requires divide-by-3) and B) ratios 192 and 384 can
+ * only be selected with divide-by-1.5, but there is an errate that make
+ * this selection difficult.
+ *
+ * In addition, there is no mechanism for communicating with the machine
+ * driver what the input settings can be.  This would need to be implemented
+ * for stand-alone mode to work.
+ */
+static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
+                                 int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct cs4270_private *cs4270 = codec->private_data;
+        unsigned int rates = 0;
+        unsigned int rate_min = -1;
+        unsigned int rate_max = 0;
+        unsigned int i;
+
+        cs4270->mclk = freq;
+
+        for (i = 0; i < NUM_MCLK_RATIOS; i++) {
+                unsigned int rate = freq / mclk_ratios[i];
+                rates |= snd_pcm_rate_to_rate_bit(rate);
+                if (rate < rate_min)
+                        rate_min = rate;
+                if (rate > rate_max)
+                        rate_max = rate;
+        }
+        /* FIXME: soc should support a rate list */
+        rates &= ~SNDRV_PCM_RATE_KNOT;
+
+        if (!rates) {
+                printk(KERN_ERR "cs4270: could not find a valid sample rate\n");
+                return -EINVAL;
+        }
+
+        codec_dai->playback.rates = rates;
+        codec_dai->playback.rate_min = rate_min;
+        codec_dai->playback.rate_max = rate_max;
+
+        codec_dai->capture.rates = rates;
+        codec_dai->capture.rate_min = rate_min;
+        codec_dai->capture.rate_max = rate_max;
+
+        return 0;
+}
+
+/*
+ * Configure the codec for the selected audio format
+ *
+ * This function takes a bitmask of SND_SOC_DAIFMT_x bits and programs the
+ * codec accordingly.
+ *
+ * Currently, this function only supports SND_SOC_DAIFMT_I2S and
+ * SND_SOC_DAIFMT_LEFT_J.  The CS4270 codec also supports right-justified
+ * data for playback only, but ASoC currently does not support different
+ * formats for playback vs. record.
+ */
+static int cs4270_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
+                              unsigned int format)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct cs4270_private *cs4270 = codec->private_data;
+        int ret = 0;
+
+        switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+        case SND_SOC_DAIFMT_LEFT_J:
+                cs4270->mode = format & SND_SOC_DAIFMT_FORMAT_MASK;
+                break;
+        default:
+                printk(KERN_ERR "cs4270: invalid DAI format\n");
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+/*
+ * The codec isn't really big-endian or little-endian, since the I2S
+ * interface requires data to be sent serially with the MSbit first.
+ * However, to support BE and LE I2S devices, we specify both here.  That
+ * way, ALSA will always match the bit patterns.
+ */
+#define CS4270_FORMATS (SNDRV_PCM_FMTBIT_S8      | \
+                        SNDRV_PCM_FMTBIT_S16_LE  | SNDRV_PCM_FMTBIT_S16_BE  | \
+                        SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE | \
+                        SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE | \
+                        SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | \
+                        SNDRV_PCM_FMTBIT_S24_LE  | SNDRV_PCM_FMTBIT_S24_BE)
+
+#ifdef USE_I2C
+
+/* CS4270 registers addresses */
+#define CS4270_CHIPID   0x01    /* Chip ID */
+#define CS4270_PWRCTL   0x02    /* Power Control */
+#define CS4270_MODE     0x03    /* Mode Control */
+#define CS4270_FORMAT   0x04    /* Serial Format, ADC/DAC Control */
+#define CS4270_TRANS    0x05    /* Transition Control */
+#define CS4270_MUTE     0x06    /* Mute Control */
+#define CS4270_VOLA     0x07    /* DAC Channel A Volume Control */
+#define CS4270_VOLB     0x08    /* DAC Channel B Volume Control */
+
+#define CS4270_FIRSTREG 0x01
+#define CS4270_LASTREG  0x08
+#define CS4270_NUMREGS  (CS4270_LASTREG - CS4270_FIRSTREG + 1)
+
+/* Bit masks for the CS4270 registers */
+#define CS4270_CHIPID_ID        0xF0
+#define CS4270_CHIPID_REV       0x0F
+#define CS4270_PWRCTL_FREEZE    0x80
+#define CS4270_PWRCTL_PDN_ADC   0x20
+#define CS4270_PWRCTL_PDN_DAC   0x02
+#define CS4270_PWRCTL_PDN       0x01
+#define CS4270_MODE_SPEED_MASK  0x30
+#define CS4270_MODE_1X          0x00
+#define CS4270_MODE_2X          0x10
+#define CS4270_MODE_4X          0x20
+#define CS4270_MODE_SLAVE       0x30
+#define CS4270_MODE_DIV_MASK    0x0E
+#define CS4270_MODE_DIV1        0x00
+#define CS4270_MODE_DIV15       0x02
+#define CS4270_MODE_DIV2        0x04
+#define CS4270_MODE_DIV3        0x06
+#define CS4270_MODE_DIV4        0x08
+#define CS4270_MODE_POPGUARD    0x01
+#define CS4270_FORMAT_FREEZE_A  0x80
+#define CS4270_FORMAT_FREEZE_B  0x40
+#define CS4270_FORMAT_LOOPBACK  0x20
+#define CS4270_FORMAT_DAC_MASK  0x18
+#define CS4270_FORMAT_DAC_LJ    0x00
+#define CS4270_FORMAT_DAC_I2S   0x08
+#define CS4270_FORMAT_DAC_RJ16  0x18
+#define CS4270_FORMAT_DAC_RJ24  0x10
+#define CS4270_FORMAT_ADC_MASK  0x01
+#define CS4270_FORMAT_ADC_LJ    0x00
+#define CS4270_FORMAT_ADC_I2S   0x01
+#define CS4270_TRANS_ONE_VOL    0x80
+#define CS4270_TRANS_SOFT       0x40
+#define CS4270_TRANS_ZERO       0x20
+#define CS4270_TRANS_INV_ADC_A  0x08
+#define CS4270_TRANS_INV_ADC_B  0x10
+#define CS4270_TRANS_INV_DAC_A  0x02
+#define CS4270_TRANS_INV_DAC_B  0x04
+#define CS4270_TRANS_DEEMPH     0x01
+#define CS4270_MUTE_AUTO        0x20
+#define CS4270_MUTE_ADC_A       0x08
+#define CS4270_MUTE_ADC_B       0x10
+#define CS4270_MUTE_POLARITY    0x04
+#define CS4270_MUTE_DAC_A       0x01
+#define CS4270_MUTE_DAC_B       0x02
+
+/*
+ * A list of addresses on which this CS4270 could use.  I2C addresses are
+ * 7 bits.  For the CS4270, the upper four bits are always 1001, and the
+ * lower three bits are determined via the AD2, AD1, and AD0 pins
+ * (respectively).
+ */
+static unsigned short normal_i2c[] = {
+        0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, I2C_CLIENT_END
+};
+I2C_CLIENT_INSMOD;
+
+/*
+ * Pre-fill the CS4270 register cache.
+ *
+ * We use the auto-increment feature of the CS4270 to read all registers in
+ * one shot.
+ */
+static int cs4270_fill_cache(struct snd_soc_codec *codec)
+{
+        u8 *cache = codec->reg_cache;
+        struct i2c_client *i2c_client = codec->control_data;
+        s32 length;
+
+        length = i2c_smbus_read_i2c_block_data(i2c_client,
+                CS4270_FIRSTREG | 0x80, CS4270_NUMREGS, cache);
+
+        if (length != CS4270_NUMREGS) {
+                printk(KERN_ERR "cs4270: I2C read failure, addr=0x%x\n",
+                       i2c_client->addr);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/*
+ * Read from the CS4270 register cache.
+ *
+ * This CS4270 registers are cached to avoid excessive I2C I/O operations.
+ * After the initial read to pre-fill the cache, the CS4270 never updates
+ * the register values, so we won't have a cache coherncy problem.
+ */
+static unsigned int cs4270_read_reg_cache(struct snd_soc_codec *codec,
+        unsigned int reg)
+{
+        u8 *cache = codec->reg_cache;
+
+        if ((reg < CS4270_FIRSTREG) || (reg > CS4270_LASTREG))
+                return -EIO;
+
+        return cache[reg - CS4270_FIRSTREG];
+}
+
+/*
+ * Write to a CS4270 register via the I2C bus.
+ *
+ * This function writes the given value to the given CS4270 register, and
+ * also updates the register cache.
+ *
+ * Note that we don't use the hw_write function pointer of snd_soc_codec.
+ * That's because it's too clunky: the hw_write_t prototype does not match
+ * i2c_smbus_write_byte_data(), and it's just another layer of overhead.
+ */
+static int cs4270_i2c_write(struct snd_soc_codec *codec, unsigned int reg,
+                            unsigned int value)
+{
+        u8 *cache = codec->reg_cache;
+
+        if ((reg < CS4270_FIRSTREG) || (reg > CS4270_LASTREG))
+                return -EIO;
+
+        /* Only perform an I2C operation if the new value is different */
+        if (cache[reg - CS4270_FIRSTREG] != value) {
+                struct i2c_client *client = codec->control_data;
+                if (i2c_smbus_write_byte_data(client, reg, value)) {
+                        printk(KERN_ERR "cs4270: I2C write failed\n");
+                        return -EIO;
+                }
+
+                /* We've written to the hardware, so update the cache */
+                cache[reg - CS4270_FIRSTREG] = value;
+        }
+
+        return 0;
+}
+
+/*
+ * Clock Ratio Selection for Master Mode with I2C enabled
+ *
+ * The data for this chart is taken from Table 5 of the CS4270 reference
+ * manual.
+ *
+ * This table is used to determine how to program the Mode Control register.
+ * It is also used by cs4270_set_dai_sysclk() to tell ALSA which sampling
+ * rates the CS4270 currently supports.
+ *
+ * Each element in this array corresponds to the ratios in mclk_ratios[].
+ * These two arrays need to be in sync.
+ *
+ * 'speed_mode' is the corresponding bit pattern to be written to the
+ * MODE bits of the Mode Control Register
+ *
+ * 'mclk' is the corresponding bit pattern to be wirten to the MCLK bits of
+ * the Mode Control Register.
+ *
+ * In situations where a single ratio is represented by multiple speed
+ * modes, we favor the slowest speed.  E.g, for a ratio of 128, we pick
+ * double-speed instead of quad-speed.  However, the CS4270 errata states
+ * that Divide-By-1.5 can cause failures, so we avoid that mode where
+ * possible.
+ *
+ * ERRATA: There is an errata for the CS4270 where divide-by-1.5 does not
+ * work if VD = 3.3V.  If this effects you, select the
+ * CONFIG_SND_SOC_CS4270_VD33_ERRATA Kconfig option, and the driver will
+ * never select any sample rates that require divide-by-1.5.
+ */
+static struct {
+        u8 speed_mode;
+        u8 mclk;
+} cs4270_mode_ratios[NUM_MCLK_RATIOS] = {
+        {CS4270_MODE_4X, CS4270_MODE_DIV1},     /* 64 */
+#ifndef CONFIG_SND_SOC_CS4270_VD33_ERRATA
+        {CS4270_MODE_4X, CS4270_MODE_DIV15},    /* 96 */
+#endif
+        {CS4270_MODE_2X, CS4270_MODE_DIV1},     /* 128 */
+        {CS4270_MODE_4X, CS4270_MODE_DIV3},     /* 192 */
+        {CS4270_MODE_1X, CS4270_MODE_DIV1},     /* 256 */
+        {CS4270_MODE_2X, CS4270_MODE_DIV3},     /* 384 */
+        {CS4270_MODE_1X, CS4270_MODE_DIV2},     /* 512 */
+        {CS4270_MODE_1X, CS4270_MODE_DIV3},     /* 768 */
+        {CS4270_MODE_1X, CS4270_MODE_DIV4}      /* 1024 */
+};
+
+/*
+ * Program the CS4270 with the given hardware parameters.
+ *
+ * The .dai_ops functions are used to provide board-specific data, like
+ * input frequencies, to this driver.  This function takes that information,
+ * combines it with the hardware parameters provided, and programs the
+ * hardware accordingly.
+ */
+static int cs4270_hw_params(struct snd_pcm_substream *substream,
+                            struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_device *socdev = rtd->socdev;
+        struct snd_soc_codec *codec = socdev->codec;
+        struct cs4270_private *cs4270 = codec->private_data;
+        unsigned int ret = 0;
+        unsigned int i;
+        unsigned int rate;
+        unsigned int ratio;
+        int reg;
+
+        /* Figure out which MCLK/LRCK ratio to use */
+
+        rate = params_rate(params);     /* Sampling rate, in Hz */
+        ratio = cs4270->mclk / rate;    /* MCLK/LRCK ratio */
+
+        for (i = 0; i < NUM_MCLK_RATIOS; i++) {
+                if (mclk_ratios[i] == ratio)
+                        break;
+        }
+
+        if (i == NUM_MCLK_RATIOS) {
+                /* We did not find a matching ratio */
+                printk(KERN_ERR "cs4270: could not find matching ratio\n");
+                return -EINVAL;
+        }
+
+        /* Freeze and power-down the codec */
+
+        ret = snd_soc_write(codec, CS4270_PWRCTL, CS4270_PWRCTL_FREEZE |
+                            CS4270_PWRCTL_PDN_ADC | CS4270_PWRCTL_PDN_DAC |
+                            CS4270_PWRCTL_PDN);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: I2C write failed\n");
+                return ret;
+        }
+
+        /* Program the mode control register */
+
+        reg = snd_soc_read(codec, CS4270_MODE);
+        reg &= ~(CS4270_MODE_SPEED_MASK | CS4270_MODE_DIV_MASK);
+        reg |= cs4270_mode_ratios[i].speed_mode | cs4270_mode_ratios[i].mclk;
+
+        ret = snd_soc_write(codec, CS4270_MODE, reg);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: I2C write failed\n");
+                return ret;
+        }
+
+        /* Program the format register */
+
+        reg = snd_soc_read(codec, CS4270_FORMAT);
+        reg &= ~(CS4270_FORMAT_DAC_MASK | CS4270_FORMAT_ADC_MASK);
+
+        switch (cs4270->mode) {
+        case SND_SOC_DAIFMT_I2S:
+                reg |= CS4270_FORMAT_DAC_I2S | CS4270_FORMAT_ADC_I2S;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                reg |= CS4270_FORMAT_DAC_LJ | CS4270_FORMAT_ADC_LJ;
+                break;
+        default:
+                printk(KERN_ERR "cs4270: unknown format\n");
+                return -EINVAL;
+        }
+
+        ret = snd_soc_write(codec, CS4270_FORMAT, reg);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: I2C write failed\n");
+                return ret;
+        }
+
+        /* Disable auto-mute.  This feature appears to be buggy, because in
+           some situations, auto-mute will not deactivate when it should. */
+
+        reg = snd_soc_read(codec, CS4270_MUTE);
+        reg &= ~CS4270_MUTE_AUTO;
+        ret = snd_soc_write(codec, CS4270_MUTE, reg);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: I2C write failed\n");
+                return ret;
+        }
+
+        /* Thaw and power-up the codec */
+
+        ret = snd_soc_write(codec, CS4270_PWRCTL, 0);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: I2C write failed\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+#ifdef CONFIG_SND_SOC_CS4270_HWMUTE
+
+/*
+ * Set the CS4270 external mute
+ *
+ * This function toggles the mute bits in the MUTE register.  The CS4270's
+ * mute capability is intended for external muting circuitry, so if the
+ * board does not have the MUTEA or MUTEB pins connected to such circuitry,
+ * then this function will do nothing.
+ */
+static int cs4270_mute(struct snd_soc_codec_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        int reg6;
+
+        reg6 = snd_soc_read(codec, CS4270_MUTE);
+
+        if (mute)
+                reg6 |= CS4270_MUTE_ADC_A | CS4270_MUTE_ADC_B |
+                        CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B;
+        else
+                reg6 &= ~(CS4270_MUTE_ADC_A | CS4270_MUTE_ADC_B |
+                          CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B);
+
+        return snd_soc_write(codec, CS4270_MUTE, reg6);
+}
+
+#endif
+
+static int cs4270_i2c_probe(struct i2c_adapter *adap, int addr, int kind);
+
+/*
+ * Notify the driver that a new I2C bus has been found.
+ *
+ * This function is called for each I2C bus in the system.  The function
+ * then asks the I2C subsystem to probe that bus at the addresses on which
+ * our device (the CS4270) could exist.  If a device is found at one of
+ * those addresses, then our probe function (cs4270_i2c_probe) is called.
+ */
+static int cs4270_i2c_attach(struct i2c_adapter *adapter)
+{
+        return i2c_probe(adapter, &addr_data, cs4270_i2c_probe);
+}
+
+static int cs4270_i2c_detach(struct i2c_client *client)
+{
+        struct snd_soc_codec *codec = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        codec->control_data = NULL;
+
+        kfree(codec->reg_cache);
+        codec->reg_cache = NULL;
+
+        kfree(client);
+        return 0;
+}
+
+/* A list of non-DAPM controls that the CS4270 supports */
+static const struct snd_kcontrol_new cs4270_snd_controls[] = {
+        SOC_DOUBLE_R("Master Playback Volume",
+                CS4270_VOLA, CS4270_VOLB, 0, 0xFF, 1)
+};
+
+static struct i2c_driver cs4270_i2c_driver = {
+        .driver = {
+                .name = "CS4270 I2C",
+                .owner = THIS_MODULE,
+        },
+        .id =             I2C_DRIVERID_CS4270,
+        .attach_adapter = cs4270_i2c_attach,
+        .detach_client =  cs4270_i2c_detach,
+};
+
+/*
+ * Global variable to store socdev for i2c probe function.
+ *
+ * If struct i2c_driver had a private_data field, we wouldn't need to use
+ * cs4270_socdec.  This is the only way to pass the socdev structure to
+ * cs4270_i2c_probe().
+ *
+ * The real solution to cs4270_socdev is to create a mechanism
+ * that maps I2C addresses to snd_soc_device structures.  Perhaps the
+ * creation of the snd_soc_device object should be moved out of
+ * cs4270_probe() and into cs4270_i2c_probe(), but that would make this
+ * driver dependent on I2C.  The CS4270 supports "stand-alone" mode, whereby
+ * the chip is *not* connected to the I2C bus, but is instead configured via
+ * input pins.
+ */
+static struct snd_soc_device *cs4270_socdev;
+
+/*
+ * Initialize the I2C interface of the CS4270
+ *
+ * This function is called for whenever the I2C subsystem finds a device
+ * at a particular address.
+ *
+ * Note: snd_soc_new_pcms() must be called before this function can be called,
+ * because of snd_ctl_add().
+ */
+static int cs4270_i2c_probe(struct i2c_adapter *adapter, int addr, int kind)
+{
+        struct snd_soc_device *socdev = cs4270_socdev;
+        struct snd_soc_codec *codec = socdev->codec;
+        struct i2c_client *i2c_client = NULL;
+        int i;
+        int ret = 0;
+
+        /* Probing all possible addresses has one drawback: if there are
+           multiple CS4270s on the bus, then you cannot specify which
+           socdev is matched with which CS4270.  For now, we just reject
+           this I2C device if the socdev already has one attached. */
+        if (codec->control_data)
+                return -ENODEV;
+
+        /* Note: codec_dai->codec is NULL here */
+
+        i2c_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!i2c_client) {
+                printk(KERN_ERR "cs4270: could not allocate I2C client\n");
+                return -ENOMEM;
+        }
+
+        codec->reg_cache = kzalloc(CS4270_NUMREGS, GFP_KERNEL);
+        if (!codec->reg_cache) {
+                printk(KERN_ERR "cs4270: could not allocate register cache\n");
+                ret = -ENOMEM;
+                goto error;
+        }
+
+        i2c_set_clientdata(i2c_client, codec);
+        strcpy(i2c_client->name, "CS4270");
+
+        i2c_client->driver = &cs4270_i2c_driver;
+        i2c_client->adapter = adapter;
+        i2c_client->addr = addr;
+
+        /* Verify that we have a CS4270 */
+
+        ret = i2c_smbus_read_byte_data(i2c_client, CS4270_CHIPID);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: failed to read I2C\n");
+                goto error;
+        }
+        /* The top four bits of the chip ID should be 1100. */
+        if ((ret & 0xF0) != 0xC0) {
+                /* The device at this address is not a CS4270 codec */
+                ret = -ENODEV;
+                goto error;
+        }
+
+        printk(KERN_INFO "cs4270: found device at I2C address %X\n", addr);
+        printk(KERN_INFO "cs4270: hardware revision %X\n", ret & 0xF);
+
+        /* Tell the I2C layer a new client has arrived */
+
+        ret = i2c_attach_client(i2c_client);
+        if (ret) {
+                printk(KERN_ERR "cs4270: could not attach codec, "
+                        "I2C address %x, error code %i\n", addr, ret);
+                goto error;
+        }
+
+        codec->control_data = i2c_client;
+        codec->read = cs4270_read_reg_cache;
+        codec->write = cs4270_i2c_write;
+        codec->reg_cache_size = CS4270_NUMREGS;
+
+        /* The I2C interface is set up, so pre-fill our register cache */
+
+        ret = cs4270_fill_cache(codec);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: failed to fill register cache\n");
+                goto error;
+        }
+
+        /* Add the non-DAPM controls */
+
+        for (i = 0; i < ARRAY_SIZE(cs4270_snd_controls); i++) {
+                struct snd_kcontrol *kctrl =
+                snd_soc_cnew(&cs4270_snd_controls[i], codec, NULL);
+
+                ret = snd_ctl_add(codec->card, kctrl);
+                if (ret < 0)
+                        goto error;
+        }
+
+        return 0;
+
+error:
+        if (codec->control_data) {
+                i2c_detach_client(i2c_client);
+                codec->control_data = NULL;
+        }
+
+        kfree(codec->reg_cache);
+        codec->reg_cache = NULL;
+        codec->reg_cache_size = 0;
+
+        kfree(i2c_client);
+
+        return ret;
+}
+
+#endif
+
+struct snd_soc_codec_dai cs4270_dai = {
+        .name = "CS4270",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = 0,
+                .formats = CS4270_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = 0,
+                .formats = CS4270_FORMATS,
+        },
+        .dai_ops = {
+                .set_sysclk = cs4270_set_dai_sysclk,
+                .set_fmt = cs4270_set_dai_fmt,
+        }
+};
+EXPORT_SYMBOL_GPL(cs4270_dai);
+
+/*
+ * ASoC probe function
+ *
+ * This function is called when the machine driver calls
+ * platform_device_add().
+ */
+static int cs4270_probe(struct platform_device *pdev)
+{
+        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+        struct snd_soc_codec *codec;
+        int ret = 0;
+
+        printk(KERN_INFO "CS4270 ALSA SoC Codec\n");
+
+        /* Allocate enough space for the snd_soc_codec structure
+           and our private data together. */
+        codec = kzalloc(ALIGN(sizeof(struct snd_soc_codec), 4) +
+                        sizeof(struct cs4270_private), GFP_KERNEL);
+        if (!codec) {
+                printk(KERN_ERR "cs4270: Could not allocate codec structure\n");
+                return -ENOMEM;
+        }
+
+        mutex_init(&codec->mutex);
+        INIT_LIST_HEAD(&codec->dapm_widgets);
+        INIT_LIST_HEAD(&codec->dapm_paths);
+
+        codec->name = "CS4270";
+        codec->owner = THIS_MODULE;
+        codec->dai = &cs4270_dai;
+        codec->num_dai = 1;
+        codec->private_data = codec + ALIGN(sizeof(struct snd_soc_codec), 4);
+
+        socdev->codec = codec;
+
+        /* Register PCMs */
+
+        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: failed to create PCMs\n");
+                return ret;
+        }
+
+#ifdef USE_I2C
+        cs4270_socdev = socdev;
+
+        ret = i2c_add_driver(&cs4270_i2c_driver);
+        if (ret) {
+                printk(KERN_ERR "cs4270: failed to attach driver");
+                snd_soc_free_pcms(socdev);
+                return ret;
+        }
+
+        /* Did we find a CS4270 on the I2C bus? */
+        if (codec->control_data) {
+                /* Initialize codec ops */
+                cs4270_dai.ops.hw_params = cs4270_hw_params;
+#ifdef CONFIG_SND_SOC_CS4270_HWMUTE
+                cs4270_dai.dai_ops.digital_mute = cs4270_mute;
+#endif
+        } else
+                printk(KERN_INFO "cs4270: no I2C device found, "
+                        "using stand-alone mode\n");
+#else
+        printk(KERN_INFO "cs4270: I2C disabled, using stand-alone mode\n");
+#endif
+
+        ret = snd_soc_register_card(socdev);
+        if (ret < 0) {
+                printk(KERN_ERR "cs4270: failed to register card\n");
+                snd_soc_free_pcms(socdev);
+                return ret;
+        }
+
+        return ret;
+}
+
+static int cs4270_remove(struct platform_device *pdev)
+{
+        struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+
+        snd_soc_free_pcms(socdev);
+
+#ifdef USE_I2C
+        if (socdev->codec->control_data)
+                i2c_del_driver(&cs4270_i2c_driver);
+#endif
+
+        kfree(socdev->codec);
+        socdev->codec = NULL;
+
+        return 0;
+}
+
+/*
+ * ASoC codec device structure
+ *
+ * Assign this variable to the codec_dev field of the machine driver's
+ * snd_soc_device structure.
+ */
+struct snd_soc_codec_device soc_codec_device_cs4270 = {
+        .probe =        cs4270_probe,
+        .remove =       cs4270_remove
+};
+EXPORT_SYMBOL_GPL(soc_codec_device_cs4270);
+
+MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");
+MODULE_DESCRIPTION("Cirrus Logic CS4270 ALSA SoC Codec Driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs4270.h b/sound/soc/codecs/cs4270.h
new file mode 100644
index 000000000000..0ced49b7804d
--- /dev/null
+++ b/sound/soc/codecs/cs4270.h
@@ -0,0 +1,28 @@
+/*
+ * Cirrus Logic CS4270 ALSA SoC Codec Driver
+ *
+ * Author: Timur Tabi <timur@freescale.com>
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#ifndef _CS4270_H
+#define _CS4270_H
+
+/*
+ * The ASoC codec DAI structure for the CS4270.  Assign this structure to
+ * the .codec_dai field of your machine driver's snd_soc_dai_link structure.
+ */
+extern struct snd_soc_codec_dai cs4270_dai;
+
+/*
+ * The ASoC codec device structure for the CS4270.  Assign this structure
+ * to the .codec_dev field of your machine driver's snd_soc_device
+ * structure.
+ */
+extern struct snd_soc_codec_device soc_codec_device_cs4270;
+
+#endif
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 80e82109fef7..4dd8f35312b3 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -34,7 +34,6 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/akita.h>
 #include <asm/arch/spitz.h>
-#include <asm/mach-types.h>
 #include "../codecs/wm8750.h"
 #include "pxa2xx-pcm.h"
 #include "pxa2xx-i2s.h"
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index e97c68306a9a..5632a2e1518d 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -18,7 +18,7 @@ config SND_S3C2443_SOC_AC97
         
 config SND_S3C24XX_SOC_NEO1973_WM8753
         tristate "SoC I2S Audio support for NEO1973 - WM8753"
-        depends on SND_S3C24XX_SOC && MACH_GTA01
+        depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA01
         select SND_S3C24XX_SOC_I2S
         select SND_SOC_WM8753
         help
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 39f02462e07d..cd89c4105fcd 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -385,6 +385,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev)
         s3c24xx_i2s.iis_clk=clk_get(&pdev->dev, "iis");
         if (s3c24xx_i2s.iis_clk == NULL) {
                 DBG("failed to get iis_clock\n");
+                iounmap(s3c24xx_i2s.regs);
                 return -ENODEV;
         }
         clk_enable(s3c24xx_i2s.iis_clk);
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index bfbdc3cbd43b..4107a87d4de3 100644
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -158,18 +158,22 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
         if (!dma)
                 return 0;
 
-        /* prepare DMA */
-        prtd->params = dma;
+        /* this may get called several times by oss emulation
+         * with different params -HW */
+        if (prtd->params == NULL) {
+                /* prepare DMA */
+                prtd->params = dma;
 
-        DBG("params %p, client %p, channel %d\n", prtd->params,
-                prtd->params->client, prtd->params->channel);
+                DBG("params %p, client %p, channel %d\n", prtd->params,
+                        prtd->params->client, prtd->params->channel);
 
-        ret = s3c2410_dma_request(prtd->params->channel,
-                                  prtd->params->client, NULL);
+                ret = s3c2410_dma_request(prtd->params->channel,
+                                          prtd->params->client, NULL);
 
-        if (ret) {
-                DBG(KERN_ERR "failed to get dma channel\n");
-                return ret;
+                if (ret) {
+                        DBG(KERN_ERR "failed to get dma channel\n");
+                        return ret;
+                }
         }
 
         /* channel needs configuring for mem=>device, increment memory addr,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 92d5d917b73b..91651bdfa761 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1362,26 +1362,6 @@ int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,
 EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext);
 
 /**
- * snd_soc_info_bool_ext - external single boolean mixer info callback
- * @kcontrol: mixer control
- * @uinfo: control element information
- *
- * Callback to provide information about a single boolean external mixer control.
- *
- * Returns 0 for success.
- */
-int snd_soc_info_bool_ext(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(snd_soc_info_bool_ext);
-
-/**
  * snd_soc_info_volsw - single mixer info callback
  * @kcontrol: mixer control
  * @uinfo: control element information
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 96bce55572a0..b3193e687db7 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -63,7 +63,7 @@
 #define POP_DEBUG 0
 #if POP_DEBUG
 #define POP_TIME 500 /* 500 msecs - change if pop debug is too fast */
-#define pop_wait(time) schedule_timeout_interruptible(msecs_to_jiffies(time))
+#define pop_wait(time) schedule_timeout_uninterruptible(msecs_to_jiffies(time))
 #define pop_dbg(format, arg...) printk(format, ## arg); pop_wait(POP_TIME)
 #else
 #define pop_dbg(format, arg...)
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f2950cab74a6..9785382a5f39 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -3,9 +3,9 @@
  * Copyright (C) 2002 David S. Miller <davem@redhat.com>
  *
  * Based entirely upon drivers/sbus/audio/cs4231.c which is:
- * Copyright (C) 1996, 1997, 1998, 1998 Derrick J Brashear (shadow@andrew.cmu.edu)
+ * Copyright (C) 1996, 1997, 1998 Derrick J Brashear (shadow@andrew.cmu.edu)
  * and also sound/isa/cs423x/cs4231_lib.c which is:
- * Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ * Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  */
 
 #include <linux/module.h>
@@ -15,6 +15,9 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+
 
 #include <sound/driver.h>
 #include <sound/core.h>
@@ -25,29 +28,21 @@
 #include <sound/initval.h>
 #include <sound/pcm_params.h>
 
-#include <asm/io.h>
-#include <asm/irq.h>
-
 #ifdef CONFIG_SBUS
 #define SBUS_SUPPORT
-#endif
-
-#ifdef SBUS_SUPPORT
 #include <asm/sbus.h>
 #endif
 
 #if defined(CONFIG_PCI) && defined(CONFIG_SPARC64)
 #define EBUS_SUPPORT
-#endif
-
-#ifdef EBUS_SUPPORT
 #include <linux/pci.h>
 #include <asm/ebus.h>
 #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;      /* Enable this card */
+/* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Sun CS4231 soundcard.");
@@ -62,19 +57,22 @@ MODULE_SUPPORTED_DEVICE("{{Sun,CS4231}}");
 
 #ifdef SBUS_SUPPORT
 struct sbus_dma_info {
-       spinlock_t      lock;
-       int             dir;
-       void __iomem    *regs;
+       spinlock_t       lock;   /* DMA access lock */
+       int              dir;
+       void __iomem     *regs;
 };
 #endif
 
 struct snd_cs4231;
 struct cs4231_dma_control {
-        void            (*prepare)(struct cs4231_dma_control *dma_cont, int dir);
-        void            (*enable)(struct cs4231_dma_control *dma_cont, int on);
-        int             (*request)(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len);
-        unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
-        void            (*preallocate)(struct snd_cs4231 *chip, struct snd_pcm *pcm); 
+        void            (*prepare)(struct cs4231_dma_control *dma_cont,
+                                   int dir);
+        void            (*enable)(struct cs4231_dma_control *dma_cont, int on);
+        int             (*request)(struct cs4231_dma_control *dma_cont,
+                                   dma_addr_t bus_addr, size_t len);
+        unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
+        void            (*preallocate)(struct snd_cs4231 *chip,
+                                       struct snd_pcm *pcm);
 #ifdef EBUS_SUPPORT
         struct          ebus_dma_info   ebus_info;
 #endif
@@ -84,7 +82,7 @@ struct cs4231_dma_control {
 };
 
 struct snd_cs4231 {
-        spinlock_t              lock;
+        spinlock_t              lock;   /* registers access lock */
         void __iomem            *port;
 
         struct cs4231_dma_control       p_dma;
@@ -108,13 +106,14 @@ struct snd_cs4231 {
 #define CS4231_MODE_PLAY        0x0001
 #define CS4231_MODE_RECORD      0x0002
 #define CS4231_MODE_TIMER       0x0004
-#define CS4231_MODE_OPEN        (CS4231_MODE_PLAY|CS4231_MODE_RECORD|CS4231_MODE_TIMER)
+#define CS4231_MODE_OPEN        (CS4231_MODE_PLAY | CS4231_MODE_RECORD | \
+                                 CS4231_MODE_TIMER)
 
         unsigned char           image[32];      /* registers image */
         int                     mce_bit;
         int                     calibrate_mute;
-        struct mutex            mce_mutex;
-        struct mutex            open_mutex;
+        struct mutex            mce_mutex;      /* mutex for mce register */
+        struct mutex            open_mutex;     /* mutex for ALSA open/close */
 
         union {
 #ifdef SBUS_SUPPORT
@@ -136,129 +135,10 @@ static struct snd_cs4231 *cs4231_list;
  */
 
 /* IO ports */
-
-#define CS4231P(chip, x)        ((chip)->port + c_d_c_CS4231##x)
+#include <sound/cs4231-regs.h>
 
 /* XXX offsets are different than PC ISA chips... */
-#define c_d_c_CS4231REGSEL      0x0
-#define c_d_c_CS4231REG         0x4
-#define c_d_c_CS4231STATUS      0x8
-#define c_d_c_CS4231PIO         0xc
-
-/* codec registers */
-
-#define CS4231_LEFT_INPUT       0x00    /* left input control */
-#define CS4231_RIGHT_INPUT      0x01    /* right input control */
-#define CS4231_AUX1_LEFT_INPUT  0x02    /* left AUX1 input control */
-#define CS4231_AUX1_RIGHT_INPUT 0x03    /* right AUX1 input control */
-#define CS4231_AUX2_LEFT_INPUT  0x04    /* left AUX2 input control */
-#define CS4231_AUX2_RIGHT_INPUT 0x05    /* right AUX2 input control */
-#define CS4231_LEFT_OUTPUT      0x06    /* left output control register */
-#define CS4231_RIGHT_OUTPUT     0x07    /* right output control register */
-#define CS4231_PLAYBK_FORMAT    0x08    /* clock and data format - playback - bits 7-0 MCE */
-#define CS4231_IFACE_CTRL       0x09    /* interface control - bits 7-2 MCE */
-#define CS4231_PIN_CTRL         0x0a    /* pin control */
-#define CS4231_TEST_INIT        0x0b    /* test and initialization */
-#define CS4231_MISC_INFO        0x0c    /* miscellaneaous information */
-#define CS4231_LOOPBACK         0x0d    /* loopback control */
-#define CS4231_PLY_UPR_CNT      0x0e    /* playback upper base count */
-#define CS4231_PLY_LWR_CNT      0x0f    /* playback lower base count */
-#define CS4231_ALT_FEATURE_1    0x10    /* alternate #1 feature enable */
-#define CS4231_ALT_FEATURE_2    0x11    /* alternate #2 feature enable */
-#define CS4231_LEFT_LINE_IN     0x12    /* left line input control */
-#define CS4231_RIGHT_LINE_IN    0x13    /* right line input control */
-#define CS4231_TIMER_LOW        0x14    /* timer low byte */
-#define CS4231_TIMER_HIGH       0x15    /* timer high byte */
-#define CS4231_LEFT_MIC_INPUT   0x16    /* left MIC input control register (InterWave only) */
-#define CS4231_RIGHT_MIC_INPUT  0x17    /* right MIC input control register (InterWave only) */
-#define CS4236_EXT_REG          0x17    /* extended register access */
-#define CS4231_IRQ_STATUS       0x18    /* irq status register */
-#define CS4231_LINE_LEFT_OUTPUT 0x19    /* left line output control register (InterWave only) */
-#define CS4231_VERSION          0x19    /* CS4231(A) - version values */
-#define CS4231_MONO_CTRL        0x1a    /* mono input/output control */
-#define CS4231_LINE_RIGHT_OUTPUT 0x1b   /* right line output control register (InterWave only) */
-#define CS4235_LEFT_MASTER      0x1b    /* left master output control */
-#define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
-#define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
-#define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
-#define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
-#define CS4231_REC_LWR_CNT      0x1f    /* record lower count */
-
-/* definitions for codec register select port - CODECP( REGSEL ) */
-
-#define CS4231_INIT             0x80    /* CODEC is initializing */
-#define CS4231_MCE              0x40    /* mode change enable */
-#define CS4231_TRD              0x20    /* transfer request disable */
-
-/* definitions for codec status register - CODECP( STATUS ) */
-
-#define CS4231_GLOBALIRQ        0x01    /* IRQ is active */
-
-/* definitions for codec irq status - CS4231_IRQ_STATUS */
-
-#define CS4231_PLAYBACK_IRQ     0x10
-#define CS4231_RECORD_IRQ       0x20
-#define CS4231_TIMER_IRQ        0x40
-#define CS4231_ALL_IRQS         0x70
-#define CS4231_REC_UNDERRUN     0x08
-#define CS4231_REC_OVERRUN      0x04
-#define CS4231_PLY_OVERRUN      0x02
-#define CS4231_PLY_UNDERRUN     0x01
-
-/* definitions for CS4231_LEFT_INPUT and CS4231_RIGHT_INPUT registers */
-
-#define CS4231_ENABLE_MIC_GAIN  0x20
-
-#define CS4231_MIXS_LINE        0x00
-#define CS4231_MIXS_AUX1        0x40
-#define CS4231_MIXS_MIC         0x80
-#define CS4231_MIXS_ALL         0xc0
-
-/* definitions for clock and data format register - CS4231_PLAYBK_FORMAT */
-
-#define CS4231_LINEAR_8         0x00    /* 8-bit unsigned data */
-#define CS4231_ALAW_8           0x60    /* 8-bit A-law companded */
-#define CS4231_ULAW_8           0x20    /* 8-bit U-law companded */
-#define CS4231_LINEAR_16        0x40    /* 16-bit twos complement data - little endian */
-#define CS4231_LINEAR_16_BIG    0xc0    /* 16-bit twos complement data - big endian */
-#define CS4231_ADPCM_16         0xa0    /* 16-bit ADPCM */
-#define CS4231_STEREO           0x10    /* stereo mode */
-/* bits 3-1 define frequency divisor */
-#define CS4231_XTAL1            0x00    /* 24.576 crystal */
-#define CS4231_XTAL2            0x01    /* 16.9344 crystal */
-
-/* definitions for interface control register - CS4231_IFACE_CTRL */
-
-#define CS4231_RECORD_PIO       0x80    /* record PIO enable */
-#define CS4231_PLAYBACK_PIO     0x40    /* playback PIO enable */
-#define CS4231_CALIB_MODE       0x18    /* calibration mode bits */
-#define CS4231_AUTOCALIB        0x08    /* auto calibrate */
-#define CS4231_SINGLE_DMA       0x04    /* use single DMA channel */
-#define CS4231_RECORD_ENABLE    0x02    /* record enable */
-#define CS4231_PLAYBACK_ENABLE  0x01    /* playback enable */
-
-/* definitions for pin control register - CS4231_PIN_CTRL */
-
-#define CS4231_IRQ_ENABLE       0x02    /* enable IRQ */
-#define CS4231_XCTL1            0x40    /* external control #1 */
-#define CS4231_XCTL0            0x80    /* external control #0 */
-
-/* definitions for test and init register - CS4231_TEST_INIT */
-
-#define CS4231_CALIB_IN_PROGRESS 0x20   /* auto calibrate in progress */
-#define CS4231_DMA_REQUEST      0x10    /* DMA request in progress */
-
-/* definitions for misc control register - CS4231_MISC_INFO */
-
-#define CS4231_MODE2            0x40    /* MODE 2 */
-#define CS4231_IW_MODE3         0x6c    /* MODE 3 - InterWave enhanced mode */
-#define CS4231_4236_MODE3       0xe0    /* MODE 3 - CS4236+ enhanced mode */
-
-/* definitions for alternate feature 1 register - CS4231_ALT_FEATURE_1 */
-
-#define CS4231_DACZ             0x01    /* zero DAC when underrun */
-#define CS4231_TIMER_ENABLE     0x40    /* codec timer enable */
-#define CS4231_OLB              0x80    /* output level bit */
+#define CS4231U(chip, x)        ((chip)->port + ((c_d_c_CS4231##x) << 2))
 
 /* SBUS DMA register defines.  */
 
@@ -339,7 +219,7 @@ static unsigned int rates[14] = {
 };
 
 static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
-        .count  = 14,
+        .count  = ARRAY_SIZE(rates),
         .list   = rates,
 };
 
@@ -389,116 +269,89 @@ static unsigned char snd_cs4231_original_image[32] =
 static u8 __cs4231_readb(struct snd_cs4231 *cp, void __iomem *reg_addr)
 {
 #ifdef EBUS_SUPPORT
-        if (cp->flags & CS4231_FLAG_EBUS) {
+        if (cp->flags & CS4231_FLAG_EBUS)
                 return readb(reg_addr);
-        } else {
+        else
 #endif
 #ifdef SBUS_SUPPORT
                 return sbus_readb(reg_addr);
 #endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
 }
 
-static void __cs4231_writeb(struct snd_cs4231 *cp, u8 val, void __iomem *reg_addr)
+static void __cs4231_writeb(struct snd_cs4231 *cp, u8 val,
+                            void __iomem *reg_addr)
 {
 #ifdef EBUS_SUPPORT
-        if (cp->flags & CS4231_FLAG_EBUS) {
+        if (cp->flags & CS4231_FLAG_EBUS)
                 return writeb(val, reg_addr);
-        } else {
+        else
 #endif
 #ifdef SBUS_SUPPORT
                 return sbus_writeb(val, reg_addr);
 #endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
 }
 
 /*
  *  Basic I/O functions
  */
 
-static void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg,
-                     unsigned char mask, unsigned char value)
+static void snd_cs4231_ready(struct snd_cs4231 *chip)
 {
         int timeout;
-        unsigned char tmp;
 
-        for (timeout = 250;
-             timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
-#ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                snd_printdd("outm: auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
-#endif
-        if (chip->calibrate_mute) {
-                chip->image[reg] &= mask;
-                chip->image[reg] |= value;
-        } else {
-                __cs4231_writeb(chip, chip->mce_bit | reg, CS4231P(chip, REGSEL));
-                mb();
-                tmp = (chip->image[reg] & mask) | value;
-                __cs4231_writeb(chip, tmp, CS4231P(chip, REG));
-                chip->image[reg] = tmp;
-                mb();
+        for (timeout = 250; timeout > 0; timeout--) {
+                int val = __cs4231_readb(chip, CS4231U(chip, REGSEL));
+                if ((val & CS4231_INIT) == 0)
+                        break;
+                udelay(100);
         }
 }
 
-static void snd_cs4231_dout(struct snd_cs4231 *chip, unsigned char reg, unsigned char value)
+static void snd_cs4231_dout(struct snd_cs4231 *chip, unsigned char reg,
+                            unsigned char value)
 {
-        int timeout;
-
-        for (timeout = 250;
-             timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
+        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                snd_printdd("out: auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
+        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
+                snd_printdd("out: auto calibration time out - reg = 0x%x, "
+                            "value = 0x%x\n",
+                            reg, value);
 #endif
-        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231P(chip, REGSEL));
-        __cs4231_writeb(chip, value, CS4231P(chip, REG));
+        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231U(chip, REGSEL));
+        wmb();
+        __cs4231_writeb(chip, value, CS4231U(chip, REG));
         mb();
 }
 
-static void snd_cs4231_out(struct snd_cs4231 *chip, unsigned char reg, unsigned char value)
+static inline void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg,
+                     unsigned char mask, unsigned char value)
 {
-        int timeout;
+        unsigned char tmp = (chip->image[reg] & mask) | value;
 
-        for (timeout = 250;
-             timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
-#ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                snd_printdd("out: auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value);
-#endif
-        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231P(chip, REGSEL));
-        __cs4231_writeb(chip, value, CS4231P(chip, REG));
+        chip->image[reg] = tmp;
+        if (!chip->calibrate_mute)
+                snd_cs4231_dout(chip, reg, tmp);
+}
+
+static void snd_cs4231_out(struct snd_cs4231 *chip, unsigned char reg,
+                           unsigned char value)
+{
+        snd_cs4231_dout(chip, reg, value);
         chip->image[reg] = value;
         mb();
 }
 
 static unsigned char snd_cs4231_in(struct snd_cs4231 *chip, unsigned char reg)
 {
-        int timeout;
-        unsigned char ret;
-
-        for (timeout = 250;
-             timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(100);
+        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                snd_printdd("in: auto calibration time out - reg = 0x%x\n", reg);
+        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
+                snd_printdd("in: auto calibration time out - reg = 0x%x\n",
+                            reg);
 #endif
-        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231P(chip, REGSEL));
+        __cs4231_writeb(chip, chip->mce_bit | reg, CS4231U(chip, REGSEL));
         mb();
-        ret = __cs4231_readb(chip, CS4231P(chip, REG));
-        return ret;
+        return __cs4231_readb(chip, CS4231U(chip, REG));
 }
 
 /*
@@ -509,15 +362,17 @@ static void snd_cs4231_busy_wait(struct snd_cs4231 *chip)
 {
         int timeout;
 
-        /* huh.. looks like this sequence is proper for CS4231A chip (GUS MAX) */
+        /* looks like this sequence is proper for CS4231A chip (GUS MAX) */
         for (timeout = 5; timeout > 0; timeout--)
-                __cs4231_readb(chip, CS4231P(chip, REGSEL));
+                __cs4231_readb(chip, CS4231U(chip, REGSEL));
 
         /* end of cleanup sequence */
-        for (timeout = 500;
-             timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT);
-             timeout--)
-                udelay(1000);
+        for (timeout = 500; timeout > 0; timeout--) {
+                int val = __cs4231_readb(chip, CS4231U(chip, REGSEL));
+                if ((val & CS4231_INIT) == 0)
+                        break;
+                msleep(1);
+        }
 }
 
 static void snd_cs4231_mce_up(struct snd_cs4231 *chip)
@@ -526,74 +381,81 @@ static void snd_cs4231_mce_up(struct snd_cs4231 *chip)
         int timeout;
 
         spin_lock_irqsave(&chip->lock, flags);
-        for (timeout = 250; timeout > 0 && (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT); timeout--)
-                udelay(100);
+        snd_cs4231_ready(chip);
 #ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
+        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
                 snd_printdd("mce_up - auto calibration time out (0)\n");
 #endif
         chip->mce_bit |= CS4231_MCE;
-        timeout = __cs4231_readb(chip, CS4231P(chip, REGSEL));
+        timeout = __cs4231_readb(chip, CS4231U(chip, REGSEL));
         if (timeout == 0x80)
-                snd_printdd("mce_up [%p]: serious init problem - codec still busy\n", chip->port);
+                snd_printdd("mce_up [%p]: serious init problem - "
+                            "codec still busy\n",
+                            chip->port);
         if (!(timeout & CS4231_MCE))
-                __cs4231_writeb(chip, chip->mce_bit | (timeout & 0x1f), CS4231P(chip, REGSEL));
+                __cs4231_writeb(chip, chip->mce_bit | (timeout & 0x1f),
+                                CS4231U(chip, REGSEL));
         spin_unlock_irqrestore(&chip->lock, flags);
 }
 
 static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
 {
         unsigned long flags;
+        unsigned long end_time;
         int timeout;
 
         spin_lock_irqsave(&chip->lock, flags);
         snd_cs4231_busy_wait(chip);
 #ifdef CONFIG_SND_DEBUG
-        if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                snd_printdd("mce_down [%p] - auto calibration time out (0)\n", CS4231P(chip, REGSEL));
+        if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
+                snd_printdd("mce_down [%p] - auto calibration time out (0)\n",
+                            CS4231U(chip, REGSEL));
 #endif
         chip->mce_bit &= ~CS4231_MCE;
-        timeout = __cs4231_readb(chip, CS4231P(chip, REGSEL));
-        __cs4231_writeb(chip, chip->mce_bit | (timeout & 0x1f), CS4231P(chip, REGSEL));
+        timeout = __cs4231_readb(chip, CS4231U(chip, REGSEL));
+        __cs4231_writeb(chip, chip->mce_bit | (timeout & 0x1f),
+                        CS4231U(chip, REGSEL));
         if (timeout == 0x80)
-                snd_printdd("mce_down [%p]: serious init problem - codec still busy\n", chip->port);
+                snd_printdd("mce_down [%p]: serious init problem - "
+                            "codec still busy\n",
+                            chip->port);
         if ((timeout & CS4231_MCE) == 0) {
                 spin_unlock_irqrestore(&chip->lock, flags);
                 return;
         }
-        snd_cs4231_busy_wait(chip);
 
-        /* calibration process */
+        /*
+         * Wait for (possible -- during init auto-calibration may not be set)
+         * calibration process to start. Needs upto 5 sample periods on AD1848
+         * which at the slowest possible rate of 5.5125 kHz means 907 us.
+         */
+        msleep(1);
 
-        for (timeout = 500; timeout > 0 && (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0; timeout--)
-                udelay(100);
-        if ((snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0) {
-                snd_printd("cs4231_mce_down - auto calibration time out (1)\n");
-                spin_unlock_irqrestore(&chip->lock, flags);
-                return;
-        }
+        /* check condition up to 250ms */
+        end_time = jiffies + msecs_to_jiffies(250);
+        while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
+                CS4231_CALIB_IN_PROGRESS) {
 
-        /* in 10ms increments, check condition, up to 250ms */
-        timeout = 25;
-        while (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) {
                 spin_unlock_irqrestore(&chip->lock, flags);
-                if (--timeout < 0) {
-                        snd_printk("mce_down - auto calibration time out (2)\n");
+                if (time_after(jiffies, end_time)) {
+                        snd_printk("mce_down - "
+                                   "auto calibration time out (2)\n");
                         return;
                 }
-                msleep(10);
+                msleep(1);
                 spin_lock_irqsave(&chip->lock, flags);
         }
 
-        /* in 10ms increments, check condition, up to 100ms */
-        timeout = 10;
-        while (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT) {
+        /* check condition up to 100ms */
+        end_time = jiffies + msecs_to_jiffies(100);
+        while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) {
                 spin_unlock_irqrestore(&chip->lock, flags);
-                if (--timeout < 0) {
-                        snd_printk("mce_down - auto calibration time out (3)\n");
+                if (time_after(jiffies, end_time)) {
+                        snd_printk("mce_down - "
+                                   "auto calibration time out (3)\n");
                         return;
                 }
-                msleep(10);
+                msleep(1);
                 spin_lock_irqsave(&chip->lock, flags);
         }
         spin_unlock_irqrestore(&chip->lock, flags);
@@ -611,7 +473,8 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont,
 
                 BUG_ON(period_size >= (1 << 24));
 
-                if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size))
+                if (dma_cont->request(dma_cont,
+                                      runtime->dma_addr + offset, period_size))
                         return;
                 (*periods_sent) = ((*periods_sent) + 1) % runtime->periods;
         }
@@ -704,21 +567,32 @@ static unsigned char snd_cs4231_get_rate(unsigned int rate)
         for (i = 0; i < 14; i++)
                 if (rate == rates[i])
                         return freq_bits[i];
-        // snd_BUG();
+
         return freq_bits[13];
 }
 
-static unsigned char snd_cs4231_get_format(struct snd_cs4231 *chip, int format, int channels)
+static unsigned char snd_cs4231_get_format(struct snd_cs4231 *chip, int format,
+                                           int channels)
 {
         unsigned char rformat;
 
         rformat = CS4231_LINEAR_8;
         switch (format) {
-        case SNDRV_PCM_FORMAT_MU_LAW:   rformat = CS4231_ULAW_8; break;
-        case SNDRV_PCM_FORMAT_A_LAW:    rformat = CS4231_ALAW_8; break;
-        case SNDRV_PCM_FORMAT_S16_LE:   rformat = CS4231_LINEAR_16; break;
-        case SNDRV_PCM_FORMAT_S16_BE:   rformat = CS4231_LINEAR_16_BIG; break;
-        case SNDRV_PCM_FORMAT_IMA_ADPCM:        rformat = CS4231_ADPCM_16; break;
+        case SNDRV_PCM_FORMAT_MU_LAW:
+                rformat = CS4231_ULAW_8;
+                break;
+        case SNDRV_PCM_FORMAT_A_LAW:
+                rformat = CS4231_ALAW_8;
+                break;
+        case SNDRV_PCM_FORMAT_S16_LE:
+                rformat = CS4231_LINEAR_16;
+                break;
+        case SNDRV_PCM_FORMAT_S16_BE:
+                rformat = CS4231_LINEAR_16_BIG;
+                break;
+        case SNDRV_PCM_FORMAT_IMA_ADPCM:
+                rformat = CS4231_ADPCM_16;
+                break;
         }
         if (channels > 1)
                 rformat |= CS4231_STEREO;
@@ -765,7 +639,8 @@ static void snd_cs4231_calibrate_mute(struct snd_cs4231 *chip, int mute)
         spin_unlock_irqrestore(&chip->lock, flags);
 }
 
-static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_hw_params *params,
+static void snd_cs4231_playback_format(struct snd_cs4231 *chip,
+                                       struct snd_pcm_hw_params *params,
                                        unsigned char pdfr)
 {
         unsigned long flags;
@@ -788,8 +663,9 @@ static void snd_cs4231_playback_format(struct snd_cs4231 *chip, struct snd_pcm_h
         mutex_unlock(&chip->mce_mutex);
 }
 
-static void snd_cs4231_capture_format(struct snd_cs4231 *chip, struct snd_pcm_hw_params *params,
-                                      unsigned char cdfr)
+static void snd_cs4231_capture_format(struct snd_cs4231 *chip,
+                                      struct snd_pcm_hw_params *params,
+                                      unsigned char cdfr)
 {
         unsigned long flags;
 
@@ -846,7 +722,8 @@ static int snd_cs4231_timer_start(struct snd_timer *timer)
                                chip->image[CS4231_TIMER_LOW] =
                                (unsigned char) ticks);
                 snd_cs4231_out(chip, CS4231_ALT_FEATURE_1,
-                               chip->image[CS4231_ALT_FEATURE_1] | CS4231_TIMER_ENABLE);
+                               chip->image[CS4231_ALT_FEATURE_1] |
+                                        CS4231_TIMER_ENABLE);
         }
         spin_unlock_irqrestore(&chip->lock, flags);
 
@@ -859,8 +736,9 @@ static int snd_cs4231_timer_stop(struct snd_timer *timer)
         struct snd_cs4231 *chip = snd_timer_chip(timer);
 
         spin_lock_irqsave(&chip->lock, flags);
+        chip->image[CS4231_ALT_FEATURE_1] &= ~CS4231_TIMER_ENABLE;
         snd_cs4231_out(chip, CS4231_ALT_FEATURE_1,
-                       chip->image[CS4231_ALT_FEATURE_1] &= ~CS4231_TIMER_ENABLE);
+                       chip->image[CS4231_ALT_FEATURE_1]);
         spin_unlock_irqrestore(&chip->lock, flags);
 
         return 0;
@@ -877,8 +755,10 @@ static void __init snd_cs4231_init(struct snd_cs4231 *chip)
 #endif
         snd_cs4231_mce_up(chip);
         spin_lock_irqsave(&chip->lock, flags);
-        chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO |
-                                            CS4231_RECORD_ENABLE | CS4231_RECORD_PIO |
+        chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE |
+                                            CS4231_PLAYBACK_PIO |
+                                            CS4231_RECORD_ENABLE |
+                                            CS4231_RECORD_PIO |
                                             CS4231_CALIB_MODE);
         chip->image[CS4231_IFACE_CTRL] |= CS4231_AUTOCALIB;
         snd_cs4231_out(chip, CS4231_IFACE_CTRL, chip->image[CS4231_IFACE_CTRL]);
@@ -891,21 +771,25 @@ static void __init snd_cs4231_init(struct snd_cs4231 *chip)
 
         snd_cs4231_mce_up(chip);
         spin_lock_irqsave(&chip->lock, flags);
-        snd_cs4231_out(chip, CS4231_ALT_FEATURE_1, chip->image[CS4231_ALT_FEATURE_1]);
+        snd_cs4231_out(chip, CS4231_ALT_FEATURE_1,
+                        chip->image[CS4231_ALT_FEATURE_1]);
         spin_unlock_irqrestore(&chip->lock, flags);
         snd_cs4231_mce_down(chip);
 
 #ifdef SNDRV_DEBUG_MCE
-        snd_printdd("init: (3) - afei = 0x%x\n", chip->image[CS4231_ALT_FEATURE_1]);
+        snd_printdd("init: (3) - afei = 0x%x\n",
+                    chip->image[CS4231_ALT_FEATURE_1]);
 #endif
 
         spin_lock_irqsave(&chip->lock, flags);
-        snd_cs4231_out(chip, CS4231_ALT_FEATURE_2, chip->image[CS4231_ALT_FEATURE_2]);
+        snd_cs4231_out(chip, CS4231_ALT_FEATURE_2,
+                        chip->image[CS4231_ALT_FEATURE_2]);
         spin_unlock_irqrestore(&chip->lock, flags);
 
         snd_cs4231_mce_up(chip);
         spin_lock_irqsave(&chip->lock, flags);
-        snd_cs4231_out(chip, CS4231_PLAYBK_FORMAT, chip->image[CS4231_PLAYBK_FORMAT]);
+        snd_cs4231_out(chip, CS4231_PLAYBK_FORMAT,
+                        chip->image[CS4231_PLAYBK_FORMAT]);
         spin_unlock_irqrestore(&chip->lock, flags);
         snd_cs4231_mce_down(chip);
 
@@ -944,8 +828,8 @@ static int snd_cs4231_open(struct snd_cs4231 *chip, unsigned int mode)
                        CS4231_RECORD_IRQ |
                        CS4231_TIMER_IRQ);
         snd_cs4231_out(chip, CS4231_IRQ_STATUS, 0);
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
 
         snd_cs4231_out(chip, CS4231_IRQ_STATUS, CS4231_PLAYBACK_IRQ |
                        CS4231_RECORD_IRQ |
@@ -974,8 +858,8 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode)
         /* disable IRQ */
         spin_lock_irqsave(&chip->lock, flags);
         snd_cs4231_out(chip, CS4231_IRQ_STATUS, 0);
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
 
         /* now disable record & playback */
 
@@ -988,7 +872,8 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode)
                 chip->image[CS4231_IFACE_CTRL] &=
                         ~(CS4231_PLAYBACK_ENABLE | CS4231_PLAYBACK_PIO |
                           CS4231_RECORD_ENABLE | CS4231_RECORD_PIO);
-                snd_cs4231_out(chip, CS4231_IFACE_CTRL, chip->image[CS4231_IFACE_CTRL]);
+                snd_cs4231_out(chip, CS4231_IFACE_CTRL,
+                                chip->image[CS4231_IFACE_CTRL]);
                 spin_unlock_irqrestore(&chip->lock, flags);
                 snd_cs4231_mce_down(chip);
                 spin_lock_irqsave(&chip->lock, flags);
@@ -996,8 +881,8 @@ static void snd_cs4231_close(struct snd_cs4231 *chip, unsigned int mode)
 
         /* clear IRQ again */
         snd_cs4231_out(chip, CS4231_IRQ_STATUS, 0);
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));        /* clear IRQ */
         spin_unlock_irqrestore(&chip->lock, flags);
 
         snd_cs4231_calibrate_mute(chip, 0);
@@ -1017,15 +902,14 @@ static int snd_cs4231_timer_open(struct snd_timer *timer)
         return 0;
 }
 
-static int snd_cs4231_timer_close(struct snd_timer * timer)
+static int snd_cs4231_timer_close(struct snd_timer *timer)
 {
         struct snd_cs4231 *chip = snd_timer_chip(timer);
         snd_cs4231_close(chip, CS4231_MODE_TIMER);
         return 0;
 }
 
-static struct snd_timer_hardware snd_cs4231_timer_table =
-{
+static struct snd_timer_hardware snd_cs4231_timer_table = {
         .flags          =       SNDRV_TIMER_HW_AUTO,
         .resolution     =       9945,
         .ticks          =       65535,
@@ -1047,8 +931,9 @@ static int snd_cs4231_playback_hw_params(struct snd_pcm_substream *substream,
         unsigned char new_pdfr;
         int err;
 
-        if ((err = snd_pcm_lib_malloc_pages(substream,
-                                            params_buffer_bytes(hw_params))) < 0)
+        err = snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
+        if (err < 0)
                 return err;
         new_pdfr = snd_cs4231_get_format(chip, params_format(hw_params),
                                          params_channels(hw_params)) |
@@ -1058,11 +943,6 @@ static int snd_cs4231_playback_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static int snd_cs4231_playback_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
@@ -1089,8 +969,9 @@ static int snd_cs4231_capture_hw_params(struct snd_pcm_substream *substream,
         unsigned char new_cdfr;
         int err;
 
-        if ((err = snd_pcm_lib_malloc_pages(substream,
-                                            params_buffer_bytes(hw_params))) < 0)
+        err = snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
+        if (err < 0)
                 return err;
         new_cdfr = snd_cs4231_get_format(chip, params_format(hw_params),
                                          params_channels(hw_params)) |
@@ -1100,11 +981,6 @@ static int snd_cs4231_capture_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
-static int snd_cs4231_capture_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_cs4231_capture_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
@@ -1130,7 +1006,8 @@ static void snd_cs4231_overrange(struct snd_cs4231 *chip)
         res = snd_cs4231_in(chip, CS4231_TEST_INIT);
         spin_unlock_irqrestore(&chip->lock, flags);
 
-        if (res & (0x08 | 0x02))        /* detect overrange only above 0dB; may be user selectable? */
+        /* detect overrange only above 0dB; may be user selectable? */
+        if (res & (0x08 | 0x02))
                 chip->capture_substream->runtime->overrange++;
 }
 
@@ -1152,51 +1029,50 @@ static void snd_cs4231_capture_callback(struct snd_cs4231 *chip)
         }
 }
 
-static snd_pcm_uframes_t snd_cs4231_playback_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t snd_cs4231_playback_pointer(
+                                        struct snd_pcm_substream *substream)
 {
         struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
         struct cs4231_dma_control *dma_cont = &chip->p_dma;
         size_t ptr;
-        
+
         if (!(chip->image[CS4231_IFACE_CTRL] & CS4231_PLAYBACK_ENABLE))
                 return 0;
         ptr = dma_cont->address(dma_cont);
         if (ptr != 0)
                 ptr -= substream->runtime->dma_addr;
-        
+
         return bytes_to_frames(substream->runtime, ptr);
 }
 
-static snd_pcm_uframes_t snd_cs4231_capture_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t snd_cs4231_capture_pointer(
+                                        struct snd_pcm_substream *substream)
 {
         struct snd_cs4231 *chip = snd_pcm_substream_chip(substream);
         struct cs4231_dma_control *dma_cont = &chip->c_dma;
         size_t ptr;
-        
+
         if (!(chip->image[CS4231_IFACE_CTRL] & CS4231_RECORD_ENABLE))
                 return 0;
         ptr = dma_cont->address(dma_cont);
         if (ptr != 0)
                 ptr -= substream->runtime->dma_addr;
-        
+
         return bytes_to_frames(substream->runtime, ptr);
 }
 
-/*
-
- */
-
 static int __init snd_cs4231_probe(struct snd_cs4231 *chip)
 {
         unsigned long flags;
-        int i, id, vers;
+        int i;
+        int id = 0;
+        int vers = 0;
         unsigned char *ptr;
 
-        id = vers = 0;
         for (i = 0; i < 50; i++) {
                 mb();
-                if (__cs4231_readb(chip, CS4231P(chip, REGSEL)) & CS4231_INIT)
-                        udelay(2000);
+                if (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT)
+                        msleep(2);
                 else {
                         spin_lock_irqsave(&chip->lock, flags);
                         snd_cs4231_out(chip, CS4231_MISC_INFO, CS4231_MODE2);
@@ -1213,8 +1089,9 @@ static int __init snd_cs4231_probe(struct snd_cs4231 *chip)
 
         spin_lock_irqsave(&chip->lock, flags);
 
-        __cs4231_readb(chip, CS4231P(chip, STATUS));    /* clear any pendings IRQ */
-        __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));
+        /* clear any pendings IRQ */
+        __cs4231_readb(chip, CS4231U(chip, STATUS));
+        __cs4231_writeb(chip, 0, CS4231U(chip, STATUS));
         mb();
 
         spin_unlock_irqrestore(&chip->lock, flags);
@@ -1247,42 +1124,50 @@ static int __init snd_cs4231_probe(struct snd_cs4231 *chip)
         return 0;               /* all things are ok.. */
 }
 
-static struct snd_pcm_hardware snd_cs4231_playback =
-{
-        .info                   = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START),
-        .formats                = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
-                                 SNDRV_PCM_FMTBIT_IMA_ADPCM |
-                                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S16_BE),
-        .rates                  = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
+static struct snd_pcm_hardware snd_cs4231_playback = {
+        .info                   = SNDRV_PCM_INFO_MMAP |
+                                  SNDRV_PCM_INFO_INTERLEAVED |
+                                  SNDRV_PCM_INFO_MMAP_VALID |
+                                  SNDRV_PCM_INFO_SYNC_START,
+        .formats                = SNDRV_PCM_FMTBIT_MU_LAW |
+                                  SNDRV_PCM_FMTBIT_A_LAW |
+                                  SNDRV_PCM_FMTBIT_IMA_ADPCM |
+                                  SNDRV_PCM_FMTBIT_U8 |
+                                  SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S16_BE,
+        .rates                  = SNDRV_PCM_RATE_KNOT |
+                                  SNDRV_PCM_RATE_8000_48000,
         .rate_min               = 5510,
         .rate_max               = 48000,
         .channels_min           = 1,
         .channels_max           = 2,
-        .buffer_bytes_max       = (32*1024),
+        .buffer_bytes_max       = 32 * 1024,
         .period_bytes_min       = 64,
-        .period_bytes_max       = (32*1024),
+        .period_bytes_max       = 32 * 1024,
         .periods_min            = 1,
         .periods_max            = 1024,
 };
 
-static struct snd_pcm_hardware snd_cs4231_capture =
-{
-        .info                   = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START),
-        .formats                = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
-                                 SNDRV_PCM_FMTBIT_IMA_ADPCM |
-                                 SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S16_BE),
-        .rates                  = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
+static struct snd_pcm_hardware snd_cs4231_capture = {
+        .info                   = SNDRV_PCM_INFO_MMAP |
+                                  SNDRV_PCM_INFO_INTERLEAVED |
+                                  SNDRV_PCM_INFO_MMAP_VALID |
+                                  SNDRV_PCM_INFO_SYNC_START,
+        .formats                = SNDRV_PCM_FMTBIT_MU_LAW |
+                                  SNDRV_PCM_FMTBIT_A_LAW |
+                                  SNDRV_PCM_FMTBIT_IMA_ADPCM |
+                                  SNDRV_PCM_FMTBIT_U8 |
+                                  SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S16_BE,
+        .rates                  = SNDRV_PCM_RATE_KNOT |
+                                  SNDRV_PCM_RATE_8000_48000,
         .rate_min               = 5510,
         .rate_max               = 48000,
         .channels_min           = 1,
         .channels_max           = 2,
-        .buffer_bytes_max       = (32*1024),
+        .buffer_bytes_max       = 32 * 1024,
         .period_bytes_min       = 64,
-        .period_bytes_max       = (32*1024),
+        .period_bytes_max       = 32 * 1024,
         .periods_min            = 1,
         .periods_max            = 1024,
 };
@@ -1295,7 +1180,8 @@ static int snd_cs4231_playback_open(struct snd_pcm_substream *substream)
 
         runtime->hw = snd_cs4231_playback;
 
-        if ((err = snd_cs4231_open(chip, CS4231_MODE_PLAY)) < 0) {
+        err = snd_cs4231_open(chip, CS4231_MODE_PLAY);
+        if (err < 0) {
                 snd_free_pages(runtime->dma_area, runtime->dma_bytes);
                 return err;
         }
@@ -1315,7 +1201,8 @@ static int snd_cs4231_capture_open(struct snd_pcm_substream *substream)
 
         runtime->hw = snd_cs4231_capture;
 
-        if ((err = snd_cs4231_open(chip, CS4231_MODE_RECORD)) < 0) {
+        err = snd_cs4231_open(chip, CS4231_MODE_RECORD);
+        if (err < 0) {
                 snd_free_pages(runtime->dma_area, runtime->dma_bytes);
                 return err;
         }
@@ -1356,7 +1243,7 @@ static struct snd_pcm_ops snd_cs4231_playback_ops = {
         .close          =       snd_cs4231_playback_close,
         .ioctl          =       snd_pcm_lib_ioctl,
         .hw_params      =       snd_cs4231_playback_hw_params,
-        .hw_free        =       snd_cs4231_playback_hw_free,
+        .hw_free        =       snd_pcm_lib_free_pages,
         .prepare        =       snd_cs4231_playback_prepare,
         .trigger        =       snd_cs4231_trigger,
         .pointer        =       snd_cs4231_playback_pointer,
@@ -1367,23 +1254,27 @@ static struct snd_pcm_ops snd_cs4231_capture_ops = {
         .close          =       snd_cs4231_capture_close,
         .ioctl          =       snd_pcm_lib_ioctl,
         .hw_params      =       snd_cs4231_capture_hw_params,
-        .hw_free        =       snd_cs4231_capture_hw_free,
+        .hw_free        =       snd_pcm_lib_free_pages,
         .prepare        =       snd_cs4231_capture_prepare,
         .trigger        =       snd_cs4231_trigger,
         .pointer        =       snd_cs4231_capture_pointer,
 };
 
-static int __init snd_cs4231_pcm(struct snd_cs4231 *chip)
+static int __init snd_cs4231_pcm(struct snd_card *card)
 {
+        struct snd_cs4231 *chip = card->private_data;
         struct snd_pcm *pcm;
         int err;
 
-        if ((err = snd_pcm_new(chip->card, "CS4231", 0, 1, 1, &pcm)) < 0)
+        err = snd_pcm_new(card, "CS4231", 0, 1, 1, &pcm);
+        if (err < 0)
                 return err;
 
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_cs4231_playback_ops);
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cs4231_capture_ops);
-        
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+                        &snd_cs4231_playback_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+                        &snd_cs4231_capture_ops);
+
         /* global setup */
         pcm->private_data = chip;
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
@@ -1396,8 +1287,9 @@ static int __init snd_cs4231_pcm(struct snd_cs4231 *chip)
         return 0;
 }
 
-static int __init snd_cs4231_timer(struct snd_cs4231 *chip)
+static int __init snd_cs4231_timer(struct snd_card *card)
 {
+        struct snd_cs4231 *chip = card->private_data;
         struct snd_timer *timer;
         struct snd_timer_id tid;
         int err;
@@ -1405,10 +1297,11 @@ static int __init snd_cs4231_timer(struct snd_cs4231 *chip)
         /* Timer initialization */
         tid.dev_class = SNDRV_TIMER_CLASS_CARD;
         tid.dev_sclass = SNDRV_TIMER_SCLASS_NONE;
-        tid.card = chip->card->number;
+        tid.card = card->number;
         tid.device = 0;
         tid.subdevice = 0;
-        if ((err = snd_timer_new(chip->card, "CS4231", &tid, &timer)) < 0)
+        err = snd_timer_new(card, "CS4231", &tid, &timer);
+        if (err < 0)
                 return err;
         strcpy(timer->name, "CS4231");
         timer->private_data = chip;
@@ -1417,7 +1310,7 @@ static int __init snd_cs4231_timer(struct snd_cs4231 *chip)
 
         return 0;
 }
-        
+
 /*
  *  MIXER part
  */
@@ -1428,15 +1321,14 @@ static int snd_cs4231_info_mux(struct snd_kcontrol *kcontrol,
         static char *texts[4] = {
                 "Line", "CD", "Mic", "Mix"
         };
-        struct snd_cs4231 *chip = snd_kcontrol_chip(kcontrol);
 
-        snd_assert(chip->card != NULL, return -EINVAL);
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 2;
         uinfo->value.enumerated.items = 4;
         if (uinfo->value.enumerated.item > 3)
                 uinfo->value.enumerated.item = 3;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        strcpy(uinfo->value.enumerated.name,
+                texts[uinfo->value.enumerated.item]);
 
         return 0;
 }
@@ -1446,7 +1338,7 @@ static int snd_cs4231_get_mux(struct snd_kcontrol *kcontrol,
 {
         struct snd_cs4231 *chip = snd_kcontrol_chip(kcontrol);
         unsigned long flags;
-        
+
         spin_lock_irqsave(&chip->lock, flags);
         ucontrol->value.enumerated.item[0] =
                 (chip->image[CS4231_LEFT_INPUT] & CS4231_MIXS_ALL) >> 6;
@@ -1464,7 +1356,7 @@ static int snd_cs4231_put_mux(struct snd_kcontrol *kcontrol,
         unsigned long flags;
         unsigned short left, right;
         int change;
-        
+
         if (ucontrol->value.enumerated.item[0] > 3 ||
             ucontrol->value.enumerated.item[1] > 3)
                 return -EINVAL;
@@ -1476,7 +1368,7 @@ static int snd_cs4231_put_mux(struct snd_kcontrol *kcontrol,
         left = (chip->image[CS4231_LEFT_INPUT] & ~CS4231_MIXS_ALL) | left;
         right = (chip->image[CS4231_RIGHT_INPUT] & ~CS4231_MIXS_ALL) | right;
         change = left != chip->image[CS4231_LEFT_INPUT] ||
-                 right != chip->image[CS4231_RIGHT_INPUT];
+                 right != chip->image[CS4231_RIGHT_INPUT];
         snd_cs4231_out(chip, CS4231_LEFT_INPUT, left);
         snd_cs4231_out(chip, CS4231_RIGHT_INPUT, right);
 
@@ -1508,7 +1400,7 @@ static int snd_cs4231_get_single(struct snd_kcontrol *kcontrol,
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int mask = (kcontrol->private_value >> 16) & 0xff;
         int invert = (kcontrol->private_value >> 24) & 0xff;
-        
+
         spin_lock_irqsave(&chip->lock, flags);
 
         ucontrol->value.integer.value[0] = (chip->image[reg] >> shift) & mask;
@@ -1533,7 +1425,7 @@ static int snd_cs4231_put_single(struct snd_kcontrol *kcontrol,
         int invert = (kcontrol->private_value >> 24) & 0xff;
         int change;
         unsigned short val;
-        
+
         val = (ucontrol->value.integer.value[0] & mask);
         if (invert)
                 val = mask - val;
@@ -1575,11 +1467,13 @@ static int snd_cs4231_get_double(struct snd_kcontrol *kcontrol,
         int shift_right = (kcontrol->private_value >> 19) & 0x07;
         int mask = (kcontrol->private_value >> 24) & 0xff;
         int invert = (kcontrol->private_value >> 22) & 1;
-        
+
         spin_lock_irqsave(&chip->lock, flags);
 
-        ucontrol->value.integer.value[0] = (chip->image[left_reg] >> shift_left) & mask;
-        ucontrol->value.integer.value[1] = (chip->image[right_reg] >> shift_right) & mask;
+        ucontrol->value.integer.value[0] =
+                (chip->image[left_reg] >> shift_left) & mask;
+        ucontrol->value.integer.value[1] =
+                (chip->image[right_reg] >> shift_right) & mask;
 
         spin_unlock_irqrestore(&chip->lock, flags);
 
@@ -1606,7 +1500,7 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol,
         int invert = (kcontrol->private_value >> 22) & 1;
         int change;
         unsigned short val1, val2;
-        
+
         val1 = ucontrol->value.integer.value[0] & mask;
         val2 = ucontrol->value.integer.value[1] & mask;
         if (invert) {
@@ -1620,7 +1514,8 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol,
 
         val1 = (chip->image[left_reg] & ~(mask << shift_left)) | val1;
         val2 = (chip->image[right_reg] & ~(mask << shift_right)) | val2;
-        change = val1 != chip->image[left_reg] || val2 != chip->image[right_reg];
+        change = val1 != chip->image[left_reg];
+        change |= val2 != chip->image[right_reg];
         snd_cs4231_out(chip, left_reg, val1);
         snd_cs4231_out(chip, right_reg, val2);
 
@@ -1630,31 +1525,42 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol,
 }
 
 #define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4231_info_single, \
-  .get = snd_cs4231_get_single, .put = snd_cs4231_put_single, \
-  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
-
-#define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_cs4231_info_double, \
-  .get = snd_cs4231_get_double, .put = snd_cs4231_put_double, \
-  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), .index = (xindex), \
+  .info = snd_cs4231_info_single,       \
+  .get = snd_cs4231_get_single, .put = snd_cs4231_put_single,   \
+  .private_value = (reg) | ((shift) << 8) | ((mask) << 16) | ((invert) << 24) }
+
+#define CS4231_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, \
+                        shift_right, mask, invert) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), .index = (xindex), \
+  .info = snd_cs4231_info_double,       \
+  .get = snd_cs4231_get_double, .put = snd_cs4231_put_double,   \
+  .private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \
+                   ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) }
 
 static struct snd_kcontrol_new snd_cs4231_controls[] __initdata = {
-CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
-CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1),
-CS4231_DOUBLE("Line Playback Switch", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),
-CS4231_DOUBLE("Line Playback Volume", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1),
-CS4231_DOUBLE("Aux Playback Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),
-CS4231_DOUBLE("Aux Playback Volume", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1),
-CS4231_DOUBLE("Aux Playback Switch", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
-CS4231_DOUBLE("Aux Playback Volume", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1),
+CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT,
+                CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
+CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT,
+                CS4231_RIGHT_OUTPUT, 0, 0, 63, 1),
+CS4231_DOUBLE("Line Playback Switch", 0, CS4231_LEFT_LINE_IN,
+                CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),
+CS4231_DOUBLE("Line Playback Volume", 0, CS4231_LEFT_LINE_IN,
+                CS4231_RIGHT_LINE_IN, 0, 0, 31, 1),
+CS4231_DOUBLE("Aux Playback Switch", 0, CS4231_AUX1_LEFT_INPUT,
+                CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),
+CS4231_DOUBLE("Aux Playback Volume", 0, CS4231_AUX1_LEFT_INPUT,
+                CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1),
+CS4231_DOUBLE("Aux Playback Switch", 1, CS4231_AUX2_LEFT_INPUT,
+                CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),
+CS4231_DOUBLE("Aux Playback Volume", 1, CS4231_AUX2_LEFT_INPUT,
+                CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1),
 CS4231_SINGLE("Mono Playback Switch", 0, CS4231_MONO_CTRL, 7, 1, 1),
 CS4231_SINGLE("Mono Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1),
 CS4231_SINGLE("Mono Output Playback Switch", 0, CS4231_MONO_CTRL, 6, 1, 1),
 CS4231_SINGLE("Mono Output Playback Bypass", 0, CS4231_MONO_CTRL, 5, 1, 0),
-CS4231_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0, 15, 0),
+CS4231_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0,
+                15, 0),
 {
         .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name   = "Capture Source",
@@ -1662,29 +1568,28 @@ CS4231_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0,
         .get    = snd_cs4231_get_mux,
         .put    = snd_cs4231_put_mux,
 },
-CS4231_DOUBLE("Mic Boost", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0),
+CS4231_DOUBLE("Mic Boost", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5,
+                1, 0),
 CS4231_SINGLE("Loopback Capture Switch", 0, CS4231_LOOPBACK, 0, 1, 0),
 CS4231_SINGLE("Loopback Capture Volume", 0, CS4231_LOOPBACK, 2, 63, 1),
 /* SPARC specific uses of XCTL{0,1} general purpose outputs.  */
 CS4231_SINGLE("Line Out Switch", 0, CS4231_PIN_CTRL, 6, 1, 1),
 CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1)
 };
-                                        
-static int __init snd_cs4231_mixer(struct snd_cs4231 *chip)
+
+static int __init snd_cs4231_mixer(struct snd_card *card)
 {
-        struct snd_card *card;
+        struct snd_cs4231 *chip = card->private_data;
         int err, idx;
 
         snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
 
-        card = chip->card;
-
         strcpy(card->mixername, chip->pcm->name);
 
         for (idx = 0; idx < ARRAY_SIZE(snd_cs4231_controls); idx++) {
-                if ((err = snd_ctl_add(card,
-                                       snd_ctl_new1(&snd_cs4231_controls[idx],
-                                                    chip))) < 0)
+                err = snd_ctl_add(card,
+                                 snd_ctl_new1(&snd_cs4231_controls[idx], chip));
+                if (err < 0)
                         return err;
         }
         return 0;
@@ -1695,6 +1600,7 @@ static int dev;
 static int __init cs4231_attach_begin(struct snd_card **rcard)
 {
         struct snd_card *card;
+        struct snd_cs4231 *chip;
 
         *rcard = NULL;
 
@@ -1706,31 +1612,40 @@ static int __init cs4231_attach_begin(struct snd_card **rcard)
                 return -ENOENT;
         }
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+                            sizeof(struct snd_cs4231));
         if (card == NULL)
                 return -ENOMEM;
 
         strcpy(card->driver, "CS4231");
         strcpy(card->shortname, "Sun CS4231");
 
+        chip = card->private_data;
+        chip->card = card;
+
         *rcard = card;
         return 0;
 }
 
-static int __init cs4231_attach_finish(struct snd_card *card, struct snd_cs4231 *chip)
+static int __init cs4231_attach_finish(struct snd_card *card)
 {
+        struct snd_cs4231 *chip = card->private_data;
         int err;
 
-        if ((err = snd_cs4231_pcm(chip)) < 0)
+        err = snd_cs4231_pcm(card);
+        if (err < 0)
                 goto out_err;
 
-        if ((err = snd_cs4231_mixer(chip)) < 0)
+        err = snd_cs4231_mixer(card);
+        if (err < 0)
                 goto out_err;
 
-        if ((err = snd_cs4231_timer(chip)) < 0)
+        err = snd_cs4231_timer(card);
+        if (err < 0)
                 goto out_err;
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto out_err;
 
         chip->next = cs4231_list;
@@ -1754,7 +1669,7 @@ static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id)
         struct snd_cs4231 *chip = dev_id;
 
         /*This is IRQ is not raised by the cs4231*/
-        if (!(__cs4231_readb(chip, CS4231P(chip, STATUS)) & CS4231_GLOBALIRQ))
+        if (!(__cs4231_readb(chip, CS4231U(chip, STATUS)) & CS4231_GLOBALIRQ))
                 return IRQ_NONE;
 
         /* ACK the APC interrupt. */
@@ -1762,24 +1677,24 @@ static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id)
 
         sbus_writel(csr, chip->port + APCCSR);
 
-        if ((csr & APC_PDMA_READY) && 
-            (csr & APC_PLAY_INT) &&
+        if ((csr & APC_PDMA_READY) &&
+            (csr & APC_PLAY_INT) &&
             (csr & APC_XINT_PNVA) &&
             !(csr & APC_XINT_EMPT))
                         snd_cs4231_play_callback(chip);
 
-        if ((csr & APC_CDMA_READY) && 
-            (csr & APC_CAPT_INT) &&
+        if ((csr & APC_CDMA_READY) &&
+            (csr & APC_CAPT_INT) &&
             (csr & APC_XINT_CNVA) &&
             !(csr & APC_XINT_EMPT))
                         snd_cs4231_capture_callback(chip);
-        
+
         status = snd_cs4231_in(chip, CS4231_IRQ_STATUS);
 
         if (status & CS4231_TIMER_IRQ) {
                 if (chip->timer)
                         snd_timer_interrupt(chip->timer, chip->timer->sticks);
-        }               
+        }
 
         if ((status & CS4231_RECORD_IRQ) && (csr & APC_CDMA_READY))
                 snd_cs4231_overrange(chip);
@@ -1796,26 +1711,27 @@ static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id)
  * SBUS DMA routines
  */
 
-static int sbus_dma_request(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len)
+static int sbus_dma_request(struct cs4231_dma_control *dma_cont,
+                            dma_addr_t bus_addr, size_t len)
 {
         unsigned long flags;
         u32 test, csr;
         int err;
         struct sbus_dma_info *base = &dma_cont->sbus_info;
-        
+
         if (len >= (1 << 24))
                 return -EINVAL;
         spin_lock_irqsave(&base->lock, flags);
         csr = sbus_readl(base->regs + APCCSR);
         err = -EINVAL;
         test = APC_CDMA_READY;
-        if ( base->dir == APC_PLAY )
+        if (base->dir == APC_PLAY)
                 test = APC_PDMA_READY;
         if (!(csr & test))
                 goto out;
         err = -EBUSY;
         test = APC_XINT_CNVA;
-        if ( base->dir == APC_PLAY )
+        if (base->dir == APC_PLAY)
                 test = APC_XINT_PNVA;
         if (!(csr & test))
                 goto out;
@@ -1838,7 +1754,7 @@ static void sbus_dma_prepare(struct cs4231_dma_control *dma_cont, int d)
         test =  APC_GENL_INT | APC_PLAY_INT | APC_XINT_ENA |
                 APC_XINT_PLAY | APC_XINT_PEMP | APC_XINT_GENL |
                  APC_XINT_PENA;
-        if ( base->dir == APC_RECORD )
+        if (base->dir == APC_RECORD)
                 test = APC_GENL_INT | APC_CAPT_INT | APC_XINT_ENA |
                         APC_XINT_CAPT | APC_XINT_CEMP | APC_XINT_GENL;
         csr |= test;
@@ -1856,28 +1772,28 @@ static void sbus_dma_enable(struct cs4231_dma_control *dma_cont, int on)
         if (!on) {
                 sbus_writel(0, base->regs + base->dir + APCNC);
                 sbus_writel(0, base->regs + base->dir + APCNVA);
-                if ( base->dir == APC_PLAY ) {
+                if (base->dir == APC_PLAY) {
                         sbus_writel(0, base->regs + base->dir + APCC);
                         sbus_writel(0, base->regs + base->dir + APCVA);
                 }
 
                 udelay(1200);
-        } 
+        }
         csr = sbus_readl(base->regs + APCCSR);
         shift = 0;
-        if ( base->dir == APC_PLAY )
+        if (base->dir == APC_PLAY)
                 shift = 1;
         if (on)
                 csr &= ~(APC_CPAUSE << shift);
         else
-                csr |= (APC_CPAUSE << shift); 
+                csr |= (APC_CPAUSE << shift);
         sbus_writel(csr, base->regs + APCCSR);
         if (on)
                 csr |= (APC_CDMA_READY << shift);
         else
                 csr &= ~(APC_CDMA_READY << shift);
         sbus_writel(csr, base->regs + APCCSR);
-        
+
         spin_unlock_irqrestore(&base->lock, flags);
 }
 
@@ -1885,14 +1801,14 @@ static unsigned int sbus_dma_addr(struct cs4231_dma_control *dma_cont)
 {
         struct sbus_dma_info *base = &dma_cont->sbus_info;
 
-        return sbus_readl(base->regs + base->dir + APCVA);
+        return sbus_readl(base->regs + base->dir + APCVA);
 }
 
 static void sbus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm)
 {
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS,
-                                              snd_dma_sbus_data(chip->dev_u.sdev),
-                                              64*1024, 128*1024);
+                                        snd_dma_sbus_data(chip->dev_u.sdev),
+                                        64 * 1024, 128 * 1024);
 }
 
 /*
@@ -1907,8 +1823,6 @@ static int snd_cs4231_sbus_free(struct snd_cs4231 *chip)
         if (chip->port)
                 sbus_iounmap(chip->port, chip->regs_size);
 
-        kfree(chip);
-
         return 0;
 }
 
@@ -1925,23 +1839,16 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
 
 static int __init snd_cs4231_sbus_create(struct snd_card *card,
                                          struct sbus_dev *sdev,
-                                         int dev,
-                                         struct snd_cs4231 **rchip)
+                                         int dev)
 {
-        struct snd_cs4231 *chip;
+        struct snd_cs4231 *chip = card->private_data;
         int err;
 
-        *rchip = NULL;
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL)
-                return -ENOMEM;
-
         spin_lock_init(&chip->lock);
         spin_lock_init(&chip->c_dma.sbus_info.lock);
         spin_lock_init(&chip->p_dma.sbus_info.lock);
         mutex_init(&chip->mce_mutex);
         mutex_init(&chip->open_mutex);
-        chip->card = card;
         chip->dev_u.sdev = sdev;
         chip->regs_size = sdev->reg_addrs[0].reg_size;
         memcpy(&chip->image, &snd_cs4231_original_image,
@@ -1992,14 +1899,12 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
                 return err;
         }
 
-        *rchip = chip;
         return 0;
 }
 
 static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
 {
         struct resource *rp = &sdev->resource[0];
-        struct snd_cs4231 *cp;
         struct snd_card *card;
         int err;
 
@@ -2013,25 +1918,28 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
                 (unsigned long long)rp->start,
                 sdev->irqs[0]);
 
-        if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) {
+        err = snd_cs4231_sbus_create(card, sdev, dev);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
-        return cs4231_attach_finish(card, cp);
+        return cs4231_attach_finish(card);
 }
 #endif
 
 #ifdef EBUS_SUPPORT
 
-static void snd_cs4231_ebus_play_callback(struct ebus_dma_info *p, int event, void *cookie)
+static void snd_cs4231_ebus_play_callback(struct ebus_dma_info *p, int event,
+                                          void *cookie)
 {
         struct snd_cs4231 *chip = cookie;
-        
+
         snd_cs4231_play_callback(chip);
 }
 
-static void snd_cs4231_ebus_capture_callback(struct ebus_dma_info *p, int event, void *cookie)
+static void snd_cs4231_ebus_capture_callback(struct ebus_dma_info *p,
+                                             int event, void *cookie)
 {
         struct snd_cs4231 *chip = cookie;
 
@@ -2042,7 +1950,8 @@ static void snd_cs4231_ebus_capture_callback(struct ebus_dma_info *p, int event,
  * EBUS DMA wrappers
  */
 
-static int _ebus_dma_request(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len)
+static int _ebus_dma_request(struct cs4231_dma_control *dma_cont,
+                             dma_addr_t bus_addr, size_t len)
 {
         return ebus_dma_request(&dma_cont->ebus_info, bus_addr, len);
 }
@@ -2087,8 +1996,6 @@ static int snd_cs4231_ebus_free(struct snd_cs4231 *chip)
         if (chip->port)
                 iounmap(chip->port);
 
-        kfree(chip);
-
         return 0;
 }
 
@@ -2105,24 +2012,17 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
 
 static int __init snd_cs4231_ebus_create(struct snd_card *card,
                                          struct linux_ebus_device *edev,
-                                         int dev,
-                                         struct snd_cs4231 **rchip)
+                                         int dev)
 {
-        struct snd_cs4231 *chip;
+        struct snd_cs4231 *chip = card->private_data;
         int err;
 
-        *rchip = NULL;
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL)
-                return -ENOMEM;
-
         spin_lock_init(&chip->lock);
         spin_lock_init(&chip->c_dma.ebus_info.lock);
         spin_lock_init(&chip->p_dma.ebus_info.lock);
         mutex_init(&chip->mce_mutex);
         mutex_init(&chip->open_mutex);
         chip->flags |= CS4231_FLAG_EBUS;
-        chip->card = card;
         chip->dev_u.pdev = edev->bus->self;
         memcpy(&chip->image, &snd_cs4231_original_image,
                sizeof(snd_cs4231_original_image));
@@ -2152,7 +2052,8 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
         chip->port = ioremap(edev->resource[0].start, 0x10);
         chip->p_dma.ebus_info.regs = ioremap(edev->resource[1].start, 0x10);
         chip->c_dma.ebus_info.regs = ioremap(edev->resource[2].start, 0x10);
-        if (!chip->port || !chip->p_dma.ebus_info.regs || !chip->c_dma.ebus_info.regs) {
+        if (!chip->port || !chip->p_dma.ebus_info.regs ||
+            !chip->c_dma.ebus_info.regs) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
                 return -EIO;
@@ -2160,18 +2061,21 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
 
         if (ebus_dma_register(&chip->c_dma.ebus_info)) {
                 snd_cs4231_ebus_free(chip);
-                snd_printdd("cs4231-%d: Unable to register EBUS capture DMA\n", dev);
+                snd_printdd("cs4231-%d: Unable to register EBUS capture DMA\n",
+                            dev);
                 return -EBUSY;
         }
         if (ebus_dma_irq_enable(&chip->c_dma.ebus_info, 1)) {
                 snd_cs4231_ebus_free(chip);
-                snd_printdd("cs4231-%d: Unable to enable EBUS capture IRQ\n", dev);
+                snd_printdd("cs4231-%d: Unable to enable EBUS capture IRQ\n",
+                            dev);
                 return -EBUSY;
         }
 
         if (ebus_dma_register(&chip->p_dma.ebus_info)) {
                 snd_cs4231_ebus_free(chip);
-                snd_printdd("cs4231-%d: Unable to register EBUS play DMA\n", dev);
+                snd_printdd("cs4231-%d: Unable to register EBUS play DMA\n",
+                            dev);
                 return -EBUSY;
         }
         if (ebus_dma_irq_enable(&chip->p_dma.ebus_info, 1)) {
@@ -2192,14 +2096,12 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
                 return err;
         }
 
-        *rchip = chip;
         return 0;
 }
 
 static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
 {
         struct snd_card *card;
-        struct snd_cs4231 *chip;
         int err;
 
         err = cs4231_attach_begin(&card);
@@ -2211,12 +2113,13 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
                 edev->resource[0].start,
                 edev->irqs[0]);
 
-        if ((err = snd_cs4231_ebus_create(card, edev, dev, &chip)) < 0) {
+        err = snd_cs4231_ebus_create(card, edev, dev);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
-        return cs4231_attach_finish(card, chip);
+        return cs4231_attach_finish(card);
 }
 #endif
 
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index e07085a7cfc3..376b98691c96 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -8,18 +8,18 @@
  * Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
  * Copyright (C) 1998, 1999 Brent Baccala (baccala@freesoft.org)
  *
- * This is the lowlevel driver for the DBRI & MMCODEC duo used for ISDN & AUDIO
- * on Sun SPARCstation 10, 20, LX and Voyager models.
+ * This is the low level driver for the DBRI & MMCODEC duo used for ISDN & AUDIO
+ * on Sun SPARCStation 10, 20, LX and Voyager models.
  *
  * - DBRI: AT&T T5900FX Dual Basic Rates ISDN Interface. It is a 32 channel
  *   data time multiplexer with ISDN support (aka T7259)
  *   Interfaces: SBus,ISDN NT & TE, CHI, 4 bits parallel.
  *   CHI: (spelled ki) Concentration Highway Interface (AT&T or Intel bus ?).
  *   Documentation:
- *   - "STP 4000SBus Dual Basic Rate ISDN (DBRI) Tranceiver" from
+ *   - "STP 4000SBus Dual Basic Rate ISDN (DBRI) Transceiver" from
  *     Sparc Technology Business (courtesy of Sun Support)
  *   - Data sheet of the T7903, a newer but very similar ISA bus equivalent
- *     available from the Lucent (formarly AT&T microelectronics) home
+ *     available from the Lucent (formerly AT&T microelectronics) home
  *     page.
  *   - http://www.freesoft.org/Linux/DBRI/
  * - MMCODEC: Crystal Semiconductor CS4215 16 bit Multimedia Audio Codec
@@ -27,21 +27,21 @@
  *   Documentation: from the Crystal Semiconductor home page.
  *
  * The DBRI is a 32 pipe machine, each pipe can transfer some bits between
- * memory and a serial device (long pipes, nr 0-15) or between two serial
- * devices (short pipes, nr 16-31), or simply send a fixed data to a serial
+ * memory and a serial device (long pipes, no. 0-15) or between two serial
+ * devices (short pipes, no. 16-31), or simply send a fixed data to a serial
  * device (short pipes).
- * A timeslot defines the bit-offset and nr of bits read from a serial device.
+ * A timeslot defines the bit-offset and no. of bits read from a serial device.
  * The timeslots are linked to 6 circular lists, one for each direction for
  * each serial device (NT,TE,CHI). A timeslot is associated to 1 or 2 pipes
  * (the second one is a monitor/tee pipe, valid only for serial input).
  *
  * The mmcodec is connected via the CHI bus and needs the data & some
- * parameters (volume, output selection) timemultiplexed in 8 byte
+ * parameters (volume, output selection) time multiplexed in 8 byte
  * chunks. It also has a control mode, which serves for audio format setting.
  *
  * Looking at the CS4215 data sheet it is easy to set up 2 or 4 codecs on
- * the same CHI bus, so I thought perhaps it is possible to use the onboard
- * & the speakerbox codec simultanously, giving 2 (not very independent :-)
+ * the same CHI bus, so I thought perhaps it is possible to use the on-board
+ * & the speakerbox codec simultaneously, giving 2 (not very independent :-)
  * audio devices. But the SUN HW group decided against it, at least on my
  * LX the speakerbox connector has at least 1 pin missing and 1 wrongly
  * connected.
@@ -56,6 +56,8 @@
 #include <sound/driver.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/io.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -64,8 +66,7 @@
 #include <sound/control.h>
 #include <sound/initval.h>
 
-#include <asm/irq.h>
-#include <asm/io.h>
+#include <linux/of.h>
 #include <asm/sbus.h>
 #include <asm/atomic.h>
 
@@ -76,7 +77,8 @@ MODULE_SUPPORTED_DEVICE("{{Sun,DBRI}}");
 
 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 */
+/* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Sun DBRI soundcard.");
@@ -104,7 +106,7 @@ static char *cmds[] = {
         "SSP", "CHI", "NT", "TE", "CDEC", "TEST", "CDM", "RESRV"
 };
 
-#define dprintk(a, x...) if(dbri_debug & a) printk(KERN_DEBUG x)
+#define dprintk(a, x...) if (dbri_debug & a) printk(KERN_DEBUG x)
 
 #else
 #define dprintk(a, x...) do { } while (0)
@@ -131,7 +133,7 @@ struct cs4215 {
 };
 
 /*
- * Control mode first 
+ * Control mode first
  */
 
 /* Time Slot 1, Status register */
@@ -219,7 +221,7 @@ static struct {
 /* Time Slot 7, Input Setting */
 #define CS4215_LG(v)    v       /* Left Gain Setting 0xf: 22.5 dB */
 #define CS4215_IS       (1<<4)  /* Input Select: 1=Microphone, 0=Line */
-#define CS4215_OVR      (1<<5)  /* 1: Overrange condition occurred */
+#define CS4215_OVR      (1<<5)  /* 1: Over range condition occurred */
 #define CS4215_PIO0     (1<<6)  /* Parallel I/O 0 */
 #define CS4215_PIO1     (1<<7)
 
@@ -232,12 +234,12 @@ static struct {
 ****************************************************************************/
 
 /* DBRI main registers */
-#define REG0    0x00UL          /* Status and Control */
-#define REG1    0x04UL          /* Mode and Interrupt */
-#define REG2    0x08UL          /* Parallel IO */
-#define REG3    0x0cUL          /* Test */
-#define REG8    0x20UL          /* Command Queue Pointer */
-#define REG9    0x24UL          /* Interrupt Queue Pointer */
+#define REG0    0x00            /* Status and Control */
+#define REG1    0x04            /* Mode and Interrupt */
+#define REG2    0x08            /* Parallel IO */
+#define REG3    0x0c            /* Test */
+#define REG8    0x20            /* Command Queue Pointer */
+#define REG9    0x24            /* Interrupt Queue Pointer */
 
 #define DBRI_NO_CMDS    64
 #define DBRI_INT_BLK    64
@@ -285,7 +287,7 @@ struct dbri_pipe {
 /* Per stream (playback or record) information */
 struct dbri_streaminfo {
         struct snd_pcm_substream *substream;
-        u32 dvma_buffer;        /* Device view of Alsa DMA buffer */
+        u32 dvma_buffer;        /* Device view of ALSA DMA buffer */
         int size;               /* Size of DMA buffer             */
         size_t offset;          /* offset in user buffer          */
         int pipe;               /* Data pipe used                 */
@@ -295,8 +297,6 @@ struct dbri_streaminfo {
 
 /* This structure holds the information for both chips (DBRI & CS4215) */
 struct snd_dbri {
-        struct snd_card *card;  /* ALSA card */
-
         int regs_size, irq;     /* Needed for unload */
         struct sbus_dev *sdev;  /* SBUS device info */
         spinlock_t lock;
@@ -317,8 +317,6 @@ struct snd_dbri {
         struct cs4215 mm;       /* mmcodec special info */
                                 /* per stream (playback/record) info */
         struct dbri_streaminfo stream_info[DBRI_NO_STREAMS];
-
-        struct snd_dbri *next;
 };
 
 #define DBRI_MAX_VOLUME         63      /* Output volume */
@@ -341,11 +339,11 @@ struct snd_dbri {
 /* DBRI Reg1 - Mode and Interrupt Register - defines. (Page 18) */
 #define D_LITTLE_END    (1<<8)  /* Byte Order */
 #define D_BIG_END       (0<<8)  /* Byte Order */
-#define D_MRR           (1<<4)  /* Multiple Error Ack on SBus (readonly) */
-#define D_MLE           (1<<3)  /* Multiple Late Error on SBus (readonly) */
-#define D_LBG           (1<<2)  /* Lost Bus Grant on SBus (readonly) */
-#define D_MBE           (1<<1)  /* Burst Error on SBus (readonly) */
-#define D_IR            (1<<0)  /* Interrupt Indicator (readonly) */
+#define D_MRR           (1<<4)  /* Multiple Error Ack on SBus (read only) */
+#define D_MLE           (1<<3)  /* Multiple Late Error on SBus (read only) */
+#define D_LBG           (1<<2)  /* Lost Bus Grant on SBus (read only) */
+#define D_MBE           (1<<1)  /* Burst Error on SBus (read only) */
+#define D_IR            (1<<0)  /* Interrupt Indicator (read only) */
 
 /* DBRI Reg2 - Parallel IO Register - defines. (Page 18) */
 #define D_ENPIO3        (1<<7)  /* Enable Pin 3 */
@@ -376,11 +374,11 @@ struct snd_dbri {
 #define D_CDM           0xe     /* CHI Data mode command */
 
 /* Special bits for some commands */
-#define D_PIPE(v)      ((v)<<0) /* Pipe Nr: 0-15 long, 16-21 short */
+#define D_PIPE(v)      ((v)<<0) /* Pipe No.: 0-15 long, 16-21 short */
 
 /* Setup Data Pipe */
 /* IRM */
-#define D_SDP_2SAME     (1<<18) /* Report 2nd time in a row value rcvd */
+#define D_SDP_2SAME     (1<<18) /* Report 2nd time in a row value received */
 #define D_SDP_CHANGE    (2<<18) /* Report any changes */
 #define D_SDP_EVERY     (3<<18) /* Report any changes */
 #define D_SDP_EOL       (1<<17) /* EOL interrupt enable */
@@ -419,7 +417,7 @@ struct snd_dbri {
 #define D_TS_NONCONTIG  (3<<10) /* Non contiguous mode */
 #define D_TS_ANCHOR     (7<<10) /* Starting short pipes */
 #define D_TS_MON(v)    ((v)<<5) /* Monitor Pipe */
-#define D_TS_NEXT(v)   ((v)<<0) /* Pipe Nr: 0-15 long, 16-21 short */
+#define D_TS_NEXT(v)   ((v)<<0) /* Pipe no.: 0-15 long, 16-21 short */
 
 /* Concentration Highway Interface Modes */
 #define D_CHI_CHICM(v)  ((v)<<16)       /* Clock mode */
@@ -435,7 +433,7 @@ struct snd_dbri {
 #define D_NT_NBF        (1<<16) /* Number of bad frames to loose framing */
 #define D_NT_IRM_IMM    (1<<15) /* Interrupt Report & Mask: Immediate */
 #define D_NT_IRM_EN     (1<<14) /* Interrupt Report & Mask: Enable */
-#define D_NT_ISNT       (1<<13) /* Configfure interface as NT */
+#define D_NT_ISNT       (1<<13) /* Configure interface as NT */
 #define D_NT_FT         (1<<12) /* Fixed Timing */
 #define D_NT_EZ         (1<<11) /* Echo Channel is Zeros */
 #define D_NT_IFA        (1<<10) /* Inhibit Final Activation */
@@ -455,7 +453,7 @@ struct snd_dbri {
 #define D_TEST_RAM(v)   ((v)<<16)       /* RAM Pointer */
 #define D_TEST_SIZE(v)  ((v)<<11)       /* */
 #define D_TEST_ROMONOFF 0x5     /* Toggle ROM opcode monitor on/off */
-#define D_TEST_PROC     0x6     /* MicroProcessor test */
+#define D_TEST_PROC     0x6     /* Microprocessor test */
 #define D_TEST_SER      0x7     /* Serial-Controller test */
 #define D_TEST_RAMREAD  0x8     /* Copy from Ram to system memory */
 #define D_TEST_RAMWRITE 0x9     /* Copy into Ram from system memory */
@@ -464,12 +462,12 @@ struct snd_dbri {
 #define D_TEST_DUMP     0xe     /* ROM Dump */
 
 /* CHI Data Mode */
-#define D_CDM_THI       (1<<8)  /* Transmit Data on CHIDR Pin */
-#define D_CDM_RHI       (1<<7)  /* Receive Data on CHIDX Pin */
-#define D_CDM_RCE       (1<<6)  /* Receive on Rising Edge of CHICK */
-#define D_CDM_XCE       (1<<2)  /* Transmit Data on Rising Edge of CHICK */
-#define D_CDM_XEN       (1<<1)  /* Transmit Highway Enable */
-#define D_CDM_REN       (1<<0)  /* Receive Highway Enable */
+#define D_CDM_THI       (1 << 8)        /* Transmit Data on CHIDR Pin */
+#define D_CDM_RHI       (1 << 7)        /* Receive Data on CHIDX Pin */
+#define D_CDM_RCE       (1 << 6)        /* Receive on Rising Edge of CHICK */
+#define D_CDM_XCE       (1 << 2) /* Transmit Data on Rising Edge of CHICK */
+#define D_CDM_XEN       (1 << 1)        /* Transmit Highway Enable */
+#define D_CDM_REN       (1 << 0)        /* Receive Highway Enable */
 
 /* The Interrupts */
 #define D_INTR_BRDY     1       /* Buffer Ready for processing */
@@ -493,9 +491,9 @@ struct snd_dbri {
 #define D_INTR_CHI      36
 #define D_INTR_CMD      38
 
-#define D_INTR_GETCHAN(v)       (((v)>>24) & 0x3f)
-#define D_INTR_GETCODE(v)       (((v)>>20) & 0xf)
-#define D_INTR_GETCMD(v)        (((v)>>16) & 0xf)
+#define D_INTR_GETCHAN(v)       (((v) >> 24) & 0x3f)
+#define D_INTR_GETCODE(v)       (((v) >> 20) & 0xf)
+#define D_INTR_GETCMD(v)        (((v) >> 16) & 0xf)
 #define D_INTR_GETVAL(v)        ((v) & 0xffff)
 #define D_INTR_GETRVAL(v)       ((v) & 0xfffff)
 
@@ -533,43 +531,42 @@ struct snd_dbri {
 #define D_P_31          31      /* */
 
 /* Transmit descriptor defines */
-#define DBRI_TD_F       (1<<31) /* End of Frame */
-#define DBRI_TD_D       (1<<30) /* Do not append CRC */
-#define DBRI_TD_CNT(v)  ((v)<<16)       /* Number of valid bytes in the buffer */
-#define DBRI_TD_B       (1<<15) /* Final interrupt */
-#define DBRI_TD_M       (1<<14) /* Marker interrupt */
-#define DBRI_TD_I       (1<<13) /* Transmit Idle Characters */
-#define DBRI_TD_FCNT(v) (v)     /* Flag Count */
-#define DBRI_TD_UNR     (1<<3)  /* Underrun: transmitter is out of data */
-#define DBRI_TD_ABT     (1<<2)  /* Abort: frame aborted */
-#define DBRI_TD_TBC     (1<<0)  /* Transmit buffer Complete */
-#define DBRI_TD_STATUS(v)       ((v)&0xff)      /* Transmit status */
-                        /* Maximum buffer size per TD: almost 8Kb */
+#define DBRI_TD_F       (1 << 31)       /* End of Frame */
+#define DBRI_TD_D       (1 << 30)       /* Do not append CRC */
+#define DBRI_TD_CNT(v)  ((v) << 16) /* Number of valid bytes in the buffer */
+#define DBRI_TD_B       (1 << 15)       /* Final interrupt */
+#define DBRI_TD_M       (1 << 14)       /* Marker interrupt */
+#define DBRI_TD_I       (1 << 13)       /* Transmit Idle Characters */
+#define DBRI_TD_FCNT(v) (v)             /* Flag Count */
+#define DBRI_TD_UNR     (1 << 3) /* Underrun: transmitter is out of data */
+#define DBRI_TD_ABT     (1 << 2)        /* Abort: frame aborted */
+#define DBRI_TD_TBC     (1 << 0)        /* Transmit buffer Complete */
+#define DBRI_TD_STATUS(v)       ((v) & 0xff)    /* Transmit status */
+                        /* Maximum buffer size per TD: almost 8KB */
 #define DBRI_TD_MAXCNT  ((1 << 13) - 4)
 
 /* Receive descriptor defines */
-#define DBRI_RD_F       (1<<31) /* End of Frame */
-#define DBRI_RD_C       (1<<30) /* Completed buffer */
-#define DBRI_RD_B       (1<<15) /* Final interrupt */
-#define DBRI_RD_M       (1<<14) /* Marker interrupt */
-#define DBRI_RD_BCNT(v) (v)     /* Buffer size */
-#define DBRI_RD_CRC     (1<<7)  /* 0: CRC is correct */
-#define DBRI_RD_BBC     (1<<6)  /* 1: Bad Byte received */
-#define DBRI_RD_ABT     (1<<5)  /* Abort: frame aborted */
-#define DBRI_RD_OVRN    (1<<3)  /* Overrun: data lost */
-#define DBRI_RD_STATUS(v)      ((v)&0xff)       /* Receive status */
-#define DBRI_RD_CNT(v) (((v)>>16)&0x1fff)       /* Valid bytes in the buffer */
+#define DBRI_RD_F       (1 << 31)       /* End of Frame */
+#define DBRI_RD_C       (1 << 30)       /* Completed buffer */
+#define DBRI_RD_B       (1 << 15)       /* Final interrupt */
+#define DBRI_RD_M       (1 << 14)       /* Marker interrupt */
+#define DBRI_RD_BCNT(v) (v)             /* Buffer size */
+#define DBRI_RD_CRC     (1 << 7)        /* 0: CRC is correct */
+#define DBRI_RD_BBC     (1 << 6)        /* 1: Bad Byte received */
+#define DBRI_RD_ABT     (1 << 5)        /* Abort: frame aborted */
+#define DBRI_RD_OVRN    (1 << 3)        /* Overrun: data lost */
+#define DBRI_RD_STATUS(v)      ((v) & 0xff)     /* Receive status */
+#define DBRI_RD_CNT(v) (((v) >> 16) & 0x1fff)   /* Valid bytes in the buffer */
 
 /* stream_info[] access */
 /* Translate the ALSA direction into the array index */
 #define DBRI_STREAMNO(substream)                                \
-                (substream->stream ==                           \
-                 SNDRV_PCM_STREAM_PLAYBACK? DBRI_PLAY: DBRI_REC)
+                (substream->stream ==                           \
+                 SNDRV_PCM_STREAM_PLAYBACK ? DBRI_PLAY: DBRI_REC)
 
 /* Return a pointer to dbri_streaminfo */
-#define DBRI_STREAM(dbri, substream)    &dbri->stream_info[DBRI_STREAMNO(substream)]
-
-static struct snd_dbri *dbri_list;      /* All DBRI devices */
+#define DBRI_STREAM(dbri, substream)    \
+                &dbri->stream_info[DBRI_STREAMNO(substream)]
 
 /*
  * Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr.
@@ -609,21 +606,21 @@ The list is terminated with a WAIT command, which generates a
 CPU interrupt to signal completion.
 
 Since the DBRI can run in parallel with the CPU, several means of
-synchronization present themselves. The method implemented here is only
-use of the dbri_cmdwait() to wait for execution of batch of sent commands.
+synchronization present themselves. The method implemented here uses
+the dbri_cmdwait() to wait for execution of batch of sent commands.
 
-A circular command buffer is used here. A new command is being added 
+A circular command buffer is used here. A new command is being added
 while another can be executed. The scheme works by adding two WAIT commands
 after each sent batch of commands. When the next batch is prepared it is
 added after the WAIT commands then the WAITs are replaced with single JUMP
-command to the new batch. The the DBRI is forced to reread the last WAIT 
-command (replaced by the JUMP by then). If the DBRI is still executing 
+command to the new batch. The the DBRI is forced to reread the last WAIT
+command (replaced by the JUMP by then). If the DBRI is still executing
 previous commands the request to reread the WAIT command is ignored.
 
 Every time a routine wants to write commands to the DBRI, it must
-first call dbri_cmdlock() and get pointer to a free space in 
-dbri->dma->cmd buffer. After this, the commands can be written to 
-the buffer, and dbri_cmdsend() is called with the final pointer value 
+first call dbri_cmdlock() and get pointer to a free space in
+dbri->dma->cmd buffer. After this, the commands can be written to
+the buffer, and dbri_cmdsend() is called with the final pointer value
 to send them to the DBRI.
 
 */
@@ -646,18 +643,17 @@ static void dbri_cmdwait(struct snd_dbri *dbri)
         }
         spin_unlock_irqrestore(&dbri->lock, flags);
 
-        if (maxloops == 0) {
+        if (maxloops == 0)
                 printk(KERN_ERR "DBRI: Chip never completed command buffer\n");
-        } else {
+        else
                 dprintk(D_CMD, "Chip completed command buffer (%d)\n",
                         MAXLOOPS - maxloops - 1);
-        }
 }
 /*
- * Lock the command queue and returns pointer to a space for len cmd words
+ * Lock the command queue and return pointer to space for len cmd words
  * It locks the cmdlock spinlock.
  */
-static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len)
+static s32 *dbri_cmdlock(struct snd_dbri *dbri, int len)
 {
         /* Space for 2 WAIT cmds (replaced later by 1 JUMP cmd) */
         len += 2;
@@ -680,7 +676,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len)
  *
  * Lock must be held before calling this.
  */
-static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len)
+static void dbri_cmdsend(struct snd_dbri *dbri, s32 *cmd, int len)
 {
         s32 tmp, addr;
         static int wait_id = 0;
@@ -700,16 +696,17 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len)
                 s32 *ptr;
 
                 for (ptr = dbri->cmdptr; ptr < cmd+2; ptr++)
-                        dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
+                        dprintk(D_CMD, "cmd: %lx:%08x\n",
+                                (unsigned long)ptr, *ptr);
         } else {
                 s32 *ptr = dbri->cmdptr;
 
                 dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
                 ptr++;
                 dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
-                for (ptr = dbri->dma->cmd; ptr < cmd+2; ptr++) {
-                        dprintk(D_CMD, "cmd: %lx:%08x\n", (unsigned long)ptr, *ptr);
-                }
+                for (ptr = dbri->dma->cmd; ptr < cmd+2; ptr++)
+                        dprintk(D_CMD, "cmd: %lx:%08x\n",
+                                (unsigned long)ptr, *ptr);
         }
 #endif
 
@@ -723,7 +720,7 @@ static void dbri_cmdsend(struct snd_dbri * dbri, s32 * cmd,int len)
 }
 
 /* Lock must be held when calling this */
-static void dbri_reset(struct snd_dbri * dbri)
+static void dbri_reset(struct snd_dbri *dbri)
 {
         int i;
         u32 tmp;
@@ -746,7 +743,7 @@ static void dbri_reset(struct snd_dbri * dbri)
 }
 
 /* Lock must not be held before calling this */
-static void dbri_initialize(struct snd_dbri * dbri)
+static void __devinit dbri_initialize(struct snd_dbri *dbri)
 {
         s32 *cmd;
         u32 dma_addr;
@@ -763,7 +760,7 @@ static void dbri_initialize(struct snd_dbri * dbri)
 
         spin_lock_init(&dbri->cmdlock);
         /*
-         * Initialize the interrupt ringbuffer.
+         * Initialize the interrupt ring buffer.
          */
         dma_addr = dbri->dma_dvma + dbri_dma_off(intr, 0);
         dbri->dma->intr[0] = dma_addr;
@@ -801,7 +798,7 @@ list ordering, among other things.  The transmit and receive functions
 here interface closely with the transmit and receive interrupt code.
 
 */
-static int pipe_active(struct snd_dbri * dbri, int pipe)
+static inline int pipe_active(struct snd_dbri *dbri, int pipe)
 {
         return ((pipe >= 0) && (dbri->pipes[pipe].desc != -1));
 }
@@ -811,20 +808,22 @@ static int pipe_active(struct snd_dbri * dbri, int pipe)
  * Called on an in-use pipe to clear anything being transmitted or received
  * Lock must be held before calling this.
  */
-static void reset_pipe(struct snd_dbri * dbri, int pipe)
+static void reset_pipe(struct snd_dbri *dbri, int pipe)
 {
         int sdp;
         int desc;
         s32 *cmd;
 
         if (pipe < 0 || pipe > DBRI_MAX_PIPE) {
-                printk(KERN_ERR "DBRI: reset_pipe called with illegal pipe number\n");
+                printk(KERN_ERR "DBRI: reset_pipe called with "
+                        "illegal pipe number\n");
                 return;
         }
 
         sdp = dbri->pipes[pipe].sdp;
         if (sdp == 0) {
-                printk(KERN_ERR "DBRI: reset_pipe called on uninitialized pipe\n");
+                printk(KERN_ERR "DBRI: reset_pipe called "
+                        "on uninitialized pipe\n");
                 return;
         }
 
@@ -835,9 +834,10 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe)
         dbri_cmdsend(dbri, cmd, 3);
 
         desc = dbri->pipes[pipe].first_desc;
-        if ( desc >= 0)
+        if (desc >= 0)
                 do {
-                        dbri->dma->desc[desc].nda = dbri->dma->desc[desc].ba = 0;
+                        dbri->dma->desc[desc].ba = 0;
+                        dbri->dma->desc[desc].nda = 0;
                         desc = dbri->next_desc[desc];
                 } while (desc != -1 && desc != dbri->pipes[pipe].first_desc);
 
@@ -848,15 +848,17 @@ static void reset_pipe(struct snd_dbri * dbri, int pipe)
 /*
  * Lock must be held before calling this.
  */
-static void setup_pipe(struct snd_dbri * dbri, int pipe, int sdp)
+static void setup_pipe(struct snd_dbri *dbri, int pipe, int sdp)
 {
         if (pipe < 0 || pipe > DBRI_MAX_PIPE) {
-                printk(KERN_ERR "DBRI: setup_pipe called with illegal pipe number\n");
+                printk(KERN_ERR "DBRI: setup_pipe called "
+                        "with illegal pipe number\n");
                 return;
         }
 
         if ((sdp & 0xf800) != sdp) {
-                printk(KERN_ERR "DBRI: setup_pipe called with strange SDP value\n");
+                printk(KERN_ERR "DBRI: setup_pipe called "
+                        "with strange SDP value\n");
                 /* sdp &= 0xf800; */
         }
 
@@ -877,25 +879,26 @@ static void setup_pipe(struct snd_dbri * dbri, int pipe, int sdp)
 /*
  * Lock must be held before calling this.
  */
-static void link_time_slot(struct snd_dbri * dbri, int pipe,
+static void link_time_slot(struct snd_dbri *dbri, int pipe,
                            int prevpipe, int nextpipe,
                            int length, int cycle)
 {
         s32 *cmd;
         int val;
 
-        if (pipe < 0 || pipe > DBRI_MAX_PIPE 
+        if (pipe < 0 || pipe > DBRI_MAX_PIPE
                         || prevpipe < 0 || prevpipe > DBRI_MAX_PIPE
                         || nextpipe < 0 || nextpipe > DBRI_MAX_PIPE) {
-                printk(KERN_ERR 
+                printk(KERN_ERR
                     "DBRI: link_time_slot called with illegal pipe number\n");
                 return;
         }
 
-        if (dbri->pipes[pipe].sdp == 0 
+        if (dbri->pipes[pipe].sdp == 0
                         || dbri->pipes[prevpipe].sdp == 0
                         || dbri->pipes[nextpipe].sdp == 0) {
-                printk(KERN_ERR "DBRI: link_time_slot called on uninitialized pipe\n");
+                printk(KERN_ERR "DBRI: link_time_slot called "
+                        "on uninitialized pipe\n");
                 return;
         }
 
@@ -935,17 +938,17 @@ static void link_time_slot(struct snd_dbri * dbri, int pipe,
 /*
  * Lock must be held before calling this.
  */
-static void unlink_time_slot(struct snd_dbri * dbri, int pipe,
+static void unlink_time_slot(struct snd_dbri *dbri, int pipe,
                              enum in_or_out direction, int prevpipe,
                              int nextpipe)
 {
         s32 *cmd;
         int val;
 
-        if (pipe < 0 || pipe > DBRI_MAX_PIPE 
+        if (pipe < 0 || pipe > DBRI_MAX_PIPE
                         || prevpipe < 0 || prevpipe > DBRI_MAX_PIPE
                         || nextpipe < 0 || nextpipe > DBRI_MAX_PIPE) {
-                printk(KERN_ERR 
+                printk(KERN_ERR
                     "DBRI: unlink_time_slot called with illegal pipe number\n");
                 return;
         }
@@ -985,7 +988,7 @@ static void unlink_time_slot(struct snd_dbri * dbri, int pipe,
  *
  * Lock must not be held before calling it.
  */
-static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
+static void xmit_fixed(struct snd_dbri *dbri, int pipe, unsigned int data)
 {
         s32 *cmd;
         unsigned long flags;
@@ -996,7 +999,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
         }
 
         if (D_SDP_MODE(dbri->pipes[pipe].sdp) == 0) {
-                printk(KERN_ERR "DBRI: xmit_fixed: Uninitialized pipe %d\n", pipe);
+                printk(KERN_ERR "DBRI: xmit_fixed: "
+                        "Uninitialized pipe %d\n", pipe);
                 return;
         }
 
@@ -1006,7 +1010,8 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
         }
 
         if (!(dbri->pipes[pipe].sdp & D_SDP_TO_SER)) {
-                printk(KERN_ERR "DBRI: xmit_fixed: Called on receive pipe %d\n", pipe);
+                printk(KERN_ERR "DBRI: xmit_fixed: Called on receive pipe %d\n",
+                        pipe);
                 return;
         }
 
@@ -1028,20 +1033,23 @@ static void xmit_fixed(struct snd_dbri * dbri, int pipe, unsigned int data)
 
 }
 
-static void recv_fixed(struct snd_dbri * dbri, int pipe, volatile __u32 * ptr)
+static void recv_fixed(struct snd_dbri *dbri, int pipe, volatile __u32 *ptr)
 {
         if (pipe < 16 || pipe > DBRI_MAX_PIPE) {
-                printk(KERN_ERR "DBRI: recv_fixed called with illegal pipe number\n");
+                printk(KERN_ERR "DBRI: recv_fixed called with "
+                        "illegal pipe number\n");
                 return;
         }
 
         if (D_SDP_MODE(dbri->pipes[pipe].sdp) != D_SDP_FIXED) {
-                printk(KERN_ERR "DBRI: recv_fixed called on non-fixed pipe %d\n", pipe);
+                printk(KERN_ERR "DBRI: recv_fixed called on "
+                        "non-fixed pipe %d\n", pipe);
                 return;
         }
 
         if (dbri->pipes[pipe].sdp & D_SDP_TO_SER) {
-                printk(KERN_ERR "DBRI: recv_fixed called on transmit pipe %d\n", pipe);
+                printk(KERN_ERR "DBRI: recv_fixed called on "
+                        "transmit pipe %d\n", pipe);
                 return;
         }
 
@@ -1064,7 +1072,7 @@ static void recv_fixed(struct snd_dbri * dbri, int pipe, volatile __u32 * ptr)
  *
  * Lock must be held before calling this.
  */
-static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period)
+static int setup_descs(struct snd_dbri *dbri, int streamno, unsigned int period)
 {
         struct dbri_streaminfo *info = &dbri->stream_info[streamno];
         __u32 dvma_buffer;
@@ -1089,21 +1097,23 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
 
         if (streamno == DBRI_PLAY) {
                 if (!(dbri->pipes[info->pipe].sdp & D_SDP_TO_SER)) {
-                        printk(KERN_ERR "DBRI: setup_descs: Called on receive pipe %d\n",
-                               info->pipe);
+                        printk(KERN_ERR "DBRI: setup_descs: "
+                                "Called on receive pipe %d\n", info->pipe);
                         return -2;
                 }
         } else {
                 if (dbri->pipes[info->pipe].sdp & D_SDP_TO_SER) {
-                        printk(KERN_ERR 
+                        printk(KERN_ERR
                             "DBRI: setup_descs: Called on transmit pipe %d\n",
                              info->pipe);
                         return -2;
                 }
-                /* Should be able to queue multiple buffers to receive on a pipe */
+                /* Should be able to queue multiple buffers
+                 * to receive on a pipe
+                 */
                 if (pipe_active(dbri, info->pipe)) {
-                        printk(KERN_ERR "DBRI: recv_on_pipe: Called on active pipe %d\n",
-                               info->pipe);
+                        printk(KERN_ERR "DBRI: recv_on_pipe: "
+                                "Called on active pipe %d\n", info->pipe);
                         return -2;
                 }
 
@@ -1113,11 +1123,13 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
 
         /* Free descriptors if pipe has any */
         desc = dbri->pipes[info->pipe].first_desc;
-        if ( desc >= 0)
+        if (desc >= 0)
                 do {
-                        dbri->dma->desc[desc].nda = dbri->dma->desc[desc].ba = 0;
+                        dbri->dma->desc[desc].ba = 0;
+                        dbri->dma->desc[desc].nda = 0;
                         desc = dbri->next_desc[desc];
-                } while (desc != -1 && desc != dbri->pipes[info->pipe].first_desc);
+                } while (desc != -1 &&
+                         desc != dbri->pipes[info->pipe].first_desc);
 
         dbri->pipes[info->pipe].desc = -1;
         dbri->pipes[info->pipe].first_desc = -1;
@@ -1130,6 +1142,7 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
                         if (!dbri->dma->desc[desc].ba)
                                 break;
                 }
+
                 if (desc == DBRI_NO_DESCS) {
                         printk(KERN_ERR "DBRI: setup_descs: No descriptors\n");
                         return -1;
@@ -1150,8 +1163,7 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
                 if (streamno == DBRI_PLAY) {
                         dbri->dma->desc[desc].word1 = DBRI_TD_CNT(mylen);
                         dbri->dma->desc[desc].word4 = 0;
-                        dbri->dma->desc[desc].word1 |= 
-                            DBRI_TD_F | DBRI_TD_B;
+                        dbri->dma->desc[desc].word1 |= DBRI_TD_F | DBRI_TD_B;
                 } else {
                         dbri->dma->desc[desc].word1 = 0;
                         dbri->dma->desc[desc].word4 =
@@ -1172,7 +1184,8 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
         }
 
         if (first_desc == -1 || last_desc == -1) {
-                printk(KERN_ERR "DBRI: setup_descs: Not enough descriptors available\n");
+                printk(KERN_ERR "DBRI: setup_descs: "
+                        " Not enough descriptors available\n");
                 return -1;
         }
 
@@ -1183,14 +1196,14 @@ static int setup_descs(struct snd_dbri * dbri, int streamno, unsigned int period
         dbri->pipes[info->pipe].desc = first_desc;
 
 #ifdef DBRI_DEBUG
-        for (desc = first_desc; desc != -1; ) {
+        for (desc = first_desc; desc != -1;) {
                 dprintk(D_DESC, "DESC %d: %08x %08x %08x %08x\n",
                         desc,
                         dbri->dma->desc[desc].word1,
                         dbri->dma->desc[desc].ba,
                         dbri->dma->desc[desc].nda, dbri->dma->desc[desc].word4);
                         desc = dbri->next_desc[desc];
-                        if ( desc == first_desc )
+                        if (desc == first_desc)
                                 break;
         }
 #endif
@@ -1213,7 +1226,8 @@ enum master_or_slave { CHImaster, CHIslave };
 /*
  * Lock must not be held before calling it.
  */
-static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_slave,
+static void reset_chi(struct snd_dbri *dbri,
+                      enum master_or_slave master_or_slave,
                       int bits_per_frame)
 {
         s32 *cmd;
@@ -1222,7 +1236,7 @@ static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_sla
         /* Set CHI Anchor: Pipe 16 */
 
         cmd = dbri_cmdlock(dbri, 4);
-        val = D_DTS_VO | D_DTS_VI | D_DTS_INS 
+        val = D_DTS_VO | D_DTS_VI | D_DTS_INS
                 | D_DTS_PRVIN(16) | D_PIPE(16) | D_DTS_PRVOUT(16);
         *(cmd++) = DBRI_CMD(D_DTS, 0, val);
         *(cmd++) = D_TS_ANCHOR | D_TS_NEXT(16);
@@ -1246,15 +1260,16 @@ static void reset_chi(struct snd_dbri * dbri, enum master_or_slave master_or_sla
         } else {
                 /* Setup DBRI for CHI Master - generate clock, FS
                  *
-                 * BPF                          =  bits per 8 kHz frame
-                 * 12.288 MHz / CHICM_divisor   = clock rate
-                 * FD  =  1 - drive CHIFS on rising edge of CHICK
+                 * BPF                          =  bits per 8 kHz frame
+                 * 12.288 MHz / CHICM_divisor   = clock rate
+                 * FD = 1 - drive CHIFS on rising edge of CHICK
                  */
                 int clockrate = bits_per_frame * 8;
                 int divisor = 12288 / clockrate;
 
                 if (divisor > 255 || divisor * clockrate != 12288)
-                        printk(KERN_ERR "DBRI: illegal bits_per_frame in setup_chi\n");
+                        printk(KERN_ERR "DBRI: illegal bits_per_frame "
+                                "in setup_chi\n");
 
                 *(cmd++) = DBRI_CMD(D_CHI, 0, D_CHI_CHICM(divisor) | D_CHI_FD
                                     | D_CHI_BPF(bits_per_frame));
@@ -1288,7 +1303,7 @@ to the DBRI via the CHI interface and few of the DBRI's PIO pins.
  * Lock must not be held before calling it.
 
 */
-static void cs4215_setup_pipes(struct snd_dbri * dbri)
+static __devinit void cs4215_setup_pipes(struct snd_dbri *dbri)
 {
         unsigned long flags;
 
@@ -1303,9 +1318,9 @@ static void cs4215_setup_pipes(struct snd_dbri * dbri)
          *          not relevant for us (only for doublechecking).
          *
          * Control mode:
-         * Pipe 17: Send timeslots 1-4 (slots 5-8 are readonly)
+         * Pipe 17: Send timeslots 1-4 (slots 5-8 are read only)
          * Pipe 18: Receive timeslot 1 (clb).
-         * Pipe 19: Receive timeslot 7 (version). 
+         * Pipe 19: Receive timeslot 7 (version).
          */
 
         setup_pipe(dbri, 4, D_SDP_MEM | D_SDP_TO_SER | D_SDP_MSB);
@@ -1321,7 +1336,7 @@ static void cs4215_setup_pipes(struct snd_dbri * dbri)
         dbri_cmdwait(dbri);
 }
 
-static int cs4215_init_data(struct cs4215 *mm)
+static __devinit int cs4215_init_data(struct cs4215 *mm)
 {
         /*
          * No action, memory resetting only.
@@ -1355,7 +1370,7 @@ static int cs4215_init_data(struct cs4215 *mm)
         return 0;
 }
 
-static void cs4215_setdata(struct snd_dbri * dbri, int muted)
+static void cs4215_setdata(struct snd_dbri *dbri, int muted)
 {
         if (muted) {
                 dbri->mm.data[0] |= 63;
@@ -1387,7 +1402,7 @@ static void cs4215_setdata(struct snd_dbri * dbri, int muted)
 /*
  * Set the CS4215 to data mode.
  */
-static void cs4215_open(struct snd_dbri * dbri)
+static void cs4215_open(struct snd_dbri *dbri)
 {
         int data_width;
         u32 tmp;
@@ -1452,7 +1467,7 @@ static void cs4215_open(struct snd_dbri * dbri)
 /*
  * Send the control information (i.e. audio format)
  */
-static int cs4215_setctrl(struct snd_dbri * dbri)
+static int cs4215_setctrl(struct snd_dbri *dbri)
 {
         int i, val;
         u32 tmp;
@@ -1502,9 +1517,9 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
 
         /*
          * Control mode:
-         * Pipe 17: Send timeslots 1-4 (slots 5-8 are readonly)
+         * Pipe 17: Send timeslots 1-4 (slots 5-8 are read only)
          * Pipe 18: Receive timeslot 1 (clb).
-         * Pipe 19: Receive timeslot 7 (version). 
+         * Pipe 19: Receive timeslot 7 (version).
          */
 
         link_time_slot(dbri, 17, 16, 16, 32, dbri->mm.offset);
@@ -1522,9 +1537,9 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
         sbus_writel(tmp, dbri->regs + REG0);
         spin_unlock_irqrestore(&dbri->lock, flags);
 
-        for (i = 10; ((dbri->mm.status & 0xe4) != 0x20); --i) {
+        for (i = 10; ((dbri->mm.status & 0xe4) != 0x20); --i)
                 msleep_interruptible(1);
-        }
+
         if (i == 0) {
                 dprintk(D_MM, "CS4215 didn't respond to CLB (0x%02x)\n",
                         dbri->mm.status);
@@ -1556,7 +1571,7 @@ static int cs4215_setctrl(struct snd_dbri * dbri)
  * As part of the process we resend the settings for the data
  * timeslots as well.
  */
-static int cs4215_prepare(struct snd_dbri * dbri, unsigned int rate,
+static int cs4215_prepare(struct snd_dbri *dbri, unsigned int rate,
                           snd_pcm_format_t format, unsigned int channels)
 {
         int freq_idx;
@@ -1613,7 +1628,7 @@ static int cs4215_prepare(struct snd_dbri * dbri, unsigned int rate,
 /*
  *
  */
-static int cs4215_init(struct snd_dbri * dbri)
+static __devinit int cs4215_init(struct snd_dbri *dbri)
 {
         u32 reg2 = sbus_readl(dbri->regs + REG2);
         dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2);
@@ -1674,7 +1689,7 @@ interrupts are disabled.
 
 /* xmit_descs()
  *
- * Starts transmiting the current TD's for recording/playing.
+ * Starts transmitting the current TD's for recording/playing.
  * For playback, ALSA has filled the DMA memory with new data (we hope).
  */
 static void xmit_descs(struct snd_dbri *dbri)
@@ -1701,7 +1716,8 @@ static void xmit_descs(struct snd_dbri *dbri)
                         *(cmd++) = DBRI_CMD(D_SDP, 0,
                                             dbri->pipes[info->pipe].sdp
                                             | D_SDP_P | D_SDP_EVERY | D_SDP_C);
-                        *(cmd++) = dbri->dma_dvma + dbri_dma_off(desc, first_td);
+                        *(cmd++) = dbri->dma_dvma +
+                                   dbri_dma_off(desc, first_td);
                         dbri_cmdsend(dbri, cmd, 2);
 
                         /* Reset our admin of the pipe. */
@@ -1722,7 +1738,8 @@ static void xmit_descs(struct snd_dbri *dbri)
                         *(cmd++) = DBRI_CMD(D_SDP, 0,
                                             dbri->pipes[info->pipe].sdp
                                             | D_SDP_P | D_SDP_EVERY | D_SDP_C);
-                        *(cmd++) = dbri->dma_dvma + dbri_dma_off(desc, first_td);
+                        *(cmd++) = dbri->dma_dvma +
+                                   dbri_dma_off(desc, first_td);
                         dbri_cmdsend(dbri, cmd, 2);
 
                         /* Reset our admin of the pipe. */
@@ -1747,15 +1764,12 @@ static void xmit_descs(struct snd_dbri *dbri)
  *
  */
 
-static void transmission_complete_intr(struct snd_dbri * dbri, int pipe)
+static void transmission_complete_intr(struct snd_dbri *dbri, int pipe)
 {
-        struct dbri_streaminfo *info;
-        int td;
+        struct dbri_streaminfo *info = &dbri->stream_info[DBRI_PLAY];
+        int td = dbri->pipes[pipe].desc;
         int status;
 
-        info = &dbri->stream_info[DBRI_PLAY];
-
-        td = dbri->pipes[pipe].desc;
         while (td >= 0) {
                 if (td >= DBRI_NO_DESCS) {
                         printk(KERN_ERR "DBRI: invalid td on pipe %d\n", pipe);
@@ -1763,9 +1777,8 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe)
                 }
 
                 status = DBRI_TD_STATUS(dbri->dma->desc[td].word4);
-                if (!(status & DBRI_TD_TBC)) {
+                if (!(status & DBRI_TD_TBC))
                         break;
-                }
 
                 dprintk(D_INT, "TD %d, status 0x%02x\n", td, status);
 
@@ -1777,15 +1790,12 @@ static void transmission_complete_intr(struct snd_dbri * dbri, int pipe)
         }
 
         /* Notify ALSA */
-        if (spin_is_locked(&dbri->lock)) {
-                spin_unlock(&dbri->lock);
-                snd_pcm_period_elapsed(info->substream);
-                spin_lock(&dbri->lock);
-        } else
-                snd_pcm_period_elapsed(info->substream);
+        spin_unlock(&dbri->lock);
+        snd_pcm_period_elapsed(info->substream);
+        spin_lock(&dbri->lock);
 }
 
-static void reception_complete_intr(struct snd_dbri * dbri, int pipe)
+static void reception_complete_intr(struct snd_dbri *dbri, int pipe)
 {
         struct dbri_streaminfo *info;
         int rd = dbri->pipes[pipe].desc;
@@ -1809,15 +1819,12 @@ static void reception_complete_intr(struct snd_dbri * dbri, int pipe)
                 rd, DBRI_RD_STATUS(status), DBRI_RD_CNT(status));
 
         /* Notify ALSA */
-        if (spin_is_locked(&dbri->lock)) {
-                spin_unlock(&dbri->lock);
-                snd_pcm_period_elapsed(info->substream);
-                spin_lock(&dbri->lock);
-        } else
-                snd_pcm_period_elapsed(info->substream);
+        spin_unlock(&dbri->lock);
+        snd_pcm_period_elapsed(info->substream);
+        spin_lock(&dbri->lock);
 }
 
-static void dbri_process_one_interrupt(struct snd_dbri * dbri, int x)
+static void dbri_process_one_interrupt(struct snd_dbri *dbri, int x)
 {
         int val = D_INTR_GETVAL(x);
         int channel = D_INTR_GETCHAN(x);
@@ -1889,7 +1896,7 @@ static void dbri_process_one_interrupt(struct snd_dbri * dbri, int x)
  * right now).  Non-zero words require processing and are handed off
  * to dbri_process_one_interrupt AFTER advancing the pointer.
  */
-static void dbri_process_interrupt_buffer(struct snd_dbri * dbri)
+static void dbri_process_interrupt_buffer(struct snd_dbri *dbri)
 {
         s32 x;
 
@@ -1965,20 +1972,20 @@ static irqreturn_t snd_dbri_interrupt(int irq, void *dev_id)
                 PCM Interface
 ****************************************************************************/
 static struct snd_pcm_hardware snd_dbri_pcm_hw = {
-        .info                   = (SNDRV_PCM_INFO_MMAP |
-                                   SNDRV_PCM_INFO_INTERLEAVED |
-                                   SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                   SNDRV_PCM_INFO_MMAP_VALID),
-        .formats                = SNDRV_PCM_FMTBIT_MU_LAW |
-                                  SNDRV_PCM_FMTBIT_A_LAW |
-                                  SNDRV_PCM_FMTBIT_U8 |
-                                  SNDRV_PCM_FMTBIT_S16_BE,
-        .rates                  = SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_5512,
+        .info           = SNDRV_PCM_INFO_MMAP |
+                          SNDRV_PCM_INFO_INTERLEAVED |
+                          SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                          SNDRV_PCM_INFO_MMAP_VALID,
+        .formats        = SNDRV_PCM_FMTBIT_MU_LAW |
+                          SNDRV_PCM_FMTBIT_A_LAW |
+                          SNDRV_PCM_FMTBIT_U8 |
+                          SNDRV_PCM_FMTBIT_S16_BE,
+        .rates          = SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_5512,
         .rate_min               = 5512,
         .rate_max               = 48000,
         .channels_min           = 1,
         .channels_max           = 2,
-        .buffer_bytes_max       = (64 * 1024),
+        .buffer_bytes_max       = 64 * 1024,
         .period_bytes_min       = 1,
         .period_bytes_max       = DBRI_TD_MAXCNT,
         .periods_min            = 1,
@@ -2011,7 +2018,8 @@ static int snd_hw_rule_channels(struct snd_pcm_hw_params *params,
 
         snd_interval_any(&ch);
         if (!(f->bits[0] & SNDRV_PCM_FMTBIT_S16_BE)) {
-                ch.min = ch.max = 1;
+                ch.min = 1;
+                ch.max = 1;
                 ch.integer = 1;
                 return snd_interval_refine(c, &ch);
         }
@@ -2035,14 +2043,14 @@ static int snd_dbri_open(struct snd_pcm_substream *substream)
         info->pipe = -1;
         spin_unlock_irqrestore(&dbri->lock, flags);
 
-        snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS,
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
                             snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT,
                             -1);
-        snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT,
-                            snd_hw_rule_channels, NULL, 
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,
+                            snd_hw_rule_channels, NULL,
                             SNDRV_PCM_HW_PARAM_CHANNELS,
                             -1);
-                                
+
         cs4215_open(dbri);
 
         return 0;
@@ -2145,7 +2153,7 @@ static int snd_dbri_prepare(struct snd_pcm_substream *substream)
         spin_lock_irq(&dbri->lock);
         info->offset = 0;
 
-        /* Setup the all the transmit/receive desciptors to cover the
+        /* Setup the all the transmit/receive descriptors to cover the
          * whole DMA buffer.
          */
         ret = setup_descs(dbri, DBRI_STREAMNO(substream),
@@ -2205,12 +2213,12 @@ static struct snd_pcm_ops snd_dbri_ops = {
         .pointer = snd_dbri_pointer,
 };
 
-static int __devinit snd_dbri_pcm(struct snd_dbri * dbri)
+static int __devinit snd_dbri_pcm(struct snd_card *card)
 {
         struct snd_pcm *pcm;
         int err;
 
-        if ((err = snd_pcm_new(dbri->card,
+        if ((err = snd_pcm_new(card,
                                /* ID */             "sun_dbri",
                                /* device */         0,
                                /* playback count */ 1,
@@ -2221,16 +2229,15 @@ static int __devinit snd_dbri_pcm(struct snd_dbri * dbri)
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dbri_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_dbri_ops);
 
-        pcm->private_data = dbri;
+        pcm->private_data = card->private_data;
         pcm->info_flags = 0;
-        strcpy(pcm->name, dbri->card->shortname);
+        strcpy(pcm->name, card->shortname);
 
         if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm,
                         SNDRV_DMA_TYPE_CONTINUOUS,
                         snd_dma_continuous_data(GFP_KERNEL),
-                        64 * 1024, 64 * 1024)) < 0) {
+                        64 * 1024, 64 * 1024)) < 0)
                 return err;
-        }
 
         return 0;
 }
@@ -2245,11 +2252,10 @@ static int snd_cs4215_info_volume(struct snd_kcontrol *kcontrol,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 2;
         uinfo->value.integer.min = 0;
-        if (kcontrol->private_value == DBRI_PLAY) {
+        if (kcontrol->private_value == DBRI_PLAY)
                 uinfo->value.integer.max = DBRI_MAX_VOLUME;
-        } else {
+        else
                 uinfo->value.integer.max = DBRI_MAX_GAIN;
-        }
         return 0;
 }
 
@@ -2271,7 +2277,8 @@ static int snd_cs4215_put_volume(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_dbri *dbri = snd_kcontrol_chip(kcontrol);
-        struct dbri_streaminfo *info = &dbri->stream_info[kcontrol->private_value];
+        struct dbri_streaminfo *info =
+                                &dbri->stream_info[kcontrol->private_value];
         int changed = 0;
 
         if (info->left_gain != ucontrol->value.integer.value[0]) {
@@ -2282,7 +2289,7 @@ static int snd_cs4215_put_volume(struct snd_kcontrol *kcontrol,
                 info->right_gain = ucontrol->value.integer.value[1];
                 changed = 1;
         }
-        if (changed == 1) {
+        if (changed) {
                 /* First mute outputs, and wait 1/8000 sec (125 us)
                  * to make sure this takes.  This avoids clicking noises.
                  */
@@ -2316,18 +2323,16 @@ static int snd_cs4215_get_single(struct snd_kcontrol *kcontrol,
         int invert = (kcontrol->private_value >> 24) & 1;
         snd_assert(dbri != NULL, return -EINVAL);
 
-        if (elem < 4) {
+        if (elem < 4)
                 ucontrol->value.integer.value[0] =
                     (dbri->mm.data[elem] >> shift) & mask;
-        } else {
+        else
                 ucontrol->value.integer.value[0] =
                     (dbri->mm.ctrl[elem - 4] >> shift) & mask;
-        }
 
-        if (invert == 1) {
+        if (invert == 1)
                 ucontrol->value.integer.value[0] =
                     mask - ucontrol->value.integer.value[0];
-        }
         return 0;
 }
 
@@ -2378,11 +2383,12 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
    timeslots. Shift is the bit offset in the timeslot, mask defines the
    number of bits. invert is a boolean for use with attenuation.
  */
-#define CS4215_SINGLE(xname, entry, shift, mask, invert) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
-  .info = snd_cs4215_info_single, \
-  .get = snd_cs4215_get_single, .put = snd_cs4215_put_single, \
-  .private_value = entry | (shift << 8) | (mask << 16) | (invert << 24) },
+#define CS4215_SINGLE(xname, entry, shift, mask, invert)        \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),         \
+  .info = snd_cs4215_info_single,                               \
+  .get = snd_cs4215_get_single, .put = snd_cs4215_put_single,   \
+  .private_value = (entry) | ((shift) << 8) | ((mask) << 16) |  \
+                        ((invert) << 24) },
 
 static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
         {
@@ -2411,19 +2417,20 @@ static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
         CS4215_SINGLE("Mic boost", 4, 4, 1, 1)
 };
 
-static int __init snd_dbri_mixer(struct snd_dbri * dbri)
+static int __devinit snd_dbri_mixer(struct snd_card *card)
 {
-        struct snd_card *card;
         int idx, err;
+        struct snd_dbri *dbri;
 
-        snd_assert(dbri != NULL && dbri->card != NULL, return -EINVAL);
+        snd_assert(card != NULL && card->private_data != NULL, return -EINVAL);
+        dbri = card->private_data;
 
-        card = dbri->card;
         strcpy(card->mixername, card->shortname);
 
         for (idx = 0; idx < ARRAY_SIZE(dbri_controls); idx++) {
-                if ((err = snd_ctl_add(card,
-                                snd_ctl_new1(&dbri_controls[idx], dbri))) < 0)
+                err = snd_ctl_add(card,
+                                snd_ctl_new1(&dbri_controls[idx], dbri));
+                if (err < 0)
                         return err;
         }
 
@@ -2438,7 +2445,8 @@ static int __init snd_dbri_mixer(struct snd_dbri * dbri)
 /****************************************************************************
                         /proc interface
 ****************************************************************************/
-static void dbri_regs_read(struct snd_info_entry * entry, struct snd_info_buffer *buffer)
+static void dbri_regs_read(struct snd_info_entry *entry,
+                           struct snd_info_buffer *buffer)
 {
         struct snd_dbri *dbri = entry->private_data;
 
@@ -2449,7 +2457,7 @@ static void dbri_regs_read(struct snd_info_entry * entry, struct snd_info_buffer
 }
 
 #ifdef DBRI_DEBUG
-static void dbri_debug_read(struct snd_info_entry * entry,
+static void dbri_debug_read(struct snd_info_entry *entry,
                             struct snd_info_buffer *buffer)
 {
         struct snd_dbri *dbri = entry->private_data;
@@ -2463,7 +2471,8 @@ static void dbri_debug_read(struct snd_info_entry * entry,
                                     "Pipe %d: %s SDP=0x%x desc=%d, "
                                     "len=%d next %d\n",
                                     pipe,
-                                   ((pptr->sdp & D_SDP_TO_SER) ? "output" : "input"),
+                                   (pptr->sdp & D_SDP_TO_SER) ? "output" :
+                                                                 "input",
                                     pptr->sdp, pptr->desc,
                                     pptr->length, pptr->nextpipe);
                 }
@@ -2471,15 +2480,16 @@ static void dbri_debug_read(struct snd_info_entry * entry,
 }
 #endif
 
-void snd_dbri_proc(struct snd_dbri * dbri)
+void __devinit snd_dbri_proc(struct snd_card *card)
 {
+        struct snd_dbri *dbri = card->private_data;
         struct snd_info_entry *entry;
 
-        if (! snd_card_proc_new(dbri->card, "regs", &entry))
+        if (!snd_card_proc_new(card, "regs", &entry))
                 snd_info_set_text_ops(entry, dbri, dbri_regs_read);
 
 #ifdef DBRI_DEBUG
-        if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
+        if (!snd_card_proc_new(card, "debug", &entry)) {
                 snd_info_set_text_ops(entry, dbri, dbri_debug_read);
                 entry->mode = S_IFREG | S_IRUGO;        /* Readable only. */
         }
@@ -2491,19 +2501,18 @@ void snd_dbri_proc(struct snd_dbri * dbri)
 **************************** Initialization ********************************
 ****************************************************************************
 */
-static void snd_dbri_free(struct snd_dbri * dbri);
+static void snd_dbri_free(struct snd_dbri *dbri);
 
-static int __init snd_dbri_create(struct snd_card *card,
+static int __devinit snd_dbri_create(struct snd_card *card,
                                   struct sbus_dev *sdev,
-                                  struct linux_prom_irqs *irq, int dev)
+                                  int irq, int dev)
 {
         struct snd_dbri *dbri = card->private_data;
         int err;
 
         spin_lock_init(&dbri->lock);
-        dbri->card = card;
         dbri->sdev = sdev;
-        dbri->irq = irq->pri;
+        dbri->irq = irq;
 
         dbri->dma = sbus_alloc_consistent(sdev, sizeof(struct dbri_dma),
                                           &dbri->dma_dvma);
@@ -2541,13 +2550,10 @@ static int __init snd_dbri_create(struct snd_card *card,
                 return err;
         }
 
-        dbri->next = dbri_list;
-        dbri_list = dbri;
-
         return 0;
 }
 
-static void snd_dbri_free(struct snd_dbri * dbri)
+static void snd_dbri_free(struct snd_dbri *dbri)
 {
         dprintk(D_GEN, "snd_dbri_free\n");
         dbri_reset(dbri);
@@ -2563,20 +2569,19 @@ static void snd_dbri_free(struct snd_dbri * dbri)
                                      (void *)dbri->dma, dbri->dma_dvma);
 }
 
-static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
+static int __devinit dbri_probe(struct of_device *of_dev,
+                                const struct of_device_id *match)
 {
+        struct sbus_dev *sdev = to_sbus_device(&of_dev->dev);
         struct snd_dbri *dbri;
-        struct linux_prom_irqs irq;
+        int irq;
         struct resource *rp;
         struct snd_card *card;
         static int dev = 0;
         int err;
 
-        if (sdev->prom_name[9] < 'e') {
-                printk(KERN_ERR "DBRI: unsupported chip version %c found.\n",
-                       sdev->prom_name[9]);
-                return -EIO;
-        }
+        dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n",
+                sdev->prom_name, sdev->slot);
 
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
@@ -2585,9 +2590,9 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
                 return -ENOENT;
         }
 
-        err = prom_getproperty(prom_node, "intr", (char *)&irq, sizeof(irq));
-        if (err < 0) {
-                printk(KERN_ERR "DBRI-%d: Firmware node lacks IRQ property.\n", dev);
+        irq = sdev->irqs[0];
+        if (irq <= 0) {
+                printk(KERN_ERR "DBRI-%d: No IRQ.\n", dev);
                 return -ENODEV;
         }
 
@@ -2601,24 +2606,29 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
         rp = &sdev->resource[0];
         sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
                 card->shortname,
-                rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri);
+                rp->flags & 0xffL, (unsigned long long)rp->start, irq);
 
-        if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) {
+        err = snd_dbri_create(card, sdev, irq, dev);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
         dbri = card->private_data;
-        if ((err = snd_dbri_pcm(dbri)) < 0)
+        err = snd_dbri_pcm(card);
+        if (err < 0)
                 goto _err;
 
-        if ((err = snd_dbri_mixer(dbri)) < 0)
+        err = snd_dbri_mixer(card);
+        if (err < 0)
                 goto _err;
 
         /* /proc file handling */
-        snd_dbri_proc(dbri);
+        snd_dbri_proc(card);
+        dev_set_drvdata(&of_dev->dev, card);
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto _err;
 
         printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
@@ -2628,49 +2638,52 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
 
         return 0;
 
- _err:
+_err:
         snd_dbri_free(dbri);
         snd_card_free(card);
         return err;
 }
 
-/* Probe for the dbri chip and then attach the driver. */
-static int __init dbri_init(void)
+static int __devexit dbri_remove(struct of_device *dev)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
-        int found = 0;
-
-        /* Probe each SBUS for the DBRI chip(s). */
-        for_all_sbusdev(sdev, sbus) {
-                /*
-                 * The version is coded in the last character
-                 */
-                if (!strncmp(sdev->prom_name, "SUNW,DBRI", 9)) {
-                        dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n",
-                                sdev->prom_name, sdev->slot);
+        struct snd_card *card = dev_get_drvdata(&dev->dev);
 
-                        if (dbri_attach(sdev->prom_node, sdev) == 0)
-                                found++;
-                }
-        }
+        snd_dbri_free(card->private_data);
+        snd_card_free(card);
+
+        dev_set_drvdata(&dev->dev, NULL);
+
+        return 0;
+}
+
+static struct of_device_id dbri_match[] = {
+        {
+                .name = "SUNW,DBRIe",
+        },
+        {
+                .name = "SUNW,DBRIf",
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, dbri_match);
+
+static struct of_platform_driver dbri_sbus_driver = {
+        .name           = "dbri",
+        .match_table    = dbri_match,
+        .probe          = dbri_probe,
+        .remove         = __devexit_p(dbri_remove),
+};
 
-        return (found > 0) ? 0 : -EIO;
+/* Probe for the dbri chip and then attach the driver. */
+static int __init dbri_init(void)
+{
+        return of_register_driver(&dbri_sbus_driver, &sbus_bus_type);
 }
 
 static void __exit dbri_exit(void)
 {
-        struct snd_dbri *this = dbri_list;
-
-        while (this != NULL) {
-                struct snd_dbri *next = this->next;
-                struct snd_card *card = this->card;
-
-                snd_dbri_free(this);
-                snd_card_free(card);
-                this = next;
-        }
-        dbri_list = NULL;
+        of_unregister_driver(&dbri_sbus_driver);
 }
 
 module_init(dbri_init);
diff --git a/sound/spi/Kconfig b/sound/spi/Kconfig
new file mode 100644
index 000000000000..0d08c29213c8
--- /dev/null
+++ b/sound/spi/Kconfig
@@ -0,0 +1,31 @@
+#SPI drivers
+
+menu "SPI devices"
+        depends on SND != n
+
+config SND_AT73C213
+        tristate "Atmel AT73C213 DAC driver"
+        depends on ATMEL_SSC
+        select SND_PCM
+        help
+          Say Y here if you want to use the Atmel AT73C213 external DAC. This
+          DAC can be found on Atmel development boards.
+
+          This driver requires the Atmel SSC driver for sound sink, a
+          peripheral found on most AT91 and AVR32 microprocessors.
+
+          To compile this driver as a module, choose M here: the module will be
+          called snd-at73c213.
+
+config SND_AT73C213_TARGET_BITRATE
+        int "Target bitrate for AT73C213"
+        depends on SND_AT73C213
+        default "48000"
+        range 8000 50000
+        help
+          Sets the target bitrate for the bitrate calculator in the driver.
+          Limited by hardware to be between 8000 Hz and 50000 Hz.
+
+          Set to 48000 Hz by default.
+
+endmenu
diff --git a/sound/spi/Makefile b/sound/spi/Makefile
new file mode 100644
index 000000000000..026fb73f887f
--- /dev/null
+++ b/sound/spi/Makefile
@@ -0,0 +1,5 @@
+# Makefile for SPI drivers
+
+snd-at73c213-objs               := at73c213.o
+
+obj-$(CONFIG_SND_AT73C213)      += snd-at73c213.o
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
new file mode 100644
index 000000000000..fee869bcc959
--- /dev/null
+++ b/sound/spi/at73c213.c
@@ -0,0 +1,1129 @@
+/*
+ * Driver for AT73C213 16-bit stereo DAC connected to Atmel SSC
+ *
+ * Copyright (C) 2006-2007 Atmel Norway
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+/*#define DEBUG*/
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <sound/driver.h>
+#include <sound/initval.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+
+#include <linux/atmel-ssc.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/at73c213.h>
+
+#include "at73c213.h"
+
+#define BITRATE_MIN      8000 /* Hardware limit? */
+#define BITRATE_TARGET  CONFIG_SND_AT73C213_TARGET_BITRATE
+#define BITRATE_MAX     50000 /* Hardware limit. */
+
+/* Initial (hardware reset) AT73C213 register values. */
+static u8 snd_at73c213_original_image[18] =
+{
+        0x00,   /* 00 - CTRL    */
+        0x05,   /* 01 - LLIG    */
+        0x05,   /* 02 - RLIG    */
+        0x08,   /* 03 - LPMG    */
+        0x08,   /* 04 - RPMG    */
+        0x00,   /* 05 - LLOG    */
+        0x00,   /* 06 - RLOG    */
+        0x22,   /* 07 - OLC     */
+        0x09,   /* 08 - MC      */
+        0x00,   /* 09 - CSFC    */
+        0x00,   /* 0A - MISC    */
+        0x00,   /* 0B -         */
+        0x00,   /* 0C - PRECH   */
+        0x05,   /* 0D - AUXG    */
+        0x00,   /* 0E -         */
+        0x00,   /* 0F -         */
+        0x00,   /* 10 - RST     */
+        0x00,   /* 11 - PA_CTRL */
+};
+
+struct snd_at73c213 {
+        struct snd_card                 *card;
+        struct snd_pcm                  *pcm;
+        struct snd_pcm_substream        *substream;
+        struct at73c213_board_info      *board;
+        int                             irq;
+        int                             period;
+        unsigned long                   bitrate;
+        struct clk                      *bitclk;
+        struct ssc_device               *ssc;
+        struct spi_device               *spi;
+        u8                              spi_wbuffer[2];
+        u8                              spi_rbuffer[2];
+        /* Image of the SPI registers in AT73C213. */
+        u8                              reg_image[18];
+        /* Protect registers against concurrent access. */
+        spinlock_t                      lock;
+};
+
+#define get_chip(card) ((struct snd_at73c213 *)card->private_data)
+
+static int
+snd_at73c213_write_reg(struct snd_at73c213 *chip, u8 reg, u8 val)
+{
+        struct spi_message msg;
+        struct spi_transfer msg_xfer = {
+                .len            = 2,
+                .cs_change      = 0,
+        };
+        int retval;
+
+        spi_message_init(&msg);
+
+        chip->spi_wbuffer[0] = reg;
+        chip->spi_wbuffer[1] = val;
+
+        msg_xfer.tx_buf = chip->spi_wbuffer;
+        msg_xfer.rx_buf = chip->spi_rbuffer;
+        spi_message_add_tail(&msg_xfer, &msg);
+
+        retval = spi_sync(chip->spi, &msg);
+
+        if (!retval)
+                chip->reg_image[reg] = val;
+
+        return retval;
+}
+
+static struct snd_pcm_hardware snd_at73c213_playback_hw = {
+        .info           = SNDRV_PCM_INFO_INTERLEAVED |
+                          SNDRV_PCM_INFO_BLOCK_TRANSFER,
+        .formats        = SNDRV_PCM_FMTBIT_S16_BE,
+        .rates          = SNDRV_PCM_RATE_CONTINUOUS,
+        .rate_min       = 8000,  /* Replaced by chip->bitrate later. */
+        .rate_max       = 50000, /* Replaced by chip->bitrate later. */
+        .channels_min   = 2,
+        .channels_max   = 2,
+        .buffer_bytes_max = 64 * 1024 - 1,
+        .period_bytes_min = 512,
+        .period_bytes_max = 64 * 1024 - 1,
+        .periods_min    = 4,
+        .periods_max    = 1024,
+};
+
+/*
+ * Calculate and set bitrate and divisions.
+ */
+static int snd_at73c213_set_bitrate(struct snd_at73c213 *chip)
+{
+        unsigned long ssc_rate = clk_get_rate(chip->ssc->clk);
+        unsigned long dac_rate_new, ssc_div, status;
+        unsigned long ssc_div_max, ssc_div_min;
+        int max_tries;
+
+        /*
+         * We connect two clocks here, picking divisors so the I2S clocks
+         * out data at the same rate the DAC clocks it in ... and as close
+         * as practical to the desired target rate.
+         *
+         * The DAC master clock (MCLK) is programmable, and is either 256
+         * or (not here) 384 times the I2S output clock (BCLK).
+         */
+
+        /* SSC clock / (bitrate * stereo * 16-bit). */
+        ssc_div = ssc_rate / (BITRATE_TARGET * 2 * 16);
+        ssc_div_min = ssc_rate / (BITRATE_MAX * 2 * 16);
+        ssc_div_max = ssc_rate / (BITRATE_MIN * 2 * 16);
+        max_tries = (ssc_div_max - ssc_div_min) / 2;
+
+        if (max_tries < 1)
+                max_tries = 1;
+
+        /* ssc_div must be a power of 2. */
+        ssc_div = (ssc_div + 1) & ~1UL;
+
+        if ((ssc_rate / (ssc_div * 2 * 16)) < BITRATE_MIN) {
+                ssc_div -= 2;
+                if ((ssc_rate / (ssc_div * 2 * 16)) > BITRATE_MAX)
+                        return -ENXIO;
+        }
+
+        /* Search for a possible bitrate. */
+        do {
+                /* SSC clock / (ssc divider * 16-bit * stereo). */
+                if ((ssc_rate / (ssc_div * 2 * 16)) < BITRATE_MIN)
+                        return -ENXIO;
+
+                /* 256 / (2 * 16) = 8 */
+                dac_rate_new = 8 * (ssc_rate / ssc_div);
+
+                status = clk_round_rate(chip->board->dac_clk, dac_rate_new);
+                if (status < 0)
+                        return status;
+
+                /* Ignore difference smaller than 256 Hz. */
+                if ((status/256) == (dac_rate_new/256))
+                        goto set_rate;
+
+                ssc_div += 2;
+        } while (--max_tries);
+
+        /* Not able to find a valid bitrate. */
+        return -ENXIO;
+
+set_rate:
+        status = clk_set_rate(chip->board->dac_clk, status);
+        if (status < 0)
+                return status;
+
+        /* Set divider in SSC device. */
+        ssc_writel(chip->ssc->regs, CMR, ssc_div/2);
+
+        /* SSC clock / (ssc divider * 16-bit * stereo). */
+        chip->bitrate = ssc_rate / (ssc_div * 16 * 2);
+
+        dev_info(&chip->spi->dev,
+                        "at73c213: supported bitrate is %lu (%lu divider)\n",
+                        chip->bitrate, ssc_div);
+
+        return 0;
+}
+
+static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct snd_at73c213 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        snd_at73c213_playback_hw.rate_min = chip->bitrate;
+        snd_at73c213_playback_hw.rate_max = chip->bitrate;
+        runtime->hw = snd_at73c213_playback_hw;
+        chip->substream = substream;
+
+        return 0;
+}
+
+static int snd_at73c213_pcm_close(struct snd_pcm_substream *substream)
+{
+        struct snd_at73c213 *chip = snd_pcm_substream_chip(substream);
+        chip->substream = NULL;
+        return 0;
+}
+
+static int snd_at73c213_pcm_hw_params(struct snd_pcm_substream *substream,
+                                 struct snd_pcm_hw_params *hw_params)
+{
+        return snd_pcm_lib_malloc_pages(substream,
+                                        params_buffer_bytes(hw_params));
+}
+
+static int snd_at73c213_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+        return snd_pcm_lib_free_pages(substream);
+}
+
+static int snd_at73c213_pcm_prepare(struct snd_pcm_substream *substream)
+{
+        struct snd_at73c213 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int block_size;
+
+        block_size = frames_to_bytes(runtime, runtime->period_size);
+
+        chip->period = 0;
+
+        ssc_writel(chip->ssc->regs, PDC_TPR,
+                        (long)runtime->dma_addr);
+        ssc_writel(chip->ssc->regs, PDC_TCR, runtime->period_size * 2);
+        ssc_writel(chip->ssc->regs, PDC_TNPR,
+                        (long)runtime->dma_addr + block_size);
+        ssc_writel(chip->ssc->regs, PDC_TNCR, runtime->period_size * 2);
+
+        return 0;
+}
+
+static int snd_at73c213_pcm_trigger(struct snd_pcm_substream *substream,
+                                   int cmd)
+{
+        struct snd_at73c213 *chip = snd_pcm_substream_chip(substream);
+        int retval = 0;
+
+        spin_lock(&chip->lock);
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                ssc_writel(chip->ssc->regs, IER, SSC_BIT(IER_ENDTX));
+                ssc_writel(chip->ssc->regs, PDC_PTCR, SSC_BIT(PDC_PTCR_TXTEN));
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+                ssc_writel(chip->ssc->regs, PDC_PTCR, SSC_BIT(PDC_PTCR_TXTDIS));
+                ssc_writel(chip->ssc->regs, IDR, SSC_BIT(IDR_ENDTX));
+                break;
+        default:
+                dev_dbg(&chip->spi->dev, "spurious command %x\n", cmd);
+                retval = -EINVAL;
+                break;
+        }
+
+        spin_unlock(&chip->lock);
+
+        return retval;
+}
+
+static snd_pcm_uframes_t
+snd_at73c213_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_at73c213 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        snd_pcm_uframes_t pos;
+        unsigned long bytes;
+
+        bytes = ssc_readl(chip->ssc->regs, PDC_TPR)
+                - (unsigned long)runtime->dma_addr;
+
+        pos = bytes_to_frames(runtime, bytes);
+        if (pos >= runtime->buffer_size)
+                pos -= runtime->buffer_size;
+
+        return pos;
+}
+
+static struct snd_pcm_ops at73c213_playback_ops = {
+        .open           = snd_at73c213_pcm_open,
+        .close          = snd_at73c213_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = snd_at73c213_pcm_hw_params,
+        .hw_free        = snd_at73c213_pcm_hw_free,
+        .prepare        = snd_at73c213_pcm_prepare,
+        .trigger        = snd_at73c213_pcm_trigger,
+        .pointer        = snd_at73c213_pcm_pointer,
+};
+
+static void snd_at73c213_pcm_free(struct snd_pcm *pcm)
+{
+        struct snd_at73c213 *chip = snd_pcm_chip(pcm);
+        if (chip->pcm) {
+                snd_pcm_lib_preallocate_free_for_all(chip->pcm);
+                chip->pcm = NULL;
+        }
+}
+
+static int __devinit snd_at73c213_pcm_new(struct snd_at73c213 *chip, int device)
+{
+        struct snd_pcm *pcm;
+        int retval;
+
+        retval = snd_pcm_new(chip->card, chip->card->shortname,
+                        device, 1, 0, &pcm);
+        if (retval < 0)
+                goto out;
+
+        pcm->private_data = chip;
+        pcm->private_free = snd_at73c213_pcm_free;
+        pcm->info_flags = SNDRV_PCM_INFO_BLOCK_TRANSFER;
+        strcpy(pcm->name, "at73c213");
+        chip->pcm = pcm;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &at73c213_playback_ops);
+
+        retval = snd_pcm_lib_preallocate_pages_for_all(chip->pcm,
+                        SNDRV_DMA_TYPE_DEV, &chip->ssc->pdev->dev,
+                        64 * 1024, 64 * 1024);
+out:
+        return retval;
+}
+
+static irqreturn_t snd_at73c213_interrupt(int irq, void *dev_id)
+{
+        struct snd_at73c213 *chip = dev_id;
+        struct snd_pcm_runtime *runtime = chip->substream->runtime;
+        u32 status;
+        int offset;
+        int block_size;
+        int next_period;
+        int retval = IRQ_NONE;
+
+        spin_lock(&chip->lock);
+
+        block_size = frames_to_bytes(runtime, runtime->period_size);
+        status = ssc_readl(chip->ssc->regs, IMR);
+
+        if (status & SSC_BIT(IMR_ENDTX)) {
+                chip->period++;
+                if (chip->period == runtime->periods)
+                        chip->period = 0;
+                next_period = chip->period + 1;
+                if (next_period == runtime->periods)
+                        next_period = 0;
+
+                offset = block_size * next_period;
+
+                ssc_writel(chip->ssc->regs, PDC_TNPR,
+                                (long)runtime->dma_addr + offset);
+                ssc_writel(chip->ssc->regs, PDC_TNCR, runtime->period_size * 2);
+                retval = IRQ_HANDLED;
+        }
+
+        ssc_readl(chip->ssc->regs, IMR);
+        spin_unlock(&chip->lock);
+
+        if (status & SSC_BIT(IMR_ENDTX))
+                snd_pcm_period_elapsed(chip->substream);
+
+        return retval;
+}
+
+/*
+ * Mixer functions.
+ */
+static int snd_at73c213_mono_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int reg = kcontrol->private_value & 0xff;
+        int shift = (kcontrol->private_value >> 8) & 0xff;
+        int mask = (kcontrol->private_value >> 16) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & 0xff;
+
+        spin_lock_irq(&chip->lock);
+
+        ucontrol->value.integer.value[0] =
+                (chip->reg_image[reg] >> shift) & mask;
+
+        if (invert)
+                ucontrol->value.integer.value[0] =
+                        mask - ucontrol->value.integer.value[0];
+
+        spin_unlock_irq(&chip->lock);
+
+        return 0;
+}
+
+static int snd_at73c213_mono_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int reg = kcontrol->private_value & 0xff;
+        int shift = (kcontrol->private_value >> 8) & 0xff;
+        int mask = (kcontrol->private_value >> 16) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & 0xff;
+        int change, retval;
+        unsigned short val;
+
+        val = (ucontrol->value.integer.value[0] & mask);
+        if (invert)
+                val = mask - val;
+        val <<= shift;
+
+        spin_lock_irq(&chip->lock);
+
+        val = (chip->reg_image[reg] & ~(mask << shift)) | val;
+        change = val != chip->reg_image[reg];
+        retval = snd_at73c213_write_reg(chip, reg, val);
+
+        spin_unlock_irq(&chip->lock);
+
+        if (retval)
+                return retval;
+
+        return change;
+}
+
+static int snd_at73c213_stereo_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
+{
+        int mask = (kcontrol->private_value >> 24) & 0xff;
+
+        if (mask == 1)
+                uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        else
+                uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = mask;
+
+        return 0;
+}
+
+static int snd_at73c213_stereo_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int left_reg = kcontrol->private_value & 0xff;
+        int right_reg = (kcontrol->private_value >> 8) & 0xff;
+        int shift_left = (kcontrol->private_value >> 16) & 0x07;
+        int shift_right = (kcontrol->private_value >> 19) & 0x07;
+        int mask = (kcontrol->private_value >> 24) & 0xff;
+        int invert = (kcontrol->private_value >> 22) & 1;
+
+        spin_lock_irq(&chip->lock);
+
+        ucontrol->value.integer.value[0] =
+                (chip->reg_image[left_reg] >> shift_left) & mask;
+        ucontrol->value.integer.value[1] =
+                (chip->reg_image[right_reg] >> shift_right) & mask;
+
+        if (invert) {
+                ucontrol->value.integer.value[0] =
+                        mask - ucontrol->value.integer.value[0];
+                ucontrol->value.integer.value[1] =
+                        mask - ucontrol->value.integer.value[1];
+        }
+
+        spin_unlock_irq(&chip->lock);
+
+        return 0;
+}
+
+static int snd_at73c213_stereo_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int left_reg = kcontrol->private_value & 0xff;
+        int right_reg = (kcontrol->private_value >> 8) & 0xff;
+        int shift_left = (kcontrol->private_value >> 16) & 0x07;
+        int shift_right = (kcontrol->private_value >> 19) & 0x07;
+        int mask = (kcontrol->private_value >> 24) & 0xff;
+        int invert = (kcontrol->private_value >> 22) & 1;
+        int change, retval;
+        unsigned short val1, val2;
+
+        val1 = ucontrol->value.integer.value[0] & mask;
+        val2 = ucontrol->value.integer.value[1] & mask;
+        if (invert) {
+                val1 = mask - val1;
+                val2 = mask - val2;
+        }
+        val1 <<= shift_left;
+        val2 <<= shift_right;
+
+        spin_lock_irq(&chip->lock);
+
+        val1 = (chip->reg_image[left_reg] & ~(mask << shift_left)) | val1;
+        val2 = (chip->reg_image[right_reg] & ~(mask << shift_right)) | val2;
+        change = val1 != chip->reg_image[left_reg]
+                || val2 != chip->reg_image[right_reg];
+        retval = snd_at73c213_write_reg(chip, left_reg, val1);
+        if (retval) {
+                spin_unlock_irq(&chip->lock);
+                goto out;
+        }
+        retval = snd_at73c213_write_reg(chip, right_reg, val2);
+        if (retval) {
+                spin_unlock_irq(&chip->lock);
+                goto out;
+        }
+
+        spin_unlock_irq(&chip->lock);
+
+        return change;
+
+out:
+        return retval;
+}
+
+static int snd_at73c213_mono_switch_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+
+        return 0;
+}
+
+static int snd_at73c213_mono_switch_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int reg = kcontrol->private_value & 0xff;
+        int shift = (kcontrol->private_value >> 8) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & 0xff;
+
+        spin_lock_irq(&chip->lock);
+
+        ucontrol->value.integer.value[0] =
+                (chip->reg_image[reg] >> shift) & 0x01;
+
+        if (invert)
+                ucontrol->value.integer.value[0] =
+                        0x01 - ucontrol->value.integer.value[0];
+
+        spin_unlock_irq(&chip->lock);
+
+        return 0;
+}
+
+static int snd_at73c213_mono_switch_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_at73c213 *chip = snd_kcontrol_chip(kcontrol);
+        int reg = kcontrol->private_value & 0xff;
+        int shift = (kcontrol->private_value >> 8) & 0xff;
+        int mask = (kcontrol->private_value >> 16) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & 0xff;
+        int change, retval;
+        unsigned short val;
+
+        if (ucontrol->value.integer.value[0])
+                val = mask;
+        else
+                val = 0;
+
+        if (invert)
+                val = mask - val;
+        val <<= shift;
+
+        spin_lock_irq(&chip->lock);
+
+        val |= (chip->reg_image[reg] & ~(mask << shift));
+        change = val != chip->reg_image[reg];
+
+        retval = snd_at73c213_write_reg(chip, reg, val);
+
+        spin_unlock_irq(&chip->lock);
+
+        if (retval)
+                return retval;
+
+        return change;
+}
+
+static int snd_at73c213_pa_volume_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = ((kcontrol->private_value >> 16) & 0xff) - 1;
+
+        return 0;
+}
+
+static int snd_at73c213_line_capture_volume_info(
+                struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        /* When inverted will give values 0x10001 => 0. */
+        uinfo->value.integer.min = 14;
+        uinfo->value.integer.max = 31;
+
+        return 0;
+}
+
+static int snd_at73c213_aux_capture_volume_info(
+                struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        /* When inverted will give values 0x10001 => 0. */
+        uinfo->value.integer.min = 14;
+        uinfo->value.integer.max = 31;
+
+        return 0;
+}
+
+#define AT73C213_MONO_SWITCH(xname, xindex, reg, shift, mask, invert)   \
+{                                                                       \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,                            \
+        .name = xname,                                                  \
+        .index = xindex,                                                \
+        .info = snd_at73c213_mono_switch_info,                          \
+        .get = snd_at73c213_mono_switch_get,                            \
+        .put = snd_at73c213_mono_switch_put,                            \
+        .private_value = (reg | (shift << 8) | (mask << 16) | (invert << 24)) \
+}
+
+#define AT73C213_STEREO(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
+{                                                                       \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,                            \
+        .name = xname,                                                  \
+        .index = xindex,                                                \
+        .info = snd_at73c213_stereo_info,                               \
+        .get = snd_at73c213_stereo_get,                                 \
+        .put = snd_at73c213_stereo_put,                                 \
+        .private_value = (left_reg | (right_reg << 8)                   \
+                        | (shift_left << 16) | (shift_right << 19)      \
+                        | (mask << 24) | (invert << 22))                \
+}
+
+static struct snd_kcontrol_new snd_at73c213_controls[] __devinitdata = {
+AT73C213_STEREO("Master Playback Volume", 0, DAC_LMPG, DAC_RMPG, 0, 0, 0x1f, 1),
+AT73C213_STEREO("Master Playback Switch", 0, DAC_LMPG, DAC_RMPG, 5, 5, 1, 1),
+AT73C213_STEREO("PCM Playback Volume", 0, DAC_LLOG, DAC_RLOG, 0, 0, 0x1f, 1),
+AT73C213_STEREO("PCM Playback Switch", 0, DAC_LLOG, DAC_RLOG, 5, 5, 1, 1),
+AT73C213_MONO_SWITCH("Mono PA Playback Switch", 0, DAC_CTRL, DAC_CTRL_ONPADRV,
+                     0x01, 0),
+{
+        .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name   = "PA Playback Volume",
+        .index  = 0,
+        .info   = snd_at73c213_pa_volume_info,
+        .get    = snd_at73c213_mono_get,
+        .put    = snd_at73c213_mono_put,
+        .private_value  = PA_CTRL | (PA_CTRL_APAGAIN << 8) | \
+                (0x0f << 16) | (1 << 24),
+},
+AT73C213_MONO_SWITCH("PA High Gain Playback Switch", 0, PA_CTRL, PA_CTRL_APALP,
+                     0x01, 1),
+AT73C213_MONO_SWITCH("PA Playback Switch", 0, PA_CTRL, PA_CTRL_APAON, 0x01, 0),
+{
+        .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name   = "Aux Capture Volume",
+        .index  = 0,
+        .info   = snd_at73c213_aux_capture_volume_info,
+        .get    = snd_at73c213_mono_get,
+        .put    = snd_at73c213_mono_put,
+        .private_value  = DAC_AUXG | (0 << 8) | (0x1f << 16) | (1 << 24),
+},
+AT73C213_MONO_SWITCH("Aux Capture Switch", 0, DAC_CTRL, DAC_CTRL_ONAUXIN,
+                     0x01, 0),
+{
+        .iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name   = "Line Capture Volume",
+        .index  = 0,
+        .info   = snd_at73c213_line_capture_volume_info,
+        .get    = snd_at73c213_stereo_get,
+        .put    = snd_at73c213_stereo_put,
+        .private_value  = DAC_LLIG | (DAC_RLIG << 8) | (0 << 16) | (0 << 19)
+                | (0x1f << 24) | (1 << 22),
+},
+AT73C213_MONO_SWITCH("Line Capture Switch", 0, DAC_CTRL, 0, 0x03, 0),
+};
+
+static int __devinit snd_at73c213_mixer(struct snd_at73c213 *chip)
+{
+        struct snd_card *card;
+        int errval, idx;
+
+        if (chip == NULL || chip->pcm == NULL)
+                return -EINVAL;
+
+        card = chip->card;
+
+        strcpy(card->mixername, chip->pcm->name);
+
+        for (idx = 0; idx < ARRAY_SIZE(snd_at73c213_controls); idx++) {
+                errval = snd_ctl_add(card,
+                                snd_ctl_new1(&snd_at73c213_controls[idx],
+                                        chip));
+                if (errval < 0)
+                        goto cleanup;
+        }
+
+        return 0;
+
+cleanup:
+        for (idx = 1; idx < ARRAY_SIZE(snd_at73c213_controls) + 1; idx++) {
+                struct snd_kcontrol *kctl;
+                kctl = snd_ctl_find_numid(card, idx);
+                if (kctl)
+                        snd_ctl_remove(card, kctl);
+        }
+        return errval;
+}
+
+/*
+ * Device functions
+ */
+static int snd_at73c213_ssc_init(struct snd_at73c213 *chip)
+{
+        /*
+         * Continuous clock output.
+         * Starts on falling TF.
+         * Delay 1 cycle (1 bit).
+         * Periode is 16 bit (16 - 1).
+         */
+        ssc_writel(chip->ssc->regs, TCMR,
+                        SSC_BF(TCMR_CKO, 1)
+                        | SSC_BF(TCMR_START, 4)
+                        | SSC_BF(TCMR_STTDLY, 1)
+                        | SSC_BF(TCMR_PERIOD, 16 - 1));
+        /*
+         * Data length is 16 bit (16 - 1).
+         * Transmit MSB first.
+         * Transmit 2 words each transfer.
+         * Frame sync length is 16 bit (16 - 1).
+         * Frame starts on negative pulse.
+         */
+        ssc_writel(chip->ssc->regs, TFMR,
+                        SSC_BF(TFMR_DATLEN, 16 - 1)
+                        | SSC_BIT(TFMR_MSBF)
+                        | SSC_BF(TFMR_DATNB, 1)
+                        | SSC_BF(TFMR_FSLEN, 16 - 1)
+                        | SSC_BF(TFMR_FSOS, 1));
+
+        return 0;
+}
+
+static int snd_at73c213_chip_init(struct snd_at73c213 *chip)
+{
+        int retval;
+        unsigned char dac_ctrl = 0;
+
+        retval = snd_at73c213_set_bitrate(chip);
+        if (retval)
+                goto out;
+
+        /* Enable DAC master clock. */
+        clk_enable(chip->board->dac_clk);
+
+        /* Initialize at73c213 on SPI bus. */
+        retval = snd_at73c213_write_reg(chip, DAC_RST, 0x04);
+        if (retval)
+                goto out_clk;
+        msleep(1);
+        retval = snd_at73c213_write_reg(chip, DAC_RST, 0x03);
+        if (retval)
+                goto out_clk;
+
+        /* Precharge everything. */
+        retval = snd_at73c213_write_reg(chip, DAC_PRECH, 0xff);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, PA_CTRL, (1<<PA_CTRL_APAPRECH));
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_CTRL,
+                        (1<<DAC_CTRL_ONLNOL) | (1<<DAC_CTRL_ONLNOR));
+        if (retval)
+                goto out_clk;
+
+        msleep(50);
+
+        /* Stop precharging PA. */
+        retval = snd_at73c213_write_reg(chip, PA_CTRL,
+                        (1<<PA_CTRL_APALP) | 0x0f);
+        if (retval)
+                goto out_clk;
+
+        msleep(450);
+
+        /* Stop precharging DAC, turn on master power. */
+        retval = snd_at73c213_write_reg(chip, DAC_PRECH, (1<<DAC_PRECH_ONMSTR));
+        if (retval)
+                goto out_clk;
+
+        msleep(1);
+
+        /* Turn on DAC. */
+        dac_ctrl = (1<<DAC_CTRL_ONDACL) | (1<<DAC_CTRL_ONDACR)
+                | (1<<DAC_CTRL_ONLNOL) | (1<<DAC_CTRL_ONLNOR);
+
+        retval = snd_at73c213_write_reg(chip, DAC_CTRL, dac_ctrl);
+        if (retval)
+                goto out_clk;
+
+        /* Mute sound. */
+        retval = snd_at73c213_write_reg(chip, DAC_LMPG, 0x3f);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_RMPG, 0x3f);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_LLOG, 0x3f);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_RLOG, 0x3f);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_LLIG, 0x11);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_RLIG, 0x11);
+        if (retval)
+                goto out_clk;
+        retval = snd_at73c213_write_reg(chip, DAC_AUXG, 0x11);
+        if (retval)
+                goto out_clk;
+
+        /* Enable I2S device, i.e. clock output. */
+        ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXEN));
+
+        goto out;
+
+out_clk:
+        clk_disable(chip->board->dac_clk);
+out:
+        return retval;
+}
+
+static int snd_at73c213_dev_free(struct snd_device *device)
+{
+        struct snd_at73c213 *chip = device->device_data;
+
+        ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS));
+        if (chip->irq >= 0) {
+                free_irq(chip->irq, chip);
+                chip->irq = -1;
+        }
+
+        return 0;
+}
+
+static int __devinit snd_at73c213_dev_init(struct snd_card *card,
+                                         struct spi_device *spi)
+{
+        static struct snd_device_ops ops = {
+                .dev_free       = snd_at73c213_dev_free,
+        };
+        struct snd_at73c213 *chip = get_chip(card);
+        int irq, retval;
+
+        irq = chip->ssc->irq;
+        if (irq < 0)
+                return irq;
+
+        spin_lock_init(&chip->lock);
+        chip->card = card;
+        chip->irq = -1;
+
+        retval = request_irq(irq, snd_at73c213_interrupt, 0, "at73c213", chip);
+        if (retval) {
+                dev_dbg(&chip->spi->dev, "unable to request irq %d\n", irq);
+                goto out;
+        }
+        chip->irq = irq;
+
+        memcpy(&chip->reg_image, &snd_at73c213_original_image,
+                        sizeof(snd_at73c213_original_image));
+
+        retval = snd_at73c213_ssc_init(chip);
+        if (retval)
+                goto out_irq;
+
+        retval = snd_at73c213_chip_init(chip);
+        if (retval)
+                goto out_irq;
+
+        retval = snd_at73c213_pcm_new(chip, 0);
+        if (retval)
+                goto out_irq;
+
+        retval = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (retval)
+                goto out_irq;
+
+        retval = snd_at73c213_mixer(chip);
+        if (retval)
+                goto out_snd_dev;
+
+        snd_card_set_dev(card, &spi->dev);
+
+        goto out;
+
+out_snd_dev:
+        snd_device_free(card, chip);
+out_irq:
+        free_irq(chip->irq, chip);
+        chip->irq = -1;
+out:
+        return retval;
+}
+
+static int snd_at73c213_probe(struct spi_device *spi)
+{
+        struct snd_card                 *card;
+        struct snd_at73c213             *chip;
+        struct at73c213_board_info      *board;
+        int                             retval;
+        char                            id[16];
+
+        board = spi->dev.platform_data;
+        if (!board) {
+                dev_dbg(&spi->dev, "no platform_data\n");
+                return -ENXIO;
+        }
+
+        if (!board->dac_clk) {
+                dev_dbg(&spi->dev, "no DAC clk\n");
+                return -ENXIO;
+        }
+
+        if (IS_ERR(board->dac_clk)) {
+                dev_dbg(&spi->dev, "no DAC clk\n");
+                return PTR_ERR(board->dac_clk);
+        }
+
+        retval = -ENOMEM;
+
+        /* Allocate "card" using some unused identifiers. */
+        snprintf(id, sizeof id, "at73c213_%d", board->ssc_id);
+        card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct snd_at73c213));
+        if (!card)
+                goto out;
+
+        chip = card->private_data;
+        chip->spi = spi;
+        chip->board = board;
+
+        chip->ssc = ssc_request(board->ssc_id);
+        if (IS_ERR(chip->ssc)) {
+                dev_dbg(&spi->dev, "could not get ssc%d device\n",
+                                board->ssc_id);
+                retval = PTR_ERR(chip->ssc);
+                goto out_card;
+        }
+
+        retval = snd_at73c213_dev_init(card, spi);
+        if (retval)
+                goto out_ssc;
+
+        strcpy(card->driver, "at73c213");
+        strcpy(card->shortname, board->shortname);
+        sprintf(card->longname, "%s on irq %d", card->shortname, chip->irq);
+
+        retval = snd_card_register(card);
+        if (retval)
+                goto out_ssc;
+
+        dev_set_drvdata(&spi->dev, card);
+
+        goto out;
+
+out_ssc:
+        ssc_free(chip->ssc);
+out_card:
+        snd_card_free(card);
+out:
+        return retval;
+}
+
+static int __devexit snd_at73c213_remove(struct spi_device *spi)
+{
+        struct snd_card *card = dev_get_drvdata(&spi->dev);
+        struct snd_at73c213 *chip = card->private_data;
+        int retval;
+
+        /* Stop playback. */
+        ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS));
+
+        /* Mute sound. */
+        retval = snd_at73c213_write_reg(chip, DAC_LMPG, 0x3f);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_RMPG, 0x3f);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_LLOG, 0x3f);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_RLOG, 0x3f);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_LLIG, 0x11);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_RLIG, 0x11);
+        if (retval)
+                goto out;
+        retval = snd_at73c213_write_reg(chip, DAC_AUXG, 0x11);
+        if (retval)
+                goto out;
+
+        /* Turn off PA. */
+        retval = snd_at73c213_write_reg(chip, PA_CTRL,
+                                        chip->reg_image[PA_CTRL] | 0x0f);
+        if (retval)
+                goto out;
+        msleep(10);
+        retval = snd_at73c213_write_reg(chip, PA_CTRL,
+                                        (1 << PA_CTRL_APALP) | 0x0f);
+        if (retval)
+                goto out;
+
+        /* Turn off external DAC. */
+        retval = snd_at73c213_write_reg(chip, DAC_CTRL, 0x0c);
+        if (retval)
+                goto out;
+        msleep(2);
+        retval = snd_at73c213_write_reg(chip, DAC_CTRL, 0x00);
+        if (retval)
+                goto out;
+
+        /* Turn off master power. */
+        retval = snd_at73c213_write_reg(chip, DAC_PRECH, 0x00);
+        if (retval)
+                goto out;
+
+out:
+        /* Stop DAC master clock. */
+        clk_disable(chip->board->dac_clk);
+
+        ssc_free(chip->ssc);
+        snd_card_free(card);
+        dev_set_drvdata(&spi->dev, NULL);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int snd_at73c213_suspend(struct spi_device *spi, pm_message_t msg)
+{
+        struct snd_card *card = dev_get_drvdata(&spi->dev);
+        struct snd_at73c213 *chip = card->private_data;
+
+        ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS));
+        clk_disable(chip->board->dac_clk);
+
+        return 0;
+}
+
+static int snd_at73c213_resume(struct spi_device *spi)
+{
+        struct snd_card *card = dev_get_drvdata(&spi->dev);
+        struct snd_at73c213 *chip = card->private_data;
+
+        clk_enable(chip->board->dac_clk);
+        ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXEN));
+
+        return 0;
+}
+#else
+#define snd_at73c213_suspend NULL
+#define snd_at73c213_resume NULL
+#endif
+
+static struct spi_driver at73c213_driver = {
+        .driver         = {
+                .name   = "at73c213",
+        },
+        .probe          = snd_at73c213_probe,
+        .suspend        = snd_at73c213_suspend,
+        .resume         = snd_at73c213_resume,
+        .remove         = __devexit_p(snd_at73c213_remove),
+};
+
+static int __init at73c213_init(void)
+{
+        return spi_register_driver(&at73c213_driver);
+}
+module_init(at73c213_init);
+
+static void __exit at73c213_exit(void)
+{
+        spi_unregister_driver(&at73c213_driver);
+}
+module_exit(at73c213_exit);
+
+MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
+MODULE_DESCRIPTION("Sound driver for AT73C213 with Atmel SSC");
+MODULE_LICENSE("GPL");
diff --git a/sound/spi/at73c213.h b/sound/spi/at73c213.h
new file mode 100644
index 000000000000..fd8b372df5d1
--- /dev/null
+++ b/sound/spi/at73c213.h
@@ -0,0 +1,119 @@
+/*
+ * Driver for the AT73C213 16-bit stereo DAC on Atmel ATSTK1000
+ *
+ * Copyright (C) 2006 - 2007 Atmel Corporation
+ *
+ * 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.
+ *
+ * The full GNU General Public License is included in this
+ * distribution in the file called COPYING.
+ */
+
+#ifndef _SND_AT73C213_H
+#define _SND_AT73C213_H
+
+/* DAC control register */
+#define DAC_CTRL                0x00
+#define DAC_CTRL_ONPADRV        7
+#define DAC_CTRL_ONAUXIN        6
+#define DAC_CTRL_ONDACR         5
+#define DAC_CTRL_ONDACL         4
+#define DAC_CTRL_ONLNOR         3
+#define DAC_CTRL_ONLNOL         2
+#define DAC_CTRL_ONLNIR         1
+#define DAC_CTRL_ONLNIL         0
+
+/* DAC left line in gain register */
+#define DAC_LLIG                0x01
+#define DAC_LLIG_LLIG           0
+
+/* DAC right line in gain register */
+#define DAC_RLIG                0x02
+#define DAC_RLIG_RLIG           0
+
+/* DAC Left Master Playback Gain Register */
+#define DAC_LMPG                0x03
+#define DAC_LMPG_LMPG           0
+
+/* DAC Right Master Playback Gain Register */
+#define DAC_RMPG                0x04
+#define DAC_RMPG_RMPG           0
+
+/* DAC Left Line Out Gain Register */
+#define DAC_LLOG                0x05
+#define DAC_LLOG_LLOG           0
+
+/* DAC Right Line Out Gain Register */
+#define DAC_RLOG                0x06
+#define DAC_RLOG_RLOG           0
+
+/* DAC Output Level Control Register */
+#define DAC_OLC                 0x07
+#define DAC_OLC_RSHORT          7
+#define DAC_OLC_ROLC            4
+#define DAC_OLC_LSHORT          3
+#define DAC_OLC_LOLC            0
+
+/* DAC Mixer Control Register */
+#define DAC_MC                  0x08
+#define DAC_MC_INVR             5
+#define DAC_MC_INVL             4
+#define DAC_MC_RMSMIN2          3
+#define DAC_MC_RMSMIN1          2
+#define DAC_MC_LMSMIN2          1
+#define DAC_MC_LMSMIN1          0
+
+/* DAC Clock and Sampling Frequency Control Register */
+#define DAC_CSFC                0x09
+#define DAC_CSFC_OVRSEL         4
+
+/* DAC Miscellaneous Register */
+#define DAC_MISC                0x0A
+#define DAC_MISC_VCMCAPSEL      7
+#define DAC_MISC_DINTSEL        4
+#define DAC_MISC_DITHEN         3
+#define DAC_MISC_DEEMPEN        2
+#define DAC_MISC_NBITS          0
+
+/* DAC Precharge Control Register */
+#define DAC_PRECH               0x0C
+#define DAC_PRECH_PRCHGPDRV     7
+#define DAC_PRECH_PRCHGAUX1     6
+#define DAC_PRECH_PRCHGLNOR     5
+#define DAC_PRECH_PRCHGLNOL     4
+#define DAC_PRECH_PRCHGLNIR     3
+#define DAC_PRECH_PRCHGLNIL     2
+#define DAC_PRECH_PRCHG         1
+#define DAC_PRECH_ONMSTR        0
+
+/* DAC Auxiliary Input Gain Control Register */
+#define DAC_AUXG                0x0D
+#define DAC_AUXG_AUXG           0
+
+/* DAC Reset Register */
+#define DAC_RST                 0x10
+#define DAC_RST_RESMASK         2
+#define DAC_RST_RESFILZ         1
+#define DAC_RST_RSTZ            0
+
+/* Power Amplifier Control Register */
+#define PA_CTRL                 0x11
+#define PA_CTRL_APAON           6
+#define PA_CTRL_APAPRECH        5
+#define PA_CTRL_APALP           4
+#define PA_CTRL_APAGAIN         0
+
+#endif /* _SND_AT73C213_H */
diff --git a/sound/synth/Makefile b/sound/synth/Makefile
index 986291dcb914..e99fd76caa17 100644
--- a/sound/synth/Makefile
+++ b/sound/synth/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-util-mem-objs := util_mem.o
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index 32a102d26709..b69035240cf6 100644
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile for ALSA
-# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
+# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
 #
 
 snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index 1d9b11f345f8..6fc3d2b2519f 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -116,7 +116,7 @@ __snd_util_memblk_new(struct snd_util_memhdr *hdr, unsigned int units,
         if (blk == NULL)
                 return NULL;
 
-        if (! prev || prev == &hdr->block)
+        if (prev == &hdr->block)
                 blk->offset = 0;
         else {
                 struct snd_util_memblk *p = get_memblk(prev);
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 315360f31278..706143826aff 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -40,6 +40,7 @@ config SND_USB_CAIAQ
            namely:
 
             * Native Instruments RigKontrol2
+            * Native Instruments RigKontrol3
             * Native Instruments Kore Controller
             * Native Instruments Audio Kontrol 1
             * Native Instruments Audio 8 DJ
@@ -55,6 +56,7 @@ config SND_USB_CAIAQ_INPUT
           alpha dials and analog pedals on the following products:
 
            * Native Instruments RigKontrol2
+           * Native Instruments RigKontrol3
            * Native Instruments Audio Kontrol 1
 
 endmenu
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index 0414d766ba07..0666908a2361 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -648,6 +648,7 @@ int __devinit snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
         dev->samplerates = dev->pcm_info.rates;
         switch (dev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
                 dev->samplerates |= SNDRV_PCM_RATE_88200;
                 dev->samplerates |= SNDRV_PCM_RATE_192000;
                 break;
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 4709347326f9..58af8142c571 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -41,9 +41,10 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.1.0");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.2.0");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
+                         "{Native Instruments, RigKontrol3},"
                          "{Native Instruments, Kore Controller},"
                          "{Native Instruments, Audio Kontrol 1}"
                          "{Native Instruments, Audio 8 DJ}}");
@@ -85,6 +86,11 @@ static struct usb_device_id snd_usb_id_table[] = {
         {
                 .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
                 .idVendor =     USB_VID_NATIVEINSTRUMENTS,
+                .idProduct =    USB_PID_RIGKONTROL3
+        },
+        {
+                .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+                .idVendor =     USB_VID_NATIVEINSTRUMENTS,
                 .idProduct =    USB_PID_KORECONTROLLER
         },
         {
@@ -226,7 +232,7 @@ int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev,
 static void setup_card(struct snd_usb_caiaqdev *dev)
 {
         int ret;
-        char val[3];
+        char val[4];
         
         /* device-specific startup specials */
         switch (dev->chip.usb_id) {
@@ -237,6 +243,14 @@ static void setup_card(struct snd_usb_caiaqdev *dev)
                 val[2] = 0x01;
                 send_command(dev, EP1_CMD_WRITE_IO, val, 3);
                 break;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+                /* RigKontrol2 - display two centered dashes ('--') */
+                val[0] = 0x00;
+                val[1] = 0x40;
+                val[2] = 0x40;
+                val[3] = 0x00;
+                send_command(dev, EP1_CMD_WRITE_IO, val, 4);
+                break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 /* Audio Kontrol 1 - make USB-LED stop blinking */
                 val[0] = 0x00;
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 088d5ec241f3..79bc5be2df7a 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -6,6 +6,7 @@
 #define USB_VID_NATIVEINSTRUMENTS 0x17cc
 
 #define USB_PID_RIGKONTROL2     0x1969
+#define USB_PID_RIGKONTROL3     0x1940
 #define USB_PID_KORECONTROLLER  0x4711
 #define USB_PID_AK1             0x0815
 #define USB_PID_AUDIO8DJ        0x1978
diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c
index 3acd12db6952..a1de0c608957 100644
--- a/sound/usb/caiaq/caiaq-input.c
+++ b/sound/usb/caiaq/caiaq-input.c
@@ -34,6 +34,8 @@
 static unsigned char keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
 static unsigned char keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4, 
                                         KEY_5, KEY_6, KEY_7 };
+static unsigned char keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
+                                        KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };
 
 #define DEG90  (range/2)
 #define DEG180 (range)
@@ -107,7 +109,8 @@ static unsigned int decode_erp(unsigned char a, unsigned char b)
 
 
 static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
-                                        const char *buf, unsigned int len)
+                                        const unsigned char *buf,
+                                        unsigned int len)
 {
         switch(dev->input_dev->id.product) {
         case USB_PID_RIGKONTROL2:
@@ -116,6 +119,12 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,
                 input_report_abs(dev->input_dev, ABS_Z, (buf[2] << 8) |buf[3]);
                 input_sync(dev->input_dev);
                 break;
+        case USB_PID_RIGKONTROL3:
+                input_report_abs(dev->input_dev, ABS_X, (buf[0] << 8) |buf[1]);
+                input_report_abs(dev->input_dev, ABS_Y, (buf[2] << 8) |buf[3]);
+                input_report_abs(dev->input_dev, ABS_Z, (buf[4] << 8) |buf[5]);
+                input_sync(dev->input_dev);
+                break;
         }
 }
 
@@ -128,7 +137,7 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
         case USB_PID_AK1:
                 i = decode_erp(buf[0], buf[1]);
                 input_report_abs(dev->input_dev, ABS_X, i);
-                input_sync(dev->input_dev);     
+                input_sync(dev->input_dev);
                 break;
         }
 }
@@ -204,6 +213,20 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
                 snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
                 break;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+                input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z);
+                input->keycode = keycode_rk3;
+                input->keycodesize = sizeof(char);
+                input->keycodemax = ARRAY_SIZE(keycode_rk3);
+                for (i=0; i<ARRAY_SIZE(keycode_rk3); i++)
+                        set_bit(keycode_rk3[i], input->keybit);
+
+                input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
+                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+                break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
                 input->absbit[0] = BIT(ABS_X);
@@ -238,7 +261,6 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
                 return;
 
         input_unregister_device(dev->input_dev);
-        input_free_device(dev->input_dev);
         dev->input_dev = NULL;
 }
 
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index ac5666f4c6d5..967b823eace0 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -123,7 +123,6 @@ struct audioformat {
         unsigned int rate_min, rate_max;        /* min/max rates */
         unsigned int nr_rates;          /* number of rate table entries */
         unsigned int *rate_table;       /* rate table */
-        unsigned int needs_knot;        /* any unusual rates? */
 };
 
 struct snd_usb_substream;
@@ -1309,7 +1308,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
 
         /* close the old interface */
         if (subs->interface >= 0 && subs->interface != fmt->iface) {
-                usb_set_interface(subs->dev, subs->interface, 0);
+                if (usb_set_interface(subs->dev, subs->interface, 0) < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: return to setting 0 failed\n",
+                                dev->devnum, fmt->iface, fmt->altsetting);
+                        return -EIO;
+                }
                 subs->interface = -1;
                 subs->format = 0;
         }
@@ -1761,7 +1764,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
                 channels[f->format] |= (1 << f->channels);
                 rates[f->format] |= f->rates;
                 /* needs knot? */
-                if (f->needs_knot)
+                if (f->rates & SNDRV_PCM_RATE_KNOT)
                         goto __out;
         }
         /* check whether channels and rates match for all formats */
@@ -1817,7 +1820,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
                 if (fp->rates & SNDRV_PCM_RATE_CONTINUOUS)
                         return 0;
                 count += fp->nr_rates;
-                if (fp->needs_knot)
+                if (fp->rates & SNDRV_PCM_RATE_KNOT)
                         needs_knot = 1;
         }
         if (!needs_knot)
@@ -2453,7 +2456,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                                     unsigned char *fmt, int offset)
 {
         int nr_rates = fmt[offset];
-        int found;
+
         if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                 snd_printk(KERN_ERR "%d:%u:%d : invalid FORMAT_TYPE desc\n",
                                    chip->dev->devnum, fp->iface, fp->altsetting);
@@ -2464,20 +2467,15 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                 /*
                  * build the rate table and bitmap flags
                  */
-                int r, idx, c;
+                int r, idx;
                 unsigned int nonzero_rates = 0;
-                /* this table corresponds to the SNDRV_PCM_RATE_XXX bit */
-                static unsigned int conv_rates[] = {
-                        5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
-                        64000, 88200, 96000, 176400, 192000
-                };
+
                 fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                 if (fp->rate_table == NULL) {
                         snd_printk(KERN_ERR "cannot malloc\n");
                         return -1;
                 }
 
-                fp->needs_knot = 0;
                 fp->nr_rates = nr_rates;
                 fp->rate_min = fp->rate_max = combine_triple(&fmt[8]);
                 for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) {
@@ -2493,23 +2491,12 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                                 fp->rate_min = rate;
                         else if (rate > fp->rate_max)
                                 fp->rate_max = rate;
-                        found = 0;
-                        for (c = 0; c < (int)ARRAY_SIZE(conv_rates); c++) {
-                                if (rate == conv_rates[c]) {
-                                        found = 1;
-                                        fp->rates |= (1 << c);
-                                        break;
-                                }
-                        }
-                        if (!found)
-                                fp->needs_knot = 1;
+                        fp->rates |= snd_pcm_rate_to_rate_bit(rate);
                 }
                 if (!nonzero_rates) {
                         hwc_debug("All rates were zero. Skipping format!\n");
                         return -1;
                 }
-                if (fp->needs_knot)
-                        fp->rates |= SNDRV_PCM_RATE_KNOT;
         } else {
                 /* continuous rates */
                 fp->rates = SNDRV_PCM_RATE_CONTINUOUS;
@@ -2857,6 +2844,10 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
                         /* skip non-supported classes */
                         continue;
                 }
+                if (snd_usb_get_speed(dev) == USB_SPEED_LOW) {
+                        snd_printk(KERN_ERR "low speed audio streaming not supported\n");
+                        continue;
+                }
                 if (! parse_audio_endpoints(chip, j)) {
                         usb_set_interface(dev, j, 0); /* reset the current interface */
                         usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
@@ -3399,7 +3390,8 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 
         *rchip = NULL;
 
-        if (snd_usb_get_speed(dev) != USB_SPEED_FULL &&
+        if (snd_usb_get_speed(dev) != USB_SPEED_LOW &&
+            snd_usb_get_speed(dev) != USB_SPEED_FULL &&
             snd_usb_get_speed(dev) != USB_SPEED_HIGH) {
                 snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev));
                 return -ENXIO;
@@ -3473,7 +3465,9 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                 usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
 
         strlcat(card->longname,
-                snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" : ", high speed",
+                snd_usb_get_speed(dev) == USB_SPEED_LOW ? ", low speed" :
+                snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" :
+                ", high speed",
                 sizeof(card->longname));
 
         snd_usb_audio_create_proc(chip);
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 99295f9b7691..6330788c1c2b 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -407,6 +407,20 @@ static void snd_usbmidi_maudio_broken_running_status_input(
 }
 
 /*
+ * CME protocol: like the standard protocol, but SysEx commands are sent as a
+ * single USB packet preceded by a 0x0F byte.
+ */
+static void snd_usbmidi_cme_input(struct snd_usb_midi_in_endpoint *ep,
+                                  uint8_t *buffer, int buffer_length)
+{
+        if (buffer_length < 2 || (buffer[0] & 0x0f) != 0x0f)
+                snd_usbmidi_standard_input(ep, buffer, buffer_length);
+        else
+                snd_usbmidi_input_data(ep, buffer[0] >> 4,
+                                       &buffer[1], buffer_length - 1);
+}
+
+/*
  * Adds one USB MIDI packet to the output buffer.
  */
 static void snd_usbmidi_output_standard_packet(struct urb* urb, uint8_t p0,
@@ -572,6 +586,12 @@ static struct usb_protocol_ops snd_usbmidi_maudio_broken_running_status_ops = {
         .output_packet = snd_usbmidi_output_standard_packet,
 };
 
+static struct usb_protocol_ops snd_usbmidi_cme_ops = {
+        .input = snd_usbmidi_cme_input,
+        .output = snd_usbmidi_standard_output,
+        .output_packet = snd_usbmidi_output_standard_packet,
+};
+
 /*
  * Novation USB MIDI protocol: number of data bytes is in the first byte
  * (when receiving) (+1!) or in the second byte (when sending); data begins
@@ -963,8 +983,10 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 snd_usbmidi_out_endpoint_delete(ep);
                 return -ENOMEM;
         }
-        /* we never use interrupt output pipes */
-        pipe = usb_sndbulkpipe(umidi->chip->dev, ep_info->out_ep);
+        if (ep_info->out_interval)
+                pipe = usb_sndintpipe(umidi->chip->dev, ep_info->out_ep);
+        else
+                pipe = usb_sndbulkpipe(umidi->chip->dev, ep_info->out_ep);
         if (umidi->chip->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */
                 /* FIXME: we need more URBs to get reasonable bandwidth here: */
                 ep->max_transfer = 4;
@@ -976,8 +998,14 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 snd_usbmidi_out_endpoint_delete(ep);
                 return -ENOMEM;
         }
-        usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
-                          ep->max_transfer, snd_usbmidi_out_urb_complete, ep);
+        if (ep_info->out_interval)
+                usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer,
+                                 ep->max_transfer, snd_usbmidi_out_urb_complete,
+                                 ep, ep_info->out_interval);
+        else
+                usb_fill_bulk_urb(ep->urb, umidi->chip->dev,
+                                  pipe, buffer, ep->max_transfer,
+                                  snd_usbmidi_out_urb_complete, ep);
         ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
 
         spin_lock_init(&ep->buffer_lock);
@@ -1323,6 +1351,13 @@ static int snd_usbmidi_get_ms_info(struct snd_usb_midi* umidi,
                         endpoints[epidx].out_ep = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
                         if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
                                 endpoints[epidx].out_interval = ep->bInterval;
+                        else if (snd_usb_get_speed(umidi->chip->dev) == USB_SPEED_LOW)
+                                /*
+                                 * Low speed bulk transfers don't exist, so
+                                 * force interrupt transfers for devices like
+                                 * ESI MIDI Mate that try to use them anyway.
+                                 */
+                                endpoints[epidx].out_interval = 1;
                         endpoints[epidx].out_cables = (1 << ms_ep->bNumEmbMIDIJack) - 1;
                         snd_printdd(KERN_INFO "EP %02X: %d jack(s)\n",
                                     ep->bEndpointAddress, ms_ep->bNumEmbMIDIJack);
@@ -1336,6 +1371,8 @@ static int snd_usbmidi_get_ms_info(struct snd_usb_midi* umidi,
                         endpoints[epidx].in_ep = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
                         if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
                                 endpoints[epidx].in_interval = ep->bInterval;
+                        else if (snd_usb_get_speed(umidi->chip->dev) == USB_SPEED_LOW)
+                                endpoints[epidx].in_interval = 1;
                         endpoints[epidx].in_cables = (1 << ms_ep->bNumEmbMIDIJack) - 1;
                         snd_printdd(KERN_INFO "EP %02X: %d jack(s)\n",
                                     ep->bEndpointAddress, ms_ep->bNumEmbMIDIJack);
@@ -1690,6 +1727,7 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
                 err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
                 break;
         case QUIRK_MIDI_CME:
+                umidi->usb_protocol_ops = &snd_usbmidi_cme_ops;
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
         default:
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 325d4b6b54aa..5e329690cfb1 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -1483,7 +1483,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsi
         struct snd_kcontrol *kctl;
         char **namelist;
 
-        if (! num_ins || desc[0] < 6 + num_ins) {
+        if (! num_ins || desc[0] < 5 + num_ins) {
                 snd_printk(KERN_ERR "invalid SELECTOR UNIT descriptor %d\n", unitid);
                 return -EINVAL;
         }
@@ -1888,14 +1888,7 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
         return 0;
 }
 
-static int snd_audigy2nx_led_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_audigy2nx_led_info          snd_ctl_boolean_mono_info
 
 static int snd_audigy2nx_led_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 5a2f518c6629..743568f89907 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -88,7 +88,19 @@
         .bInterfaceClass = USB_CLASS_AUDIO,
         .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
 },
-
+/* E-Mu devices */
+{
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f02,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
+{
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f04,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
 /*
  * Yamaha devices
  */
@@ -1254,7 +1266,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
         /* TODO: add Edirol PC-80 support */
-        /* TODO: add Edirol UA-1EX support */
+{
+        USB_DEVICE(0x0582, 0x0096),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "EDIROL",
+                .product_name = "UA-1EX",
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 {
         USB_DEVICE(0x0582, 0x009a),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1567,6 +1600,40 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+{
+        USB_DEVICE(0x0763, 0x2019),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                /* .vendor_name = "M-Audio", */
+                /* .product_name = "Ozone Academic", */
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = & (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 3,
+                                .type = QUIRK_MIDI_MIDIMAN,
+                                .data = & (const struct snd_usb_midi_endpoint_info) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 
 /* Casio devices */
 {
@@ -1709,6 +1776,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */
+{
+        USB_DEVICE(0x103d, 0x0100),
+                .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Stanton",
+                .product_name = "ScratchAmp",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+{
+        USB_DEVICE(0x103d, 0x0101),
+                .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Stanton",
+                .product_name = "ScratchAmp",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+
 /* Novation EMS devices */
 {
         USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
@@ -1738,6 +1823,17 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* */
+{
+        /* aka. Serato Scratch Live DJ Box */
+        USB_DEVICE(0x13e5, 0x0001),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Rane",
+                .product_name = "SL-1",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+
 /* Miditech devices */
 {
         USB_DEVICE(0x4752, 0x0011),