sound: use DEFINE_PCI_DEVICE_TABLE
[safe/jmp/linux-2.6] / sound / pci / oxygen / oxygen.c
index 0a7c613..289cb4d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * C-Media CMI8788 driver for C-Media's reference design and for the X-Meridian
+ * C-Media CMI8788 driver for C-Media's reference design and similar models
  *
  * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
  *
@@ -18,6 +18,8 @@
  */
 
 /*
+ * CMI8788:
+ *
  * SPI 0 -> 1st AK4396 (front)
  * SPI 1 -> 2nd AK4396 (surround)
  * SPI 2 -> 3rd AK4396 (center/LFE)
  *
  * GPIO 0 -> DFS0 of AK5385
  * GPIO 1 -> DFS1 of AK5385
+ * GPIO 8 -> enable headphone amplifier on HT-Omega models
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to ADC input
  */
 
+#include <linux/delay.h>
+#include <linux/mutex.h>
 #include <linux/pci.h>
+#include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
+#include "ak4396.h"
+#include "wm8785.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8788}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -53,19 +65,25 @@ MODULE_PARM_DESC(id, "ID string");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "enable card");
 
-static struct pci_device_id oxygen_ids[] __devinitdata = {
-       { OXYGEN_PCI_SUBID(0x10b0, 0x0216) },
-       { OXYGEN_PCI_SUBID(0x10b0, 0x0218) },
-       { OXYGEN_PCI_SUBID(0x10b0, 0x0219) },
-       { OXYGEN_PCI_SUBID(0x13f6, 0x0001) },
-       { OXYGEN_PCI_SUBID(0x13f6, 0x0010) },
-       { OXYGEN_PCI_SUBID(0x13f6, 0x8788) },
-       { OXYGEN_PCI_SUBID(0x147a, 0xa017) },
-       { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
-       { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
-       { OXYGEN_PCI_SUBID(0x1a58, 0x0910) },
-       { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = 1 },
-       { OXYGEN_PCI_SUBID(0x7284, 0x9761) },
+enum {
+       MODEL_CMEDIA_REF,       /* C-Media's reference design */
+       MODEL_MERIDIAN,         /* AuzenTech X-Meridian */
+       MODEL_CLARO,            /* HT-Omega Claro */
+       MODEL_CLARO_HALO,       /* HT-Omega Claro halo */
+};
+
+static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
+       { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x13f6, 0x0001), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x13f6, 0x0010), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x13f6, 0x8788), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x147a, 0xa017), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
+       { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
+       { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CLARO },
+       { OXYGEN_PCI_SUBID(0x7284, 0x9781), .driver_data = MODEL_CLARO_HALO },
        { }
 };
 MODULE_DEVICE_TABLE(pci, oxygen_ids);
@@ -76,86 +94,12 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE 0x0001
 #define GPIO_AK5385_DFS_QUAD   0x0002
 
-#define AK4396_WRITE   0x2000
-
-#define AK4396_CONTROL_1       0
-#define AK4396_CONTROL_2       1
-#define AK4396_CONTROL_3       2
-#define AK4396_LCH_ATT         3
-#define AK4396_RCH_ATT         4
-
-/* control 1 */
-#define AK4396_RSTN            0x01
-#define AK4396_DIF_MASK                0x0e
-#define AK4396_DIF_16_LSB      0x00
-#define AK4396_DIF_20_LSB      0x02
-#define AK4396_DIF_24_MSB      0x04
-#define AK4396_DIF_24_I2S      0x06
-#define AK4396_DIF_24_LSB      0x08
-#define AK4396_ACKS            0x80
-/* control 2 */
-#define AK4396_SMUTE           0x01
-#define AK4396_DEM_MASK                0x06
-#define AK4396_DEM_441         0x00
-#define AK4396_DEM_OFF         0x02
-#define AK4396_DEM_48          0x04
-#define AK4396_DEM_32          0x06
-#define AK4396_DFS_MASK                0x18
-#define AK4396_DFS_NORMAL      0x00
-#define AK4396_DFS_DOUBLE      0x08
-#define AK4396_DFS_QUAD                0x10
-#define AK4396_SLOW            0x20
-#define AK4396_DZFM            0x40
-#define AK4396_DZFE            0x80
-/* control 3 */
-#define AK4396_DZFB            0x04
-#define AK4396_DCKB            0x10
-#define AK4396_DCKS            0x20
-#define AK4396_DSDM            0x40
-#define AK4396_D_P_MASK                0x80
-#define AK4396_PCM             0x00
-#define AK4396_DSD             0x80
-
-#define WM8785_R0      0
-#define WM8785_R1      1
-#define WM8785_R2      2
-#define WM8785_R7      7
-
-/* R0 */
-#define WM8785_MCR_MASK                0x007
-#define WM8785_MCR_SLAVE       0x000
-#define WM8785_MCR_MASTER_128  0x001
-#define WM8785_MCR_MASTER_192  0x002
-#define WM8785_MCR_MASTER_256  0x003
-#define WM8785_MCR_MASTER_384  0x004
-#define WM8785_MCR_MASTER_512  0x005
-#define WM8785_MCR_MASTER_768  0x006
-#define WM8785_OSR_MASK                0x018
-#define WM8785_OSR_SINGLE      0x000
-#define WM8785_OSR_DOUBLE      0x008
-#define WM8785_OSR_QUAD                0x010
-#define WM8785_FORMAT_MASK     0x060
-#define WM8785_FORMAT_RJUST    0x000
-#define WM8785_FORMAT_LJUST    0x020
-#define WM8785_FORMAT_I2S      0x040
-#define WM8785_FORMAT_DSP      0x060
-/* R1 */
-#define WM8785_WL_MASK         0x003
-#define WM8785_WL_16           0x000
-#define WM8785_WL_20           0x001
-#define WM8785_WL_24           0x002
-#define WM8785_WL_32           0x003
-#define WM8785_LRP             0x004
-#define WM8785_BCLKINV         0x008
-#define WM8785_LRSWAP          0x010
-#define WM8785_DEVNO_MASK      0x0e0
-/* R2 */
-#define WM8785_HPFR            0x001
-#define WM8785_HPFL            0x002
-#define WM8785_SDODIS          0x004
-#define WM8785_PWRDNR          0x008
-#define WM8785_PWRDNL          0x010
-#define WM8785_TDM_MASK                0x1c0
+#define GPIO_CLARO_HP          0x0100
+
+struct generic_data {
+       u8 ak4396_regs[4][5];
+       u16 wm8785_regs[3];
+};
 
 static void ak4396_write(struct oxygen *chip, unsigned int codec,
                         u8 reg, u8 value)
@@ -164,39 +108,66 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec,
        static const u8 codec_spi_map[4] = {
                0, 1, 2, 4
        };
+       struct generic_data *data = chip->model_data;
+
        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
                         OXYGEN_SPI_DATA_LENGTH_2 |
                         OXYGEN_SPI_CLOCK_160 |
                         (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
                         AK4396_WRITE | (reg << 8) | value);
+       data->ak4396_regs[codec][reg] = value;
+}
+
+static void ak4396_write_cached(struct oxygen *chip, unsigned int codec,
+                               u8 reg, u8 value)
+{
+       struct generic_data *data = chip->model_data;
+
+       if (value != data->ak4396_regs[codec][reg])
+               ak4396_write(chip, codec, reg, value);
 }
 
 static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
 {
+       struct generic_data *data = chip->model_data;
+
        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
                         OXYGEN_SPI_DATA_LENGTH_2 |
                         OXYGEN_SPI_CLOCK_160 |
                         (3 << OXYGEN_SPI_CODEC_SHIFT) |
                         OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                         (reg << 9) | value);
+       if (reg < ARRAY_SIZE(data->wm8785_regs))
+               data->wm8785_regs[reg] = value;
 }
 
-static void ak4396_init(struct oxygen *chip)
+static void ak4396_registers_init(struct oxygen *chip)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int i;
 
-       chip->ak4396_ctl2 = AK4396_DEM_OFF | AK4396_DFS_NORMAL;
        for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_2, chip->ak4396_ctl2);
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_3, AK4396_PCM);
-               ak4396_write(chip, i, AK4396_LCH_ATT, 0xff);
-               ak4396_write(chip, i, AK4396_RCH_ATT, 0xff);
+               ak4396_write(chip, i, AK4396_CONTROL_1,
+                            AK4396_DIF_24_MSB | AK4396_RSTN);
+               ak4396_write(chip, i, AK4396_CONTROL_2,
+                            data->ak4396_regs[0][AK4396_CONTROL_2]);
+               ak4396_write(chip, i, AK4396_CONTROL_3,
+                            AK4396_PCM);
+               ak4396_write(chip, i, AK4396_LCH_ATT,
+                            chip->dac_volume[i * 2]);
+               ak4396_write(chip, i, AK4396_RCH_ATT,
+                            chip->dac_volume[i * 2 + 1]);
        }
+}
+
+static void ak4396_init(struct oxygen *chip)
+{
+       struct generic_data *data = chip->model_data;
+
+       data->ak4396_regs[0][AK4396_CONTROL_2] =
+               AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
+       ak4396_registers_init(chip);
        snd_component_add(chip->card, "AK4396");
 }
 
@@ -207,12 +178,23 @@ static void ak5385_init(struct oxygen *chip)
        snd_component_add(chip->card, "AK5385");
 }
 
-static void wm8785_init(struct oxygen *chip)
+static void wm8785_registers_init(struct oxygen *chip)
 {
+       struct generic_data *data = chip->model_data;
+
        wm8785_write(chip, WM8785_R7, 0);
-       wm8785_write(chip, WM8785_R0, WM8785_MCR_SLAVE |
-                    WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST);
-       wm8785_write(chip, WM8785_R1, WM8785_WL_24);
+       wm8785_write(chip, WM8785_R0, data->wm8785_regs[0]);
+       wm8785_write(chip, WM8785_R2, data->wm8785_regs[2]);
+}
+
+static void wm8785_init(struct oxygen *chip)
+{
+       struct generic_data *data = chip->model_data;
+
+       data->wm8785_regs[0] =
+               WM8785_MCR_SLAVE | WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST;
+       data->wm8785_regs[2] = WM8785_HPFR | WM8785_HPFL;
+       wm8785_registers_init(chip);
        snd_component_add(chip->card, "WM8785");
 }
 
@@ -228,31 +210,88 @@ static void meridian_init(struct oxygen *chip)
        ak5385_init(chip);
 }
 
+static void claro_enable_hp(struct oxygen *chip)
+{
+       msleep(300);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_CLARO_HP);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_HP);
+}
+
+static void claro_init(struct oxygen *chip)
+{
+       ak4396_init(chip);
+       wm8785_init(chip);
+       claro_enable_hp(chip);
+}
+
+static void claro_halo_init(struct oxygen *chip)
+{
+       ak4396_init(chip);
+       ak5385_init(chip);
+       claro_enable_hp(chip);
+}
+
 static void generic_cleanup(struct oxygen *chip)
 {
 }
 
+static void claro_disable_hp(struct oxygen *chip)
+{
+       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_CLARO_HP);
+}
+
+static void claro_cleanup(struct oxygen *chip)
+{
+       claro_disable_hp(chip);
+}
+
+static void claro_suspend(struct oxygen *chip)
+{
+       claro_disable_hp(chip);
+}
+
+static void generic_resume(struct oxygen *chip)
+{
+       ak4396_registers_init(chip);
+       wm8785_registers_init(chip);
+}
+
+static void meridian_resume(struct oxygen *chip)
+{
+       ak4396_registers_init(chip);
+}
+
+static void claro_resume(struct oxygen *chip)
+{
+       ak4396_registers_init(chip);
+       claro_enable_hp(chip);
+}
+
 static void set_ak4396_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int i;
        u8 value;
 
