浏览代码

ASoC: wm8994: Don't bring up to STANDBY by default

In cases where we should enter STANDBY DAPM will power us up, otherwise
there is no need to power up and we can remain in OFF.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Mark Brown 13 年之前
父节点
当前提交
839e5fadc6
共有 1 个文件被更改,包括 0 次插入9 次删除
  1. 0 9
      sound/soc/codecs/wm8994.c

+ 0 - 9
sound/soc/codecs/wm8994.c

@@ -2759,13 +2759,6 @@ static int wm8994_resume(struct snd_soc_codec *codec)
 		codec->cache_only = 0;
 		codec->cache_only = 0;
 	}
 	}
 
 
-	/* Restore the registers */
-	ret = snd_soc_cache_sync(codec);
-	if (ret != 0)
-		dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
-
-	wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
 	for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
 	for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
 		if (!wm8994->fll_suspend[i].out)
 		if (!wm8994->fll_suspend[i].out)
 			continue;
 			continue;
@@ -3574,8 +3567,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 		wm8994->lrclk_shared[1] = 0;
 		wm8994->lrclk_shared[1] = 0;
 	}
 	}
 
 
-	wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
 	/* Latch volume updates (right only; we always do left then right). */
 	/* Latch volume updates (right only; we always do left then right). */
 	snd_soc_update_bits(codec, WM8994_AIF1_DAC1_LEFT_VOLUME,
 	snd_soc_update_bits(codec, WM8994_AIF1_DAC1_LEFT_VOLUME,
 			    WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);
 			    WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);