]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - sound/pci/oxygen/virtuoso.c
Merge branch 'next'
[linux-2.6-omap-h63xx.git] / sound / pci / oxygen / virtuoso.c
index 01d7b75f91828144f16c33b4ce81fb4e47ce7438..98c6a8c65d813cb9f816d3e2d83a206cdbb1935e 100644 (file)
  * AD0 <- 0
  */
 
+/*
+ * Xonar HDAV1.3 (Deluxe)
+ * ----------------------
+ *
+ * CMI8788:
+ *
+ * I²C <-> PCM1796 (front)
+ *
+ * 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)
+ *
+ * TXD -> HDMI controller
+ * RXD <- HDMI controller
+ *
+ * PCM1796 front: AD1,0 <- 0,0
+ *
+ * no daughterboard
+ * ----------------
+ *
+ * GPIO 4 <- 1
+ *
+ * H6 daughterboard
+ * ----------------
+ *
+ * GPIO 4 <- 0
+ * GPIO 5 <- 0
+ *
+ * I²C <-> PCM1796 (surround)
+ *     <-> PCM1796 (center/LFE)
+ *     <-> PCM1796 (back)
+ *
+ * PCM1796 surround:   AD1,0 <- 0,1
+ * PCM1796 center/LFE: AD1,0 <- 1,0
+ * PCM1796 back:       AD1,0 <- 1,1
+ *
+ * unknown daughterboard
+ * ---------------------
+ *
+ * GPIO 4 <- 0
+ * GPIO 5 <- 1
+ *
+ * I²C <-> CS4362A (surround, center/LFE, back)
+ *
+ * CS4362A: AD0 <- 0
+ */
+
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <sound/ac97_codec.h>
+#include <sound/asoundef.h>
 #include <sound/control.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
+#include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
 #include "cm9780.h"
@@ -98,12 +150,15 @@ enum {
        MODEL_D2X,
        MODEL_D1,
        MODEL_DX,
+       MODEL_HDAV,     /* without daughterboard */
+       MODEL_HDAV_H6,  /* with H6 daughterboard */
 };
 
 static struct pci_device_id xonar_ids[] __devinitdata = {
        { OXYGEN_PCI_SUBID(0x1043, 0x8269), .driver_data = MODEL_D2 },
        { OXYGEN_PCI_SUBID(0x1043, 0x8275), .driver_data = MODEL_DX },
        { OXYGEN_PCI_SUBID(0x1043, 0x82b7), .driver_data = MODEL_D2X },
+       { OXYGEN_PCI_SUBID(0x1043, 0x8314), .driver_data = MODEL_HDAV },
        { OXYGEN_PCI_SUBID(0x1043, 0x834f), .driver_data = MODEL_D1 },
        { }
 };
@@ -124,11 +179,18 @@ MODULE_DEVICE_TABLE(pci, xonar_ids);
 #define GPIO_DX_FRONT_PANEL    0x0002
 #define GPIO_DX_INPUT_ROUTE    0x0100
 
+#define GPIO_HDAV_DB_MASK      0x0030
+#define GPIO_HDAV_DB_H6                0x0000
+#define GPIO_HDAV_DB_XX                0x0020
+
+#define I2C_DEVICE_PCM1796(i)  (0x98 + ((i) << 1))     /* 10011, ADx=i, /W=0 */
 #define I2C_DEVICE_CS4398      0x9e    /* 10011, AD1=1, AD0=1, /W=0 */
 #define I2C_DEVICE_CS4362A     0x30    /* 001100, AD0=0, /W=0 */
 
 struct xonar_data {
+       unsigned int model;
        unsigned int anti_pop_delay;
+       unsigned int dacs;
        u16 output_enable_bit;
        u8 ext_power_reg;
        u8 ext_power_int_reg;
@@ -137,10 +199,13 @@ struct xonar_data {
        u8 pcm1796_oversampling;
        u8 cs4398_fm;
        u8 cs4362a_fm;
+       u8 hdmi_params[5];
 };
 
-static void pcm1796_write(struct oxygen *chip, unsigned int codec,
-                         u8 reg, u8 value)
+static void xonar_gpio_changed(struct oxygen *chip);
+
+static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec,
+                                    u8 reg, u8 value)
 {
        /* maps ALSA channel pair number to SPI output */
        static const u8 codec_map[4] = {
@@ -154,6 +219,22 @@ static void pcm1796_write(struct oxygen *chip, unsigned int codec,
                         (reg << 8) | value);
 }
 
+static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec,
+                                    u8 reg, u8 value)
+{
+       oxygen_write_i2c(chip, I2C_DEVICE_PCM1796(codec), reg, value);
+}
+
+static void pcm1796_write(struct oxygen *chip, unsigned int codec,
+                         u8 reg, u8 value)
+{
+       if ((chip->model.function_flags & OXYGEN_FUNCTION_2WIRE_SPI_MASK) ==
+           OXYGEN_FUNCTION_SPI)
+               pcm1796_write_spi(chip, codec, reg, value);
+       else
+               pcm1796_write_i2c(chip, codec, reg, value);
+}
+
 static void cs4398_write(struct oxygen *chip, u8 reg, u8 value)
 {
        oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
@@ -164,6 +245,24 @@ static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
        oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
 }
 
+static void hdmi_write_command(struct oxygen *chip, u8 command,
+                              unsigned int count, const u8 *params)
+{
+       unsigned int i;
+       u8 checksum;
+
+       oxygen_write_uart(chip, 0xfb);
+       oxygen_write_uart(chip, 0xef);
+       oxygen_write_uart(chip, command);
+       oxygen_write_uart(chip, count);
+       for (i = 0; i < count; ++i)
+               oxygen_write_uart(chip, params[i]);
+       checksum = 0xfb + 0xef + command + count;
+       for (i = 0; i < count; ++i)
+               checksum += params[i];
+       oxygen_write_uart(chip, checksum);
+}
+
 static void xonar_enable_output(struct oxygen *chip)
 {
        struct xonar_data *data = chip->model_data;
@@ -180,6 +279,7 @@ static void xonar_common_init(struct oxygen *chip)
                oxygen_set_bits8(chip, data->ext_power_int_reg,
                                 data->ext_power_bit);
                chip->interrupt_mask |= OXYGEN_INT_GPIO;
+               chip->model.gpio_changed = xonar_gpio_changed;
                data->has_power = !!(oxygen_read8(chip, data->ext_power_reg)
                                     & data->ext_power_bit);
        }
