diff options
| author | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> | 2013-11-20 14:37:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:01 +0000 |
| commit | 3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490 (patch) | |
| tree | 5113a746ead998e0dff04b726f183b35ccb7e184 /sound | |
| parent | f69f86b1ba6493126a7f093a65a8952bcb183de2 (diff) | |
| download | linux-3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490.tar.gz linux-3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490.tar.bz2 linux-3e68ce1bc72e5d6615677ec5a8b0a9bcb6c7a490.zip | |
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@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 6f05b17d1965..fea991031be1 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, |