ASoC: arizona: Don't change the FLLn_GAIN before entering FREERUN

When reclocking an active FLL, to ensure a clean transition, do
not change the gain setting until we have entered free run.

Signed-off-by: Nariman Poushin <nariman@opensource.wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index ecfdbfcae366..0fc3b4b61552 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -2218,11 +2218,11 @@ static int arizona_enable_fll(struct arizona_fll *fll)
 
         if (already_enabled) {
                 /* Facilitate smooth refclk across the transition */
-                regmap_update_bits_async(fll->arizona->regmap, fll->base + 0x9,
-                                         ARIZONA_FLL1_GAIN_MASK, 0);
                 regmap_update_bits(fll->arizona->regmap, fll->base + 1,
                                    ARIZONA_FLL1_FREERUN, ARIZONA_FLL1_FREERUN);
                 udelay(32);
+                regmap_update_bits_async(fll->arizona->regmap, fll->base + 0x9,
+                                         ARIZONA_FLL1_GAIN_MASK, 0);
         }
 
         /*