summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/arizona.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-06 00:09:59 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-08 11:40:28 +0800
commiteca2e8e24a0c712c2613ce5704e9e73b693d2e98 (patch)
tree60334e9477d6ea1044606f273de7fa7c2caf890d /sound/soc/codecs/arizona.c
parent8f113d7d2606003e485c4e8452977750d916dbc6 (diff)
downloadlwn-eca2e8e24a0c712c2613ce5704e9e73b693d2e98.tar.gz
lwn-eca2e8e24a0c712c2613ce5704e9e73b693d2e98.zip
ASoC: arizona: Ensure synchroniser is disabled when not needed
When live configuring a FLL configuration with no synchroniser disable the synchroniser in case the previous configuration used one. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/arizona.c')
-rw-r--r--sound/soc/codecs/arizona.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 8b7855df99de..53ddd529769c 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1187,6 +1187,9 @@ static void arizona_enable_fll(struct arizona_fll *fll,
arizona_apply_fll(arizona, fll->base, sync,
fll->sync_src, false);
+
+ regmap_update_bits(arizona->regmap, fll->base + 0x11,
+ ARIZONA_FLL1_SYNC_ENA, 0);
} else {
arizona_fll_err(fll, "No clocks provided\n");
return;