1 files changed, 245 insertions, 228 deletions

diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index d491fd6c0be2..54cad38ec30a 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -22,20 +22,26 @@
  *
  * CMI8788:
  *
- * SPI 0 -> 1st PCM1796 (front)
- * SPI 1 -> 2nd PCM1796 (surround)
- * SPI 2 -> 3rd PCM1796 (center/LFE)
- * SPI 4 -> 4th PCM1796 (back)
+ *   SPI 0 -> 1st PCM1796 (front)
+ *   SPI 1 -> 2nd PCM1796 (surround)
+ *   SPI 2 -> 3rd PCM1796 (center/LFE)
+ *   SPI 4 -> 4th PCM1796 (back)
  *
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 5 <- external power present (D2X only)
- * GPIO 7 -> ALT
- * GPIO 8 -> enable output to speakers
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 5 <- external power present (D2X only)
+ *   GPIO 7 -> ALT
+ *   GPIO 8 -> enable output to speakers
  *
  * CM9780:
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN   <- aux
+ *   VIDEO_IN <- CD
+ *   FMIC_IN  <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  */
 
 /*
@@ -44,52 +50,53 @@
  *
  * CMI8788:
  *
- * I²C <-> PCM1796 (front)
+ *   I²C <-> PCM1796 (addr 1001100) (front)
  *
- * GPI 0 <- external power present
+ *   GPI 0 <- external power present
  *
- * GPIO 0 -> enable output to speakers
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 0 -> enable HDMI (0) or speaker (1) output
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 4 <- daughterboard detection
+ *   GPIO 5 <- daughterboard detection
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> ?
+ *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
- * TXD -> HDMI controller
- * RXD <- HDMI controller
- *
- * PCM1796 front: AD1,0 <- 0,0
+ *   UART <-> HDMI controller
  *
  * CM9780:
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN <- aux
+ *   CD_IN  <- CD
+ *   MIC_IN <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  *
  * no daughterboard
  * ----------------
  *
- * GPIO 4 <- 1
+ *   GPIO 4 <- 1
  *
  * H6 daughterboard
  * ----------------
  *
- * GPIO 4 <- 0
- * GPIO 5 <- 0
- *
- * I²C <-> PCM1796 (surround)
- *     <-> PCM1796 (center/LFE)
- *     <-> PCM1796 (back)
+ *   GPIO 4 <- 0
+ *   GPIO 5 <- 0
  *
- * PCM1796 surround:   AD1,0 <- 0,1
- * PCM1796 center/LFE: AD1,0 <- 1,0
- * PCM1796 back:       AD1,0 <- 1,1
+ *   I²C <-> PCM1796 (addr 1001101) (surround)
+ *       <-> PCM1796 (addr 1001110) (center/LFE)
+ *       <-> PCM1796 (addr 1001111) (back)
  *
  * unknown daughterboard
  * ---------------------
  *
- * GPIO 4 <- 0
- * GPIO 5 <- 1
- *
- * I²C <-> CS4362A (surround, center/LFE, back)
+ *   GPIO 4 <- 0
+ *   GPIO 5 <- 1
  *
- * CS4362A: AD0 <- 0
+ *   I²C <-> CS4362A (addr 0011000) (surround, center/LFE, back)
  */
 
 /*
@@ -98,32 +105,35 @@
  *
  * CMI8788:
  *
- * I²C <-> PCM1792A
- *     <-> CS2000 (ST only)
+ *   I²C <-> PCM1792A (addr 1001100)
+ *       <-> CS2000 (addr 1001110) (ST only)
  *
- * ADC1 MCLK -> REF_CLK of CS2000 (ST only)
+ *   ADC1 MCLK -> REF_CLK of CS2000 (ST only)
  *
- * GPI 0 <- external power present (STX only)
+ *   GPI 0 <- external power present (STX only)
  *
- * GPIO 0 -> enable output to speakers
- * GPIO 1 -> route HP to front panel (0) or rear jack (1)
- * GPIO 2 -> M0 of CS5381
- * GPIO 3 -> M1 of CS5381
- * GPIO 7 -> route output to speaker jacks (0) or HP (1)
- * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
+ *   GPIO 0 -> enable output to speakers
+ *   GPIO 1 -> route HP to front panel (0) or rear jack (1)
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 4 <- daughterboard detection
+ *   GPIO 5 <- daughterboard detection
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> route output to speaker jacks (0) or HP (1)
+ *   GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
  * PCM1792A:
  *
- * AD1,0 <- 0,0
- * SCK <- CLK_OUT of CS2000 (ST only)
+ *   SCK <- CLK_OUT of CS2000 (ST only)
  *
- * CS2000:
+ * CM9780:
  *
- * AD0 <- 0
+ *   LINE_OUT -> input of ADC
  *
- * CM9780:
+ *   AUX_IN <- aux
+ *   MIC_IN <- mic
  *
- * GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
  *
  * H6 daughterboard
  * ----------------
@@ -133,15 +143,39 @@
  */
 
 /*
- * Xonar HDAV1.3 Slim
- * ------------------
+ * Xonar Xense
+ * -----------
  *
  * CMI8788:
  *
- * GPIO 1 -> enable output
+ *   I²C <-> PCM1796 (addr 1001100) (front)
+ *       <-> CS4362A (addr 0011000) (surround, center/LFE, back)
+ *       <-> CS2000 (addr 1001110)
+ *
+ *   ADC1 MCLK -> REF_CLK of CS2000
+ *
+ *   GPI 0 <- external power present
+ *
+ *   GPIO 0 -> enable output
+ *   GPIO 1 -> route HP to front panel (0) or rear jack (1)
+ *   GPIO 2 -> M0 of CS5381
+ *   GPIO 3 -> M1 of CS5381
+ *   GPIO 4 -> enable output
+ *   GPIO 5 -> enable output
+ *   GPIO 6 -> ?
+ *   GPIO 7 -> route output to HP (0) or speaker (1)
+ *   GPIO 8 -> route input jack to mic-in (0) or line-in (1)
  *
- * TXD -> HDMI controller
- * RXD <- HDMI controller
+ * CM9780:
+ *
+ *   LINE_OUT -> input of ADC
+ *
+ *   AUX_IN   <- aux
+ *   VIDEO_IN <- ?
+ *   FMIC_IN  <- mic
+ *
+ *   GPO 0 -> route line-in (0) or AC97 output (1) to CS5381 input
+ *   GPO 1 -> route mic-in from input jack (0) or front panel header (1)
  */
 
 #include <linux/pci.h>
@@ -150,6 +184,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
+#include <sound/info.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
@@ -167,12 +202,14 @@
 #define GPIO_INPUT_ROUTE        0x0100
 
 #define GPIO_HDAV_OUTPUT_ENABLE 0x0001
+#define GPIO_HDAV_MAGIC         0x00c0
 
 #define GPIO_DB_MASK            0x0030
 #define GPIO_DB_H6              0x0000
 
 #define GPIO_ST_OUTPUT_ENABLE   0x0001
 #define GPIO_ST_HP_REAR         0x0002
+#define GPIO_ST_MAGIC           0x0040
 #define GPIO_ST_HP              0x0080
 
 #define I2C_DEVICE_PCM1796(i)   (0x98 + ((i) << 1))     /* 10011, ii, /W=0 */
@@ -186,11 +223,12 @@ struct xonar_pcm179x {
         unsigned int dacs;
         u8 pcm1796_regs[4][5];
         unsigned int current_rate;
-        bool os_128;
+        bool h6;
         bool hp_active;
         s8 hp_gain_offset;
         bool has_cs2000;
-        u8 cs2000_fun_cfg_1;
+        u8 cs2000_regs[0x1f];
+        bool broken_i2c;
 };
 
 struct xonar_hdav {
@@ -249,16 +287,14 @@ static void cs2000_write(struct oxygen *chip, u8 reg, u8 value)
         struct xonar_pcm179x *data = chip->model_data;
 
         oxygen_write_i2c(chip, I2C_DEVICE_CS2000, reg, value);
-        if (reg == CS2000_FUN_CFG_1)
-                data->cs2000_fun_cfg_1 = value;
+        data->cs2000_regs[reg] = value;
 }
 
 static void cs2000_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
-        if (reg != CS2000_FUN_CFG_1 ||
-            value != data->cs2000_fun_cfg_1)
+        if (value != data->cs2000_regs[reg])
                 cs2000_write(chip, reg, value);
 }
 
@@ -268,6 +304,7 @@ static void pcm1796_registers_init(struct oxygen *chip)
         unsigned int i;
         s8 gain_offset;
 
+        msleep(1);
         gain_offset = data->hp_active ? data->hp_gain_offset : 0;
         for (i = 0; i < data->dacs; ++i) {
                 /* set ATLD before ATL/ATR */
@@ -282,6 +319,7 @@ static void pcm1796_registers_init(struct oxygen *chip)
                 pcm1796_write(chip, i, 20,
                               data->pcm1796_regs[0][20 - PCM1796_REG_BASE]);
                 pcm1796_write(chip, i, 21, 0);
+                gain_offset = 0;
         }
 }
 
@@ -290,10 +328,11 @@ static void pcm1796_init(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE |
-                PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+                PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
         data->pcm1796_regs[0][19 - PCM1796_REG_BASE] =
                 PCM1796_FLT_SHARP | PCM1796_ATS_1;
-        data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = PCM1796_OS_64;
+        data->pcm1796_regs[0][20 - PCM1796_REG_BASE] =
+                data->h6 ? PCM1796_OS_64 : PCM1796_OS_128;
         pcm1796_registers_init(chip);
         data->current_rate = 48000;
 }
@@ -339,18 +378,20 @@ static void xonar_hdav_init(struct oxygen *chip)
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
                        OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
+                       OXYGEN_2WIRE_SPEED_STANDARD);
 
         data->pcm179x.generic.anti_pop_delay = 100;
         data->pcm179x.generic.output_enable_bit = GPIO_HDAV_OUTPUT_ENABLE;
         data->pcm179x.generic.ext_power_reg = OXYGEN_GPI_DATA;
         data->pcm179x.generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
         data->pcm179x.generic.ext_power_bit = GPI_EXT_POWER;
-        data->pcm179x.dacs = chip->model.private_data ? 4 : 1;
+        data->pcm179x.dacs = chip->model.dac_channels_mixer / 2;
+        data->pcm179x.h6 = chip->model.dac_channels_mixer > 2;
 
         pcm1796_init(chip);
 
-        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_HDAV_MAGIC | GPIO_INPUT_ROUTE);
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_INPUT_ROUTE);
 
         xonar_init_cs53x1(chip);
@@ -367,7 +408,7 @@ static void xonar_st_init_i2c(struct oxygen *chip)
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
                        OXYGEN_2WIRE_INTERRUPT_MASK |
-                       OXYGEN_2WIRE_SPEED_FAST);
+                       OXYGEN_2WIRE_SPEED_STANDARD);
 }
 
 static void xonar_st_init_common(struct oxygen *chip)
@@ -375,13 +416,14 @@ static void xonar_st_init_common(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE;
-        data->dacs = chip->model.private_data ? 4 : 1;
+        data->dacs = chip->model.dac_channels_mixer / 2;
         data->hp_gain_offset = 2*-18;
 
         pcm1796_init(chip);
 
         oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                          GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
+                          GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR |
+                          GPIO_ST_MAGIC | GPIO_ST_HP);
         oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
                             GPIO_INPUT_ROUTE | GPIO_ST_HP_REAR | GPIO_ST_HP);
 
@@ -410,9 +452,11 @@ static void cs2000_registers_init(struct oxygen *chip)
         cs2000_write(chip, CS2000_RATIO_0 + 1, 0x10);
         cs2000_write(chip, CS2000_RATIO_0 + 2, 0x00);
         cs2000_write(chip, CS2000_RATIO_0 + 3, 0x00);
-        cs2000_write(chip, CS2000_FUN_CFG_1, data->cs2000_fun_cfg_1);
+        cs2000_write(chip, CS2000_FUN_CFG_1,
+                     data->cs2000_regs[CS2000_FUN_CFG_1]);
         cs2000_write(chip, CS2000_FUN_CFG_2, 0);
         cs2000_write(chip, CS2000_GLOBAL_CFG, CS2000_EN_DEV_CFG_2);
