diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-10-07 09:40:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-10 05:29:57 -0400 |
commit | 4d4adfc9790da2a6f7382004451b73231c1d2ccf (patch) | |
tree | 55a8ab95f1b4e38affcd1a23d1894109805fe23a /sound/soc/codecs/wm8750.c | |
parent | 9bf311fe17f16effaf264af76cb3aaaf384556b3 (diff) |
ASoC: wm8750: 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/soc/codecs/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 862c520055fe..ca75a8180708 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -616,6 +616,8 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec, | |||
616 | break; | 616 | break; |
617 | case SND_SOC_BIAS_STANDBY: | 617 | case SND_SOC_BIAS_STANDBY: |
618 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { | 618 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
619 | snd_soc_cache_sync(codec); | ||
620 | |||
619 | /* Set VMID to 5k */ | 621 | /* Set VMID to 5k */ |
620 | snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1); | 622 | snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1); |
621 | 623 | ||
@@ -673,21 +675,7 @@ static int wm8750_suspend(struct snd_soc_codec *codec, pm_message_t state) | |||
673 | 675 | ||
674 | static int wm8750_resume(struct snd_soc_codec *codec) | 676 | static int wm8750_resume(struct snd_soc_codec *codec) |
675 | { | 677 | { |
676 | int i; | ||
677 | u8 data[2]; | ||
678 | u16 *cache = codec->reg_cache; | ||
679 | |||
680 | /* Sync reg_cache with the hardware */ | ||
681 | for (i = 0; i < ARRAY_SIZE(wm8750_reg); i++) { | ||
682 | if (i == WM8750_RESET) | ||
683 | continue; | ||
684 | data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); | ||
685 | data[1] = cache[i] & 0x00ff; | ||
686 | codec->hw_write(codec->control_data, data, 2); | ||
687 | } | ||
688 | |||
689 | wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 678 | wm8750_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
690 | |||
691 | return 0; | 679 | return 0; |
692 | } | 680 | } |
693 | 681 | ||