Commit 18240b67 authored by Mark Brown's avatar Mark Brown

ASoC: Host clock2 read up in WM8904 FLL configuration

Avoids skipping over the read for disable cases.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a17accb7
...@@ -1893,6 +1893,8 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source, ...@@ -1893,6 +1893,8 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
Fout == wm8904->fll_fout) Fout == wm8904->fll_fout)
return 0; return 0;
clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
if (Fout == 0) { if (Fout == 0) {
dev_dbg(codec->dev, "FLL disabled\n"); dev_dbg(codec->dev, "FLL disabled\n");
...@@ -1936,7 +1938,6 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source, ...@@ -1936,7 +1938,6 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
/* Save current state then disable the FLL and SYSCLK to avoid /* Save current state then disable the FLL and SYSCLK to avoid
* misclocking */ * misclocking */
clock2 = snd_soc_read(codec, WM8904_CLOCK_RATES_2);
fll1 = snd_soc_read(codec, WM8904_FLL_CONTROL_1); fll1 = snd_soc_read(codec, WM8904_FLL_CONTROL_1);
snd_soc_update_bits(codec, WM8904_CLOCK_RATES_2, snd_soc_update_bits(codec, WM8904_CLOCK_RATES_2,
WM8904_CLK_SYS_ENA, 0); WM8904_CLK_SYS_ENA, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment