]> err.no Git - linux-2.6/blobdiff - sound/pci/oxygen/virtuoso.c
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...
[linux-2.6] / sound / pci / oxygen / virtuoso.c
index 83c2c43e7b8593fc8295c6b1be83427b03610f5a..40e92f5cd69c760111073cfe8e8a9c60e1f00cce 100644 (file)
@@ -18,6 +18,8 @@
  */
 
 /*
+ * CMI8788:
+ *
  * SPI 0 -> 1st PCM1796 (front)
  * SPI 1 -> 2nd PCM1796 (surround)
  * SPI 2 -> 3rd PCM1796 (center/LFE)
  *
  * GPIO 2 -> M0 of CS5381
  * GPIO 3 -> M1 of CS5381
- * GPIO 5 <- ? (D2X only)
+ * GPIO 5 <- external power present (D2X only)
  * GPIO 7 -> ALT
- * GPIO 8 -> ? (amps enable?)
+ * GPIO 8 -> enable output to speakers
+ *
+ * CM9780:
+ *
+ * GPIO 0 -> enable AC'97 bypass (line in -> ADC)
  */
 
 #include <linux/pci.h>
@@ -40,6 +46,7 @@
 #include <sound/pcm.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
+#include "cm9780.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("Asus AV200 driver");
@@ -64,14 +71,75 @@ static struct pci_device_id xonar_ids[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(pci, xonar_ids);
 
-/* register 0x12 */
+
+#define GPIO_CS5381_M_MASK     0x000c
+#define GPIO_CS5381_M_SINGLE   0x0000
+#define GPIO_CS5381_M_DOUBLE   0x0004
+#define GPIO_CS5381_M_QUAD     0x0008
+#define GPIO_EXT_POWER         0x0020
+#define GPIO_ALT               0x0080
+#define GPIO_OUTPUT_ENABLE     0x0100
+
+#define GPIO_LINE_MUTE         CM9780_GPO0
+
+/* register 16 */
+#define PCM1796_ATL_MASK       0xff
+/* register 17 */
+#define PCM1796_ATR_MASK       0xff
+/* register 18 */
 #define PCM1796_MUTE           0x01
-#define PCM1796_FMT_24_MSB     0x30
+#define PCM1796_DME            0x02
+#define PCM1796_DMF_MASK       0x0c
+#define PCM1796_DMF_DISABLED   0x00
+#define PCM1796_DMF_48         0x04
+#define PCM1796_DMF_441                0x08
+#define PCM1796_DMF_32         0x0c
+#define PCM1796_FMT_MASK       0x70
+#define PCM1796_FMT_16_RJUST   0x00
+#define PCM1796_FMT_20_RJUST   0x10
+#define PCM1796_FMT_24_RJUST   0x20
+#define PCM1796_FMT_24_LJUST   0x30
+#define PCM1796_FMT_16_I2S     0x40
+#define PCM1796_FMT_24_I2S     0x50
 #define PCM1796_ATLD           0x80
-/* register 0x14 */
+/* register 19 */
+#define PCM1796_INZD           0x01
+#define PCM1796_FLT_MASK       0x02
+#define PCM1796_FLT_SHARP      0x00
+#define PCM1796_FLT_SLOW       0x02
+#define PCM1796_DFMS           0x04
+#define PCM1796_OPE            0x10
+#define PCM1796_ATS_MASK       0x60
+#define PCM1796_ATS_1          0x00
+#define PCM1796_ATS_2          0x20
+#define PCM1796_ATS_4          0x40
+#define PCM1796_ATS_8          0x60
+#define PCM1796_REV            0x80
+/* register 20 */
+#define PCM1796_OS_MASK                0x03
 #define PCM1796_OS_64          0x00
 #define PCM1796_OS_32          0x01
 #define PCM1796_OS_128         0x02
+#define PCM1796_CHSL_MASK      0x04
+#define PCM1796_CHSL_LEFT      0x00
+#define PCM1796_CHSL_RIGHT     0x04
+#define PCM1796_MONO           0x08
+#define PCM1796_DFTH           0x10
+#define PCM1796_DSD            0x20
+#define PCM1796_SRST           0x40
+/* register 21 */
+#define PCM1796_PCMZ           0x01
+#define PCM1796_DZ_MASK                0x06
+/* register 22 */
+#define PCM1796_ZFGL           0x01
+#define PCM1796_ZFGR           0x02
+/* register 23 */
+#define PCM1796_ID_MASK                0x1f
+
+struct xonar_data {
+       u8 is_d2x;
+       u8 has_power;
+};
 
 static void pcm1796_write(struct oxygen *chip, unsigned int codec,
                          u8 reg, u8 value)
@@ -80,32 +148,49 @@ static void pcm1796_write(struct oxygen *chip, unsigned int codec,
        static const u8 codec_map[4] = {
                0, 1, 2, 4
        };
-       oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER_WRITE |
+       oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER  |
                         OXYGEN_SPI_DATA_LENGTH_2 |
+                        OXYGEN_SPI_CLOCK_160 |
                         (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
-                        OXYGEN_SPI_MAGIC,
+                        OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
                         (reg << 8) | value);
 }
 
 static void xonar_init(struct oxygen *chip)
 {
+       struct xonar_data *data = chip->model_data;
        unsigned int i;
 
+       data->is_d2x = chip->pci->subsystem_device == 0x82b7;
+
        for (i = 0; i < 4; ++i) {
-               pcm1796_write(chip, i, 0x12, PCM1796_FMT_24_MSB | PCM1796_ATLD);
-               pcm1796_write(chip, i, 0x13, 0);
-               pcm1796_write(chip, i, 0x14, PCM1796_OS_64);
-               pcm1796_write(chip, i, 0x15, 0);
-               pcm1796_write(chip, i, 0x10, 0xff);
-               pcm1796_write(chip, i, 0x11, 0xff);
+               pcm1796_write(chip, i, 18, PCM1796_FMT_24_LJUST | PCM1796_ATLD);
+               pcm1796_write(chip, i, 19, PCM1796_FLT_SHARP | PCM1796_ATS_1);
+               pcm1796_write(chip, i, 20, PCM1796_OS_64);
+               pcm1796_write(chip, i, 21, 0);
+               pcm1796_write(chip, i, 16, 0xff); /* set ATL/ATR after ATLD */
+               pcm1796_write(chip, i, 17, 0xff);
        }
 
-       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x8c);
-       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, 0x00, 0x8c);
-       oxygen_ac97_set_bits(chip, 0, 0x62, 0x0080);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                         GPIO_CS5381_M_MASK | GPIO_ALT);
+       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                             GPIO_CS5381_M_SINGLE,
+                             GPIO_CS5381_M_MASK | GPIO_ALT);
+       if (data->is_d2x) {
+               oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                                   GPIO_EXT_POWER);
+               oxygen_set_bits16(chip, OXYGEN_GPIO_INTERRUPT_MASK,
+                                 GPIO_EXT_POWER);
+               chip->interrupt_mask |= OXYGEN_INT_GPIO;
+               data->has_power = !!(oxygen_read16(chip, OXYGEN_GPIO_DATA)
+                                    & GPIO_EXT_POWER);
+       }
+       oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+       oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS, GPIO_LINE_MUTE);
        msleep(300);