+        msleep(3); /* PLL lock delay */
 }
 
 static void xonar_st_init(struct oxygen *chip)
@@ -420,13 +464,18 @@ static void xonar_st_init(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         data->generic.anti_pop_delay = 100;
+        data->h6 = chip->model.dac_channels_mixer > 2;
         data->has_cs2000 = 1;
-        data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1;
+        data->cs2000_regs[CS2000_FUN_CFG_1] = CS2000_REF_CLK_DIV_1;
+        data->broken_i2c = true;
 
         oxygen_write16(chip, OXYGEN_I2S_A_FORMAT,
-                       OXYGEN_RATE_48000 | OXYGEN_I2S_FORMAT_I2S |
-                       OXYGEN_I2S_MCLK_128 | OXYGEN_I2S_BITS_16 |
-                       OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64);
+                       OXYGEN_RATE_48000 |
+                       OXYGEN_I2S_FORMAT_I2S |
+                       OXYGEN_I2S_MCLK(data->h6 ? MCLK_256 : MCLK_512) |
+                       OXYGEN_I2S_BITS_16 |
+                       OXYGEN_I2S_MASTER |
+                       OXYGEN_I2S_BCLK_64);
 
         xonar_st_init_i2c(chip);
         cs2000_registers_init(chip);
@@ -507,44 +556,16 @@ static void xonar_st_resume(struct oxygen *chip)
         xonar_stx_resume(chip);
 }
 
-static unsigned int mclk_from_rate(struct oxygen *chip, unsigned int rate)
-{
-        struct xonar_pcm179x *data = chip->model_data;
-
-        if (rate <= 32000)
-                return OXYGEN_I2S_MCLK_512;
-        else if (rate <= 48000 && data->os_128)
-                return OXYGEN_I2S_MCLK_512;
-        else if (rate <= 96000)
-                return OXYGEN_I2S_MCLK_256;
-        else
-                return OXYGEN_I2S_MCLK_128;
-}
-
-static unsigned int get_pcm1796_i2s_mclk(struct oxygen *chip,
-                                         unsigned int channel,
-                                         struct snd_pcm_hw_params *params)
-{
-        if (channel == PCM_MULTICH)
-                return mclk_from_rate(chip, params_rate(params));
-        else
-                return oxygen_default_i2s_mclk(chip, channel, params);
-}
-
 static void update_pcm1796_oversampling(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
         unsigned int i;
         u8 reg;
 
-        if (data->current_rate <= 32000)
+        if (data->current_rate <= 48000 && !data->h6)
                 reg = PCM1796_OS_128;
-        else if (data->current_rate <= 48000 && data->os_128)
-                reg = PCM1796_OS_128;
-        else if (data->current_rate <= 96000 || data->os_128)
-                reg = PCM1796_OS_64;
         else
-                reg = PCM1796_OS_32;
+                reg = PCM1796_OS_64;
         for (i = 0; i < data->dacs; ++i)
                 pcm1796_write_cached(chip, i, 20, reg);
 }
@@ -554,6 +575,7 @@ static void set_pcm1796_params(struct oxygen *chip,
 {
         struct xonar_pcm179x *data = chip->model_data;
 
+        msleep(1);
         data->current_rate = params_rate(params);
         update_pcm1796_oversampling(chip);
 }
@@ -570,6 +592,7 @@ static void update_pcm1796_volume(struct oxygen *chip)
                                      + gain_offset);
                 pcm1796_write_cached(chip, i, 17, chip->dac_volume[i * 2 + 1]
                                      + gain_offset);
+                gain_offset = 0;
         }
 }
 
@@ -579,7 +602,7 @@ static void update_pcm1796_mute(struct oxygen *chip)
         unsigned int i;
         u8 value;
 
-        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
+        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD;
         if (chip->dac_mute)
                 value |= PCM1796_MUTE;
         for (i = 0; i < data->dacs; ++i)
@@ -592,45 +615,35 @@ static void update_cs2000_rate(struct oxygen *chip, unsigned int rate)
         u8 rate_mclk, reg;
 
         switch (rate) {
-                /* XXX Why is the I2S A MCLK half the actual I2S MCLK? */
         case 32000:
-                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
-                break;
-        case 44100:
-                if (data->os_128)
-                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
-                else
-                        rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_128;
-                break;
-        default: /* 48000 */
-                if (data->os_128)
-                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
-                else
-                        rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_128;
-                break;
         case 64000:
-                rate_mclk = OXYGEN_RATE_32000 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_32000;
                 break;
+        case 44100:
         case 88200:
-                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
-                break;
-        case 96000:
-                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
-                break;
         case 176400:
-                rate_mclk = OXYGEN_RATE_44100 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_44100;
                 break;
+        default:
+        case 48000:
+        case 96000:
         case 192000:
-                rate_mclk = OXYGEN_RATE_48000 | OXYGEN_I2S_MCLK_256;
+                rate_mclk = OXYGEN_RATE_48000;
                 break;
         }
-        oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT, rate_mclk,
-                              OXYGEN_I2S_RATE_MASK | OXYGEN_I2S_MCLK_MASK);
-        if ((rate_mclk & OXYGEN_I2S_MCLK_MASK) <= OXYGEN_I2S_MCLK_128)
+
+        if (rate <= 96000 && (rate > 48000 || data->h6)) {
+                rate_mclk |= OXYGEN_I2S_MCLK(MCLK_256);
                 reg = CS2000_REF_CLK_DIV_1;
-        else
+        } else {
+                rate_mclk |= OXYGEN_I2S_MCLK(MCLK_512);
                 reg = CS2000_REF_CLK_DIV_2;
+        }
+
+        oxygen_write16_masked(chip, OXYGEN_I2S_A_FORMAT, rate_mclk,
+                              OXYGEN_I2S_RATE_MASK | OXYGEN_I2S_MCLK_MASK);
         cs2000_write_cached(chip, CS2000_FUN_CFG_1, reg);
+        msleep(3); /* PLL lock delay */
 }
 
 static void set_st_params(struct oxygen *chip,
@@ -665,13 +678,7 @@ static int rolloff_info(struct snd_kcontrol *ctl,
                 "Sharp Roll-off", "Slow Roll-off"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int rolloff_get(struct snd_kcontrol *ctl,
@@ -719,57 +726,13 @@ static const struct snd_kcontrol_new rolloff_control = {
         .put = rolloff_put,
 };
 
-static int os_128_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
-{
-        static const char *const names[2] = { "64x", "128x" };
-
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item >= 2)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
-}
-
-static int os_128_get(struct snd_kcontrol *ctl,
-                      struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        struct xonar_pcm179x *data = chip->model_data;
-
-        value->value.enumerated.item[0] = data->os_128;
-        return 0;
-}
-
-static int os_128_put(struct snd_kcontrol *ctl,
-                      struct snd_ctl_elem_value *value)
-{
-        struct oxygen *chip = ctl->private_data;
-        struct xonar_pcm179x *data = chip->model_data;
-        int changed;
-
-        mutex_lock(&chip->mutex);
-        changed = value->value.enumerated.item[0] != data->os_128;
-        if (changed) {
-                data->os_128 = value->value.enumerated.item[0];
-                if (data->has_cs2000)
-                        update_cs2000_rate(chip, data->current_rate);
-                oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
-                                      mclk_from_rate(chip, data->current_rate),
-                                      OXYGEN_I2S_MCLK_MASK);
-                update_pcm1796_oversampling(chip);
-        }
-        mutex_unlock(&chip->mutex);
-        return changed;
-}
-
-static const struct snd_kcontrol_new os_128_control = {
+static const struct snd_kcontrol_new hdav_hdmi_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "DAC Oversampling Playback Enum",
-        .info = os_128_info,
-        .get = os_128_get,
-        .put = os_128_put,
+        .name = "HDMI Playback Switch",
+        .info = snd_ctl_boolean_mono_info,
+        .get = xonar_gpio_bit_switch_get,
+        .put = xonar_gpio_bit_switch_put,
+        .private_value = GPIO_HDAV_OUTPUT_ENABLE | XONAR_GPIO_BIT_INVERT,
 };
 
 static int st_output_switch_info(struct snd_kcontrol *ctl,
@@ -779,13 +742,7 @@ static int st_output_switch_info(struct snd_kcontrol *ctl,
                 "Speakers", "Headphones", "FP Headphones"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item >= 3)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 3, names);
 }
 
 static int st_output_switch_get(struct snd_kcontrol *ctl,
@@ -840,13 +797,7 @@ static int st_hp_volume_offset_info(struct snd_kcontrol *ctl,
                 "< 64 ohms", "64-300 ohms", "300-600 ohms"
         };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 3;
-        if (info->value.enumerated.item > 2)
-                info->value.enumerated.item = 2;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 3, names);
 }
 
 static int st_hp_volume_offset_get(struct snd_kcontrol *ctl,
@@ -928,16 +879,25 @@ static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
         return 0;
 }
 
