vserver 1.9.5.x5
[linux-2.6.git] / sound / pci / ice1712 / aureon.c
index e9a3b05..4405d96 100644 (file)
  *   both controls in the future, once if wm codecs are reused in
  *   many boards.
  *
- * - writing over SPI is implemented but reading is not yet.
- *   the SPDIF-in channel status, etc. can be read from CS chip.
- *
  * - DAC digital volumes are not implemented in the mixer.
  *   if they show better response than DAC analog volumes, we can use them
  *   instead.
  *
- * - Aureon boards are equipped with AC97 codec, too.  it's used to do
- *   the analog mixing but not easily controllable (it's not connected
- *   directly from envy24ht chip).  so let's leave it as it is.
- *
- *
  *   Lowlevel functions for AudioTrak Prodigy 7.1 (and possibly 192) cards
  *      Copyright (c) 2003 Dimitromanolakis Apostolos <apostol@cs.utoronto.ca>
  *
  *                    we have no digital output, no capture, pretty bad clicks and poops
  *                    on mixer switch and other coll stuff.
  *
- * - Prodigy boards are equipped with AC97 STAC9744 chip , too.  it's used to do
- *   the analog mixing but not easily controllable (it's not connected
- *   directly from envy24ht chip).  so let's leave it as it is.
- *
  */      
 
 #include <sound/driver.h>
 #define WM_OUT_MUX2            0x1e    /* output MUX */
 #define WM_RESET               0x1f    /* software reset */
 
+/* CS8415A registers */
+#define CS8415_CTRL1   0x01
+#define CS8415_CTRL2   0x02
+#define CS8415_QSUB            0x14
+#define CS8415_RATIO   0x1E
+#define CS8415_C_BUFFER        0x20
+#define CS8415_ID              0x7F
+
+static void aureon_ac97_write(ice1712_t *ice, unsigned short reg, unsigned short val) {
+       unsigned int tmp;
+
+       /* Send address to XILINX chip */
+       tmp = (snd_ice1712_gpio_read(ice) & ~0xFF) | (reg & 0x7F);
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp |= AUREON_AC97_ADDR;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp &= ~AUREON_AC97_ADDR;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);     
+
+       /* Send low-order byte to XILINX chip */
+       tmp &= ~AUREON_AC97_DATA_MASK;
+       tmp |= val & AUREON_AC97_DATA_MASK;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp |= AUREON_AC97_DATA_LOW;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp &= ~AUREON_AC97_DATA_LOW;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       
+       /* Send high-order byte to XILINX chip */
+       tmp &= ~AUREON_AC97_DATA_MASK;
+       tmp |= (val >> 8) & AUREON_AC97_DATA_MASK;
+
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp |= AUREON_AC97_DATA_HIGH;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp &= ~AUREON_AC97_DATA_HIGH;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       
+       /* Instruct XILINX chip to parse the data to the STAC9744 chip */
+       tmp |= AUREON_AC97_COMMIT;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       tmp &= ~AUREON_AC97_COMMIT;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(10);
+       
+       /* Store the data in out private buffer */
+       ice->spec.aureon.stac9744[(reg & 0x7F) >> 1] = val;
+}
+
+static unsigned short aureon_ac97_read(ice1712_t *ice, unsigned short reg)
+{
+       return ice->spec.aureon.stac9744[(reg & 0x7F) >> 1];
+}
+
+/*
+ * Initialize STAC9744 chip
+ */
+static int aureon_ac97_init (ice1712_t *ice) {
+       int i;
+       static unsigned short ac97_defaults[] = {
+               0x00, 0x9640,
+               0x02, 0x8000,
+               0x04, 0x8000,
+               0x06, 0x8000,
+               0x0C, 0x8008,
+               0x0E, 0x8008,
+               0x10, 0x8808,
+               0x12, 0x8808,
+               0x14, 0x8808,
+               0x16, 0x8808,
+               0x18, 0x8808,
+               0x1C, 0x8000,
+               0x26, 0x000F,
+               0x28, 0x0201,
+               0x2C, 0xBB80,
+               0x32, 0xBB80,
+               0x7C, 0x8384,
+               0x7E, 0x7644,
+               (unsigned short)-1
+       };
+       unsigned int tmp;
+
+       /* Cold reset */
+       tmp = (snd_ice1712_gpio_read(ice) | AUREON_AC97_RESET) & ~AUREON_AC97_DATA_MASK;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(3);
+       
+       tmp &= ~AUREON_AC97_RESET;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(3);
+       
+       tmp |= AUREON_AC97_RESET;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(3);
+       
+       memset(&ice->spec.aureon.stac9744, 0, sizeof(ice->spec.aureon.stac9744));
+       for (i=0; ac97_defaults[i] != (unsigned short)-1; i+=2)
+               ice->spec.aureon.stac9744[(ac97_defaults[i]) >> 1] = ac97_defaults[i+1];
+               
+       aureon_ac97_write(ice, AC97_MASTER, 0x0000); // Unmute AC'97 master volume permanently - muting is done by WM8770
+
+       return 0;
+}
+
+#define AUREON_AC97_STEREO     0x80
+
+/*
+ * AC'97 volume controls
+ */
+static int aureon_ac97_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = kcontrol->private_value & AUREON_AC97_STEREO ? 2 : 1;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 31;
+       return 0;
+}
+
+static int aureon_ac97_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short vol;
+
+       down(&ice->gpio_mutex);
+
+       vol = aureon_ac97_read(ice, kcontrol->private_value & 0x7F);
+       ucontrol->value.integer.value[0] = 0x1F - (vol & 0x1F);
+       if (kcontrol->private_value & AUREON_AC97_STEREO)
+               ucontrol->value.integer.value[1] = 0x1F - ((vol >> 8) & 0x1F);
+
+       up(&ice->gpio_mutex);
+       return 0;
+}
+
+static int aureon_ac97_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short ovol, nvol;
+       int change;
+       
+       snd_ice1712_save_gpio_status(ice);
+
+       ovol = aureon_ac97_read(ice, kcontrol->private_value & 0x7F);
+       nvol = (0x1F - ucontrol->value.integer.value[0]) & 0x001F;
+       if (kcontrol->private_value & AUREON_AC97_STEREO)
+               nvol |= ((0x1F - ucontrol->value.integer.value[1]) << 8) & 0x1F00;
+       nvol |= ovol & ~0x1F1F;
+       
+       if ((change = (ovol != nvol)))
+               aureon_ac97_write(ice, kcontrol->private_value & 0x7F, nvol);
+
+       snd_ice1712_restore_gpio_status(ice);
+
+       return change;          
+}
+
+/*
+ * AC'97 mute controls
+ */
+#define aureon_ac97_mute_info  aureon_mono_bool_info
+
+static int aureon_ac97_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+       down(&ice->gpio_mutex);
+
+       ucontrol->value.integer.value[0] = aureon_ac97_read(ice, kcontrol->private_value & 0x7F) & 0x8000 ? 0 : 1;
+
+       up(&ice->gpio_mutex);
+       return 0;
+}
+
+static int aureon_ac97_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short ovol, nvol;
+       int change;
+
+       snd_ice1712_save_gpio_status(ice);
+       
+       ovol = aureon_ac97_read(ice, kcontrol->private_value & 0x7F);
+       nvol = (ucontrol->value.integer.value[0] ? 0x0000 : 0x8000) | (ovol & ~ 0x8000);
+       
+       if ((change = (ovol != nvol)))
+               aureon_ac97_write(ice, kcontrol->private_value & 0x7F, nvol);
+               
+       snd_ice1712_restore_gpio_status(ice);
+
+       return change;
+}
+
+/*
+ * AC'97 mute controls
+ */
+#define aureon_ac97_micboost_info      aureon_mono_bool_info
+
+static int aureon_ac97_micboost_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+       down(&ice->gpio_mutex);
+
+       ucontrol->value.integer.value[0] = aureon_ac97_read(ice, AC97_MIC) & 0x0020 ? 0 : 1;
+
+       up(&ice->gpio_mutex);
+       return 0;
+}
+
+static int aureon_ac97_micboost_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short ovol, nvol;
+       int change;
+
+       snd_ice1712_save_gpio_status(ice);
+       
+       ovol = aureon_ac97_read(ice, AC97_MIC);
+       nvol = (ucontrol->value.integer.value[0] ? 0x0000 : 0x0020) | (ovol & ~0x0020);
+       
+       if ((change = (ovol != nvol)))
+               aureon_ac97_write(ice, AC97_MIC, nvol);
+               
+       snd_ice1712_restore_gpio_status(ice);
+
+       return change;
+}
 
 /*
  * write data in the SPI mode
 static void aureon_spi_write(ice1712_t *ice, unsigned int cs, unsigned int data, int bits)
 {
        unsigned int tmp;
-       unsigned int cscs;
        int i;
 
        tmp = snd_ice1712_gpio_read(ice);
 
-       if (ice->eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)
-               cscs = PRODIGY_CS8415_CS;
-       else
-               cscs = AUREON_CS8415_CS;
-
-       snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RW|AUREON_WM_DATA|AUREON_WM_CLK|
-                                        AUREON_WM_CS|cscs));
+       snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RW|AUREON_SPI_MOSI|AUREON_SPI_CLK|
+                                        AUREON_WM_CS|AUREON_CS8415_CS));
        tmp |= AUREON_WM_RW;
        tmp &= ~cs;
        snd_ice1712_gpio_write(ice, tmp);
        udelay(1);
 
        for (i = bits - 1; i >= 0; i--) {
-               tmp &= ~AUREON_WM_CLK;
+               tmp &= ~AUREON_SPI_CLK;
                snd_ice1712_gpio_write(ice, tmp);
                udelay(1);
                if (data & (1 << i))
-                       tmp |= AUREON_WM_DATA;
+                       tmp |= AUREON_SPI_MOSI;
                else
-                       tmp &= ~AUREON_WM_DATA;
+                       tmp &= ~AUREON_SPI_MOSI;
                snd_ice1712_gpio_write(ice, tmp);
                udelay(1);
-               tmp |= AUREON_WM_CLK;
+               tmp |= AUREON_SPI_CLK;
                snd_ice1712_gpio_write(ice, tmp);
                udelay(1);
        }
 
-       tmp &= ~AUREON_WM_CLK;
+       tmp &= ~AUREON_SPI_CLK;
        tmp |= cs;
        snd_ice1712_gpio_write(ice, tmp);
        udelay(1);
-       tmp |= AUREON_WM_CLK;
+       tmp |= AUREON_SPI_CLK;
        snd_ice1712_gpio_write(ice, tmp);
        udelay(1);
 }
-     
+
+/*
+ * Read data in SPI mode
+ */
+static void aureon_spi_read(ice1712_t *ice, unsigned int cs, unsigned int data, int bits, unsigned char *buffer, int size) {
+       int i, j;
+       unsigned int tmp;
+
+       tmp = (snd_ice1712_gpio_read(ice) & ~AUREON_SPI_CLK) | AUREON_CS8415_CS|AUREON_WM_CS;
+       snd_ice1712_gpio_write(ice, tmp);
+       tmp &= ~cs;
+       snd_ice1712_gpio_write(ice, tmp);
+       udelay(1);
+
+       for (i=bits-1; i>=0; i--) {
+               if (data & (1 << i))
+                       tmp |= AUREON_SPI_MOSI;
+               else
+                       tmp &= ~AUREON_SPI_MOSI;
+               snd_ice1712_gpio_write(ice, tmp);
+               udelay(1);
+
+               tmp |= AUREON_SPI_CLK;
+               snd_ice1712_gpio_write(ice, tmp);
+               udelay(1);
+
+               tmp &= ~AUREON_SPI_CLK;
+               snd_ice1712_gpio_write(ice, tmp);
+               udelay(1);
+       }
+
+       for (j=0; j<size; j++) {
+               unsigned char outdata = 0;
+               for (i=7; i>=0; i--) {
+                       tmp = snd_ice1712_gpio_read(ice);
+                       outdata <<= 1;
+                       outdata |= (tmp & AUREON_SPI_MISO) ? 1 : 0;
+                       udelay(1);
+
+                       tmp |= AUREON_SPI_CLK;
+                       snd_ice1712_gpio_write(ice, tmp);
+                       udelay(1);
+
+                       tmp &= ~AUREON_SPI_CLK;
+                       snd_ice1712_gpio_write(ice, tmp);
+                       udelay(1);
+               }
+               buffer[j] = outdata;
+       }
+
+       tmp |= cs;
+       snd_ice1712_gpio_write(ice, tmp);
+}
+
+static unsigned char aureon_cs8415_get(ice1712_t *ice, int reg) {
+       unsigned char val;
+       aureon_spi_write(ice, AUREON_CS8415_CS, 0x2000 | reg, 16);
+       aureon_spi_read(ice, AUREON_CS8415_CS, 0x21, 8, &val, 1);
+       return val;
+}
+
+static void aureon_cs8415_read(ice1712_t *ice, int reg, unsigned char *buffer, int size) {
+       aureon_spi_write(ice, AUREON_CS8415_CS, 0x2000 | reg, 16);
+       aureon_spi_read(ice, AUREON_CS8415_CS, 0x21, 8, buffer, size);
+}
+
+static void aureon_cs8415_put(ice1712_t *ice, int reg, unsigned char val) {
+       aureon_spi_write(ice, AUREON_CS8415_CS, 0x200000 | (reg << 8) | val, 24);
+}
 
 /*
  * get the current register value of WM codec
@@ -178,79 +465,178 @@ static int aureon_mono_bool_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
        return 0;
 }
 
+/*
+ * AC'97 master playback mute controls (Mute on WM8770 chip)
+ */
+#define aureon_ac97_mmute_info aureon_mono_bool_info
+
+static int aureon_ac97_mmute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+       down(&ice->gpio_mutex);
+
+       ucontrol->value.integer.value[0] = (wm_get(ice, WM_OUT_MUX1) >> 1) & 0x01;
+
+       up(&ice->gpio_mutex);
+       return 0;
+}
+
+static int aureon_ac97_mmute_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) {
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short ovol, nvol;
+       int change;
+       
+       snd_ice1712_save_gpio_status(ice);
+       
+       ovol = wm_get(ice, WM_OUT_MUX1);
+       nvol = (ovol & ~0x02) | (ucontrol->value.integer.value[0] ? 0x02 : 0x00);
+       if ((change = (ovol != nvol)))
+               wm_put(ice, WM_OUT_MUX1, nvol);
+               
+       snd_ice1712_restore_gpio_status(ice);
+
+       return change;
+}
+
+/*
+ * Logarithmic volume values for WM8770
+ * Computed as 20 * Log10(255 / x)
+ */
+static unsigned char wm_vol[256] = {
+       127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
+       23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
+       17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
+       13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,
+       11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
+       8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
+       6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+       5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3,
+       3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+       2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0
+};
+
+#define WM_VOL_MAX     (sizeof(wm_vol) - 1)
+#define WM_VOL_MUTE    0x8000
+
+static void wm_set_vol(ice1712_t *ice, unsigned int index, unsigned short vol, unsigned short master)
+{
+       unsigned char nvol;
+       
+       if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE))
+               nvol = 0;
+       else
+               nvol = 127 - wm_vol[(((vol & ~WM_VOL_MUTE) * (master & ~WM_VOL_MUTE)) / 127) & WM_VOL_MAX];
+       
+       wm_put(ice, index, nvol);
+       wm_put_nocache(ice, index, 0x180 | nvol);
+}
+
 /*
  * DAC mute control
  */
