[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>

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 412291241ece6e334150d06ecfe624fa1de633c1..8151b45a280ccff8a035d2899678cd7beb92ce47 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -310,8 +310,10 @@ static const struct soc_enum wm8731_enum[] = {
 
 static const struct snd_kcontrol_new wm8731_snd_controls[] = {
 
-SOC_DOUBLE_R("Playback Volume", WM8731_LOUT1V, WM8731_ROUT1V, 0, 127, 0),
-SOC_DOUBLE_R("Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V, 7, 1, 0),
+SOC_DOUBLE_R("Master Playback Volume", WM8731_LOUT1V, WM8731_ROUT1V,
+       0, 127, 0),
+SOC_DOUBLE_R("Master Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V,
+       7, 1, 0),
 
 SOC_DOUBLE_R("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0),
 SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1),

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index c5d13a9454d9eb147623f6b74e9e76b2f4199088..4cc85128dc59dcc325f140a01ad6ad424589dc7f 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -444,9 +444,9 @@ SOC_DOUBLE_R("Capture Volume", WM8750_LINVOL, WM8750_RINVOL, 0, 63, 0),
 SOC_DOUBLE_R("Capture ZC Switch", WM8750_LINVOL, WM8750_RINVOL, 6, 1, 0),
 SOC_DOUBLE_R("Capture Switch", WM8750_LINVOL, WM8750_RINVOL, 7, 1, 1),
 
-SOC_DOUBLE_R("Out1 Playback ZC Switch", WM8750_LOUT1V,
+SOC_DOUBLE_R("Headphone Playback ZC Switch", WM8750_LOUT1V,
        WM8750_ROUT1V, 7, 1, 0),
-SOC_DOUBLE_R("Out2 Playback ZC Switch", WM8750_LOUT2V,
+SOC_DOUBLE_R("Speaker Playback ZC Switch", WM8750_LOUT2V,
        WM8750_ROUT2V, 7, 1, 0),
 
 SOC_ENUM("Playback De-emphasis", wm8750_enum[15]),
@@ -487,7 +487,7 @@ SOC_SINGLE("Right ADC Capture Volume", WM8750_RADC, 0, 255, 0),
 SOC_SINGLE("ZC Timeout Switch", WM8750_ADCTL1, 0, 1, 0),
 SOC_SINGLE("Playback Invert Switch", WM8750_ADCTL1, 1, 1, 0),
 
-SOC_SINGLE("Right Out2 Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0),
+SOC_SINGLE("Right Speaker Playback Invert Switch", WM8750_ADCTL2, 4, 1, 0),
 
 /* Unimplemented */
 /* ADCDAC Bit 0 - ADCHPD */
@@ -514,8 +514,10 @@ SOC_DOUBLE_R("Bypass Mono Playback Volume", WM8750_MOUTM1,
 
 SOC_SINGLE("Mono Playback ZC Switch", WM8750_MOUTV, 7, 1, 0),
 
-SOC_DOUBLE_R("Out1 Playback Volume", WM8750_LOUT1V, WM8750_ROUT1V, 0, 127, 0),
-SOC_DOUBLE_R("Out2 Playback Volume", WM8750_LOUT2V, WM8750_ROUT2V, 0, 127, 0),
+SOC_DOUBLE_R("Headphone Playback Volume", WM8750_LOUT1V, WM8750_ROUT1V,
+       0, 127, 0),
+SOC_DOUBLE_R("Speaker Playback Volume", WM8750_LOUT2V, WM8750_ROUT2V,
+       0, 127, 0),
 
 SOC_SINGLE("Mono Playback Volume", WM8750_MOUTV, 0, 127, 0),