Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Shengjiu Wang and committed by
Abel Vesa
f52f0006 3f5f63ad

+12 -11
+12 -11
drivers/clk/imx/clk-pll14xx.c
··· 104 104 static long pll14xx_calc_rate(struct clk_pll14xx *pll, int mdiv, int pdiv, 105 105 int sdiv, int kdiv, unsigned long prate) 106 106 { 107 - u64 fvco = prate; 107 + u64 fout = prate; 108 108 109 - /* fvco = (m * 65536 + k) * Fin / (p * 65536) */ 110 - fvco *= (mdiv * 65536 + kdiv); 109 + /* fout = (m * 65536 + k) * Fin / (p * 65536) / (1 << sdiv) */ 110 + fout *= (mdiv * 65536 + kdiv); 111 111 pdiv *= 65536; 112 112 113 - do_div(fvco, pdiv << sdiv); 113 + do_div(fout, pdiv << sdiv); 114 114 115 - return fvco; 115 + return fout; 116 116 } 117 117 118 118 static long pll1443x_calc_kdiv(int mdiv, int pdiv, int sdiv, ··· 131 131 { 132 132 u32 pll_div_ctl0, pll_div_ctl1; 133 133 int mdiv, pdiv, sdiv, kdiv; 134 - long fvco, rate_min, rate_max, dist, best = LONG_MAX; 134 + long fout, rate_min, rate_max, dist, best = LONG_MAX; 135 135 const struct imx_pll14xx_rate_table *tt; 136 136 137 137 /* ··· 143 143 * d) -32768 <= k <= 32767 144 144 * 145 145 * fvco = (m * 65536 + k) * prate / (p * 65536) 146 + * fout = (m * 65536 + k) * prate / (p * 65536) / (1 << sdiv) 146 147 */ 147 148 148 149 /* First try if we can get the desired rate from one of the static entries */ ··· 174 173 pr_debug("%s: in=%ld, want=%ld Only adjust kdiv %ld -> %d\n", 175 174 clk_hw_get_name(&pll->hw), prate, rate, 176 175 FIELD_GET(KDIV_MASK, pll_div_ctl1), kdiv); 177 - fvco = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); 178 - t->rate = (unsigned int)fvco; 176 + fout = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); 177 + t->rate = (unsigned int)fout; 179 178 t->mdiv = mdiv; 180 179 t->pdiv = pdiv; 181 180 t->sdiv = sdiv; ··· 191 190 mdiv = clamp(mdiv, 64, 1023); 192 191 193 192 kdiv = pll1443x_calc_kdiv(mdiv, pdiv, sdiv, rate, prate); 194 - fvco = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); 193 + fout = pll14xx_calc_rate(pll, mdiv, pdiv, sdiv, kdiv, prate); 195 194 196 195 /* best match */ 197 - dist = abs((long)rate - (long)fvco); 196 + dist = abs((long)rate - (long)fout); 198 197 if (dist < best) { 199 198 best = dist; 200 - t->rate = (unsigned int)fvco; 199 + t->rate = (unsigned int)fout; 201 200 t->mdiv = mdiv; 202 201 t->pdiv = pdiv; 203 202 t->sdiv = sdiv;