Commit 0f72a8a3 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: arizona: Avoid changing SYNC_ENA whilst the FLL_ENA is set

For best performance changing the synchroniser state whilst the FLL is
running should be avoided. As this has been done fairly regularly in
practice rather than hard preventing this, simply improve the FLL enable
sequence and give a warning if the user changes the synchroniser state.
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9fd1cd58
...@@ -2209,12 +2209,15 @@ static int arizona_enable_fll(struct arizona_fll *fll) ...@@ -2209,12 +2209,15 @@ static int arizona_enable_fll(struct arizona_fll *fll)
struct arizona *arizona = fll->arizona; struct arizona *arizona = fll->arizona;
bool use_sync = false; bool use_sync = false;
int already_enabled = arizona_is_enabled_fll(fll, fll->base); int already_enabled = arizona_is_enabled_fll(fll, fll->base);
int sync_enabled = arizona_is_enabled_fll(fll, fll->base + 0x10);
struct arizona_fll_cfg cfg; struct arizona_fll_cfg cfg;
int i; int i;
unsigned int val; unsigned int val;
if (already_enabled < 0) if (already_enabled < 0)
return already_enabled; return already_enabled;
if (sync_enabled < 0)
return sync_enabled;
if (already_enabled) { if (already_enabled) {
/* Facilitate smooth refclk across the transition */ /* Facilitate smooth refclk across the transition */
...@@ -2255,6 +2258,9 @@ static int arizona_enable_fll(struct arizona_fll *fll) ...@@ -2255,6 +2258,9 @@ static int arizona_enable_fll(struct arizona_fll *fll)
return -EINVAL; return -EINVAL;
} }
if (already_enabled && !!sync_enabled != use_sync)
arizona_fll_warn(fll, "Synchroniser changed on active FLL\n");
/* /*
* Increase the bandwidth if we're not using a low frequency * Increase the bandwidth if we're not using a low frequency
* sync source. * sync source.
...@@ -2270,12 +2276,12 @@ static int arizona_enable_fll(struct arizona_fll *fll) ...@@ -2270,12 +2276,12 @@ static int arizona_enable_fll(struct arizona_fll *fll)
if (!already_enabled) if (!already_enabled)
pm_runtime_get(arizona->dev); pm_runtime_get(arizona->dev);
regmap_update_bits_async(arizona->regmap, fll->base + 1,
ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
if (use_sync) if (use_sync)
regmap_update_bits_async(arizona->regmap, fll->base + 0x11, regmap_update_bits_async(arizona->regmap, fll->base + 0x11,
ARIZONA_FLL1_SYNC_ENA, ARIZONA_FLL1_SYNC_ENA,
ARIZONA_FLL1_SYNC_ENA); ARIZONA_FLL1_SYNC_ENA);
regmap_update_bits_async(arizona->regmap, fll->base + 1,
ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
if (already_enabled) if (already_enabled)
regmap_update_bits_async(arizona->regmap, fll->base + 1, regmap_update_bits_async(arizona->regmap, fll->base + 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment