]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - sound/pci/oxygen/xonar_cs43xx.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[mv-sheeva.git] / sound / pci / oxygen / xonar_cs43xx.c
index 8fb5797577dd66f445a12fc603f6c03560cef5bd..16c226bfcd2bc945e795c7bab877cfeb71f9b055 100644 (file)
  * CS4362A:
  *
  * AD0 <- 0
+ *
+ * CM9780:
+ *
+ * GPO 0 -> route line-in (0) or AC97 output (1) to CS5361 input
  */
 
 #include <linux/pci.h>
 
 struct xonar_cs43xx {
        struct xonar_generic generic;
-       u8 cs4398_fm;
-       u8 cs4362a_fm;
+       u8 cs4398_regs[8];
+       u8 cs4362a_regs[15];
 };
 
 static void cs4398_write(struct oxygen *chip, u8 reg, u8 value)
 {
-       oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
-}
+       struct xonar_cs43xx *data = chip->model_data;
 
-static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
-{
-       oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
+       oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
+       if (reg < ARRAY_SIZE(data->cs4398_regs))
+               data->cs4398_regs[reg] = value;
 }
 
-static void update_cs4362a_volumes(struct oxygen *chip)
+static void cs4398_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
-       u8 mute;
+       struct xonar_cs43xx *data = chip->model_data;
 
-       mute = chip->dac_mute ? CS4362A_MUTE : 0;
-       cs4362a_write(chip, 7, (127 - chip->dac_volume[2]) | mute);
-       cs4362a_write(chip, 8, (127 - chip->dac_volume[3]) | mute);
-       cs4362a_write(chip, 10, (127 - chip->dac_volume[4]) | mute);
-       cs4362a_write(chip, 11, (127 - chip->dac_volume[5]) | mute);
-       cs4362a_write(chip, 13, (127 - chip->dac_volume[6]) | mute);
-       cs4362a_write(chip, 14, (127 - chip->dac_volume[7]) | mute);
+       if (value != data->cs4398_regs[reg])
+               cs4398_write(chip, reg, value);
 }
 
-static void update_cs43xx_volume(struct oxygen *chip)
+static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
 {
-       cs4398_write(chip, 5, (127 - chip->dac_volume[0]) * 2);
-       cs4398_write(chip, 6, (127 - chip->dac_volume[1]) * 2);
-       update_cs4362a_volumes(chip);
+       struct xonar_cs43xx *data = chip->model_data;
+
+       oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
+       if (reg < ARRAY_SIZE(data->cs4362a_regs))
+               data->cs4362a_regs[reg] = value;
 }
 
-static void update_cs43xx_mute(struct oxygen *chip)
+static void cs4362a_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
-       u8 reg;
+       struct xonar_cs43xx *data = chip->model_data;
 
-       reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
-       if (chip->dac_mute)
-               reg |= CS4398_MUTE_B | CS4398_MUTE_A;
-       cs4398_write(chip, 4, reg);
-       update_cs4362a_volumes(chip);
+       if (value != data->cs4362a_regs[reg])
+               cs4362a_write(chip, reg, value);
 }
 
-static void cs43xx_init(struct oxygen *chip)
+static void cs43xx_registers_init(struct oxygen *chip)
 {
        struct xonar_cs43xx *data = chip->model_data;
+       unsigned int i;
 
        /* set CPEN (control port mode) and power down */
        cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);
        cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
        /* configure */
-       cs4398_write(chip, 2, data->cs4398_fm);
+       cs4398_write(chip, 2, data->cs4398_regs[2]);
        cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L);
-       cs4398_write(chip, 7, CS4398_RMP_DN | CS4398_RMP_UP |
-                    CS4398_ZERO_CROSS | CS4398_SOFT_RAMP);
+       cs4398_write(chip, 4, data->cs4398_regs[4]);
+       cs4398_write(chip, 5, data->cs4398_regs[5]);
+       cs4398_write(chip, 6, data->cs4398_regs[6]);
+       cs4398_write(chip, 7, data->cs4398_regs[7]);
        cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST);
        cs4362a_write(chip, 0x03, CS4362A_MUTEC_6 | CS4362A_AMUTE |
                      CS4362A_RMP_UP | CS4362A_ZERO_CROSS | CS4362A_SOFT_RAMP);
-       cs4362a_write(chip, 0x04, CS4362A_RMP_DN | CS4362A_DEM_NONE);
+       cs4362a_write(chip, 0x04, data->cs4362a_regs[0x04]);
        cs4362a_write(chip, 0x05, 0);