-#define wm_dac_mute_info       aureon_mono_bool_info
+#define wm_pcm_mute_info       aureon_mono_bool_info
 
-static int wm_dac_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int wm_pcm_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-       unsigned short val;
 
        down(&ice->gpio_mutex);
-       val = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)+WM_MUTE);
-       ucontrol->value.integer.value[0] = ~val>>4 & 0x1;
+       ucontrol->value.integer.value[0] = (wm_get(ice, WM_MUTE) & 0x10) ? 0 : 1;
        up(&ice->gpio_mutex);
        return 0;
 }
 
-static int wm_dac_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int wm_pcm_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-       unsigned short new, old;
+       unsigned short nval, oval;
        int change;
 
        snd_ice1712_save_gpio_status(ice);
-       old = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)+WM_MUTE);
-       new = (~ucontrol->value.integer.value[0]<<4&0x10) | (old&~0x10);
-       change = (new != old);
-       if (change)
-               wm_put(ice, snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)+WM_MUTE, new);
+       oval = wm_get(ice, WM_MUTE);
+       nval = (oval & ~0x10) | (ucontrol->value.integer.value[0] ? 0 : 0x10);
+       if ((change = (nval != oval)))
+               wm_put(ice, WM_MUTE, nval);
        snd_ice1712_restore_gpio_status(ice);
 
        return change;
 }
 
+/*
+ * Master volume attenuation mixer control
+ */
+static int wm_master_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 2;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = WM_VOL_MAX;
+       return 0;
+}
+
+static int wm_master_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       int i;
+       for (i=0; i<2; i++)
+               ucontrol->value.integer.value[i] = ice->spec.aureon.master[i] & ~WM_VOL_MUTE;
+       return 0;
+}
+
+static int wm_master_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       int ch, change = 0;
+
+       snd_ice1712_save_gpio_status(ice);
+       for (ch = 0; ch < 2; ch++) {
+               if (ucontrol->value.integer.value[ch] != ice->spec.aureon.master[ch]) {
+                       int dac;
+                       ice->spec.aureon.master[ch] &= WM_VOL_MUTE;
+                       ice->spec.aureon.master[ch] |= ucontrol->value.integer.value[ch];
+                       for (dac = 0; dac < ice->num_total_dacs; dac += 2)
+                               wm_set_vol(ice, WM_DAC_ATTEN + dac + ch,
+                                          ice->spec.aureon.vol[dac + ch],
+                                          ice->spec.aureon.master[ch]);
+                       change = 1;
+               }
+       }
+       snd_ice1712_restore_gpio_status(ice);
+       return change;
+}
+
 /*
  * DAC volume attenuation mixer control
  */
-static int wm_dac_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+static int wm_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
        int voices = kcontrol->private_value >> 8;
        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
        uinfo->count = voices;
        uinfo->value.integer.min = 0;           /* mute (-101dB) */
-       uinfo->value.integer.max = 101;         /* 0dB */
+       uinfo->value.integer.max = 0x7F;        /* 0dB */
        return 0;
 }
 
-static int wm_dac_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int wm_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
-       int i, idx, ofs, voices;
-       unsigned short vol;
+       int i, ofs, voices;
 
        voices = kcontrol->private_value >> 8;
        ofs = kcontrol->private_value & 0xff;
-       down(&ice->gpio_mutex);
-       for (i = 0; i < voices; i++) {
-               idx  = WM_DAC_ATTEN + ofs + i;
-               vol = wm_get(ice, idx) & 0x7f;
-               if (vol <= 0x1a)
-                       ucontrol->value.integer.value[i] = 0;
-               else
-                       ucontrol->value.integer.value[i] = vol - 0x1a;
-       }
-       up(&ice->gpio_mutex);
+       for (i = 0; i < voices; i++)
+               ucontrol->value.integer.value[i] = ice->spec.aureon.vol[ofs+i] & ~WM_VOL_MUTE;
        return 0;
 }
 
-static int wm_dac_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int wm_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
        int i, idx, ofs, voices;
-       unsigned short ovol, nvol;
        int change = 0;
 
        voices = kcontrol->private_value >> 8;
@@ -258,47 +644,139 @@ static int wm_dac_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontr
        snd_ice1712_save_gpio_status(ice);
        for (i = 0; i < voices; i++) {
                idx  = WM_DAC_ATTEN + ofs + i;
-               nvol = ucontrol->value.integer.value[i] + 0x1a;
-               ovol = wm_get(ice, idx) & 0x7f;
-               if (ovol != nvol) {
-                       if (nvol <= 0x1a && ovol <= 0x1a)
-                               continue;
-                       wm_put(ice, idx, nvol | 0x80); /* zero-detect, prelatch */
-                       wm_put_nocache(ice, idx, nvol | 0x180); /* update */
+               if (ucontrol->value.integer.value[i] != ice->spec.aureon.vol[ofs+i]) {
+                       ice->spec.aureon.vol[ofs+i] &= WM_VOL_MUTE;
+                       ice->spec.aureon.vol[ofs+i] |= ucontrol->value.integer.value[i];
+                       wm_set_vol(ice, idx, ice->spec.aureon.vol[ofs+i],
+                                  ice->spec.aureon.master[i]);
+                       change = 1;
+               }
+       }
+       snd_ice1712_restore_gpio_status(ice);
+       return change;
+}
+
+/*
+ * WM8770 mute control
+ */
+static int wm_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+       uinfo->count = kcontrol->private_value >> 8;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 1;
+       return 0;
+}
+
+static int wm_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       int voices, ofs, i;
+       
+       voices = kcontrol->private_value >> 8;
+       ofs = kcontrol->private_value & 0xFF;
+
+       for (i = 0; i < voices; i++)
+               ucontrol->value.integer.value[i] = (ice->spec.aureon.vol[ofs+i] & WM_VOL_MUTE) ? 0 : 1;
+       return 0;
+}
+
+static int wm_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       int change = 0, voices, ofs, i;
+
+       voices = kcontrol->private_value >> 8;
+       ofs = kcontrol->private_value & 0xFF;
+
+       snd_ice1712_save_gpio_status(ice);
+       for (i = 0; i < voices; i++) {
+               int val = (ice->spec.aureon.vol[ofs + i] & WM_VOL_MUTE) ? 0 : 1;
+               if (ucontrol->value.integer.value[i] != val) {
+                       ice->spec.aureon.vol[ofs + i] &= ~WM_VOL_MUTE;
+                       ice->spec.aureon.vol[ofs + i] |=
+                               ucontrol->value.integer.value[i] ? 0 : WM_VOL_MUTE;
+                       wm_set_vol(ice, ofs + i, ice->spec.aureon.vol[ofs + i],
+                                  ice->spec.aureon.master[i]);
+                       change = 1;
+               }
+       }
+       snd_ice1712_restore_gpio_status(ice);
+
+       return change;
+}
+
+/*
+ * WM8770 master mute control
+ */
+static int wm_master_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+       uinfo->count = 2;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 1;
+       return 0;
+}
+
+static int wm_master_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       
+       ucontrol->value.integer.value[0] = (ice->spec.aureon.master[0] & WM_VOL_MUTE) ? 0 : 1;
+       ucontrol->value.integer.value[1] = (ice->spec.aureon.master[1] & WM_VOL_MUTE) ? 0 : 1;
+       return 0;
+}
+
+static int wm_master_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       int change = 0, i;
+
+       snd_ice1712_save_gpio_status(ice);
+       for (i = 0; i < 2; i++) {
+               int val = (ice->spec.aureon.master[i] & WM_VOL_MUTE) ? 0 : 1;
+               if (ucontrol->value.integer.value[i] != val) {
+                       int dac;
+                       ice->spec.aureon.master[i] &= ~WM_VOL_MUTE;
+                       ice->spec.aureon.master[i] |=
+                               ucontrol->value.integer.value[i] ? 0 : WM_VOL_MUTE;
+                       for (dac = 0; dac < ice->num_total_dacs; dac += 2)
+                               wm_set_vol(ice, WM_DAC_ATTEN + dac + i,
+                                          ice->spec.aureon.vol[dac + i],
+                                          ice->spec.aureon.master[i]);
                        change = 1;
                }
        }
        snd_ice1712_restore_gpio_status(ice);
+
        return change;
 }
 
 /* digital master volume */
-#define MASTER_0dB 0xff
-#define MASTER_RES 128 /* -64dB */
-#define MASTER_MIN (MASTER_0dB - MASTER_RES)
-static int wm_master_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+#define PCM_0dB 0xff
+#define PCM_RES 128    /* -64dB */
+#define PCM_MIN (PCM_0dB - PCM_RES)
+static int wm_pcm_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
        uinfo->count = 1;
        uinfo->value.integer.min = 0;           /* mute (-64dB) */
