aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ac97
diff options
context:
space:
mode:
authorLuke Zhang <lzhang@intrinsyc.com>2006-09-26 09:28:41 -0400
committerJaroslav Kysela <perex@suse.cz>2006-10-06 14:22:55 -0400
commit2aedbda6f9a51f0a2130c150676a5c99c81fa7a2 (patch)
treeff05059b08035bd71b0c83da71d12f86f98f8aad /sound/pci/ac97
parent476d1205d182e12a74f4197ccc9092ea6a80e15b (diff)
[ALSA] WM9712 fixes for ac97_patch.c
This patch by Luke Zhang fixes a couple of issues with the WM9712 support in ac97_patch.c Changes:- o Fix Out3 ZC switch invert. o Extend capture volume control to 6 bits. o Change Mic 1 volume mask to 5 bits (31). o Add Mic 2 volume. Signed-off-by: Luke Zhang <lzhang@intrinsyc.com> Signed-off-by: Liam Girdwood <liam.girdwood@wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r--sound/pci/ac97/ac97_patch.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index dc28b111a06d..15be6ba87c82 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -530,7 +530,7 @@ AC97_ENUM("ALC Headphone Mux", wm9711_enum[1]),
530AC97_SINGLE("ALC Headphone Volume", AC97_VIDEO, 7, 7, 1), 530AC97_SINGLE("ALC Headphone Volume", AC97_VIDEO, 7, 7, 1),
531 531
532AC97_SINGLE("Out3 Switch", AC97_AUX, 15, 1, 1), 532AC97_SINGLE("Out3 Switch", AC97_AUX, 15, 1, 1),
533AC97_SINGLE("Out3 ZC Switch", AC97_AUX, 7, 1, 1), 533AC97_SINGLE("Out3 ZC Switch", AC97_AUX, 7, 1, 0),
534AC97_ENUM("Out3 Mux", wm9711_enum[2]), 534AC97_ENUM("Out3 Mux", wm9711_enum[2]),
535AC97_ENUM("Out3 LR Mux", wm9711_enum[3]), 535AC97_ENUM("Out3 LR Mux", wm9711_enum[3]),
536AC97_SINGLE("Out3 Volume", AC97_AUX, 0, 31, 1), 536AC97_SINGLE("Out3 Volume", AC97_AUX, 0, 31, 1),
@@ -575,13 +575,14 @@ AC97_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
575 575
576AC97_SINGLE("ADC Switch", AC97_REC_GAIN, 15, 1, 1), 576AC97_SINGLE("ADC Switch", AC97_REC_GAIN, 15, 1, 1),
577AC97_ENUM("Capture Volume Steps", wm9711_enum[6]), 577AC97_ENUM("Capture Volume Steps", wm9711_enum[6]),
578AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 1), 578AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 1),
579AC97_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0), 579AC97_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
580 580
581AC97_SINGLE("Mic 1 to Phone Switch", AC97_MIC, 14, 1, 1), 581AC97_SINGLE("Mic 1 to Phone Switch", AC97_MIC, 14, 1, 1),
582AC97_SINGLE("Mic 2 to Phone Switch", AC97_MIC, 13, 1, 1), 582AC97_SINGLE("Mic 2 to Phone Switch", AC97_MIC, 13, 1, 1),
583AC97_ENUM("Mic Select Source", wm9711_enum[7]), 583AC97_ENUM("Mic Select Source", wm9711_enum[7]),
584AC97_SINGLE("Mic 1 Volume", AC97_MIC, 8, 32, 1), 584AC97_SINGLE("Mic 1 Volume", AC97_MIC, 8, 31, 1),
585AC97_SINGLE("Mic 2 Volume", AC97_MIC, 0, 31, 1),
585AC97_SINGLE("Mic 20dB Boost Switch", AC97_MIC, 7, 1, 0), 586AC97_SINGLE("Mic 20dB Boost Switch", AC97_MIC, 7, 1, 0),
586 587
587AC97_SINGLE("Master ZC Switch", AC97_MASTER, 7, 1, 0), 588AC97_SINGLE("Master ZC Switch", AC97_MASTER, 7, 1, 0),