ASoC: arizona: Set FLL to free-run before disabling

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490
Commit:     3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490
Parent:     f69f86b1ba6493126a7f093a65a8952bcb183de2
Author:     Richard Fitzgerald <rf at opensource.wolfsonmicro.com>
AuthorDate: Wed Nov 20 14:37:09 2013 +0000
Committer:  Mark Brown <broonie at linaro.org>
CommitDate: Wed Nov 20 15:20:01 2013 +0000

    ASoC: arizona: Set FLL to free-run before disabling
    
    The FLL must be placed into free-run mode before disabling
    to allow it to entirely shut down.
    
    Signed-off-by: Richard Fitzgerald <rf at opensource.wolfsonmicro.com>
    Signed-off-by: Mark Brown <broonie at linaro.org>
    Cc: stable at vger.kernel.org
---
 sound/soc/codecs/arizona.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 6f05b17..fea9910 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1529,6 +1529,8 @@ static void arizona_enable_fll(struct arizona_fll *fll,
 	try_wait_for_completion(&fll->ok);
 
 	regmap_update_bits(arizona->regmap, fll->base + 1,
+			   ARIZONA_FLL1_FREERUN, 0);
+	regmap_update_bits(arizona->regmap, fll->base + 1,
 			   ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
 	if (use_sync)
 		regmap_update_bits(arizona->regmap, fll->base + 0x11,
@@ -1546,6 +1548,8 @@ static void arizona_disable_fll(struct arizona_fll *fll)
 	struct arizona *arizona = fll->arizona;
 	bool change;
 
+	regmap_update_bits(arizona->regmap, fll->base + 1,
+			   ARIZONA_FLL1_FREERUN, ARIZONA_FLL1_FREERUN);
 	regmap_update_bits_check(arizona->regmap, fll->base + 1,
 				 ARIZONA_FLL1_ENA, 0, &change);
 	regmap_update_bits(arizona->regmap, fll->base + 0x11,