Skip to content

Commit 052d03a

Browse files
saschahauerabelvesa
authored andcommitted
clk: imx: pll14xx: name variables after usage
In clk_pll1443x_set_rate() 'tmp' is used for the content of different registers which makes it a bit hard to follow. Use different variables named after the registers to make it clearer. No functional change intended. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Abel Vesa <abel.vesa@nxp.com> Link: https://lore.kernel.org/r/20220304125256.2125023-6-s.hauer@pengutronix.de Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
1 parent 53990cf commit 052d03a

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

drivers/clk/imx/clk-pll14xx.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
238238
{
239239
struct clk_pll14xx *pll = to_clk_pll14xx(hw);
240240
const struct imx_pll14xx_rate_table *rate;
241-
u32 tmp, div_val;
241+
u32 gnrl_ctl, div_ctl0;
242242
int ret;
243243

244244
rate = imx_get_pll_settings(pll, drate);
@@ -248,32 +248,32 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
248248
return -EINVAL;
249249
}
250250

251-
tmp = readl_relaxed(pll->base + DIV_CTL0);
251+
div_ctl0 = readl_relaxed(pll->base + DIV_CTL0);
252252

253-
if (!clk_pll14xx_mp_change(rate, tmp)) {
254-
tmp &= ~SDIV_MASK;
255-
tmp |= FIELD_PREP(SDIV_MASK, rate->sdiv);
256-
writel_relaxed(tmp, pll->base + DIV_CTL0);
253+
if (!clk_pll14xx_mp_change(rate, div_ctl0)) {
254+
div_ctl0 &= ~SDIV_MASK;
255+
div_ctl0 |= FIELD_PREP(SDIV_MASK, rate->sdiv);
256+
writel_relaxed(div_ctl0, pll->base + DIV_CTL0);
257257

258-
tmp = FIELD_PREP(KDIV_MASK, rate->kdiv);
259-
writel_relaxed(tmp, pll->base + DIV_CTL1);
258+
writel_relaxed(FIELD_PREP(KDIV_MASK, rate->kdiv),
259+
pll->base + DIV_CTL1);
260260

261261
return 0;
262262
}
263263

264264
/* Enable RST */
265-
tmp = readl_relaxed(pll->base + GNRL_CTL);
266-
tmp &= ~RST_MASK;
267-
writel_relaxed(tmp, pll->base + GNRL_CTL);
265+
gnrl_ctl = readl_relaxed(pll->base + GNRL_CTL);
266+
gnrl_ctl &= ~RST_MASK;
267+
writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
268268

269269
/* Enable BYPASS */
270-
tmp |= BYPASS_MASK;
271-
writel_relaxed(tmp, pll->base + GNRL_CTL);
270+
gnrl_ctl |= BYPASS_MASK;
271+
writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
272272

273-
div_val = FIELD_PREP(MDIV_MASK, rate->mdiv) |
274-
FIELD_PREP(PDIV_MASK, rate->pdiv) |
275-
FIELD_PREP(SDIV_MASK, rate->sdiv);
276-
writel_relaxed(div_val, pll->base + DIV_CTL0);
273+
div_ctl0 = FIELD_PREP(MDIV_MASK, rate->mdiv) |
274+
FIELD_PREP(PDIV_MASK, rate->pdiv) |
275+
FIELD_PREP(SDIV_MASK, rate->sdiv);
276+
writel_relaxed(div_ctl0, pll->base + DIV_CTL0);
277277
writel_relaxed(FIELD_PREP(KDIV_MASK, rate->kdiv), pll->base + DIV_CTL1);
278278

279279
/*
@@ -285,17 +285,17 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
285285
udelay(3);
286286

287287
/* Disable RST */
288-
tmp |= RST_MASK;
289-
writel_relaxed(tmp, pll->base + GNRL_CTL);
288+
gnrl_ctl |= RST_MASK;
289+
writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
290290

291291
/* Wait Lock*/
292292
ret = clk_pll14xx_wait_lock(pll);
293293
if (ret)
294294
return ret;
295295

296296
/* Bypass */
297-
tmp &= ~BYPASS_MASK;
298-
writel_relaxed(tmp, pll->base + GNRL_CTL);
297+
gnrl_ctl &= ~BYPASS_MASK;
298+
writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
299299

300300
return 0;
301301
}

0 commit comments

Comments
 (0)