diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-24 11:59:30 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-17 08:59:39 -0500 |
| commit | a1b3b5eeeebac8acfa7838ef90f5a00a6f9188a0 (patch) | |
| tree | 494c5f242fe497729c0b57929319305f2a3ebc29 /sound/soc/codecs/wm8962.c | |
| parent | 203db220718c735dcb959fddc64e94fff3b52f73 (diff) | |
ASoC: Avoid direct register cache access when setting defaults
Directly accessing the register cache means that we can't use anything
except a flat register cache so use snd_soc_update_bits().
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 7c02924beddf..5c7b730a864f 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
| @@ -3822,16 +3822,26 @@ static int wm8962_probe(struct snd_soc_codec *codec) | |||
| 3822 | } | 3822 | } |
| 3823 | 3823 | ||
| 3824 | /* Latch volume update bits */ | 3824 | /* Latch volume update bits */ |
| 3825 | reg_cache[WM8962_LEFT_INPUT_VOLUME] |= WM8962_IN_VU; | 3825 | snd_soc_update_bits(codec, WM8962_LEFT_INPUT_VOLUME, |
| 3826 | reg_cache[WM8962_RIGHT_INPUT_VOLUME] |= WM8962_IN_VU; | 3826 | WM8962_IN_VU, WM8962_IN_VU); |
| 3827 | reg_cache[WM8962_LEFT_ADC_VOLUME] |= WM8962_ADC_VU; | 3827 | snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_VOLUME, |
| 3828 | reg_cache[WM8962_RIGHT_ADC_VOLUME] |= WM8962_ADC_VU; | 3828 | WM8962_IN_VU, WM8962_IN_VU); |
| 3829 | reg_cache[WM8962_LEFT_DAC_VOLUME] |= WM8962_DAC_VU; | 3829 | snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME, |
| 3830 | reg_cache[WM8962_RIGHT_DAC_VOLUME] |= WM8962_DAC_VU; | 3830 | WM8962_ADC_VU, WM8962_ADC_VU); |
| 3831 | reg_cache[WM8962_SPKOUTL_VOLUME] |= WM8962_SPKOUT_VU; | 3831 | snd_soc_update_bits(codec, WM8962_RIGHT_ADC_VOLUME, |
| 3832 | reg_cache[WM8962_SPKOUTR_VOLUME] |= WM8962_SPKOUT_VU; | 3832 | WM8962_ADC_VU, WM8962_ADC_VU); |
| 3833 | reg_cache[WM8962_HPOUTL_VOLUME] |= WM8962_HPOUT_VU; | 3833 | snd_soc_update_bits(codec, WM8962_LEFT_DAC_VOLUME, |
| 3834 | reg_cache[WM8962_HPOUTR_VOLUME] |= WM8962_HPOUT_VU; | 3834 | WM8962_DAC_VU, WM8962_DAC_VU); |
| 3835 | snd_soc_update_bits(codec, WM8962_RIGHT_DAC_VOLUME, | ||
| 3836 | WM8962_DAC_VU, WM8962_DAC_VU); | ||
| 3837 | snd_soc_update_bits(codec, WM8962_SPKOUTL_VOLUME, | ||
| 3838 | WM8962_SPKOUT_VU, WM8962_SPKOUT_VU); | ||
| 3839 | snd_soc_update_bits(codec, WM8962_SPKOUTR_VOLUME, | ||
| 3840 | WM8962_SPKOUT_VU, WM8962_SPKOUT_VU); | ||
| 3841 | snd_soc_update_bits(codec, WM8962_HPOUTL_VOLUME, | ||
| 3842 | WM8962_HPOUT_VU, WM8962_HPOUT_VU); | ||
| 3843 | snd_soc_update_bits(codec, WM8962_HPOUTR_VOLUME, | ||
| 3844 | WM8962_HPOUT_VU, WM8962_HPOUT_VU); | ||
| 3835 | 3845 | ||
| 3836 | wm8962_add_widgets(codec); | 3846 | wm8962_add_widgets(codec); |
| 3837 | 3847 | ||