From: Clemens Ladisch <clemens@ladisch.de>
Date: Thu, 9 Sep 2010 10:19:21 +0000 (+0200)
Subject: ALSA: virtuoso: fix Xonar DS input switches
X-Git-Tag: v2.6.37-rc1~126^2~2^2~48
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bac84edf0360ac94a27308778ef98dc9068777c;p=pandora-kernel.git

ALSA: virtuoso: fix Xonar DS input switches

Use the correct number, register bits, and names for the input switches.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 4346006df3ec..fb3f95ccafa1 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -29,6 +29,13 @@
  * GPIO 6 -> route input jack to input 1/2 (1/0)
  * GPIO 7 -> enable output to speakers
  * GPIO 8 -> enable output to speakers
+ *
+ * WM8766:
+ *
+ * input 1 <- line
+ * input 2 <- mic
+ * input 3 <- front mic
+ * input 4 <- aux
  */
 
 #include <linux/pci.h>
@@ -896,7 +903,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",