Commit df79e2b4 authored by Sean Anderson's avatar Sean Anderson Committed by Leo Yu-Chi Liang
Browse files

clk: k210: Don't set PLL rates if we are already at the correct rate



This speeds up boot by preventing multiple reconfigurations of the PLLs.
Signed-off-by: Sean Anderson's avatarSean Anderson <seanga2@gmail.com>
Reviewed-by: default avatarLeo Yu-Chi Liang <ycliang@andestech.com>
parent 29e3067d
...@@ -847,21 +847,22 @@ static ulong k210_pll_set_rate(struct k210_clk_priv *priv, int id, ulong rate, ...@@ -847,21 +847,22 @@ static ulong k210_pll_set_rate(struct k210_clk_priv *priv, int id, ulong rate,
const struct k210_pll_params *pll = &k210_plls[id]; const struct k210_pll_params *pll = &k210_plls[id];
struct k210_pll_config config = {}; struct k210_pll_config config = {};
u32 reg; u32 reg;
ulong calc_rate;
if (rate_in < 0) if (rate_in < 0)
return rate_in; return rate_in;
log_debug("Calculating parameters with rate=%lu and rate_in=%lu\n",
rate, rate_in);
err = k210_pll_calc_config(rate, rate_in, &config); err = k210_pll_calc_config(rate, rate_in, &config);
if (err) if (err)
return err; return err;
log_debug("Got r=%u f=%u od=%u\n", config.r, config.f, config.od); log_debug("Got r=%u f=%u od=%u\n", config.r, config.f, config.od);
/* /* Don't bother setting the rate if we're already at that rate */
* Don't use clk_disable as it might not actually disable the pll due to calc_rate = DIV_ROUND_DOWN_ULL(((u64)rate_in) * config.f,
* refcounting config.r * config.od);
*/ if (calc_rate == k210_pll_get_rate(priv, id, rate))
return calc_rate;
k210_pll_disable(priv, id); k210_pll_disable(priv, id);
reg = readl(priv->base + pll->off); reg = readl(priv->base + pll->off);
...@@ -875,7 +876,7 @@ static ulong k210_pll_set_rate(struct k210_clk_priv *priv, int id, ulong rate, ...@@ -875,7 +876,7 @@ static ulong k210_pll_set_rate(struct k210_clk_priv *priv, int id, ulong rate,
| FIELD_PREP(K210_PLL_BWADJ, config.f - 1); | FIELD_PREP(K210_PLL_BWADJ, config.f - 1);
writel(reg, priv->base + pll->off); writel(reg, priv->base + pll->off);
err = k210_pll_enable(priv, id); k210_pll_enable(priv, id);
serial_setbrg(); serial_setbrg();
return k210_pll_get_rate(priv, id, rate); return k210_pll_get_rate(priv, id, rate);
......
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