-       value = chip->ak4396_ctl2 & ~AK4396_DFS_MASK;
+       value = data->ak4396_regs[0][AK4396_CONTROL_2] & ~AK4396_DFS_MASK;
        if (params_rate(params) <= 54000)
                value |= AK4396_DFS_NORMAL;
-       else if (params_rate(params) < 120000)
+       else if (params_rate(params) <= 108000)
                value |= AK4396_DFS_DOUBLE;
        else
                value |= AK4396_DFS_QUAD;
-       chip->ak4396_ctl2 = value;
-       for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_1, AK4396_DIF_24_MSB);
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_2, value);
-               ak4396_write(chip, i,
-                            AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
+
+       msleep(1); /* wait for the new MCLK to become stable */
+
+       if (value != data->ak4396_regs[0][AK4396_CONTROL_2]) {
+               for (i = 0; i < 4; ++i) {
+                       ak4396_write(chip, i, AK4396_CONTROL_1,
+                                    AK4396_DIF_24_MSB);
+                       ak4396_write(chip, i, AK4396_CONTROL_2, value);
+                       ak4396_write(chip, i, AK4396_CONTROL_1,
+                                    AK4396_DIF_24_MSB | AK4396_RSTN);
+               }
        }
 }
 
@@ -261,32 +300,32 @@ static void update_ak4396_volume(struct oxygen *chip)
        unsigned int i;
 
        for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i,
-                            AK4396_LCH_ATT, chip->dac_volume[i * 2]);
-               ak4396_write(chip, i,
-                            AK4396_RCH_ATT, chip->dac_volume[i * 2 + 1]);
+               ak4396_write_cached(chip, i, AK4396_LCH_ATT,
+                                   chip->dac_volume[i * 2]);
+               ak4396_write_cached(chip, i, AK4396_RCH_ATT,
+                                   chip->dac_volume[i * 2 + 1]);
        }
 }
 
 static void update_ak4396_mute(struct oxygen *chip)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int i;
        u8 value;
 
-       value = chip->ak4396_ctl2 & ~AK4396_SMUTE;
+       value = data->ak4396_regs[0][AK4396_CONTROL_2] & ~AK4396_SMUTE;
        if (chip->dac_mute)
                value |= AK4396_SMUTE;
        for (i = 0; i < 4; ++i)
-               ak4396_write(chip, i, AK4396_CONTROL_2, value);
+               ak4396_write_cached(chip, i, AK4396_CONTROL_2, value);
 }
 
 static void set_wm8785_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int value;
 
-       wm8785_write(chip, WM8785_R7, 0);
-
        value = WM8785_MCR_SLAVE | WM8785_FORMAT_LJUST;
        if (params_rate(params) <= 48000)
                value |= WM8785_OSR_SINGLE;
@@ -294,13 +333,11 @@ static void set_wm8785_params(struct oxygen *chip,
                value |= WM8785_OSR_DOUBLE;
        else
                value |= WM8785_OSR_QUAD;
-       wm8785_write(chip, WM8785_R0, value);
-
-       if (snd_pcm_format_width(params_format(params)) <= 16)
-               value = WM8785_WL_16;
-       else
-               value = WM8785_WL_24;
-       wm8785_write(chip, WM8785_R1, value);
+       if (value != data->wm8785_regs[0]) {
+               wm8785_write(chip, WM8785_R7, 0);
+               wm8785_write(chip, WM8785_R0, value);
+               wm8785_write(chip, WM8785_R2, data->wm8785_regs[2]);
+       }
 }
 
 static void set_ak5385_params(struct oxygen *chip,
@@ -318,65 +355,208 @@ static void set_ak5385_params(struct oxygen *chip,
                              value, GPIO_AK5385_DFS_MASK);
 }
 
