aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyung-Kwee Ryu <Kyung-Kwee.Ryu@wolfsonmicro.com>2012-04-24 13:01:48 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-25 04:50:50 -0400
commite05854ddaa012f3369884acf61ec9953285404b4 (patch)
tree825e04ed8b624a1b982559026a8cf8172a1755b4
parentdd7b10b30c40dddb9750926d78cfe89c0cd8434d (diff)
ASoC: wm8994: Make sure we disable FLL bypass when stopping the FLL
If FLL bypass is left enabled when we disable the CODEC then the output clock will be left running which consumes a small amount of additional current. Only enable bypass when there is an output. Signed-off-by: Kyung-Kwee Ryu <Kyung-Kwee.Ryu@wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 4cebac4f6215..746d3db6f19f 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1982,7 +1982,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
1982 WM8994_FLL1_ENA, 0); 1982 WM8994_FLL1_ENA, 0);
1983 1983
1984 if (wm8994->fll_byp && src == WM8994_FLL_SRC_BCLK && 1984 if (wm8994->fll_byp && src == WM8994_FLL_SRC_BCLK &&
1985 freq_in == freq_out) { 1985 freq_in == freq_out && freq_out) {
1986 dev_dbg(codec->dev, "Bypassing FLL%d\n", id + 1); 1986 dev_dbg(codec->dev, "Bypassing FLL%d\n", id + 1);
1987 snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset, 1987 snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_5 + reg_offset,
1988 WM8958_FLL1_BYP, WM8958_FLL1_BYP); 1988 WM8958_FLL1_BYP, WM8958_FLL1_BYP);