-       uinfo->value.integer.max = MASTER_RES;  /* 0dB */
+       uinfo->value.integer.max = PCM_RES;     /* 0dB */
        return 0;
 }
 
-static int wm_master_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int wm_pcm_vol_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
        unsigned short val;
 
        down(&ice->gpio_mutex);
        val = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) & 0xff;
-       val = val > MASTER_MIN ? (val - MASTER_MIN) : 0;
+       val = val > PCM_MIN ? (val - PCM_MIN) : 0;
        ucontrol->value.integer.value[0] = val;
        up(&ice->gpio_mutex);
        return 0;
 }
 
-static int wm_master_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int wm_pcm_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
 {
        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
        unsigned short ovol, nvol;
@@ -306,7 +784,7 @@ static int wm_master_vol_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco
 
        snd_ice1712_save_gpio_status(ice);
        nvol = ucontrol->value.integer.value[0];
-       nvol = (nvol ? (nvol + MASTER_MIN) : 0) & 0xff;
+       nvol = (nvol ? (nvol + PCM_MIN) : 0) & 0xff;
        ovol = wm_get(ice, WM_DAC_DIG_MASTER_ATTEN) & 0xff;
        if (ovol != nvol) {
                wm_put(ice, WM_DAC_DIG_MASTER_ATTEN, nvol); /* prelatch */
@@ -355,7 +833,7 @@ static int wm_adc_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * uco
                old = wm_get(ice, WM_ADC_GAIN + i);
                new = (~ucontrol->value.integer.value[i]<<5&0x20) | (old&~0x20);
                if (new != old) {
-                       wm_put(ice, snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)+WM_ADC_GAIN, new);
+                       wm_put(ice, WM_ADC_GAIN + i, new);
                        change = 1;
                }
        }
@@ -425,12 +903,32 @@ static int wm_adc_mux_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
                "Mic",          //AIN4
                "AC97"          //AIN5
        };
+       static char *universe_texts[] = {
+               "Aux1",         //AIN1
+               "CD",           //AIN2
+               "Phono",        //AIN3
+               "Line",         //AIN4
+               "Aux2",         //AIN5
+               "Mic",          //AIN6
+               "Aux3",         //AIN7
+               "AC97"          //AIN8
+       };
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = 2;
-       uinfo->value.enumerated.items = 5;
-       if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-               uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE) {
+               uinfo->value.enumerated.items = 8;
+               if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                       uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+               strcpy(uinfo->value.enumerated.name, universe_texts[uinfo->value.enumerated.item]);
+       }
+       else {
+               uinfo->value.enumerated.items = 5;
+               if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                       uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+               strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       }
        return 0;
 }
 
@@ -465,6 +963,154 @@ static int wm_adc_mux_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucont
        return 0;
 }
 
+/*
+ * CS8415 Input mux
+ */
+static int aureon_cs8415_mux_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       static char *aureon_texts[] = {
+               "CD",           //RXP0
+               "Optical"       //RXP1
+       };
+       static char *prodigy_texts[] = {
+               "CD",
+               "Coax"
+       };
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 2;
+       if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+               uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+       if (ice->eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)
+               strcpy(uinfo->value.enumerated.name, prodigy_texts[uinfo->value.enumerated.item]);
+       else
+               strcpy(uinfo->value.enumerated.name, aureon_texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int aureon_cs8415_mux_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+       //snd_ice1712_save_gpio_status(ice);
+       //val = aureon_cs8415_get(ice, CS8415_CTRL2);
+       ucontrol->value.integer.value[0] = ice->spec.aureon.cs8415_mux;
+       //snd_ice1712_restore_gpio_status(ice);
+       return 0;
+}
+
+static int aureon_cs8415_mux_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned short oval, nval;
+       int change;
+
+       snd_ice1712_save_gpio_status(ice);
+       oval = aureon_cs8415_get(ice, CS8415_CTRL2);
+       nval = oval & ~0x07;
+       nval |= ucontrol->value.integer.value[0] & 7;
+       change = (oval != nval);
+       if (change)
+               aureon_cs8415_put(ice, CS8415_CTRL2, nval);
+       snd_ice1712_restore_gpio_status(ice);
+       ice->spec.aureon.cs8415_mux = ucontrol->value.integer.value[0];
+       return change;
+}
+
+static int aureon_cs8415_rate_info (snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 1;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 192000;
+       return 0;
+}
+
+static int aureon_cs8415_rate_get (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned char ratio;
+       ratio = aureon_cs8415_get(ice, CS8415_RATIO);
+       ucontrol->value.integer.value[0] = (int)((unsigned int)ratio * 750);
+       return 0;
+}
+
+/*
+ * CS8415A Mute
+ */
+static int aureon_cs8415_mute_info (snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+       uinfo->count = 1;
+       return 0;
+}
+
+static int aureon_cs8415_mute_get (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       snd_ice1712_save_gpio_status(ice);
+       ucontrol->value.integer.value[0] = (aureon_cs8415_get(ice, CS8415_CTRL1) & 0x20) ? 0 : 1;
+       snd_ice1712_restore_gpio_status(ice);
+       return 0;
+}
+
+static int aureon_cs8415_mute_put (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       unsigned char oval, nval;
+       int change;
+       snd_ice1712_save_gpio_status(ice);
+       oval = aureon_cs8415_get(ice, CS8415_CTRL1);
+       if (ucontrol->value.integer.value[0])
+               nval = oval & ~0x20;
+       else
+               nval = oval | 0x20;
+       if ((change = (oval != nval)))
+               aureon_cs8415_put(ice, CS8415_CTRL1, nval);
+       snd_ice1712_restore_gpio_status(ice);
+       return change;
+}
+
+/*
+ * CS8415A Q-Sub info
+ */
+static int aureon_cs8415_qsub_info (snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
+       uinfo->count = 10;
+       return 0;
+}
+
+static int aureon_cs8415_qsub_get (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) {
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+       
+       snd_ice1712_save_gpio_status(ice);
+       aureon_cs8415_read(ice, CS8415_QSUB, ucontrol->value.bytes.data, 10);
+       snd_ice1712_restore_gpio_status(ice);
+
+       return 0;
+}
+
+static int aureon_cs8415_spdif_info (snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) {
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
+       uinfo->count = 1;
+       return 0;
+}
+
+static int aureon_cs8415_mask_get (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) {
+       memset(ucontrol->value.iec958.status, 0xFF, 24);
+       return 0;
+}
+
+static int aureon_cs8415_spdif_get (snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) {
+       ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+       snd_ice1712_save_gpio_status(ice);
+       aureon_cs8415_read(ice, CS8415_C_BUFFER, ucontrol->value.iec958.status, 24);
+       snd_ice1712_restore_gpio_status(ice);
+       return 0;
+}
+
 /*
  * Headphone Amplifier
  */