-static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
+static int rolloff_info(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_info *info)
+{
+       static const char *const names[2] = {
+               "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;
+}
+
+static int rolloff_get(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
+{
+       struct oxygen *chip = ctl->private_data;
+       struct generic_data *data = chip->model_data;
 
-static int ak4396_control_filter(struct snd_kcontrol_new *template)
+       value->value.enumerated.item[0] =
+               (data->ak4396_regs[0][AK4396_CONTROL_2] & AK4396_SLOW) != 0;
+       return 0;
+}
+
+static int rolloff_put(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
 {
-       if (!strcmp(template->name, "Master Playback Volume")) {
-               template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
-               template->tlv.p = ak4396_db_scale;
+       struct oxygen *chip = ctl->private_data;
+       struct generic_data *data = chip->model_data;
+       unsigned int i;
+       int changed;
+       u8 reg;
+
+       mutex_lock(&chip->mutex);
+       reg = data->ak4396_regs[0][AK4396_CONTROL_2];
+       if (value->value.enumerated.item[0])
+               reg |= AK4396_SLOW;
+       else
+               reg &= ~AK4396_SLOW;
+       changed = reg != data->ak4396_regs[0][AK4396_CONTROL_2];
+       if (changed) {
+               for (i = 0; i < 4; ++i)
+                       ak4396_write(chip, i, AK4396_CONTROL_2, reg);
        }
+       mutex_unlock(&chip->mutex);
+       return changed;
+}
+
+static const struct snd_kcontrol_new rolloff_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "DAC Filter Playback Enum",
+       .info = rolloff_info,
+       .get = rolloff_get,
+       .put = rolloff_put,
+};
+
+static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info)
+{
+       static const char *const names[2] = {
+               "None", "High-pass Filter"
+       };
+
+       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 hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+       struct oxygen *chip = ctl->private_data;
+       struct generic_data *data = chip->model_data;
+
+       value->value.enumerated.item[0] =
+               (data->wm8785_regs[WM8785_R2] & WM8785_HPFR) != 0;
+       return 0;
+}
+
+static int hpf_put(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
+{
+       struct oxygen *chip = ctl->private_data;
+       struct generic_data *data = chip->model_data;
+       unsigned int reg;
+       int changed;
+
+       mutex_lock(&chip->mutex);
+       reg = data->wm8785_regs[WM8785_R2] & ~(WM8785_HPFR | WM8785_HPFL);
+       if (value->value.enumerated.item[0])
+               reg |= WM8785_HPFR | WM8785_HPFL;
+       changed = reg != data->wm8785_regs[WM8785_R2];
+       if (changed)
+               wm8785_write(chip, WM8785_R2, reg);
+       mutex_unlock(&chip->mutex);
+       return changed;
+}
+
+static const struct snd_kcontrol_new hpf_control = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "ADC Filter Capture Enum",
+       .info = hpf_info,
+       .get = hpf_get,
+       .put = hpf_put,
+};
+
+static int generic_mixer_init(struct oxygen *chip)
+{
+       return snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
+}
+
+static int generic_wm8785_mixer_init(struct oxygen *chip)
+{
+       int err;
+
+       err = generic_mixer_init(chip);
+       if (err < 0)
+               return err;
+       err = snd_ctl_add(chip->card, snd_ctl_new1(&hpf_control, chip));
+       if (err < 0)
+               return err;
        return 0;
 }
 
+static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
+
 static const struct oxygen_model model_generic = {
        .shortname = "C-Media CMI8788",
        .longname = "C-Media Oxygen HD Audio",
        .chip = "CMI8788",
-       .owner = THIS_MODULE,
        .init = generic_init,
-       .control_filter = ak4396_control_filter,
+       .mixer_init = generic_wm8785_mixer_init,
        .cleanup = generic_cleanup,
+       .resume = generic_resume,
+       .get_i2s_mclk = oxygen_default_i2s_mclk,
        .set_dac_params = set_ak4396_params,
        .set_adc_params = set_wm8785_params,
        .update_dac_volume = update_ak4396_volume,
        .update_dac_mute = update_ak4396_mute,
-       .used_channels = OXYGEN_CHANNEL_A |
-                        OXYGEN_CHANNEL_C |
-                        OXYGEN_CHANNEL_SPDIF |
-                        OXYGEN_CHANNEL_MULTICH |
-                        OXYGEN_CHANNEL_AC97,
-       .function_flags = 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_meridian = {
-       .shortname = "C-Media CMI8788",
-       .longname = "C-Media Oxygen HD Audio",
-       .chip = "CMI8788",
-       .owner = THIS_MODULE,
-       .init = meridian_init,
-       .control_filter = ak4396_control_filter,
-       .cleanup = generic_cleanup,
-       .set_dac_params = set_ak4396_params,
-       .set_adc_params = set_ak5385_params,
-       .update_dac_volume = update_ak4396_volume,
-       .update_dac_mute = update_ak4396_mute,
-       .used_channels = OXYGEN_CHANNEL_B |
-                        OXYGEN_CHANNEL_C |
-                        OXYGEN_CHANNEL_SPDIF |
-                        OXYGEN_CHANNEL_MULTICH |
-                        OXYGEN_CHANNEL_AC97,
-       .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+       .dac_tlv = ak4396_db_scale,
+       .model_data_size = sizeof(struct generic_data),
+       .device_config = PLAYBACK_0_TO_I2S |
+                        PLAYBACK_1_TO_SPDIF |
+                        PLAYBACK_2_TO_AC97_1 |
+                        CAPTURE_0_FROM_I2S_1 |
+                        CAPTURE_1_FROM_SPDIF |
+                        CAPTURE_2_FROM_AC97_1,
+       .dac_channels = 8,
+       .dac_volume_min = 0,
+       .dac_volume_max = 255,
+       .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 int __devinit get_oxygen_model(struct oxygen *chip,
+                                     const struct pci_device_id *id)
+{
+       chip->model = model_generic;
+       switch (id->driver_data) {
+       case MODEL_MERIDIAN:
+               chip->model.init = meridian_init;
+               chip->model.mixer_init = generic_mixer_init;
+               chip->model.resume = meridian_resume;
+               chip->model.set_adc_params = set_ak5385_params;
+               chip->model.device_config = PLAYBACK_0_TO_I2S |
+                                           PLAYBACK_1_TO_SPDIF |
+                                           CAPTURE_0_FROM_I2S_2 |
+                                           CAPTURE_1_FROM_SPDIF;
+               break;
+       case MODEL_CLARO:
+               chip->model.init = claro_init;
+               chip->model.cleanup = claro_cleanup;
+               chip->model.suspend = claro_suspend;
+               chip->model.resume = claro_resume;
+               break;
+       case MODEL_CLARO_HALO:
+               chip->model.init = claro_halo_init;
+               chip->model.mixer_init = generic_mixer_init;
+               chip->model.cleanup = claro_cleanup;
+               chip->model.suspend = claro_suspend;
+               chip->model.resume = claro_resume;
+               chip->model.set_adc_params = set_ak5385_params;
+               break;
+       }
+       if (id->driver_data == MODEL_MERIDIAN ||
+           id->driver_data == MODEL_CLARO_HALO) {
+               chip->model.misc_flags = OXYGEN_MISC_MIDI;
+               chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;
+       }
+       return 0;
+}
+
 static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                                          const struct pci_device_id *pci_id)
 {
        static int dev;
-       const struct oxygen_model *model;
        int err;
 
        if (dev >= SNDRV_CARDS)
@@ -385,8 +565,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                ++dev;
                return -ENOENT;
        }
-       model = pci_id->driver_data ? &model_meridian : &model_generic;
-       err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model);
+       err = oxygen_pci_probe(pci, index[dev], id[dev], THIS_MODULE,
+                              oxygen_ids, get_oxygen_model);
        if (err >= 0)
                ++dev;
        return err;
@@ -397,6 +577,10 @@ static struct pci_driver oxygen_driver = {
        .id_table = oxygen_ids,
        .probe = generic_oxygen_probe,
        .remove = __devexit_p(oxygen_pci_remove),
+#ifdef CONFIG_PM
+       .suspend = oxygen_pci_suspend,
+       .resume = oxygen_pci_resume,
+#endif
 };
 
 static int __init alsa_card_oxygen_init(void)