|
@@ -287,7 +287,6 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
static int wm8711_set_bias_level(struct snd_soc_codec *codec,
|
|
|
enum snd_soc_bias_level level)
|
|
|
{
|
|
@@ -300,6 +299,9 @@ static int wm8711_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);
|
|
|
+
|
|
|
snd_soc_write(codec, WM8711_PWR, reg | 0x0040);
|
|
|
break;
|
|
|
case SND_SOC_BIAS_OFF:
|
|
@@ -346,18 +348,7 @@ static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state)
|
|
|
|
|
|
static int wm8711_resume(struct snd_soc_codec *codec)
|
|
|
{
|
|
|
- int i;
|
|
|
- u8 data[2];
|
|
|
- u16 *cache = codec->reg_cache;
|
|
|
-
|
|
|
- /* Sync reg_cache with the hardware */
|
|
|
- for (i = 0; i < ARRAY_SIZE(wm8711_reg); i++) {
|
|
|
- data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
|
|
|
- data[1] = cache[i] & 0x00ff;
|
|
|
- codec->hw_write(codec->control_data, data, 2);
|
|
|
- }
|
|
|
wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|