@@ -587,44 +1233,98 @@ static int aureon_oversampling_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
  */
 
 static snd_kcontrol_new_t aureon_dac_controls[] __devinitdata = {
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Master Playback Switch",
+               .info = wm_master_mute_info,
+               .get = wm_master_mute_get,
+               .put = wm_master_mute_put
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Master Playback Volume",
+               .info = wm_master_vol_info,
+               .get = wm_master_vol_get,
+               .put = wm_master_vol_put
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Front Playback Switch",
+               .info = wm_mute_info,
+               .get = wm_mute_get,
+               .put = wm_mute_put,
+               .private_value = (2 << 8) | 0
+       },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Front Playback Volume",
-               .info = wm_dac_vol_info,
-               .get = wm_dac_vol_get,
-               .put = wm_dac_vol_put,
+               .info = wm_vol_info,
+               .get = wm_vol_get,
+               .put = wm_vol_put,
                .private_value = (2 << 8) | 0
        },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Rear Playback Switch",
+               .info = wm_mute_info,
+               .get = wm_mute_get,
+               .put = wm_mute_put,
+               .private_value = (2 << 8) | 2
+       },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Rear Playback Volume",
-               .info = wm_dac_vol_info,
-               .get = wm_dac_vol_get,
-               .put = wm_dac_vol_put,
+               .info = wm_vol_info,
+               .get = wm_vol_get,
+               .put = wm_vol_put,
                .private_value = (2 << 8) | 2
        },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Center Playback Switch",
+               .info = wm_mute_info,
+               .get = wm_mute_get,
+               .put = wm_mute_put,
+               .private_value = (1 << 8) | 4
+       },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Center Playback Volume",
-               .info = wm_dac_vol_info,
-               .get = wm_dac_vol_get,
-               .put = wm_dac_vol_put,
+               .info = wm_vol_info,
+               .get = wm_vol_get,
+               .put = wm_vol_put,
                .private_value = (1 << 8) | 4
        },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "LFE Playback Switch",
+               .info = wm_mute_info,
+               .get = wm_mute_get,
+               .put = wm_mute_put,
+               .private_value = (1 << 8) | 5
+       },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "LFE Playback Volume",
-               .info = wm_dac_vol_info,
-               .get = wm_dac_vol_get,
-               .put = wm_dac_vol_put,
+               .info = wm_vol_info,
+               .get = wm_vol_get,
+               .put = wm_vol_put,
                .private_value = (1 << 8) | 5
        },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Side Playback Switch",
+               .info = wm_mute_info,
+               .get = wm_mute_get,
+               .put = wm_mute_put,
+               .private_value = (2 << 8) | 6
+       },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Side Playback Volume",
-               .info = wm_dac_vol_info,
-               .get = wm_dac_vol_get,
-               .put = wm_dac_vol_put,
+               .info = wm_vol_info,
+               .get = wm_vol_get,
+               .put = wm_vol_put,
                .private_value = (2 << 8) | 6
        }
 };
@@ -632,17 +1332,17 @@ static snd_kcontrol_new_t aureon_dac_controls[] __devinitdata = {
 static snd_kcontrol_new_t wm_controls[] __devinitdata = {
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "Master Playback Switch",
-               .info = wm_dac_mute_info,
-               .get = wm_dac_mute_get,
-               .put = wm_dac_mute_put,
+               .name = "PCM Playback Switch",
+               .info = wm_pcm_mute_info,
+               .get = wm_pcm_mute_get,
+               .put = wm_pcm_mute_put
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "Master Playback Volume",
-               .info = wm_master_vol_info,
-               .get = wm_master_vol_get,
-               .put = wm_master_vol_put,
+               .name = "PCM Playback Volume",
+               .info = wm_pcm_vol_info,
+               .get = wm_pcm_vol_get,
+               .put = wm_pcm_vol_put
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -650,14 +1350,13 @@ static snd_kcontrol_new_t wm_controls[] __devinitdata = {
                .info = wm_adc_mute_info,
                .get = wm_adc_mute_get,
                .put = wm_adc_mute_put,
-
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Capture Volume",
                .info = wm_adc_vol_info,
                .get = wm_adc_vol_get,
-               .put = wm_adc_vol_put,
+               .put = wm_adc_vol_put
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -665,10 +1364,11 @@ static snd_kcontrol_new_t wm_controls[] __devinitdata = {
                .info = wm_adc_mux_info,
                .get = wm_adc_mux_get,
                .put = wm_adc_mux_put,
+               .private_value = 5
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-               .name = "Headphone Amplifier Switch",
+               .name = "External Amplifier",
                .info = aureon_hpamp_info,
                .get = aureon_hpamp_get,
                .put = aureon_hpamp_put
@@ -686,10 +1386,252 @@ static snd_kcontrol_new_t wm_controls[] __devinitdata = {
                .info = aureon_oversampling_info,
                .get = aureon_oversampling_get,
                .put = aureon_oversampling_put
-       },
+       }
+};
+
+static snd_kcontrol_new_t ac97_controls[] __devinitdata = {
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "AC97 Playback Switch",
+               .info = aureon_ac97_mmute_info,
+               .get = aureon_ac97_mmute_get,
+               .put = aureon_ac97_mmute_put,
+               .private_value = AC97_MASTER
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "AC97 Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_MASTER|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "CD Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_CD
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "CD Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_CD|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Aux Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_AUX,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Aux Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_AUX|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_LINE
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_LINE|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_MIC
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_MIC
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Boost (+20dB)",
+               .info = aureon_ac97_micboost_info,
+               .get = aureon_ac97_micboost_get,
+               .put = aureon_ac97_micboost_put
+       }
+};
+
+static snd_kcontrol_new_t universe_ac97_controls[] __devinitdata = {
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "AC97 Playback Switch",
+               .info = aureon_ac97_mmute_info,
+               .get = aureon_ac97_mmute_get,
+               .put = aureon_ac97_mmute_put,
+               .private_value = AC97_MASTER
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "AC97 Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_MASTER|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "CD Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_AUX
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "CD Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_AUX|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Phono Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_CD,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Phono Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_CD|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_LINE
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Line Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_LINE|AUREON_AC97_STEREO
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_MIC
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_MIC
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Mic Boost (+20dB)",
+               .info = aureon_ac97_micboost_info,
+               .get = aureon_ac97_micboost_get,
+               .put = aureon_ac97_micboost_put
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Aux Playback Switch",
+               .info = aureon_ac97_mute_info,
+               .get = aureon_ac97_mute_get,
+               .put = aureon_ac97_mute_put,
+               .private_value = AC97_VIDEO,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Aux Playback Volume",
+               .info = aureon_ac97_vol_info,
+               .get = aureon_ac97_vol_get,
+               .put = aureon_ac97_vol_put,
+               .private_value = AC97_VIDEO|AUREON_AC97_STEREO
+       }
 };
 
+       
+static snd_kcontrol_new_t cs8415_controls[] __devinitdata = {
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH),
+               .info = aureon_cs8415_mute_info,
+               .get = aureon_cs8415_mute_get,
+               .put = aureon_cs8415_mute_put
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Source",
+               .info = aureon_cs8415_mux_info,
+               .get = aureon_cs8415_mux_get,
+               .put = aureon_cs8415_mux_put,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .name = SNDRV_CTL_NAME_IEC958("Q-subcode ",CAPTURE,DEFAULT),
+               .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+               .info = aureon_cs8415_qsub_info,
+               .get = aureon_cs8415_qsub_get,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,MASK),
+               .access = SNDRV_CTL_ELEM_ACCESS_READ,
+               .info = aureon_cs8415_spdif_info,
+               .get = aureon_cs8415_mask_get
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,DEFAULT),
+               .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+               .info = aureon_cs8415_spdif_info,
+               .get = aureon_cs8415_spdif_get
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+               .name = SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Rate",
+               .access =SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+               .info = aureon_cs8415_rate_info,
+               .get = aureon_cs8415_rate_get
+       }
+};
 
 static int __devinit aureon_add_controls(ice1712_t *ice)
 {
        unsigned int i, counts;
@@ -697,7 +1639,7 @@ static int __devinit aureon_add_controls(ice1712_t *ice)
 
        counts = ARRAY_SIZE(aureon_dac_controls);
        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON51_SKY)
-               counts--; /* no side */
+               counts -= 2; /* no side */
        for (i = 0; i < counts; i++) {
                err = snd_ctl_add(ice->card, snd_ctl_new1(&aureon_dac_controls[i], ice));
                if (err < 0)
@@ -709,6 +1651,43 @@ static int __devinit aureon_add_controls(ice1712_t *ice)
                if (err < 0)
                        return err;
        }
+       
+       if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE) {
+               for (i = 0; i < ARRAY_SIZE(universe_ac97_controls); i++) {
+                       err = snd_ctl_add(ice->card, snd_ctl_new1(&universe_ac97_controls[i], ice));
+                       if (err < 0)
+                               return err;
+               }
+       }
+       else {
+               for (i = 0; i < ARRAY_SIZE(ac97_controls); i++) {
+                       err = snd_ctl_add(ice->card, snd_ctl_new1(&ac97_controls[i], ice));
+                       if (err < 0)
+                               return err;
+               }
+       }
+
+       {
+               unsigned char id;
+               snd_ice1712_save_gpio_status(ice);
+               id = aureon_cs8415_get(ice, CS8415_ID);
+               if (id != 0x41)
+                       snd_printk("No CS8415 chip. Skipping CS8415 controls.\n");
+               else if ((id & 0x0F) != 0x01)
+                       snd_printk("Detected unsupported CS8415 rev. (%c)\n", (char)((id & 0x0F) + 'A' - 1));
+               else {
+                       for (i = 0; i< ARRAY_SIZE(cs8415_controls); i++) {
+                               snd_kcontrol_t *kctl;
+                               err = snd_ctl_add(ice->card, (kctl = snd_ctl_new1(&cs8415_controls[i], ice)));
+                               if (err < 0)
+                                       return err;
+                               if (i > 1)
+                                       kctl->id.device = ice->pcm->device;
+                       }
+               }
+               snd_ice1712_restore_gpio_status(ice);
+       }
+       
        return 0;
 }
 
@@ -720,9 +1699,9 @@ static int __devinit aureon_init(ice1712_t *ice)
 {
        static unsigned short wm_inits_aureon[] = {
                /* These come first to reduce init pop noise */
-               0x1b, 0x000,            /* ADC Mux */
-               0x1c, 0x009,            /* Out Mux1 */
-               0x1d, 0x009,            /* Out Mux2 */
+               0x1b, 0x044,            /* ADC Mux (AC'97 source) */
+               0x1c, 0x00B,            /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
+               0x1d, 0x009,            /* Out Mux2 (VOUT2 = DAC, VOUT3 = DAC) */
 
                0x18, 0x000,            /* All power-up */
 
@@ -798,14 +1777,14 @@ static int __devinit aureon_init(ice1712_t *ice)
        };
        static unsigned short cs_inits[] = {
                0x0441, /* RUN */
-               0x0100, /* no mute */
-               0x0200, /* */
-               0x0600, /* slave, 24bit */
+               0x0180, /* no mute, OMCK output on RMCK pin */
+               0x0201, /* S/PDIF source on RXP1 */
+               0x0605, /* slave, 24bit, MSB on second OSCLK, SDOUT for right channel when OLRCK is high */
                (unsigned short)-1
        };
        unsigned int tmp;
        unsigned short *p;
-       unsigned int cscs;
+       int err, i;
 
        if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON51_SKY) {
                ice->num_total_dacs = 6;
@@ -816,28 +1795,26 @@ static int __devinit aureon_init(ice1712_t *ice)
                ice->num_total_adcs = 2;
        }
 
