From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 5 Mar 2013 16:09:59 +0000 (+0800)
Subject: ASoC: arizona: Ensure synchroniser is disabled when not needed
X-Git-Tag: v3.10-rc1~14^2~53^2~26^2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eca2e8e24a0c712c2613ce5704e9e73b693d2e98;p=uclinux-h8%2Flinux.git

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>
---

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;