ALSA: hda - enable snoop for Intel Cougar Point
[safe/jmp/linux-2.6] / sound / pci / ca0106 / ca0106_mixer.c
index 9855f52..8f443a9 100644 (file)
@@ -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>
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
 #include <sound/tlv.h>
+#include <asm/io.h>
 
 #include "ca0106.h"
 
-static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
-static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);
+static void ca0106_spdif_enable(struct snd_ca0106 *emu)
+{
+       unsigned int val;
+
+       if (emu->spdif_enable) {
+               /* Digital */
+               snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
+               snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x0b000000);
+               val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) & ~0x1000;
+               snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val);
+               val = inl(emu->port + GPIO) & ~0x101;
+               outl(val, emu->port + GPIO);
+
+       } else {
+               /* Analog */
+               snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
+               snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
+               val = snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000;
+               snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0, val);
+               val = inl(emu->port + GPIO) | 0x101;
+               outl(val, emu->port + GPIO);
+       }
+}
 
-static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_info *uinfo)
+static void ca0106_set_capture_source(struct snd_ca0106 *emu)
 {
-       uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-       uinfo->count = 1;
-       uinfo->value.integer.min = 0;
-       uinfo->value.integer.max = 1;
-       return 0;
+       unsigned int val = emu->capture_source;
+       unsigned int source, mask;
+       source = (val << 28) | (val << 24) | (val << 20) | (val << 16);
+       mask = snd_ca0106_ptr_read(emu, CAPTURE_SOURCE, 0) & 0xffff;
+       snd_ca0106_ptr_write(emu, CAPTURE_SOURCE, 0, source | mask);
+}
+
+static void ca0106_set_i2c_capture_source(struct snd_ca0106 *emu,
+                                         unsigned int val, int force)
+{
+       unsigned int ngain, ogain;
+       u32 source;
+
+       snd_ca0106_i2c_write(emu, ADC_MUX, 0); /* Mute input */
+       ngain = emu->i2c_capture_volume[val][0]; /* Left */
+       ogain = emu->i2c_capture_volume[emu->i2c_capture_source][0]; /* Left */
+       if (force || ngain != ogain)
+               snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCL, ngain & 0xff);
+       ngain = emu->i2c_capture_volume[val][1]; /* Right */
+       ogain = emu->i2c_capture_volume[emu->i2c_capture_source][1]; /* Right */
+       if (force || ngain != ogain)
+               snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCR, ngain & 0xff);
+       source = 1 << val;
+       snd_ca0106_i2c_write(emu, ADC_MUX, source); /* Set source */
+       emu->i2c_capture_source = val;
+}
+
+static void ca0106_set_capture_mic_line_in(struct snd_ca0106 *emu)
+{
+       u32 tmp;
+
+       if (emu->capture_mic_line_in) {
+               /* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */
+               tmp = inl(emu->port+GPIO) & ~0x400;
+               tmp = tmp | 0x400;
+               outl(tmp, emu->port+GPIO);
+               /* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC); */
+       } else {
+               /* snd_ca0106_i2c_write(emu, ADC_MUX, 0); */ /* Mute input */
+               tmp = inl(emu->port+GPIO) & ~0x400;
+               outl(tmp, emu->port+GPIO);
+               /* snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN); */
+       }
 }
 
+static void ca0106_set_spdif_bits(struct snd_ca0106 *emu, int idx)
+{
+       snd_ca0106_ptr_write(emu, SPCS0 + idx, 0, emu->spdif_str_bits[idx]);
+}
+
+/*
+ */
+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);
+
+#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)
 {
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
 
-       ucontrol->value.enumerated.item[0] = emu->spdif_enable;
+       ucontrol->value.integer.value[0] = emu->spdif_enable;
        return 0;
 }
 