-       /* to remeber the register values */
+       /* to remeber the register values of CS8415 */
        ice->akm = kcalloc(1, sizeof(akm4xxx_t), GFP_KERNEL);
        if (! ice->akm)
                return -ENOMEM;
        ice->akm_codecs = 1;
+       
+       if ((err = aureon_ac97_init(ice)) != 0)
+               return err;
 
-       if (ice->eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)
-               cscs = PRODIGY_CS8415_CS;
-       else
-               cscs = AUREON_CS8415_CS;
-
-       snd_ice1712_gpio_set_dir(ice, 0xbfffff); /* fix this for the time being */
+       snd_ice1712_gpio_set_dir(ice, 0x5fffff); /* fix this for the time being */
 
        /* reset the wm codec as the SPI mode */
        snd_ice1712_save_gpio_status(ice);
-       snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RESET|AUREON_WM_CS|
-                                        cscs|AUREON_HP_SEL));
+       snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RESET|AUREON_WM_CS|AUREON_CS8415_CS|AUREON_HP_SEL));
+
        tmp = snd_ice1712_gpio_read(ice);
        tmp &= ~AUREON_WM_RESET;
        snd_ice1712_gpio_write(ice, tmp);
        udelay(1);
-       tmp |= AUREON_WM_CS | cscs;
+       tmp |= AUREON_WM_CS | AUREON_CS8415_CS;
        snd_ice1712_gpio_write(ice, tmp);
        udelay(1);
        tmp |= AUREON_WM_RESET;
@@ -854,12 +1831,19 @@ static int __devinit aureon_init(ice1712_t *ice)
 
        /* initialize CS8415A codec */
        for (p = cs_inits; *p != (unsigned short)-1; p++)
-               aureon_spi_write(ice, cscs,
-                                *p | 0x200000, 24);
+               aureon_spi_write(ice, AUREON_CS8415_CS, *p | 0x200000, 24);
+       ice->spec.aureon.cs8415_mux = 1;
 
        aureon_set_headphone_amp(ice, 1);
 
        snd_ice1712_restore_gpio_status(ice);
+       
+       ice->spec.aureon.master[0] = WM_VOL_MUTE;
+       ice->spec.aureon.master[1] = WM_VOL_MUTE;
+       for (i = 0; i < ice->num_total_dacs; i++) {
+               ice->spec.aureon.vol[i] = WM_VOL_MUTE;
+               wm_set_vol(ice, i, ice->spec.aureon.vol[i], ice->spec.aureon.master[i % 2]);
+       }
 
        return 0;
 }
@@ -873,14 +1857,14 @@ static int __devinit aureon_init(ice1712_t *ice)
 static unsigned char aureon51_eeprom[] __devinitdata = {
        0x0a,   /* SYSCONF: clock 512, spdif-in/ADC, 3DACs */
        0x80,   /* ACLINK: I2S */
-       0xf8,   /* I2S: vol, 96k, 24bit, 192k */
+       0xfc,   /* I2S: vol, 96k, 24bit, 192k */
        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
        0xff,   /* GPIO_DIR */
        0xff,   /* GPIO_DIR1 */
-       0xbf,   /* GPIO_DIR2 */
-       0xff,   /* GPIO_MASK */
-       0xff,   /* GPIO_MASK1 */
-       0xff,   /* GPIO_MASK2 */
+       0x5f,   /* GPIO_DIR2 */
+       0x00,   /* GPIO_MASK */
+       0x00,   /* GPIO_MASK1 */
+       0x00,   /* GPIO_MASK2 */
        0x00,   /* GPIO_STATE */
        0x00,   /* GPIO_STATE1 */
        0x00,   /* GPIO_STATE2 */
@@ -889,11 +1873,11 @@ static unsigned char aureon51_eeprom[] __devinitdata = {
 static unsigned char aureon71_eeprom[] __devinitdata = {
        0x0b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */
        0x80,   /* ACLINK: I2S */
-       0xf8,   /* I2S: vol, 96k, 24bit, 192k */
+       0xfc,   /* I2S: vol, 96k, 24bit, 192k */
        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
        0xff,   /* GPIO_DIR */
        0xff,   /* GPIO_DIR1 */
-       0xbf,   /* GPIO_DIR2 */
+       0x5f,   /* GPIO_DIR2 */
        0x00,   /* GPIO_MASK */
        0x00,   /* GPIO_MASK1 */
        0x00,   /* GPIO_MASK2 */
@@ -905,11 +1889,11 @@ static unsigned char aureon71_eeprom[] __devinitdata = {
 static unsigned char prodigy71_eeprom[] __devinitdata = {
        0x0b,   /* SYSCONF: clock 512, spdif-in/ADC, 4DACs */
        0x80,   /* ACLINK: I2S */
-       0xf8,   /* I2S: vol, 96k, 24bit, 192k */
+       0xfc,   /* I2S: vol, 96k, 24bit, 192k */
        0xc3,   /* SPDIF: out-en, out-int, spdif-in */
        0xff,   /* GPIO_DIR */
        0xff,   /* GPIO_DIR1 */
-       0xbf,   /* GPIO_DIR2 */
+       0x5f,   /* GPIO_DIR2 */
        0x00,   /* GPIO_MASK */
        0x00,   /* GPIO_MASK1 */
        0x00,   /* GPIO_MASK2 */
@@ -943,12 +1927,12 @@ struct snd_ice1712_card_info snd_vt1724_aureon_cards[] __devinitdata = {
        {
                .subvendor = VT1724_SUBDEVICE_AUREON71_UNIVERSE,
                .name = "Terratec Aureon 7.1-Universe",
-               /* model not needed - identical with 7.1-Space */
+               .model = "universe",
                .chip_init = aureon_init,
                .build_controls = aureon_add_controls,
                .eeprom_size = sizeof(aureon71_eeprom),
                .eeprom_data = aureon71_eeprom,
-               .driver = "Aureon71",
+               .driver = "Aureon71Universe",
        },
        {
                .subvendor = VT1724_SUBDEVICE_PRODIGY71,