aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-07-09 12:41:48 -0400
committerMark Brown <broonie@linaro.org>2014-07-10 06:09:16 -0400
commit5e39a50bf8c644f2ef348037d3e3efdc03fa65b2 (patch)
tree9af95270d0304173bec905ab43c241de07fba373
parentc393aca94f26e90290cd861743efbfbcd97c0316 (diff)
ASoC: arizona: FLL freerun only required whilst disabling
The FLL freerun is only required whilst we disable the FLL not the entire time the FLL is disabled. This patch moves the FLL freerun disable from the enable sequence to the disable sequence. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/codecs/arizona.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index a6f09bb0a2e9..7c362cb36b21 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1792,8 +1792,6 @@ static int arizona_enable_fll(struct arizona_fll *fll)
1792 try_wait_for_completion(&fll->ok); 1792 try_wait_for_completion(&fll->ok);
1793 1793
1794 regmap_update_bits_async(arizona->regmap, fll->base + 1, 1794 regmap_update_bits_async(arizona->regmap, fll->base + 1,
1795 ARIZONA_FLL1_FREERUN, 0);
1796 regmap_update_bits_async(arizona->regmap, fll->base + 1,
1797 ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA); 1795 ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
1798 if (use_sync) 1796 if (use_sync)
1799 regmap_update_bits_async(arizona->regmap, fll->base + 0x11, 1797 regmap_update_bits_async(arizona->regmap, fll->base + 0x11,
@@ -1819,6 +1817,8 @@ static void arizona_disable_fll(struct arizona_fll *fll)
1819 ARIZONA_FLL1_ENA, 0, &change); 1817 ARIZONA_FLL1_ENA, 0, &change);
1820 regmap_update_bits(arizona->regmap, fll->base + 0x11, 1818 regmap_update_bits(arizona->regmap, fll->base + 0x11,
1821 ARIZONA_FLL1_SYNC_ENA, 0); 1819 ARIZONA_FLL1_SYNC_ENA, 0);
1820 regmap_update_bits_async(arizona->regmap, fll->base + 1,
1821 ARIZONA_FLL1_FREERUN, 0);
1822 1822
1823 if (change) 1823 if (change)
1824 pm_runtime_put_autosuspend(arizona->dev); 1824 pm_runtime_put_autosuspend(arizona->dev);