@@ -193,9 +293,10 @@ static void xonar_common_init(struct oxygen *chip)
 
 static void update_pcm1796_volume(struct oxygen *chip)
 {
+       struct xonar_data *data = chip->model_data;
        unsigned int i;
 
-       for (i = 0; i < 4; ++i) {
+       for (i = 0; i < data->dacs; ++i) {
                pcm1796_write(chip, i, 16, chip->dac_volume[i * 2]);
                pcm1796_write(chip, i, 17, chip->dac_volume[i * 2 + 1]);
        }
@@ -203,13 +304,14 @@ static void update_pcm1796_volume(struct oxygen *chip)
 
 static void update_pcm1796_mute(struct oxygen *chip)
 {
+       struct xonar_data *data = chip->model_data;
        unsigned int i;
        u8 value;
 
        value = PCM1796_DMF_DISABLED | PCM1796_FMT_24_LJUST | PCM1796_ATLD;
        if (chip->dac_mute)
                value |= PCM1796_MUTE;
-       for (i = 0; i < 4; ++i)
+       for (i = 0; i < data->dacs; ++i)
                pcm1796_write(chip, i, 18, value);
 }
 
@@ -218,7 +320,7 @@ static void pcm1796_init(struct oxygen *chip)
        struct xonar_data *data = chip->model_data;
        unsigned int i;
 
-       for (i = 0; i < 4; ++i) {
+       for (i = 0; i < data->dacs; ++i) {
                pcm1796_write(chip, i, 19, PCM1796_FLT_SHARP | PCM1796_ATS_1);
                pcm1796_write(chip, i, 20, data->pcm1796_oversampling);
                pcm1796_write(chip, i, 21, 0);
@@ -234,6 +336,13 @@ static void xonar_d2_init(struct oxygen *chip)
        data->anti_pop_delay = 300;
        data->output_enable_bit = GPIO_D2_OUTPUT_ENABLE;
        data->pcm1796_oversampling = PCM1796_OS_64;
+       if (data->model == MODEL_D2X) {
+               data->ext_power_reg = OXYGEN_GPIO_DATA;
+               data->ext_power_int_reg = OXYGEN_GPIO_INTERRUPT_MASK;
+               data->ext_power_bit = GPIO_D2X_EXT_POWER;
+               oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                                   GPIO_D2X_EXT_POWER);
+       }
 
        pcm1796_init(chip);
 
@@ -246,17 +355,6 @@ static void xonar_d2_init(struct oxygen *chip)
        snd_component_add(chip->card, "CS5381");
 }
 
-static void xonar_d2x_init(struct oxygen *chip)
-{
-       struct xonar_data *data = chip->model_data;
-
-       data->ext_power_reg = OXYGEN_GPIO_DATA;
-       data->ext_power_int_reg = OXYGEN_GPIO_INTERRUPT_MASK;
-       data->ext_power_bit = GPIO_D2X_EXT_POWER;
-       oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2X_EXT_POWER);
-       xonar_d2_init(chip);
-}
-
 static void update_cs4362a_volumes(struct oxygen *chip)
 {
        u8 mute;
@@ -324,6 +422,11 @@ static void xonar_d1_init(struct oxygen *chip)
        data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
        data->cs4362a_fm = CS4362A_FM_SINGLE |
                CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+       if (data->model == MODEL_DX) {
+               data->ext_power_reg = OXYGEN_GPI_DATA;
+               data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
+               data->ext_power_bit = GPI_DX_EXT_POWER;
+       }
 
        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                       OXYGEN_2WIRE_LENGTH_8 |
@@ -344,30 +447,86 @@ static void xonar_d1_init(struct oxygen *chip)
        snd_component_add(chip->card, "CS5361");
 }
 
-static void xonar_dx_init(struct oxygen *chip)
+static void xonar_hdav_init(struct oxygen *chip)
 {
        struct xonar_data *data = chip->model_data;
+       u8 param;
 
+       oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                      OXYGEN_2WIRE_LENGTH_8 |
+                      OXYGEN_2WIRE_INTERRUPT_MASK |
+                      OXYGEN_2WIRE_SPEED_FAST);
+
+       data->anti_pop_delay = 100;
+       data->output_enable_bit = GPIO_DX_OUTPUT_ENABLE;
        data->ext_power_reg = OXYGEN_GPI_DATA;
        data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
        data->ext_power_bit = GPI_DX_EXT_POWER;
-       xonar_d1_init(chip);
+       data->pcm1796_oversampling = PCM1796_OS_64;
+
+       pcm1796_init(chip);
+
+       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_DX_INPUT_ROUTE);
+       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DX_INPUT_ROUTE);
+
+       oxygen_reset_uart(chip);
+       param = 0;
+       hdmi_write_command(chip, 0x61, 1, &param);
+       param = 1;
+       hdmi_write_command(chip, 0x74, 1, &param);
+       data->hdmi_params[1] = IEC958_AES3_CON_FS_48000;
+       data->hdmi_params[4] = 1;
+       hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
+
+       xonar_common_init(chip);
+
+       snd_component_add(chip->card, "PCM1796");
+       snd_component_add(chip->card, "CS5381");
 }
 
-static void xonar_cleanup(struct oxygen *chip)
+static void xonar_disable_output(struct oxygen *chip)
 {
        struct xonar_data *data = chip->model_data;
 
        oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, data->output_enable_bit);
 }
 
+static void xonar_d2_cleanup(struct oxygen *chip)
+{
+       xonar_disable_output(chip);
+}
+
 static void xonar_d1_cleanup(struct oxygen *chip)
 {
-       xonar_cleanup(chip);
+       xonar_disable_output(chip);
        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
        oxygen_clear_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
 }
 
+static void xonar_hdav_cleanup(struct oxygen *chip)
+{
+       u8 param = 0;
+
+       hdmi_write_command(chip, 0x74, 1, &param);
+       xonar_disable_output(chip);
+}
+
+static void xonar_d2_suspend(struct oxygen *chip)
+{
+       xonar_d2_cleanup(chip);
+}
+
+static void xonar_d1_suspend(struct oxygen *chip)
+{
+       xonar_d1_cleanup(chip);
+}
+
+static void xonar_hdav_suspend(struct oxygen *chip)
+{
+       xonar_hdav_cleanup(chip);
+       msleep(2);
+}
+
 static void xonar_d2_resume(struct oxygen *chip)
 {
        pcm1796_init(chip);
@@ -380,6 +539,33 @@ static void xonar_d1_resume(struct oxygen *chip)
        xonar_enable_output(chip);
 }
 
+static void xonar_hdav_resume(struct oxygen *chip)
+{
+       struct xonar_data *data = chip->model_data;
+       u8 param;
+
+       oxygen_reset_uart(chip);
+       param = 0;
+       hdmi_write_command(chip, 0x61, 1, &param);
+       param = 1;
+       hdmi_write_command(chip, 0x74, 1, &param);
+       hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
+       pcm1796_init(chip);
+       xonar_enable_output(chip);
+}
+
+static void xonar_hdav_pcm_hardware_filter(unsigned int channel,
+                                          struct snd_pcm_hardware *hardware)
+{
+       if (channel == PCM_MULTICH) {
+               hardware->rates = SNDRV_PCM_RATE_44100 |
+                                 SNDRV_PCM_RATE_48000 |
+                                 SNDRV_PCM_RATE_96000 |
+                                 SNDRV_PCM_RATE_192000;
+               hardware->rate_min = 44100;
+       }
+}
+
 static void set_pcm1796_params(struct oxygen *chip,
                               struct snd_pcm_hw_params *params)
 {
@@ -388,7 +574,7 @@ static void set_pcm1796_params(struct oxygen *chip,
 
        data->pcm1796_oversampling =
                params_rate(params) >= 96000 ? PCM1796_OS_32 : PCM1796_OS_64;
-       for (i = 0; i < 4; ++i)
+       for (i = 0; i < data->dacs; ++i)
                pcm1796_write(chip, i, 20, data->pcm1796_oversampling);
 }
 
@@ -430,6 +616,42 @@ static void set_cs43xx_params(struct oxygen *chip,
        cs4362a_write(chip, 0x0c, data->cs4362a_fm);
 }
 
+static void set_hdmi_params(struct oxygen *chip,
+                           struct snd_pcm_hw_params *params)
+{
+       struct xonar_data *data = chip->model_data;
+
+       data->hdmi_params[0] = 0; /* 1 = non-audio */
+       switch (params_rate(params)) {
+       case 44100:
+               data->hdmi_params[1] = IEC958_AES3_CON_FS_44100;
+               break;
+       case 48000:
+               data->hdmi_params[1] = IEC958_AES3_CON_FS_48000;
+               break;
+       default: /* 96000 */
+               data->hdmi_params[1] = IEC958_AES3_CON_FS_96000;
+               break;
+       case 192000:
+               data->hdmi_params[1] = IEC958_AES3_CON_FS_192000;
+               break;
+       }
+       data->hdmi_params[2] = params_channels(params) / 2 - 1;
+       if (params_format(params) == SNDRV_PCM_FORMAT_S16_LE)
+               data->hdmi_params[3] = 0;
+       else
+               data->hdmi_params[3] = 0xc0;
+       data->hdmi_params[4] = 1; /* ? */
+       hdmi_write_command(chip, 0x54, 5, data->hdmi_params);
+}
+
+static void set_hdav_params(struct oxygen *chip,
+                           struct snd_pcm_hw_params *params)
+{
+       set_pcm1796_params(chip, params);
+       set_hdmi_params(chip, params);
+}
+
 static void xonar_gpio_changed(struct oxygen *chip)
 {
        struct xonar_data *data = chip->model_data;
@@ -449,29 +671,43 @@ static void xonar_gpio_changed(struct oxygen *chip)
        }
 }
 
