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>

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 8ae6585edbe0ce518d2228c8d2b7f7db75ac32ee..9bb8192de7f27fe160c9c8ac0b0e52bdf832b426 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2759,13 +2759,6 @@ static int wm8994_resume(struct snd_soc_codec *codec)
                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++) {
                if (!wm8994->fll_suspend[i].out)
                        continue;
@@ -3574,8 +3567,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                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). */
        snd_soc_update_bits(codec, WM8994_AIF1_DAC1_LEFT_VOLUME,
                            WM8994_AIF1DAC1_VU, WM8994_AIF1DAC1_VU);