aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2007-10-22 11:41:08 -0400
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:09 -0500
commit18fe4ac25811ff4006844b6e575acdc9103cbaba (patch)
treec6e51a9ea6c9c1ecfdb62adcd94833ea5946e2b5 /sound/soc
parent61bae0934eddeb51b2559186dfd79a7a6ed3a90a (diff)
[ALSA] soc - Add 'Mono Playback Switch' to WM9712 codec driver
The following patch adds 'Mono Playback Switch' control to WM9712 codec SoC driver. Also, it fixes Treble, Bass and Mono playback volume inversion bits. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm9712.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 986b5d59cefa..427cb61f65a6 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -102,7 +102,8 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0),
102SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0), 102SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0),
103SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0), 103SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0),
104SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0), 104SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
105SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0), 105SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),
106SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
106 107
107SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0), 108SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
108SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0), 109SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
@@ -145,8 +146,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]),
145SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1), 146SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1),
146SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1), 147SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1),
147SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0), 148SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
148SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0), 149SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
149SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0), 150SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
150 151
151SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1), 152SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
152SOC_ENUM("Capture Volume Steps", wm9712_enum[6]), 153SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),