-static int alt_switch_get(struct snd_kcontrol *ctl,
-                         struct snd_ctl_elem_value *value)
+static void xonar_hdav_uart_input(struct oxygen *chip)
+{
+       if (chip->uart_input_count >= 2 &&
+           chip->uart_input[chip->uart_input_count - 2] == 'O' &&
+           chip->uart_input[chip->uart_input_count - 1] == 'K') {
+               printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:");
+               print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+                                    chip->uart_input, chip->uart_input_count);
+               chip->uart_input_count = 0;
+       }
+}
+
+static int gpio_bit_switch_get(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value)
 {
        struct oxygen *chip = ctl->private_data;
+       u16 bit = ctl->private_value;
 
        value->value.integer.value[0] =
-               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_D2_ALT);
+               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & bit);
        return 0;
 }
 
-static int alt_switch_put(struct snd_kcontrol *ctl,
-                         struct snd_ctl_elem_value *value)
+static int gpio_bit_switch_put(struct snd_kcontrol *ctl,
+                              struct snd_ctl_elem_value *value)
 {
        struct oxygen *chip = ctl->private_data;
+       u16 bit = ctl->private_value;
        u16 old_bits, new_bits;
        int changed;
 
        spin_lock_irq(&chip->reg_lock);
        old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
        if (value->value.integer.value[0])
-               new_bits = old_bits | GPIO_D2_ALT;
+               new_bits = old_bits | bit;
        else
-               new_bits = old_bits & ~GPIO_D2_ALT;
+               new_bits = old_bits & ~bit;
        changed = new_bits != old_bits;
        if (changed)
                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_bits);
@@ -483,47 +719,22 @@ static const struct snd_kcontrol_new alt_switch = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "Analog Loopback Switch",
        .info = snd_ctl_boolean_mono_info,
-       .get = alt_switch_get,
-       .put = alt_switch_put,
+       .get = gpio_bit_switch_get,
+       .put = gpio_bit_switch_put,
+       .private_value = GPIO_D2_ALT,
 };
 
-static int front_panel_get(struct snd_kcontrol *ctl,
-                          struct snd_ctl_elem_value *value)
-{
-       struct oxygen *chip = ctl->private_data;
-
-       value->value.integer.value[0] =
-               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DX_FRONT_PANEL);
-       return 0;
-}
-
-static int front_panel_put(struct snd_kcontrol *ctl,
-                          struct snd_ctl_elem_value *value)
-{
-       struct oxygen *chip = ctl->private_data;
-       u16 old_reg, new_reg;
-
-       spin_lock_irq(&chip->reg_lock);
-       old_reg = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-       if (value->value.integer.value[0])
-               new_reg = old_reg | GPIO_DX_FRONT_PANEL;
-       else
-               new_reg = old_reg & ~GPIO_DX_FRONT_PANEL;
-       oxygen_write16(chip, OXYGEN_GPIO_DATA, new_reg);
-       spin_unlock_irq(&chip->reg_lock);
-       return old_reg != new_reg;
-}
-
 static const struct snd_kcontrol_new front_panel_switch = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "Front Panel Switch",
        .info = snd_ctl_boolean_mono_info,
-       .get = front_panel_get,
-       .put = front_panel_put,
+       .get = gpio_bit_switch_get,
+       .put = gpio_bit_switch_put,
+       .private_value = GPIO_DX_FRONT_PANEL,
 };
 
-static void xonar_d1_ac97_switch(struct oxygen *chip,
-                                unsigned int reg, unsigned int mute)
+static void xonar_line_mic_ac97_switch(struct oxygen *chip,
+                                      unsigned int reg, unsigned int mute)
 {
        if (reg == AC97_LINE) {
                spin_lock_irq(&chip->reg_lock);
@@ -552,7 +763,7 @@ static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
        return 0;
 }
 
-static int xonar_mixer_init(struct oxygen *chip)
+static int xonar_d2_mixer_init(struct oxygen *chip)
 {
        return snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip));
 }
