diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2006-11-09 10:35:01 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:01:22 -0500 |
commit | bd903b6ed7fb107e122682db5ac8aaa323ab84c9 (patch) | |
tree | 23eb969303637b3eedb66eb826b13d026e38ed92 /sound/soc/codecs/wm8731.c | |
parent | b373bdebf57e2ac7994d9be3a68fd5507515caef (diff) |
[ALSA] ASoC - mixer name changes for older OSS app support
This patch suggested by Richard Purdie changes the names of some WM8731
and WM8750 mixers so that they will be recognised by some older OSS
mixer apps.
Changes:-
o WM8731 Playback changed to Master Playback
o WM8750 Out1 changed to Headphone
o WM8750 Out2 changed to Speaker
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/codecs/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 412291241ece..8151b45a280c 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -310,8 +310,10 @@ static const struct soc_enum wm8731_enum[] = { | |||
310 | 310 | ||
311 | static const struct snd_kcontrol_new wm8731_snd_controls[] = { | 311 | static const struct snd_kcontrol_new wm8731_snd_controls[] = { |
312 | 312 | ||
313 | SOC_DOUBLE_R("Playback Volume", WM8731_LOUT1V, WM8731_ROUT1V, 0, 127, 0), | 313 | SOC_DOUBLE_R("Master Playback Volume", WM8731_LOUT1V, WM8731_ROUT1V, |
314 | SOC_DOUBLE_R("Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V, 7, 1, 0), | 314 | 0, 127, 0), |
315 | SOC_DOUBLE_R("Master Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V, | ||
316 | 7, 1, 0), | ||
315 | 317 | ||
316 | SOC_DOUBLE_R("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0), | 318 | SOC_DOUBLE_R("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0), |
317 | SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1), | 319 | SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1), |