| From fb5af53d421d80725172427e9076f6e889603df6 Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Sun, 15 May 2011 12:18:38 -0700 |
| Subject: ASoC: Add some missing volume update bit sets for wm_hubs |
| devices |
| |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| |
| commit fb5af53d421d80725172427e9076f6e889603df6 upstream. |
| |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Acked-by: Liam Girdwood <lrg@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/soc/codecs/wm_hubs.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/sound/soc/codecs/wm_hubs.c |
| +++ b/sound/soc/codecs/wm_hubs.c |
| @@ -686,17 +686,21 @@ int wm_hubs_add_analogue_controls(struct |
| snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, |
| WM8993_IN2_VU, WM8993_IN2_VU); |
| |
| + snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_LEFT, |
| + WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); |
| snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_RIGHT, |
| WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); |
| |
| snd_soc_update_bits(codec, WM8993_LEFT_OUTPUT_VOLUME, |
| - WM8993_HPOUT1L_ZC, WM8993_HPOUT1L_ZC); |
| + WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC, |
| + WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC); |
| snd_soc_update_bits(codec, WM8993_RIGHT_OUTPUT_VOLUME, |
| WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC, |
| WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC); |
| |
| snd_soc_update_bits(codec, WM8993_LEFT_OPGA_VOLUME, |
| - WM8993_MIXOUTL_ZC, WM8993_MIXOUTL_ZC); |
| + WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU, |
| + WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU); |
| snd_soc_update_bits(codec, WM8993_RIGHT_OPGA_VOLUME, |
| WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU, |
| WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU); |