-       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x100);
-       oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, 0x100);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_OUTPUT_ENABLE);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_OUTPUT_ENABLE);
 
        snd_component_add(chip->card, "PCM1796");
        snd_component_add(chip->card, "CS5381");
@@ -113,7 +198,7 @@ static void xonar_init(struct oxygen *chip)
 
 static void xonar_cleanup(struct oxygen *chip)
 {
-       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, 0x100);
+       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_OUTPUT_ENABLE);
 }
 
 static void set_pcm1796_params(struct oxygen *chip,
@@ -125,7 +210,7 @@ static void set_pcm1796_params(struct oxygen *chip,
 
        value = params_rate(params) >= 96000 ? PCM1796_OS_32 : PCM1796_OS_64;
        for (i = 0; i < 4; ++i)
-               pcm1796_write(chip, i, 0x14, value);
+               pcm1796_write(chip, i, 20, value);
 #endif
 }
 
@@ -134,8 +219,8 @@ static void update_pcm1796_volume(struct oxygen *chip)
        unsigned int i;
 
        for (i = 0; i < 4; ++i) {
-               pcm1796_write(chip, i, 0x10, chip->dac_volume[i * 2]);
-               pcm1796_write(chip, i, 0x11, chip->dac_volume[i * 2 + 1]);
+               pcm1796_write(chip, i, 16, chip->dac_volume[i * 2]);
+               pcm1796_write(chip, i, 17, chip->dac_volume[i * 2 + 1]);
        }
 }
 
@@ -144,11 +229,11 @@ static void update_pcm1796_mute(struct oxygen *chip)
        unsigned int i;
        u8 value;
 
-       value = PCM1796_FMT_24_MSB | PCM1796_ATLD;
+       value = PCM1796_FMT_24_LJUST | PCM1796_ATLD;
        if (chip->dac_mute)
                value |= PCM1796_MUTE;
        for (i = 0; i < 4; ++i)
