Commit e46199ec authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: wm8971: Convert to snd_soc_cache_sync 



Convert to snd_soc_cache_sync for sync reg_cache with the hardware.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bc45df2d

sound/soc/codecs/wm8971.c

+3 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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 */