-       cs4362a_write(chip, 0x06, data->cs4362a_fm);
-       cs4362a_write(chip, 0x09, data->cs4362a_fm);
-       cs4362a_write(chip, 0x0c, data->cs4362a_fm);
-       update_cs43xx_volume(chip);
-       update_cs43xx_mute(chip);
+       for (i = 6; i <= 14; ++i)
+               cs4362a_write(chip, i, data->cs4362a_regs[i]);
        /* clear power down */
        cs4398_write(chip, 8, CS4398_CPEN);
        cs4362a_write(chip, 0x01, CS4362A_CPEN);
@@ -143,16 +140,32 @@ static void xonar_d1_init(struct oxygen *chip)
 
        data->generic.anti_pop_delay = 800;
        data->generic.output_enable_bit = GPIO_D1_OUTPUT_ENABLE;
-       data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
-       data->cs4362a_fm = CS4362A_FM_SINGLE |
+       data->cs4398_regs[2] =
+               CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
+       data->cs4398_regs[4] = CS4398_MUTEP_LOW |
+               CS4398_MUTE_B | CS4398_MUTE_A | CS4398_PAMUTE;
+       data->cs4398_regs[5] = 60 * 2;
+       data->cs4398_regs[6] = 60 * 2;
+       data->cs4398_regs[7] = CS4398_RMP_DN | CS4398_RMP_UP |
+               CS4398_ZERO_CROSS | CS4398_SOFT_RAMP;
+       data->cs4362a_regs[4] = CS4362A_RMP_DN | CS4362A_DEM_NONE;
+       data->cs4362a_regs[6] = CS4362A_FM_SINGLE |
                CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+       data->cs4362a_regs[7] = 60 | CS4362A_MUTE;
+       data->cs4362a_regs[8] = 60 | CS4362A_MUTE;
+       data->cs4362a_regs[9] = data->cs4362a_regs[6];
+       data->cs4362a_regs[10] = 60 | CS4362A_MUTE;
+       data->cs4362a_regs[11] = 60 | CS4362A_MUTE;
+       data->cs4362a_regs[12] = data->cs4362a_regs[6];
+       data->cs4362a_regs[13] = 60 | CS4362A_MUTE;
+       data->cs4362a_regs[14] = 60 | CS4362A_MUTE;
 
        oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                       OXYGEN_2WIRE_LENGTH_8 |
                       OXYGEN_2WIRE_INTERRUPT_MASK |
                       OXYGEN_2WIRE_SPEED_FAST);
 
-       cs43xx_init(chip);
+       cs43xx_registers_init(chip);
 
        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
                          GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
@@ -194,7 +207,7 @@ static void xonar_d1_resume(struct oxygen *chip)
 {
        oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
        msleep(1);
-       cs43xx_init(chip);
+       cs43xx_registers_init(chip);
        xonar_enable_output(chip);
 }
 