@@ -562,130 +773,147 @@ static int xonar_d1_mixer_init(struct oxygen *chip)
        return snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip));
 }
 
-static const struct oxygen_model xonar_models[] = {
-       [MODEL_D2] = {
-               .shortname = "Xonar D2",
-               .longname = "Asus Virtuoso 200",
-               .chip = "AV200",
-               .owner = THIS_MODULE,
-               .init = xonar_d2_init,
-               .control_filter = xonar_d2_control_filter,
-               .mixer_init = xonar_mixer_init,
-               .cleanup = xonar_cleanup,
-               .suspend = xonar_cleanup,
-               .resume = xonar_d2_resume,
-               .set_dac_params = set_pcm1796_params,
-               .set_adc_params = set_cs53x1_params,
-               .update_dac_volume = update_pcm1796_volume,
-               .update_dac_mute = update_pcm1796_mute,
-               .dac_tlv = pcm1796_db_scale,
-               .model_data_size = sizeof(struct xonar_data),
-               .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                              PLAYBACK_1_TO_SPDIF |
-                              CAPTURE_0_FROM_I2S_2 |
-                              CAPTURE_1_FROM_SPDIF,
-               .dac_channels = 8,
-               .dac_volume_min = 0x0f,
-               .dac_volume_max = 0xff,
-               .misc_flags = OXYGEN_MISC_MIDI,
-               .function_flags = OXYGEN_FUNCTION_SPI |
-                                 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-               .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-               .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-       },
-       [MODEL_D2X] = {
-               .shortname = "Xonar D2X",
-               .longname = "Asus Virtuoso 200",
-               .chip = "AV200",
-               .owner = THIS_MODULE,
-               .init = xonar_d2x_init,
-               .control_filter = xonar_d2_control_filter,
-               .mixer_init = xonar_mixer_init,
-               .cleanup = xonar_cleanup,
-               .suspend = xonar_cleanup,
-               .resume = xonar_d2_resume,
-               .set_dac_params = set_pcm1796_params,
-               .set_adc_params = set_cs53x1_params,
-               .update_dac_volume = update_pcm1796_volume,
-               .update_dac_mute = update_pcm1796_mute,
-               .gpio_changed = xonar_gpio_changed,
-               .dac_tlv = pcm1796_db_scale,
-               .model_data_size = sizeof(struct xonar_data),
-               .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                              PLAYBACK_1_TO_SPDIF |
-                              CAPTURE_0_FROM_I2S_2 |
-                              CAPTURE_1_FROM_SPDIF,
-               .dac_channels = 8,
-               .dac_volume_min = 0x0f,
-               .dac_volume_max = 0xff,
-               .misc_flags = OXYGEN_MISC_MIDI,
-               .function_flags = OXYGEN_FUNCTION_SPI |
-                                 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-               .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-               .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-       },
-       [MODEL_D1] = {
-               .shortname = "Xonar D1",
-               .longname = "Asus Virtuoso 100",
-               .chip = "AV200",
-               .owner = THIS_MODULE,
-               .init = xonar_d1_init,
-               .control_filter = xonar_d1_control_filter,
-               .mixer_init = xonar_d1_mixer_init,
-               .cleanup = xonar_d1_cleanup,
-               .suspend = xonar_d1_cleanup,
-               .resume = xonar_d1_resume,
-               .set_dac_params = set_cs43xx_params,
-               .set_adc_params = set_cs53x1_params,
-               .update_dac_volume = update_cs43xx_volume,
-               .update_dac_mute = update_cs43xx_mute,
-               .ac97_switch = xonar_d1_ac97_switch,
-               .dac_tlv = cs4362a_db_scale,
-               .model_data_size = sizeof(struct xonar_data),
-               .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                              PLAYBACK_1_TO_SPDIF |
-                              CAPTURE_0_FROM_I2S_2,
-               .dac_channels = 8,
-               .dac_volume_min = 0,
-               .dac_volume_max = 127,
-               .function_flags = OXYGEN_FUNCTION_2WIRE,
-               .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-               .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-       },
-       [MODEL_DX] = {
-               .shortname = "Xonar DX",
-               .longname = "Asus Virtuoso 100",
-               .chip = "AV200",
-               .owner = THIS_MODULE,
-               .init = xonar_dx_init,
-               .control_filter = xonar_d1_control_filter,
-               .mixer_init = xonar_d1_mixer_init,
-               .cleanup = xonar_d1_cleanup,
-               .suspend = xonar_d1_cleanup,
-               .resume = xonar_d1_resume,
-               .set_dac_params = set_cs43xx_params,
-               .set_adc_params = set_cs53x1_params,
-               .update_dac_volume = update_cs43xx_volume,
-               .update_dac_mute = update_cs43xx_mute,
-               .gpio_changed = xonar_gpio_changed,
-               .ac97_switch = xonar_d1_ac97_switch,
-               .dac_tlv = cs4362a_db_scale,
-               .model_data_size = sizeof(struct xonar_data),
-               .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                              PLAYBACK_1_TO_SPDIF |
-                              CAPTURE_0_FROM_I2S_2,
-               .dac_channels = 8,
-               .dac_volume_min = 0,
-               .dac_volume_max = 127,
-               .function_flags = OXYGEN_FUNCTION_2WIRE,
-               .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-               .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-       },
+static int xonar_model_probe(struct oxygen *chip, unsigned long driver_data)
+{
+       static const char *const names[] = {
+               [MODEL_D1]      = "Xonar D1",
+               [MODEL_DX]      = "Xonar DX",
+               [MODEL_D2]      = "Xonar D2",
+               [MODEL_D2X]     = "Xonar D2X",
+               [MODEL_HDAV]    = "Xonar HDAV1.3",
+               [MODEL_HDAV_H6] = "Xonar HDAV1.3+H6",
+       };
+       static const u8 dacs[] = {
+               [MODEL_D1]      = 2,
+               [MODEL_DX]      = 2,
+               [MODEL_D2]      = 4,
+               [MODEL_D2X]     = 4,
+               [MODEL_HDAV]    = 1,
+               [MODEL_HDAV_H6] = 4,
+       };
+       struct xonar_data *data = chip->model_data;
+
+       data->model = driver_data;
+       if (data->model == MODEL_HDAV) {
+               oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                                   GPIO_HDAV_DB_MASK);
+               switch (oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                       GPIO_HDAV_DB_MASK) {
+               case GPIO_HDAV_DB_H6:
+                       data->model = MODEL_HDAV_H6;
+                       break;
+               case GPIO_HDAV_DB_XX:
+                       snd_printk(KERN_ERR "unknown daughterboard\n");
+                       return -ENODEV;
+               }
+       }
+
+       data->dacs = dacs[data->model];
+       chip->model.shortname = names[data->model];
+       return 0;
+}
+
+static const struct oxygen_model model_xonar_d2 = {
+       .longname = "Asus Virtuoso 200",
+       .chip = "AV200",
+       .owner = THIS_MODULE,
+       .probe = xonar_model_probe,
+       .init = xonar_d2_init,
+       .control_filter = xonar_d2_control_filter,
+       .mixer_init = xonar_d2_mixer_init,
+       .cleanup = xonar_d2_cleanup,
+       .suspend = xonar_d2_suspend,
+       .resume = xonar_d2_resume,
+       .set_dac_params = set_pcm1796_params,
+       .set_adc_params = set_cs53x1_params,
+       .update_dac_volume = update_pcm1796_volume,
+       .update_dac_mute = update_pcm1796_mute,
+       .dac_tlv = pcm1796_db_scale,
+       .model_data_size = sizeof(struct xonar_data),
+       .device_config = PLAYBACK_0_TO_I2S |
+                        PLAYBACK_1_TO_SPDIF |
+                        CAPTURE_0_FROM_I2S_2 |
+                        CAPTURE_1_FROM_SPDIF |
+                        MIDI_OUTPUT |
+                        MIDI_INPUT,
+       .dac_channels = 8,
+       .dac_volume_min = 0x0f,
+       .dac_volume_max = 0xff,
+       .misc_flags = OXYGEN_MISC_MIDI,
+       .function_flags = OXYGEN_FUNCTION_SPI |
+                         OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+       .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+       .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+static const struct oxygen_model model_xonar_d1 = {
+       .longname = "Asus Virtuoso 100",
+       .chip = "AV200",
+       .owner = THIS_MODULE,
+       .probe = xonar_model_probe,
+       .init = xonar_d1_init,
+       .control_filter = xonar_d1_control_filter,
+       .mixer_init = xonar_d1_mixer_init,
+       .cleanup = xonar_d1_cleanup,
+       .suspend = xonar_d1_suspend,
+       .resume = xonar_d1_resume,
+       .set_dac_params = set_cs43xx_params,
+       .set_adc_params = set_cs53x1_params,
+       .update_dac_volume = update_cs43xx_volume,
+       .update_dac_mute = update_cs43xx_mute,
+       .ac97_switch = xonar_line_mic_ac97_switch,
+       .dac_tlv = cs4362a_db_scale,
+       .model_data_size = sizeof(struct xonar_data),
+       .device_config = PLAYBACK_0_TO_I2S |
+                        PLAYBACK_1_TO_SPDIF |
+                        CAPTURE_0_FROM_I2S_2,
+       .dac_channels = 8,
+       .dac_volume_min = 0,
+       .dac_volume_max = 127,
+       .function_flags = OXYGEN_FUNCTION_2WIRE,
+       .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+       .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+static const struct oxygen_model model_xonar_hdav = {
+       .longname = "Asus Virtuoso 200",
+       .chip = "AV200",
+       .owner = THIS_MODULE,
+       .probe = xonar_model_probe,
+       .init = xonar_hdav_init,
+       .cleanup = xonar_hdav_cleanup,
+       .suspend = xonar_hdav_suspend,
+       .resume = xonar_hdav_resume,
+       .pcm_hardware_filter = xonar_hdav_pcm_hardware_filter,
+       .set_dac_params = set_hdav_params,
+       .set_adc_params = set_cs53x1_params,
+       .update_dac_volume = update_pcm1796_volume,
+       .update_dac_mute = update_pcm1796_mute,
+       .uart_input = xonar_hdav_uart_input,
+       .ac97_switch = xonar_line_mic_ac97_switch,
+       .dac_tlv = pcm1796_db_scale,
+       .model_data_size = sizeof(struct xonar_data),
+       .device_config = PLAYBACK_0_TO_I2S |
+                        PLAYBACK_1_TO_SPDIF |
+                        CAPTURE_0_FROM_I2S_2,
+       .dac_channels = 8,
+       .dac_volume_min = 0x0f,
+       .dac_volume_max = 0xff,
+       .function_flags = OXYGEN_FUNCTION_2WIRE,
+       .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+       .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
 static int __devinit xonar_probe(struct pci_dev *pci,
                                 const struct pci_device_id *pci_id)
 {
+       static const struct oxygen_model *const models[] = {
+               [MODEL_D1]      = &model_xonar_d1,
+               [MODEL_DX]      = &model_xonar_d1,
+               [MODEL_D2]      = &model_xonar_d2,
+               [MODEL_D2X]     = &model_xonar_d2,
+               [MODEL_HDAV]    = &model_xonar_hdav,
+       };
        static int dev;
        int err;
 
@@ -695,8 +923,10 @@ static int __devinit xonar_probe(struct pci_dev *pci,
                ++dev;
                return -ENOENT;
        }
+       BUG_ON(pci_id->driver_data >= ARRAY_SIZE(models));
        err = oxygen_pci_probe(pci, index[dev], id[dev],
-                              &xonar_models[pci_id->driver_data]);
+                              models[pci_id->driver_data],
+                              pci_id->driver_data);
        if (err >= 0)
                ++dev;
        return err;