aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-09-09 06:19:21 -0400
committerTakashi Iwai <tiwai@suse.de>2010-09-09 04:53:27 -0400
commit9bac84edf0360ac94a27308778ef98dc9068777c (patch)
treea6eb42df579c0055fcd737d46733216e8f34dbf6
parentda0dab5ecb5001f76e739e71ee199db4c61e7af2 (diff)
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>
-rw-r--r--sound/pci/oxygen/xonar_wm87x6.c12
1 files changed, 11 insertions, 1 deletions
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 @@
29 * GPIO 6 -> route input jack to input 1/2 (1/0) 29 * GPIO 6 -> route input jack to input 1/2 (1/0)
30 * GPIO 7 -> enable output to speakers 30 * GPIO 7 -> enable output to speakers
31 * GPIO 8 -> enable output to speakers 31 * GPIO 8 -> enable output to speakers
32 *
33 * WM8766:
34 *
35 * input 1 <- line
36 * input 2 <- mic
37 * input 3 <- front mic
38 * input 4 <- aux
32 */ 39 */
33 40
34#include <linux/pci.h> 41#include <linux/pci.h>
@@ -896,7 +903,10 @@ static const struct snd_kcontrol_new ds_controls[] = {
896 .put = wm8776_input_mux_put, 903 .put = wm8776_input_mux_put,
897 .private_value = 1 << 1, 904 .private_value = 1 << 1,
898 }, 905 },
899 WM8776_BIT_SWITCH("Aux", WM8776_ADCMUX, 1 << 2, 0, 0), 906 WM8776_BIT_SWITCH("Front Mic Capture Switch",
907 WM8776_ADCMUX, 1 << 2, 0, 0),
908 WM8776_BIT_SWITCH("Aux Capture Switch",
909 WM8776_ADCMUX, 1 << 3, 0, 0),
900 { 910 {
901 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 911 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
902 .name = "ADC Filter Capture Enum", 912 .name = "ADC Filter Capture Enum",