@@ -202,23 +215,68 @@ static void set_cs43xx_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params)
 {
        struct xonar_cs43xx *data = chip->model_data;
+       u8 cs4398_fm, cs4362a_fm;
 
-       data->cs4398_fm = CS4398_DEM_NONE | CS4398_DIF_LJUST;
-       data->cs4362a_fm = CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
        if (params_rate(params) <= 50000) {
-               data->cs4398_fm |= CS4398_FM_SINGLE;
-               data->cs4362a_fm |= CS4362A_FM_SINGLE;
+               cs4398_fm = CS4398_FM_SINGLE;
+               cs4362a_fm = CS4362A_FM_SINGLE;
        } else if (params_rate(params) <= 100000) {
-               data->cs4398_fm |= CS4398_FM_DOUBLE;
-               data->cs4362a_fm |= CS4362A_FM_DOUBLE;
+               cs4398_fm = CS4398_FM_DOUBLE;
+               cs4362a_fm = CS4362A_FM_DOUBLE;
        } else {
-               data->cs4398_fm |= CS4398_FM_QUAD;
-               data->cs4362a_fm |= CS4362A_FM_QUAD;
+               cs4398_fm = CS4398_FM_QUAD;
+               cs4362a_fm = CS4362A_FM_QUAD;
        }
-       cs4398_write(chip, 2, data->cs4398_fm);
-       cs4362a_write(chip, 0x06, data->cs4362a_fm);
-       cs4362a_write(chip, 0x09, data->cs4362a_fm);
-       cs4362a_write(chip, 0x0c, data->cs4362a_fm);
+       cs4398_fm |= CS4398_DEM_NONE | CS4398_DIF_LJUST;
+       cs4398_write_cached(chip, 2, cs4398_fm);
+       cs4362a_fm |= data->cs4362a_regs[6] & ~CS4362A_FM_MASK;
+       cs4362a_write_cached(chip, 6, cs4362a_fm);
+       cs4362a_write_cached(chip, 12, cs4362a_fm);
+       cs4362a_fm &= CS4362A_FM_MASK;
+       cs4362a_fm |= data->cs4362a_regs[9] & ~CS4362A_FM_MASK;
+       cs4362a_write_cached(chip, 9, cs4362a_fm);
+}
+
+static void update_cs4362a_volumes(struct oxygen *chip)
+{
+       unsigned int i;
+       u8 mute;
+
+       mute = chip->dac_mute ? CS4362A_MUTE : 0;
+       for (i = 0; i < 6; ++i)
+               cs4362a_write_cached(chip, 7 + i + i / 2,
+                                    (127 - chip->dac_volume[2 + i]) | mute);
+}
+
+static void update_cs43xx_volume(struct oxygen *chip)
+{
+       cs4398_write_cached(chip, 5, (127 - chip->dac_volume[0]) * 2);
+       cs4398_write_cached(chip, 6, (127 - chip->dac_volume[1]) * 2);
+       update_cs4362a_volumes(chip);
+}
+
+static void update_cs43xx_mute(struct oxygen *chip)
+{
+       u8 reg;
+
+       reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
+       if (chip->dac_mute)
+               reg |= CS4398_MUTE_B | CS4398_MUTE_A;
+       cs4398_write_cached(chip, 4, reg);
+       update_cs4362a_volumes(chip);
+}
+
+static void update_cs43xx_center_lfe_mix(struct oxygen *chip, bool mixed)
+{
+       struct xonar_cs43xx *data = chip->model_data;
+       u8 reg;
+
+       reg = data->cs4362a_regs[9] & ~CS4362A_ATAPI_MASK;
+       if (mixed)
+               reg |= CS4362A_ATAPI_B_LR | CS4362A_ATAPI_A_LR;
+       else
+               reg |= CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+       cs4362a_write_cached(chip, 9, reg);
 }
 
 static const struct snd_kcontrol_new front_panel_switch = {
@@ -230,6 +288,68 @@ static const struct snd_kcontrol_new front_panel_switch = {
        .private_value = GPIO_D1_FRONT_PANEL,
 };
 
+static int rolloff_info(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_info *info)
+{
+       static const char *const names[2] = {
+               "Fast 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 xonar_cs43xx *data = chip->model_data;
+
+       value->value.enumerated.item[0] =
+               (data->cs4398_regs[7] & CS4398_FILT_SEL) != 0;
+       return 0;
+}
+
+static int rolloff_put(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
+{
+       struct oxygen *chip = ctl->private_data;
+       struct xonar_cs43xx *data = chip->model_data;
+       int changed;
+       u8 reg;
+
+       mutex_lock(&chip->mutex);
+       reg = data->cs4398_regs[7];
+       if (value->value.enumerated.item[0])
+               reg |= CS4398_FILT_SEL;
+       else
+               reg &= ~CS4398_FILT_SEL;
+       changed = reg != data->cs4398_regs[7];
+       if (changed) {
+               cs4398_write(chip, 7, reg);
+               if (reg & CS4398_FILT_SEL)
+                       reg = data->cs4362a_regs[0x04] | CS4362A_FILT_SEL;
+               else
+                       reg = data->cs4362a_regs[0x04] & ~CS4362A_FILT_SEL;
+               cs4362a_write(chip, 0x04, 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 void xonar_d1_line_mic_ac97_switch(struct oxygen *chip,
                                          unsigned int reg, unsigned int mute)
 {
@@ -253,7 +373,15 @@ static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
 
 static int xonar_d1_mixer_init(struct oxygen *chip)
 {
-       return snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip));
+       int err;
+
+       err = snd_ctl_add(chip->card, snd_ctl_new1(&front_panel_switch, chip));
+       if (err < 0)
+               return err;
+       err = snd_ctl_add(chip->card, snd_ctl_new1(&rolloff_control, chip));
+       if (err < 0)
+               return err;
+       return 0;
 }
 
 static const struct oxygen_model model_xonar_d1 = {
@@ -265,10 +393,12 @@ static const struct oxygen_model model_xonar_d1 = {
        .cleanup = xonar_d1_cleanup,
        .suspend = xonar_d1_suspend,
        .resume = xonar_d1_resume,
+       .get_i2s_mclk = oxygen_default_i2s_mclk,
        .set_dac_params = set_cs43xx_params,
        .set_adc_params = xonar_set_cs53x1_params,
        .update_dac_volume = update_cs43xx_volume,
        .update_dac_mute = update_cs43xx_mute,
+       .update_center_lfe_mix = update_cs43xx_center_lfe_mix,
        .ac97_switch = xonar_d1_line_mic_ac97_switch,
        .dac_tlv = cs4362a_db_scale,
        .model_data_size = sizeof(struct xonar_cs43xx),