diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-10-07 09:41:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-10 05:29:58 -0400 |
commit | abe11d0aacc75eb400fc1c6e40b28703e481076e (patch) | |
tree | 53e2d7a28ae66143d251720a3f31f33abbdb00c4 /sound | |
parent | 4d4adfc9790da2a6f7382004451b73231c1d2ccf (diff) |
ASoC: wm8776: Convert to snd_soc_cache_sync
Convert to snd_soc_cache_sync for sync reg_cache with the hardware.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 00d8846fae8a..bfdc52370ad0 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -308,6 +308,8 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, | |||
308 | break; | 308 | break; |
309 | case SND_SOC_BIAS_STANDBY: | 309 | case SND_SOC_BIAS_STANDBY: |
310 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { | 310 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
311 | snd_soc_cache_sync(codec); | ||
312 | |||
311 | /* Disable the global powerdown; DAPM does the rest */ | 313 | /* Disable the global powerdown; DAPM does the rest */ |
312 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); | 314 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); |
313 | } | 315 | } |
@@ -379,21 +381,7 @@ static int wm8776_suspend(struct snd_soc_codec *codec, pm_message_t state) | |||
379 | 381 | ||
380 | static int wm8776_resume(struct snd_soc_codec *codec) | 382 | static int wm8776_resume(struct snd_soc_codec *codec) |
381 | { | 383 | { |
382 | int i; | ||
383 | u8 data[2]; | ||
384 | u16 *cache = codec->reg_cache; | ||
385 | |||
386 | /* Sync reg_cache with the hardware */ | ||
387 | for (i = 0; i < ARRAY_SIZE(wm8776_reg); i++) { | ||
388 | if (cache[i] == wm8776_reg[i]) | ||
389 | continue; | ||
390 | data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); | ||
391 | data[1] = cache[i] & 0x00ff; | ||
392 | codec->hw_write(codec->control_data, data, 2); | ||
393 | } | ||
394 | |||
395 | wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 384 | wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
396 | |||
397 | return 0; | 385 | return 0; |
398 | } | 386 | } |
399 | #else | 387 | #else |