-               pcm1796_write(chip, i, 0x12, value);
+               pcm1796_write(chip, i, 18, value);
 }
 
 static void set_cs5381_params(struct oxygen *chip,
@@ -157,12 +242,77 @@ static void set_cs5381_params(struct oxygen *chip,
        unsigned int value;
 
        if (params_rate(params) <= 54000)
-               value = 0;
+               value = GPIO_CS5381_M_SINGLE;
        else if (params_rate(params) <= 108000)
-               value = 4;
+               value = GPIO_CS5381_M_DOUBLE;
        else
-               value = 8;
-       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, value, 0x000c);
+               value = GPIO_CS5381_M_QUAD;
+       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                             value, GPIO_CS5381_M_MASK);
+}
+
+static void xonar_gpio_changed(struct oxygen *chip)
+{
+       struct xonar_data *data = chip->model_data;
+       u8 has_power;
+
+       if (!data->is_d2x)
+               return;
+       has_power = !!(oxygen_read16(chip, OXYGEN_GPIO_DATA)
+                      & GPIO_EXT_POWER);
+       if (has_power != data->has_power) {
+               data->has_power = has_power;
+               if (has_power) {
+                       snd_printk(KERN_NOTICE "power restored\n");
+               } else {
+                       snd_printk(KERN_CRIT
+                                  "Hey! Don't unplug the power cable!\n");
+                       /* TODO: stop PCMs */
+               }
+       }
+}
+
+static void mute_ac97_ctl(struct oxygen *chip, unsigned int control)
+{
+       unsigned int index = chip->controls[control]->private_value & 0xff;
+       u16 value;
+
+       value = oxygen_read_ac97(chip, 0, index);
+       if (!(value & 0x8000)) {
+               oxygen_write_ac97(chip, 0, index, value | 0x8000);
+               snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                              &chip->controls[control]->id);
+       }
+}
+
+static void xonar_ac97_switch_hook(struct oxygen *chip, unsigned int codec,
+                                  unsigned int reg, int mute)
+{
+       if (codec != 0)
+               return;
+       /* line-in is exclusive */
+       switch (reg) {
+       case AC97_LINE:
+               oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
+                                        mute ? GPIO_LINE_MUTE : 0,
+                                        GPIO_LINE_MUTE);
+               if (!mute) {
+                       mute_ac97_ctl(chip, CONTROL_MIC_CAPTURE_SWITCH);
+                       mute_ac97_ctl(chip, CONTROL_CD_CAPTURE_SWITCH);
+                       mute_ac97_ctl(chip, CONTROL_AUX_CAPTURE_SWITCH);
+               }
+               break;
+       case AC97_MIC:
+       case AC97_CD:
+       case AC97_VIDEO:
+       case AC97_AUX:
+               if (!mute) {
+                       oxygen_ac97_set_bits(chip, 0, CM9780_GPIO_STATUS,
+                                            GPIO_LINE_MUTE);
+                       mute_ac97_ctl(chip, CONTROL_LINE_CAPTURE_SWITCH);
+               }
+               break;
+       }
 }
 
 static int pcm1796_volume_info(struct snd_kcontrol *ctl,
@@ -181,7 +331,7 @@ static int alt_switch_get(struct snd_kcontrol *ctl,
        struct oxygen *chip = ctl->private_data;
 
        value->value.integer.value[0] =
-               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & 0x80);
+               !!(oxygen_read16(chip, OXYGEN_GPIO_DATA) & GPIO_ALT);
        return 0;
 }
 
@@ -195,9 +345,9 @@ static int alt_switch_put(struct snd_kcontrol *ctl,
        spin_lock_irq(&chip->reg_lock);
        old_bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
        if (value->value.integer.value[0])
-               new_bits = old_bits | 0x80;
+               new_bits = old_bits | GPIO_ALT;
        else
-               new_bits = old_bits & ~0x80;
+               new_bits = old_bits & ~GPIO_ALT;
        changed = new_bits != old_bits;
        if (changed)
                oxygen_write16(chip, OXYGEN_GPIO_DATA, new_bits);
@@ -222,7 +372,10 @@ static int xonar_control_filter(struct snd_kcontrol_new *template)
                template->info = pcm1796_volume_info,
                template->tlv.p = pcm1796_db_scale;
        } else if (!strncmp(template->name, "CD Capture ", 11)) {
+               /* CD in is actually connected to the video in pin */
                template->private_value ^= AC97_CD ^ AC97_VIDEO;
+       } else if (!strcmp(template->name, "Line Capture Volume")) {
+               return 1; /* line-in bypasses the AC'97 mixer */
        }
        return 0;
 }
@@ -244,6 +397,10 @@ static const struct oxygen_model model_xonar = {
        .set_adc_params = set_cs5381_params,
        .update_dac_volume = update_pcm1796_volume,
        .update_dac_mute = update_pcm1796_mute,
+       .ac97_switch_hook = xonar_ac97_switch_hook,
+       .gpio_changed = xonar_gpio_changed,
+       .model_data_size = sizeof(struct xonar_data),
+       .dac_channels = 8,
        .used_channels = OXYGEN_CHANNEL_B |
                         OXYGEN_CHANNEL_C |
                         OXYGEN_CHANNEL_SPDIF |
@@ -265,7 +422,7 @@ static int __devinit xonar_probe(struct pci_dev *pci,
                ++dev;
                return -ENOENT;
        }
-       err = oxygen_pci_probe(pci, index[dev], id[dev], &model_xonar);
+       err = oxygen_pci_probe(pci, index[dev], id[dev], 1, &model_xonar);
        if (err >= 0)
                ++dev;
        return err;