+static int xonar_st_h6_control_filter(struct snd_kcontrol_new *template)
+{
+        if (!strncmp(template->name, "Master Playback ", 16))
+                /* no volume/mute, as I²C to the third DAC does not work */
+                return 1;
+        return 0;
+}
+
 static int add_pcm1796_controls(struct oxygen *chip)
 {
+        struct xonar_pcm179x *data = chip->model_data;
         int err;
 
-        err = snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
-        if (err < 0)
-                return err;
-        err = snd_ctl_add(chip->card, snd_ctl_new1(&os_128_control, chip));
-        if (err < 0)
-                return err;
+        if (!data->broken_i2c) {
+                err = snd_ctl_add(chip->card,
+                                  snd_ctl_new1(&rolloff_control, chip));
+                if (err < 0)
+                        return err;
+        }
         return 0;
 }
 
@@ -956,7 +916,15 @@ static int xonar_d2_mixer_init(struct oxygen *chip)
 
 static int xonar_hdav_mixer_init(struct oxygen *chip)
 {
-        return add_pcm1796_controls(chip);
+        int err;
+
+        err = snd_ctl_add(chip->card, snd_ctl_new1(&hdav_hdmi_control, chip));
+        if (err < 0)
+                return err;
+        err = add_pcm1796_controls(chip);
+        if (err < 0)
+                return err;
+        return 0;
 }
 
 static int xonar_st_mixer_init(struct oxygen *chip)
@@ -976,6 +944,45 @@ static int xonar_st_mixer_init(struct oxygen *chip)
         return 0;
 }
 
