Skip to content

Commit

Permalink
ASoC: wm8971: Convert to snd_soc_cache_sync
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Oct 10, 2011
1 parent bc45df2 commit e46199e
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions sound/soc/codecs/wm8971.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,9 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
snd_soc_cache_sync(codec);

/* mute dac and set vmid to 500k, enable VREF */
snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
break;
Expand Down Expand Up @@ -605,20 +608,8 @@ static int wm8971_suspend(struct snd_soc_codec *codec, pm_message_t state)

static int wm8971_resume(struct snd_soc_codec *codec)
{
int i;
u8 data[2];
u16 *cache = codec->reg_cache;
u16 reg;

/* Sync reg_cache with the hardware */
for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) {
if (i == WM8971_RESET)
continue;
data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
data[1] = cache[i] & 0x00ff;
codec->hw_write(codec->control_data, data, 2);
}

wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

/* charge wm8971 caps */
Expand Down

0 comments on commit e46199e

Please sign in to comment.