@@ -102,30 +173,12 @@ static int snd_ca0106_shared_spdif_put(struct snd_kcontrol *kcontrol,
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int val;
        int change = 0;
-       u32 mask;
 
-       val = ucontrol->value.enumerated.item[0] ;
+       val = !!ucontrol->value.integer.value[0];
        change = (emu->spdif_enable != val);
        if (change) {
                emu->spdif_enable = val;
-               if (val == 1) {
-                       /* Digital */
-                       snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
-                       snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x0b000000);
-                       snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
-                               snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) & ~0x1000);
-                       mask = inl(emu->port + GPIO) & ~0x101;
-                       outl(mask, emu->port + GPIO);
-
-               } else {
-                       /* Analog */
-                       snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
-                       snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
-                       snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
-                               snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
-                       mask = inl(emu->port + GPIO) | 0x101;
-                       outl(mask, emu->port + GPIO);
-               }
+               ca0106_spdif_enable(emu);
        }
         return change;
 }
@@ -161,16 +214,14 @@ static int snd_ca0106_capture_source_put(struct snd_kcontrol *kcontrol,
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int val;
        int change = 0;
-       u32 mask;
-       u32 source;
 
        val = ucontrol->value.enumerated.item[0] ;
+       if (val >= 6)
+               return -EINVAL;
        change = (emu->capture_source != val);
        if (change) {
                emu->capture_source = val;
-               source = (val << 28) | (val << 24) | (val << 20) | (val << 16);
-               mask = snd_ca0106_ptr_read(emu, CAPTURE_SOURCE, 0) & 0xffff;
-               snd_ca0106_ptr_write(emu, CAPTURE_SOURCE, 0, source | mask);
+               ca0106_set_capture_source(emu);
        }
         return change;
 }
@@ -205,28 +256,17 @@ static int snd_ca0106_i2c_capture_source_put(struct snd_kcontrol *kcontrol,
 {
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int source_id;
-       unsigned int ngain, ogain;
        int change = 0;
-       u32 source;
        /* If the capture source has changed,
         * update the capture volume from the cached value
         * for the particular source.
         */
        source_id = ucontrol->value.enumerated.item[0] ;
+       if (source_id >= 4)
+               return -EINVAL;
        change = (emu->i2c_capture_source != source_id);
        if (change) {
-               snd_ca0106_i2c_write(emu, ADC_MUX, 0); /* Mute input */
-               ngain = emu->i2c_capture_volume[source_id][0]; /* Left */
-               ogain = emu->i2c_capture_volume[emu->i2c_capture_source][0]; /* Left */
-               if (ngain != ogain)
-                       snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) & 0xff));
-               ngain = emu->i2c_capture_volume[source_id][1]; /* Left */
-               ogain = emu->i2c_capture_volume[emu->i2c_capture_source][1]; /* Left */
-               if (ngain != ogain)
-                       snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) & 0xff));
-               source = 1 << source_id;
-               snd_ca0106_i2c_write(emu, ADC_MUX, source); /* Set source */
-               emu->i2c_capture_source = source_id;
+               ca0106_set_i2c_capture_source(emu, source_id, 0);
        }
         return change;
 }
@@ -274,24 +314,14 @@ static int snd_ca0106_capture_mic_line_in_put(struct snd_kcontrol *kcontrol,
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int val;
        int change = 0;
-       u32 tmp;
 
        val = ucontrol->value.enumerated.item[0] ;
+       if (val > 1)
+               return -EINVAL;
        change = (emu->capture_mic_line_in != val);
        if (change) {
                emu->capture_mic_line_in = val;
-               if (val) {
-                       //snd_ca0106_i2c_write(emu, ADC_MUX, 0); /* Mute input */
-                       tmp = inl(emu->port+GPIO) & ~0x400;
-                       tmp = tmp | 0x400;
-                       outl(tmp, emu->port+GPIO);
-                       //snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC);
-               } else {
-                       //snd_ca0106_i2c_write(emu, ADC_MUX, 0); /* Mute input */
-                       tmp = inl(emu->port+GPIO) & ~0x400;
-                       outl(tmp, emu->port+GPIO);
-                       //snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN);
-               }
+               ca0106_set_capture_mic_line_in(emu);
        }
         return change;
 }
