[alsa-devel] [PATCH] Fix inverted Bass, Treble, Mono volume and Phone volume WM9712 mixer controls.

[Mike Rapoport]

Mark Brown wrote:
> From: Joe Sauer <jsauer at vernier.com>
> 
> Signed-off-by: Joe Sauer <jsauer at vernier.com>
> Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm9712.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
> index 986b5d5..111c266 100644
> --- a/sound/soc/codecs/wm9712.c
> +++ b/sound/soc/codecs/wm9712.c
> @@ -102,7 +102,7 @@ SOC_SINGLE("Speaker Playback ZC Switch", AC97_MASTER, 7, 1, 0),
>  SOC_SINGLE("Speaker Playback Invert Switch", AC97_MASTER, 6, 1, 0),
>  SOC_SINGLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 7, 1, 0),
>  SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_MONO, 7, 1, 0),
> -SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 0),
> +SOC_SINGLE("Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1),

I think there also should be "Mono Playback Switch", otherwise there's no way
you can unmute mono playback:
+ SOC_SINGLE("Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),


>  SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
>  SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
> @@ -131,7 +131,7 @@ SOC_SINGLE("Aux Playback Headphone Volume", AC97_CD, 12, 7, 1),
>  SOC_SINGLE("Aux Playback Speaker Volume", AC97_CD, 8, 7, 1),
>  SOC_SINGLE("Aux Playback Phone Volume", AC97_CD, 4, 7, 1),
>  
> -SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 0),
> +SOC_SINGLE("Phone Volume", AC97_PHONE, 0, 15, 1),
>  SOC_DOUBLE("Line Capture Volume", AC97_LINE, 8, 0, 31, 1),
>  
>  SOC_SINGLE("Capture 20dB Boost Switch", AC97_REC_SEL, 14, 1, 0),
> @@ -145,8 +145,8 @@ SOC_ENUM("Bass Control", wm9712_enum[5]),
>  SOC_SINGLE("Bass Cut-off Switch", AC97_MASTER_TONE, 12, 1, 1),
>  SOC_SINGLE("Tone Cut-off Switch", AC97_MASTER_TONE, 4, 1, 1),
>  SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_MASTER_TONE, 6, 1, 0),
> -SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 0),
> -SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 0),
> +SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
> +SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
>  
>  SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
>  SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),

-- 
Sincerely yours,
Mike.