+static void dump_pcm1796_registers(struct oxygen *chip,
+                                   struct snd_info_buffer *buffer)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int dac, i;
+
+        for (dac = 0; dac < data->dacs; ++dac) {
+                snd_iprintf(buffer, "\nPCM1796 %u:", dac + 1);
+                for (i = 0; i < 5; ++i)
+                        snd_iprintf(buffer, " %02x",
+                                    data->pcm1796_regs[dac][i]);
+        }
+        snd_iprintf(buffer, "\n");
+}
+
+static void dump_cs2000_registers(struct oxygen *chip,
+                                  struct snd_info_buffer *buffer)
+{
+        struct xonar_pcm179x *data = chip->model_data;
+        unsigned int i;
+
+        if (data->has_cs2000) {
+                snd_iprintf(buffer, "\nCS2000:\n00:   ");
+                for (i = 1; i < 0x10; ++i)
+                        snd_iprintf(buffer, " %02x", data->cs2000_regs[i]);
+                snd_iprintf(buffer, "\n10:");
+                for (i = 0x10; i < 0x1f; ++i)
+                        snd_iprintf(buffer, " %02x", data->cs2000_regs[i]);
+                snd_iprintf(buffer, "\n");
+        }
+}
+
+static void dump_st_registers(struct oxygen *chip,
+                              struct snd_info_buffer *buffer)
+{
+        dump_pcm1796_registers(chip, buffer);
+        dump_cs2000_registers(chip, buffer);
+}
+
 static const struct oxygen_model model_xonar_d2 = {
         .longname = "Asus Virtuoso 200",
         .chip = "AV200",
@@ -985,11 +992,11 @@ static const struct oxygen_model model_xonar_d2 = {
         .cleanup = xonar_d2_cleanup,
         .suspend = xonar_d2_suspend,
         .resume = xonar_d2_resume,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_pcm1796_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
+        .dump_registers = dump_pcm1796_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_pcm179x),
         .device_config = PLAYBACK_0_TO_I2S |
@@ -999,13 +1006,16 @@ static const struct oxygen_model model_xonar_d2 = {
                          MIDI_OUTPUT |
                          MIDI_INPUT |
                          AC97_CD_INPUT,
-        .dac_channels = 8,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 8,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .misc_flags = OXYGEN_MISC_MIDI,
         .function_flags = OXYGEN_FUNCTION_SPI |
                           OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1018,25 +1028,28 @@ static const struct oxygen_model model_xonar_hdav = {
         .suspend = xonar_hdav_suspend,
         .resume = xonar_hdav_resume,
         .pcm_hardware_filter = xonar_hdmi_pcm_hardware_filter,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_hdav_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
         .uart_input = xonar_hdmi_uart_input,
         .ac97_switch = xonar_line_mic_ac97_switch,
+        .dump_registers = dump_pcm1796_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_hdav),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
                          CAPTURE_0_FROM_I2S_2 |
                          CAPTURE_1_FROM_SPDIF,
-        .dac_channels = 8,
+        .dac_channels_pcm = 8,
+        .dac_channels_mixer = 2,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .misc_flags = OXYGEN_MISC_MIDI,
         .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1048,22 +1061,26 @@ static const struct oxygen_model model_xonar_st = {
         .cleanup = xonar_st_cleanup,
         .suspend = xonar_st_suspend,
         .resume = xonar_st_resume,
-        .get_i2s_mclk = get_pcm1796_i2s_mclk,
         .set_dac_params = set_st_params,
         .set_adc_params = xonar_set_cs53x1_params,
         .update_dac_volume = update_pcm1796_volume,
         .update_dac_mute = update_pcm1796_mute,
         .ac97_switch = xonar_line_mic_ac97_switch,
+        .dump_registers = dump_st_registers,
         .dac_tlv = pcm1796_db_scale,
         .model_data_size = sizeof(struct xonar_pcm179x),
         .device_config = PLAYBACK_0_TO_I2S |
                          PLAYBACK_1_TO_SPDIF |
-                         CAPTURE_0_FROM_I2S_2,
-        .dac_channels = 2,
+                         CAPTURE_0_FROM_I2S_2 |
+                         AC97_FMIC_SWITCH,
+        .dac_channels_pcm = 2,
+        .dac_channels_mixer = 2,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
         .function_flags = OXYGEN_FUNCTION_2WIRE,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .dac_mclks = OXYGEN_MCLKS(512, 128, 128),
+        .adc_mclks = OXYGEN_MCLKS(256, 128, 128),
+        .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S,
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
@@ -1089,7 +1106,8 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                         break;
                 case GPIO_DB_H6:
                         chip->model.shortname = "Xonar HDAV1.3+H6";
-                        chip->model.private_data = 1;
+                        chip->model.dac_channels_mixer = 8;
+                        chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
                         break;
                 }
                 break;
@@ -1102,8 +1120,10 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                         break;
                 case GPIO_DB_H6:
                         chip->model.shortname = "Xonar ST+H6";
-                        chip->model.dac_channels = 8;
-                        chip->model.private_data = 1;
+                        chip->model.control_filter = xonar_st_h6_control_filter;
+                        chip->model.dac_channels_pcm = 8;
+                        chip->model.dac_channels_mixer = 8;
+                        chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128);
                         break;
                 }
                 break;
@@ -1114,9 +1134,6 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                 chip->model.resume = xonar_stx_resume;
                 chip->model.set_dac_params = set_pcm1796_params;
                 break;
-        case 0x835e:
-                snd_printk(KERN_ERR "the HDAV1.3 Slim is not supported\n");
-                return -ENODEV;
         default:
                 return -EINVAL;
         }