10 files changed, 173 insertions, 77 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 6c0a11adb2a8..98a8eb3c92f7 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -79,6 +79,7 @@ static DEFINE_PCI_DEVICE_TABLE(oxygen_ids) = {
         { 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(0x13f6, 0xffff), .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 },
@@ -505,7 +506,8 @@ static const struct oxygen_model model_generic = {
                          PLAYBACK_2_TO_AC97_1 |
                          CAPTURE_0_FROM_I2S_1 |
                          CAPTURE_1_FROM_SPDIF |
-                         CAPTURE_2_FROM_AC97_1,
+                         CAPTURE_2_FROM_AC97_1 |
+                         AC97_CD_INPUT,
         .dac_channels = 8,
         .dac_volume_min = 0,
         .dac_volume_max = 255,
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index a3409edcfb50..7d5222caa0a9 100644
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -34,6 +34,7 @@
      /* CAPTURE_3_FROM_I2S_3            not implemented */
 #define MIDI_OUTPUT             0x0800
 #define MIDI_INPUT              0x1000
+#define AC97_CD_INPUT           0x2000
 
 enum {
         CONTROL_SPDIF_PCM,
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 7e93cf884437..e5ebe56fb0c5 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -308,25 +308,46 @@ static void oxygen_restore_eeprom(struct oxygen *chip,
         }
 }
 
-static void pci_bridge_magic(void)
+static void configure_pcie_bridge(struct pci_dev *pci)
 {
-        struct pci_dev *pci = NULL;
+        enum { PEX811X, PI7C9X110 };
+        static const struct pci_device_id bridge_ids[] = {
+                { PCI_VDEVICE(PLX, 0x8111), .driver_data = PEX811X },
+                { PCI_VDEVICE(PLX, 0x8112), .driver_data = PEX811X },
+                { PCI_DEVICE(0x12d8, 0xe110), .driver_data = PI7C9X110 },
+                { }
+        };
+        struct pci_dev *bridge;
+        const struct pci_device_id *id;
         u32 tmp;
 
-        for (;;) {
-                /* If there is any Pericom PI7C9X110 PCI-E/PCI bridge ... */
-                pci = pci_get_device(0x12d8, 0xe110, pci);
-                if (!pci)
-                        break;
-                /*
-                 * ... configure its secondary internal arbiter to park to
-                 * the secondary port, instead of to the last master.
-                 */
-                if (!pci_read_config_dword(pci, 0x40, &tmp)) {
-                        tmp |= 1;
-                        pci_write_config_dword(pci, 0x40, tmp);
-                }
-                /* Why?  Try asking C-Media. */
+        if (!pci->bus || !pci->bus->self)
+                return;
+        bridge = pci->bus->self;
+
+        id = pci_match_id(bridge_ids, bridge);
+        if (!id)
+                return;
+
+        switch (id->driver_data) {
+        case PEX811X:   /* PLX PEX8111/PEX8112 PCIe/PCI bridge */
+                pci_read_config_dword(bridge, 0x48, &tmp);
+                tmp |= 1;       /* enable blind prefetching */
+                tmp |= 1 << 11; /* enable beacon generation */
+                pci_write_config_dword(bridge, 0x48, tmp);
+
+                pci_write_config_dword(bridge, 0x84, 0x0c);
+                pci_read_config_dword(bridge, 0x88, &tmp);
+                tmp &= ~(7 << 27);
+                tmp |= 2 << 27; /* set prefetch size to 128 bytes */
+                pci_write_config_dword(bridge, 0x88, tmp);
+                break;
+
+        case PI7C9X110: /* Pericom PI7C9X110 PCIe/PCI bridge */
+                pci_read_config_dword(bridge, 0x40, &tmp);
+                tmp |= 1;       /* park the PCI arbiter to the sound chip */
+                pci_write_config_dword(bridge, 0x40, tmp);
+                break;
         }
 }
 
@@ -613,7 +634,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
         snd_card_set_dev(card, &pci->dev);
         card->private_free = oxygen_card_free;
 
-        pci_bridge_magic();
+        configure_pcie_bridge(pci);
         oxygen_init(chip);
         chip->model.init(chip);
 
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index f375b8a27862..2849b36f5f7e 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -708,7 +708,7 @@ static int ac97_fp_rec_volume_put(struct snd_kcontrol *ctl,
                 .private_value = ((codec) << 24) | ((stereo) << 16) | (index), \
         }
 
-static DECLARE_TLV_DB_SCALE(monitor_db_scale, -1000, 1000, 0);
+static DECLARE_TLV_DB_SCALE(monitor_db_scale, -600, 600, 0);
 static DECLARE_TLV_DB_SCALE(ac97_db_scale, -3450, 150, 0);
 static DECLARE_TLV_DB_SCALE(ac97_rec_db_scale, 0, 150, 0);
 
@@ -972,6 +972,9 @@ static int add_controls(struct oxygen *chip,
                 if (!strcmp(template.name, "Stereo Upmixing") &&
                     chip->model.dac_channels == 2)
                         continue;
+                if (!strncmp(template.name, "CD Capture ", 11) &&
+                    !(chip->model.device_config & AC97_CD_INPUT))
+                        continue;
                 if (!strcmp(template.name, "Master Playback Volume") &&
                     chip->model.dac_tlv) {
                         template.tlv.p = chip->model.dac_tlv;
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index 9dff6954c397..814667442eb0 100644
--- a/sound/pci/oxygen/oxygen_pcm.c
+++ b/sound/pci/oxygen/oxygen_pcm.c
@@ -56,8 +56,8 @@ static const struct snd_pcm_hardware oxygen_stereo_hardware = {
         .channels_max = 2,
         .buffer_bytes_max = BUFFER_BYTES_MAX,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
 };
 static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
@@ -82,8 +82,8 @@ static const struct snd_pcm_hardware oxygen_multichannel_hardware = {
         .channels_max = 8,
         .buffer_bytes_max = BUFFER_BYTES_MAX_MULTICH,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX_MULTICH / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX_MULTICH,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX_MULTICH / PERIOD_BYTES_MIN,
 };
 static const struct snd_pcm_hardware oxygen_ac97_hardware = {
@@ -100,8 +100,8 @@ static const struct snd_pcm_hardware oxygen_ac97_hardware = {
         .channels_max = 2,
         .buffer_bytes_max = BUFFER_BYTES_MAX,
         .period_bytes_min = PERIOD_BYTES_MIN,
-        .period_bytes_max = BUFFER_BYTES_MAX / 2,
-        .periods_min = 2,
+        .period_bytes_max = BUFFER_BYTES_MAX,
+        .periods_min = 1,
         .periods_max = BUFFER_BYTES_MAX / PERIOD_BYTES_MIN,
 };
 
diff --git a/sound/pci/oxygen/oxygen_regs.h b/sound/pci/oxygen/oxygen_regs.h
index 72de159d4567..4dcd41b78258 100644
--- a/sound/pci/oxygen/oxygen_regs.h
+++ b/sound/pci/oxygen/oxygen_regs.h
@@ -436,13 +436,15 @@
 /* OXYGEN_CHANNEL_* */
 
 #define OXYGEN_CODEC_VERSION            0xe4
-#define  OXYGEN_XCID_MASK               0x07
+#define  OXYGEN_CODEC_ID_MASK           0x07
 
 #define OXYGEN_REVISION                 0xe6
-#define  OXYGEN_REVISION_XPKGID_MASK    0x0007
+#define  OXYGEN_PACKAGE_ID_MASK         0x0007
+#define  OXYGEN_PACKAGE_ID_8786         0x0004
+#define  OXYGEN_PACKAGE_ID_8787         0x0006
+#define  OXYGEN_PACKAGE_ID_8788         0x0007
 #define  OXYGEN_REVISION_MASK           0xfff8
-#define  OXYGEN_REVISION_2              0x0008  /* bit flag */
-#define  OXYGEN_REVISION_8787           0x0014  /* 8 bits */
+#define  OXYGEN_REVISION_2              0x0008
 
 #define OXYGEN_OFFSIN_48K               0xe8
 #define OXYGEN_OFFSBASE_48K             0xe9
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 06c863e86e3d..469010a8b849 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -25,9 +25,9 @@
 #include "xonar.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
-MODULE_DESCRIPTION("Asus AVx00 driver");
+MODULE_DESCRIPTION("Asus Virtuoso driver");
 MODULE_LICENSE("GPL v2");
-MODULE_SUPPORTED_DEVICE("{{Asus,AV100},{Asus,AV200}}");
+MODULE_SUPPORTED_DEVICE("{{Asus,AV66},{Asus,AV100},{Asus,AV200}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
@@ -49,6 +49,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
         { OXYGEN_PCI_SUBID(0x1043, 0x834f) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835c) },
         { OXYGEN_PCI_SUBID(0x1043, 0x835d) },
+        { OXYGEN_PCI_SUBID(0x1043, 0x835e) },
         { OXYGEN_PCI_SUBID(0x1043, 0x838e) },
         { OXYGEN_PCI_SUBID_BROKEN_EEPROM },
         { }
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index 7c4986b27f2b..aa27c31049af 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -367,13 +367,6 @@ static void xonar_d1_line_mic_ac97_switch(struct oxygen *chip,
 
 static const DECLARE_TLV_DB_SCALE(cs4362a_db_scale, -6000, 100, 0);
 
-static int xonar_d1_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        return 0;
-}
-
 static int xonar_d1_mixer_init(struct oxygen *chip)
 {
         int err;
@@ -391,7 +384,6 @@ static const struct oxygen_model model_xonar_d1 = {
         .longname = "Asus Virtuoso 100",
         .chip = "AV200",
         .init = xonar_d1_init,
-        .control_filter = xonar_d1_control_filter,
         .mixer_init = xonar_d1_mixer_init,
         .cleanup = xonar_d1_cleanup,
         .suspend = xonar_d1_suspend,
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index ba18fb546b4f..d491fd6c0be2 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -132,6 +132,18 @@
  * GPIO 5 <- 0
  */
 
+/*
+ * Xonar HDAV1.3 Slim
+ * ------------------
+ *
+ * CMI8788:
+ *
+ * GPIO 1 -> enable output
+ *
+ * TXD -> HDMI controller
+ * RXD <- HDMI controller
+ */
+
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
@@ -362,7 +374,6 @@ static void xonar_st_init_common(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
-        data->generic.anti_pop_delay = 100;
         data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE;
         data->dacs = chip->model.private_data ? 4 : 1;
         data->hp_gain_offset = 2*-18;
@@ -408,6 +419,7 @@ static void xonar_st_init(struct oxygen *chip)
 {
         struct xonar_pcm179x *data = chip->model_data;
 
+        data->generic.anti_pop_delay = 100;
         data->has_cs2000 = 1;
         data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1;
 
@@ -428,6 +440,7 @@ static void xonar_stx_init(struct oxygen *chip)
         struct xonar_pcm179x *data = chip->model_data;
 
         xonar_st_init_i2c(chip);
+        data->generic.anti_pop_delay = 800;
         data->generic.ext_power_reg = OXYGEN_GPI_DATA;
         data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
         data->generic.ext_power_bit = GPI_EXT_POWER;
@@ -915,13 +928,6 @@ static int xonar_d2_control_filter(struct snd_kcontrol_new *template)
         return 0;
 }
 
-static int xonar_st_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        return 0;
-}
-
 static int add_pcm1796_controls(struct oxygen *chip)
 {
         int err;
@@ -991,7 +997,8 @@ static const struct oxygen_model model_xonar_d2 = {
                          CAPTURE_0_FROM_I2S_2 |
                          CAPTURE_1_FROM_SPDIF |
                          MIDI_OUTPUT |
-                         MIDI_INPUT,
+                         MIDI_INPUT |
+                         AC97_CD_INPUT,
         .dac_channels = 8,
         .dac_volume_min = 255 - 2*60,
         .dac_volume_max = 255,
@@ -1037,7 +1044,6 @@ static const struct oxygen_model model_xonar_st = {
         .longname = "Asus Virtuoso 100",
         .chip = "AV200",
         .init = xonar_st_init,
-        .control_filter = xonar_st_control_filter,
         .mixer_init = xonar_st_mixer_init,
         .cleanup = xonar_st_cleanup,
         .suspend = xonar_st_suspend,
@@ -1108,6 +1114,9 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
                 chip->model.resume = xonar_stx_resume;
                 chip->model.set_dac_params = set_pcm1796_params;
                 break;
+        case 0x835e:
+                snd_printk(KERN_ERR "the HDAV1.3 Slim is not supported\n");
+                return -ENODEV;
         default:
                 return -EINVAL;
         }
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index b82c1cfa96f5..200f7601276f 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -25,16 +25,24 @@
  * SPI 0 -> WM8766 (surround, center/LFE, back)
  * SPI 1 -> WM8776 (front, input)
  *
- * GPIO 4 <- headphone detect
- * GPIO 6 -> route input jack to input 1/2 (1/0)
- * GPIO 7 -> enable output to speakers
- * GPIO 8 -> enable output to speakers
+ * GPIO 4 <- headphone detect, 0 = plugged
+ * GPIO 6 -> route input jack to mic-in (0) or line-in (1)
+ * GPIO 7 -> enable output to front L/R speaker channels
+ * GPIO 8 -> enable output to other speaker channels and front panel headphone
+ *
+ * WM8766:
+ *
+ * input 1 <- line
+ * input 2 <- mic
+ * input 3 <- front mic
+ * input 4 <- aux
  */
 
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <sound/control.h>
 #include <sound/core.h>
+#include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
@@ -44,7 +52,8 @@
 
 #define GPIO_DS_HP_DETECT       0x0010
 #define GPIO_DS_INPUT_ROUTE     0x0040
-#define GPIO_DS_OUTPUT_ENABLE   0x0180
+#define GPIO_DS_OUTPUT_FRONTLR  0x0080
+#define GPIO_DS_OUTPUT_ENABLE   0x0100
 
 #define LC_CONTROL_LIMITER      0x40000000
 #define LC_CONTROL_ALC          0x20000000
@@ -56,6 +65,7 @@ struct xonar_wm87x6 {
         struct snd_kcontrol *line_adcmux_control;
         struct snd_kcontrol *mic_adcmux_control;
         struct snd_kcontrol *lc_controls[13];
+        struct snd_jack *hp_jack;
 };
 
 static void wm8776_write(struct oxygen *chip,
@@ -97,8 +107,12 @@ static void wm8766_write(struct oxygen *chip,
                          (0 << OXYGEN_SPI_CODEC_SHIFT) |
                          OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                          (reg << 9) | value);
-        if (reg < ARRAY_SIZE(data->wm8766_regs))
+        if (reg < ARRAY_SIZE(data->wm8766_regs)) {
+                if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
+                    (reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
+                        value &= ~WM8766_UPDATE;
                 data->wm8766_regs[reg] = value;
+        }
 }
 
 static void wm8766_write_cached(struct oxygen *chip,
@@ -107,12 +121,8 @@ static void wm8766_write_cached(struct oxygen *chip,
         struct xonar_wm87x6 *data = chip->model_data;
 
         if (reg >= ARRAY_SIZE(data->wm8766_regs) ||
-            value != data->wm8766_regs[reg]) {
-                if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
-                    (reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
-                        value &= ~WM8766_UPDATE;
+            value != data->wm8766_regs[reg])
                 wm8766_write(chip, reg, value);
-        }
 }
 
 static void wm8776_registers_init(struct oxygen *chip)
@@ -141,7 +151,10 @@ static void wm8776_registers_init(struct oxygen *chip)
 
 static void wm8766_registers_init(struct oxygen *chip)
 {
+        struct xonar_wm87x6 *data = chip->model_data;
+
         wm8766_write(chip, WM8766_RESET, 0);
+        wm8766_write(chip, WM8766_DAC_CTRL, data->wm8766_regs[WM8766_DAC_CTRL]);
         wm8766_write(chip, WM8766_INT_CTRL, WM8766_FMT_LJUST | WM8766_IWL_24);
         wm8766_write(chip, WM8766_DAC_CTRL2,
                      WM8766_ZCD | (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
@@ -170,6 +183,40 @@ static void wm8776_init(struct oxygen *chip)
         wm8776_registers_init(chip);
 }
 
+static void wm8766_init(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+
+        data->wm8766_regs[WM8766_DAC_CTRL] =
+                WM8766_PL_LEFT_LEFT | WM8766_PL_RIGHT_RIGHT;
+        wm8766_registers_init(chip);
+}
+
+static void xonar_ds_handle_hp_jack(struct oxygen *chip)
+{
+        struct xonar_wm87x6 *data = chip->model_data;
+        bool hp_plugged;
+        unsigned int reg;
+
+        mutex_lock(&chip->mutex);
+
+        hp_plugged = !(oxygen_read16(chip, OXYGEN_GPIO_DATA) &
+                       GPIO_DS_HP_DETECT);
+
+        oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                              hp_plugged ? 0 : GPIO_DS_OUTPUT_FRONTLR,
+                              GPIO_DS_OUTPUT_FRONTLR);
+
+        reg = data->wm8766_regs[WM8766_DAC_CTRL] & ~WM8766_MUTEALL;
+        if (hp_plugged)
+                reg |= WM8766_MUTEALL;
+        wm8766_write_cached(chip, WM8766_DAC_CTRL, reg);
+
+        snd_jack_report(data->hp_jack, hp_plugged ? SND_JACK_HEADPHONE : 0);
+
+        mutex_unlock(&chip->mutex);
+}
+
 static void xonar_ds_init(struct oxygen *chip)
 {
         struct xonar_wm87x6 *data = chip->model_data;
@@ -178,16 +225,22 @@ static void xonar_ds_init(struct oxygen *chip)
         data->generic.output_enable_bit = GPIO_DS_OUTPUT_ENABLE;
 
         wm8776_init(chip);
-        wm8766_registers_init(chip);
+        wm8766_init(chip);
 
-        oxygen_write16_masked(chip, OXYGEN_GPIO_CONTROL, GPIO_DS_INPUT_ROUTE,
-                              GPIO_DS_HP_DETECT | GPIO_DS_INPUT_ROUTE);
+        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
+                          GPIO_DS_INPUT_ROUTE | GPIO_DS_OUTPUT_FRONTLR);
+        oxygen_clear_bits16(chip, OXYGEN_GPIO_CONTROL,
+                            GPIO_DS_HP_DETECT);
         oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_DS_INPUT_ROUTE);
         oxygen_set_bits16(chip, OXYGEN_GPIO_INTERRUPT_MASK, GPIO_DS_HP_DETECT);
         chip->interrupt_mask |= OXYGEN_INT_GPIO;
 
         xonar_enable_output(chip);
 
+        snd_jack_new(chip->card, "Headphone",
+                     SND_JACK_HEADPHONE, &data->hp_jack);
+        xonar_ds_handle_hp_jack(chip);
+
         snd_component_add(chip->card, "WM8776");
         snd_component_add(chip->card, "WM8766");
 }
@@ -208,6 +261,7 @@ static void xonar_ds_resume(struct oxygen *chip)
         wm8776_registers_init(chip);
         wm8766_registers_init(chip);
         xonar_enable_output(chip);
+        xonar_ds_handle_hp_jack(chip);
 }
 
 static void wm8776_adc_hardware_filter(unsigned int channel,
@@ -323,12 +377,27 @@ static void update_wm87x6_mute(struct oxygen *chip)
                             (chip->dac_mute ? WM8766_DMUTE_MASK : 0));
 }
 
-static void xonar_ds_gpio_changed(struct oxygen *chip)
+static void update_wm8766_center_lfe_mix(struct oxygen *chip, bool mixed)
 {
-        u16 bits;
+        struct xonar_wm87x6 *data = chip->model_data;
+        unsigned int reg;
 
-        bits = oxygen_read16(chip, OXYGEN_GPIO_DATA);
-        snd_printk(KERN_INFO "HP detect: %d\n", !!(bits & GPIO_DS_HP_DETECT));
+        /*
+         * The WM8766 can mix left and right channels, but this setting
+         * applies to all three stereo pairs.
+         */
+        reg = data->wm8766_regs[WM8766_DAC_CTRL] &
+                ~(WM8766_PL_LEFT_MASK | WM8766_PL_RIGHT_MASK);
+        if (mixed)
+                reg |= WM8766_PL_LEFT_LRMIX | WM8766_PL_RIGHT_LRMIX;
+        else
+                reg |= WM8766_PL_LEFT_LEFT | WM8766_PL_RIGHT_RIGHT;
+        wm8766_write_cached(chip, WM8766_DAC_CTRL, reg);
+}
+
+static void xonar_ds_gpio_changed(struct oxygen *chip)
+{
+        xonar_ds_handle_hp_jack(chip);
 }
 
 static int wm8776_bit_switch_get(struct snd_kcontrol *ctl,
@@ -896,7 +965,10 @@ static const struct snd_kcontrol_new ds_controls[] = {
                 .put = wm8776_input_mux_put,
                 .private_value = 1 << 1,
         },
-        WM8776_BIT_SWITCH("Aux", WM8776_ADCMUX, 1 << 2, 0, 0),
+        WM8776_BIT_SWITCH("Front Mic Capture Switch",
+                          WM8776_ADCMUX, 1 << 2, 0, 0),
+        WM8776_BIT_SWITCH("Aux Capture Switch",
+                          WM8776_ADCMUX, 1 << 3, 0, 0),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "ADC Filter Capture Enum",
@@ -956,13 +1028,6 @@ static const struct snd_kcontrol_new lc_controls[] = {
                                 LC_CONTROL_ALC, wm8776_ngth_db_scale),
 };
 
-static int xonar_ds_control_filter(struct snd_kcontrol_new *template)
-{
-        if (!strncmp(template->name, "CD Capture ", 11))
-                return 1; /* no CD input */
-        return 0;
-}
-
 static int xonar_ds_mixer_init(struct oxygen *chip)
 {
         struct xonar_wm87x6 *data = chip->model_data;
@@ -999,10 +1064,9 @@ static int xonar_ds_mixer_init(struct oxygen *chip)
 
 static const struct oxygen_model model_xonar_ds = {
         .shortname = "Xonar DS",
-        .longname = "Asus Virtuoso 200",
+        .longname = "Asus Virtuoso 66",
         .chip = "AV200",
         .init = xonar_ds_init,
-        .control_filter = xonar_ds_control_filter,
         .mixer_init = xonar_ds_mixer_init,
         .cleanup = xonar_ds_cleanup,
         .suspend = xonar_ds_suspend,
@@ -1013,6 +1077,7 @@ static const struct oxygen_model model_xonar_ds = {
         .set_adc_params = set_wm8776_adc_params,
         .update_dac_volume = update_wm87x6_volume,
         .update_dac_mute = update_wm87x6_mute,
+        .update_center_lfe_mix = update_wm8766_center_lfe_mix,
         .gpio_changed = xonar_ds_gpio_changed,
         .dac_tlv = wm87x6_dac_db_scale,
         .model_data_size = sizeof(struct xonar_wm87x6),