kevin/linux
1
Fork 0
Code

clk: imx: pll14xx: change naming of fvco to fout

Browse Source 
pll14xx_calc_rate() output the fout clock not the fvco clock
The relation of fvco and fout is:
	fout = fvco / (1 << sdiv)

So use correct naming for the clock.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/1703068389-6130-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
This commit is contained in:
Shengjiu Wang 2023-12-20 18:33:09 +08:00 committed by Abel Vesa
parent 3f5f63adee
commit f52f000698
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/clk/imx/clk-pll14xx.c
View File

@ -104,15 +104,15 @@ static const struct imx_pll14xx_rate_table *imx_get_pll_settings(
static long pll14xx_calc_rate(struct clk_pll14xx *pll, int mdiv, int pdiv, static long pll14xx_calc_rate(struct clk_pll14xx *pll, int mdiv, int pdiv,
int sdiv, int kdiv, unsigned long prate) int sdiv, int kdiv, unsigned long prate)
{ {
u64 fvco = prate; u64 fout = prate;
/* fvco = (m * 65536 + k) * Fin / (p * 65536) */ /* fout = (m * 65536 + k) * Fin / (p * 65536) / (1 << sdiv) */
fvco *= (mdiv * 65536 + kdiv); fout *= (mdiv * 65536 + kdiv);
pdiv *= 65536; pdiv *= 65536;
do_div(fvco, pdiv << sdiv); do_div(fout, pdiv << sdiv);
return fvco; return fout;
} }
static long pll1443x_calc_kdiv(int mdiv, int pdiv, int sdiv, static long pll1443x_calc_kdiv(int mdiv, int pdiv, int sdiv,
@ -131,7 +131,7 @@ static void imx_pll14xx_calc_settings(struct clk_pll14xx *pll, unsigned long rat
{ {
u32 pll_div_ctl0, pll_div_ctl1; u32 pll_div_ctl0, pll_div_ctl1;
int mdiv, pdiv, sdiv, kdiv; int mdiv, pdiv, sdiv, kdiv;
long fvco, rate_min, rate_max, dist, best = LONG_MAX; long fout, rate_min, rate_max, dist, best = LONG_MAX;
const struct imx_pll14xx_rate_table *tt; const struct imx_pll14xx_rate_table *tt;
/* /*
@ -143,6 +143,7 @@ static void imx_pll14xx_calc_settings(struct clk_pll14xx *pll, unsigned long rat
* d) -32768 <= k <= 32767 * d) -32768 <= k <= 32767
* *
* fvco = (m * 65536 + k) * prate / (p * 65536) * fvco = (m * 65536 + k) * prate / (p * 65536)
* fout = (m * 65536 + k) * prate / (p * 65536) / (1 << sdiv)
*/ */
/* First try if we can get the desired rate from one of the static entries */ /* First try if we can get the desired rate from one of the static entries */
@ -173,8 +174,8 @@ static void imx_pll14xx_calc_settings(struct clk_pll14xx *pll, unsigned long rat
pr_debug("%s: in=%ld, want=%ld Only adjust kdiv %ld -> %d\n", pr_debug("%s: in=%ld, want=%ld Only adjust kdiv %ld -> %d\n",
clk_hw_get_name(&pll->hw), prate, rate, clk_hw_get_name(&pll->hw), prate, rate,
FIELD_GET(KDIV_MASK, pll_div_ctl1), kdiv); FIELD_GET(KDIV_MASK, pll_div_ctl1), kdiv);
fvco = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); fout = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate);
t->rate = (unsigned int)fvco; t->rate = (unsigned int)fout;
t->mdiv = mdiv; t->mdiv = mdiv;
t->pdiv = pdiv; t->pdiv = pdiv;
t->sdiv = sdiv; t->sdiv = sdiv;
@ -190,13 +191,13 @@ static void imx_pll14xx_calc_settings(struct clk_pll14xx *pll, unsigned long rat
mdiv = clamp(mdiv, 64, 1023); mdiv = clamp(mdiv, 64, 1023);
kdiv = pll1443x_calc_kdiv(mdiv, pdiv, sdiv, rate, prate); kdiv = pll1443x_calc_kdiv(mdiv, pdiv, sdiv, rate, prate);
fvco = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); fout = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate);
/* best match */ /* best match */
dist = abs((long)rate - (long)fvco); dist = abs((long)rate - (long)fout);
if (dist < best) { if (dist < best) {
best = dist; best = dist;
t->rate = (unsigned int)fvco; t->rate = (unsigned int)fout;
t->mdiv = mdiv; t->mdiv = mdiv;
t->pdiv = pdiv; t->pdiv = pdiv;
t->sdiv = sdiv; t->sdiv = sdiv;