@@ -323,16 +353,33 @@ static int snd_ca0106_spdif_info(struct snd_kcontrol *kcontrol,
        return 0;
 }
 
-static int snd_ca0106_spdif_get(struct snd_kcontrol *kcontrol,
+static void decode_spdif_bits(unsigned char *status, unsigned int bits)
+{
+       status[0] = (bits >> 0) & 0xff;
+       status[1] = (bits >> 8) & 0xff;
+       status[2] = (bits >> 16) & 0xff;
+       status[3] = (bits >> 24) & 0xff;
+}
+
+static int snd_ca0106_spdif_get_default(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
 
-       ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff;
-       ucontrol->value.iec958.status[1] = (emu->spdif_bits[idx] >> 8) & 0xff;
-       ucontrol->value.iec958.status[2] = (emu->spdif_bits[idx] >> 16) & 0xff;
-       ucontrol->value.iec958.status[3] = (emu->spdif_bits[idx] >> 24) & 0xff;
+       decode_spdif_bits(ucontrol->value.iec958.status,
+                         emu->spdif_bits[idx]);
+        return 0;
+}
+
+static int snd_ca0106_spdif_get_stream(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+       decode_spdif_bits(ucontrol->value.iec958.status,
+                         emu->spdif_str_bits[idx]);
         return 0;
 }
 
@@ -346,24 +393,48 @@ static int snd_ca0106_spdif_get_mask(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int snd_ca0106_spdif_put(struct snd_kcontrol *kcontrol,
+static unsigned int encode_spdif_bits(unsigned char *status)
+{
+       return ((unsigned int)status[0] << 0) |
+               ((unsigned int)status[1] << 8) |
+               ((unsigned int)status[2] << 16) |
+               ((unsigned int)status[3] << 24);
+}
+
+static int snd_ca0106_spdif_put_default(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
        unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-       int change;
        unsigned int val;
 
-       val = (ucontrol->value.iec958.status[0] << 0) |
-             (ucontrol->value.iec958.status[1] << 8) |
-             (ucontrol->value.iec958.status[2] << 16) |
-             (ucontrol->value.iec958.status[3] << 24);
-       change = val != emu->spdif_bits[idx];
-       if (change) {
-               snd_ca0106_ptr_write(emu, SPCS0 + idx, 0, val);
+       val = encode_spdif_bits(ucontrol->value.iec958.status);
+       if (val != emu->spdif_bits[idx]) {
                emu->spdif_bits[idx] = val;
+               /* FIXME: this isn't safe, but needed to keep the compatibility
+                * with older alsa-lib config
+                */
+               emu->spdif_str_bits[idx] = val;
+               ca0106_set_spdif_bits(emu, idx);
+               return 1;
        }
-        return change;
+       return 0;
+}
+
+static int snd_ca0106_spdif_put_stream(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+       unsigned int val;
+
+       val = encode_spdif_bits(ucontrol->value.iec958.status);
+       if (val != emu->spdif_str_bits[idx]) {
+               emu->spdif_str_bits[idx] = val;
+               ca0106_set_spdif_bits(emu, idx);
+               return 1;
+       }
+        return 0;
 }
 
 static int snd_ca0106_volume_info(struct snd_kcontrol *kcontrol,
@@ -449,7 +520,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
        ogain = emu->i2c_capture_volume[source_id][0]; /* Left */
        ngain = ucontrol->value.integer.value[0];
        if (ngain > 0xff)
-               return 0;
+               return -EINVAL;
        if (ogain != ngain) {
                if (emu->i2c_capture_source == source_id)
                        snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) & 0xff) );
@@ -459,7 +530,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
        ogain = emu->i2c_capture_volume[source_id][1]; /* Right */
        ngain = ucontrol->value.integer.value[1];
        if (ngain > 0xff)
-               return 0;
+               return -EINVAL;
        if (ogain != ngain) {
                if (emu->i2c_capture_source == source_id)
                        snd_ca0106_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) & 0xff));
@@ -470,6 +541,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 ? -EINVAL : 1;
+}
+
 #define CA_VOLUME(xname,chid,reg) \
 {                                                              \
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
@@ -482,19 +589,6 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol,
        .private_value = ((chid) << 8) | (reg)                  \
 }
 
