[ALSA] virtuoso: initialize two-wire control register

[firefly-linux-kernel-4.4.55.git] / sound / pci / oxygen / virtuoso.c

diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 1db4aa5dfad4bacd718d4d673b618ef9d513ab1e..c7080d6b71c2bcd84a94a73523b1fb5585504c20 100644 (file)
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -47,10 +47,10 @@
  * GPI 0 <- external power present
  *
  * GPIO 0 -> enable output to speakers
- * GPIO 1 -> ALT?
+ * GPIO 1 -> ?
  * GPIO 2 -> M0 of CS5361
  * GPIO 3 -> M1 of CS5361
- * GPIO 8 -> line-in/mic-in/digital-out switch?
+ * GPIO 8 -> route input jack to line-in (0) or mic-in (1)
  *
  * CS4398:
  *
@@ -120,7 +120,7 @@ MODULE_DEVICE_TABLE(pci, xonar_ids);
 #define GPI_DX_EXT_POWER       0x01
 #define GPIO_DX_OUTPUT_ENABLE  0x0001
 #define GPIO_DX_UNKNOWN1       0x0002
-#define GPIO_DX_UNKNOWN2       0x0100
+#define GPIO_DX_INPUT_ROUTE    0x0100
 
 #define I2C_DEVICE_CS4398      0x9e    /* 10011, AD1=1, AD0=1, /W=0 */
 #define I2C_DEVICE_CS4362A     0x30    /* 001100, AD0=0, /W=0 */
@@ -229,9 +229,10 @@ static void xonar_dx_init(struct oxygen *chip)
        data->ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
        data->ext_power_bit = GPI_DX_EXT_POWER;
 
-       /* XXX the DACs' datasheets say fast mode is not allowed */
-       oxygen_set_bits16(chip, OXYGEN_2WIRE_BUS_STATUS,
-                         OXYGEN_2WIRE_SPEED_FAST);
+       oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
+                      OXYGEN_2WIRE_LENGTH_8 |
+                      OXYGEN_2WIRE_INTERRUPT_MASK |
+                      OXYGEN_2WIRE_SPEED_FAST);
 
        /* set CPEN (control port mode) and power down */
        cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);
@@ -267,7 +268,8 @@ static void xonar_dx_init(struct oxygen *chip)
        cs4362a_write(chip, 0x01, CS4362A_CPEN);
 
        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
-                         GPIO_DX_UNKNOWN1 | GPIO_DX_UNKNOWN2);
+                         GPIO_DX_UNKNOWN1 | GPIO_DX_INPUT_ROUTE);
+       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DX_INPUT_ROUTE);
 
        xonar_common_init(chip);
 
@@ -469,6 +471,65 @@ static const struct snd_kcontrol_new alt_switch = {
        .put = alt_switch_put,
 };
 
+static int unknown_info(struct snd_kcontrol *ctl,
+                       struct snd_ctl_elem_info *info)
+{
+       info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       info->count = 1;
+       info->value.enumerated.items = 2;
+       if (info->value.enumerated.item > 1)
+               info->value.enumerated.item = 1;
+       sprintf(info->value.enumerated.name, "%u", info->value.enumerated.item);
+       return 0;
+}
+
+static int unknown_get(struct snd_kcontrol *ctl,
+                      struct snd_ctl_elem_value *value)
+{
+       struct oxygen *chip = ctl->private_data;
+
+       value->value.enumerated.item[0] =
+               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_DX_UNKNOWN1);
+       return 0;
+}
+
+static int unknown_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.enumerated.item[0])
+               new_reg = old_reg | GPIO_DX_UNKNOWN1;
+       else
+               new_reg = old_reg & ~GPIO_DX_UNKNOWN1;
+       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 unknown_switch = {
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name = "PanelConfig?",
+       .info = unknown_info,
+       .get = unknown_get,
+       .put = unknown_put,
+};
+
+static void xonar_dx_ac97_switch(struct oxygen *chip,
+                                unsigned int reg, unsigned int mute)
+{
+       if (reg == AC97_LINE) {
+               spin_lock_irq(&chip->reg_lock);
+               oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                                     mute ? GPIO_DX_INPUT_ROUTE : 0,
+                                     GPIO_DX_INPUT_ROUTE);
+               spin_unlock_irq(&chip->reg_lock);
+       }
+}
+
 static const DECLARE_TLV_DB_SCALE(pcm1796_db_scale, -12000, 50, 0);
 static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -12700, 100, 0);
 
@@ -493,11 +554,6 @@ static int xonar_dx_control_filter(struct snd_kcontrol_new *template)
                template->tlv.p = cs4362a_db_scale;
        } else if (!strncmp(template->name, "CD Capture ", 11)) {
                return 1; /* no CD input */
-       } else if (!strcmp(template->name,
-                          SNDRV_CTL_NAME_IEC958("", CAPTURE, MASK)) ||
-                  !strcmp(template->name,
-                          SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT))) {
-               return 1; /* no digital input */
        }
        return 0;
 }
@@ -507,6 +563,11 @@ static int xonar_mixer_init(struct oxygen *chip)
        return snd_ctl_add(chip->card, snd_ctl_new1(&alt_switch, chip));
 }
 
+static int xonar_dx_mixer_init(struct oxygen *chip)
+{
+       return snd_ctl_add(chip->card, snd_ctl_new1(&unknown_switch, chip));
+}
+
 static const struct oxygen_model xonar_models[] = {
        [MODEL_D2] = {
                .shortname = "Xonar D2",
@@ -566,12 +627,14 @@ static const struct oxygen_model xonar_models[] = {
                .owner = THIS_MODULE,
                .init = xonar_dx_init,
                .control_filter = xonar_dx_control_filter,
+               .mixer_init = xonar_dx_mixer_init,
                .cleanup = xonar_dx_cleanup,
                .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_dx_ac97_switch,
                .model_data_size = sizeof(struct xonar_data),
                .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
                               PLAYBACK_1_TO_SPDIF |