-#define I2C_VOLUME(xname,chid) \
-{                                                              \
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
-                 SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
-       .info =  snd_ca0106_i2c_volume_info,                    \
-       .get =   snd_ca0106_i2c_volume_get,                     \
-       .put =   snd_ca0106_i2c_volume_put,                     \
-       .tlv = { .p = snd_ca0106_db_scale2 },                   \
-       .private_value = chid                                   \
-}
-
-
 static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
        CA_VOLUME("Analog Front Playback Volume",
                  CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2),
@@ -517,11 +611,6 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
         CA_VOLUME("CAPTURE feedback Playback Volume",
                  1, CAPTURE_CONTROL),
 
-        I2C_VOLUME("Phone Capture Volume", 0),
-        I2C_VOLUME("Mic Capture Volume", 1),
-        I2C_VOLUME("Line in Capture Volume", 2),
-        I2C_VOLUME("Aux Capture Volume", 3),
-
        {
                .access =       SNDRV_CTL_ELEM_ACCESS_READ,
                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
@@ -539,14 +628,14 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
        },
        {
                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name =         "Digital Capture Source",
+               .name =         "Digital Source Capture Enum",
                .info =         snd_ca0106_capture_source_info,
                .get =          snd_ca0106_capture_source_get,
                .put =          snd_ca0106_capture_source_put
        },
        {
                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name =         "Capture Source",
+               .name =         "Analog Source Capture Enum",
                .info =         snd_ca0106_i2c_capture_source_info,
                .get =          snd_ca0106_i2c_capture_source_get,
                .put =          snd_ca0106_i2c_capture_source_put
@@ -556,9 +645,58 @@ static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
                .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
                .count =        4,
                .info =         snd_ca0106_spdif_info,
-               .get =          snd_ca0106_spdif_get,
-               .put =          snd_ca0106_spdif_put
+               .get =          snd_ca0106_spdif_get_default,
+               .put =          snd_ca0106_spdif_put_default
        },
+       {
+               .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+               .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM),
+               .count =        4,
+               .info =         snd_ca0106_spdif_info,
+               .get =          snd_ca0106_spdif_get_stream,
+               .put =          snd_ca0106_spdif_put_stream
+       },
+};
+
+#define I2C_VOLUME(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
+                 SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
+       .info =  snd_ca0106_i2c_volume_info,                    \
+       .get =   snd_ca0106_i2c_volume_get,                     \
+       .put =   snd_ca0106_i2c_volume_put,                     \
+       .tlv = { .p = snd_ca0106_db_scale2 },                   \
+       .private_value = chid                                   \
+}
+
+static struct snd_kcontrol_new snd_ca0106_volume_i2c_adc_ctls[] __devinitdata = {
+        I2C_VOLUME("Phone Capture Volume", 0),
+        I2C_VOLUME("Mic Capture Volume", 1),
+        I2C_VOLUME("Line in Capture Volume", 2),
+        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)
@@ -590,11 +728,57 @@ 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)
+
+static __devinitdata
+DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1);
+
+static char *slave_vols[] __devinitdata = {
+       "Analog Front Playback Volume",
+        "Analog Rear Playback Volume",
+       "Analog Center/LFE Playback Volume",
+        "Analog Side Playback Volume",
+        "IEC958 Front Playback Volume",
+       "IEC958 Rear Playback Volume",
+       "IEC958 Center/LFE Playback Volume",
+       "IEC958 Unknown Playback Volume",
+        "CAPTURE feedback Playback Volume",
+       NULL
+};
+
+static char *slave_sws[] __devinitdata = {
+       "Analog Front Playback Switch",
+       "Analog Rear Playback Switch",
+       "Analog Center/LFE Playback Switch",
+       "Analog Side Playback Switch",
+       "IEC958 Playback Switch",
+       NULL
+};
+
+static void __devinit add_slaves(struct snd_card *card,
+                                struct snd_kcontrol *master, char **list)
+{
+       for (; *list; list++) {
+               struct snd_kcontrol *slave = ctl_find(card, *list);
+               if (slave)
+                       snd_ctl_add_slave(master, slave);
+       }
+}
+
 int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
 {
-       int i, err;
+       int err;
         struct snd_card *card = emu->card;
        char **c;
+       struct snd_kcontrol *vmaster;
        static char *ca0106_remove_ctls[] = {
                "Master Mono Playback Switch",
                "Master Mono Playback Volume",
@@ -608,15 +792,15 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
                "Phone Playback Volume",
                "Video Playback Switch",
                "Video Playback Volume",
-               "PC Speaker Playback Switch",
-               "PC Speaker Playback Volume",
+               "Beep Playback Switch",
+               "Beep Playback Volume",
                "Mono Output Select",
                "Capture Source",
                "Capture Switch",
                "Capture Volume",
                "External Amplifier",
                "Sigmatel 4-Speaker Stereo Playback Switch",
-               "Sigmatel Surround Phase Inversion Playback ",
+               "Surround Phase Inversion Playback Switch",
                NULL
        };
        static char *ca0106_rename_ctls[] = {
@@ -639,12 +823,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) {
+               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 */
@@ -652,6 +833,78 @@ 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);
+
+       /* Create virtual master controls */
+       vmaster = snd_ctl_make_virtual_master("Master Playback Volume",
+                                             snd_ca0106_master_db_scale);
+       if (!vmaster)
+               return -ENOMEM;
+       err = snd_ctl_add(card, vmaster);
+       if (err < 0)
+               return err;
+       add_slaves(card, vmaster, slave_vols);
+
+       if (emu->details->spi_dac == 1) {
+               vmaster = snd_ctl_make_virtual_master("Master Playback Switch",
+                                                     NULL);
+               if (!vmaster)
+                       return -ENOMEM;
+               err = snd_ctl_add(card, vmaster);
+               if (err < 0)
+                       return err;
+               add_slaves(card, vmaster, slave_sws);
+       }
+
+       strcpy(card->mixername, "CA0106");
         return 0;
 }
 
+#ifdef CONFIG_PM
+struct ca0106_vol_tbl {
+       unsigned int channel_id;
+       unsigned int reg;
+};
+
+static struct ca0106_vol_tbl saved_volumes[NUM_SAVED_VOLUMES] = {
+       { CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2 },
+       { CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME2 },
+       { CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME2 },
+       { CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME2 },
+       { CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME1 },
+       { CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME1 },
+       { CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME1 },
+       { CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME1 },
+       { 1, CAPTURE_CONTROL },
+};
+
+void snd_ca0106_mixer_suspend(struct snd_ca0106 *chip)
+{
+       int i;
+
+       /* save volumes */
+       for (i = 0; i < NUM_SAVED_VOLUMES; i++)
+               chip->saved_vol[i] =
+                       snd_ca0106_ptr_read(chip, saved_volumes[i].reg,
+                                           saved_volumes[i].channel_id);
+}
+
+void snd_ca0106_mixer_resume(struct snd_ca0106  *chip)
+{
+       int i;
+
+       for (i = 0; i < NUM_SAVED_VOLUMES; i++)
+               snd_ca0106_ptr_write(chip, saved_volumes[i].reg,
+                                    saved_volumes[i].channel_id,
+                                    chip->saved_vol[i]);
+
+       ca0106_spdif_enable(chip);
+       ca0106_set_capture_source(chip);
+       ca0106_set_i2c_capture_source(chip, chip->i2c_capture_source, 1);
+       for (i = 0; i < 4; i++)
+               ca0106_set_spdif_bits(chip, i);
+       if (chip->details->i2c_adc)
+               ca0106_set_capture_mic_line_in(chip);
+}
+#endif /* CONFIG_PM */