korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-19 00:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

clk: imx: pll14xx: name variables after usage

Browse Source 
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>
This commit is contained in:
Sascha Hauer 2022-03-04 13:52:53 +01:00 committed by Abel Vesa
parent 53990cf9d5
commit 052d03a043
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
{ {
struct clk_pll14xx *pll = to_clk_pll14xx(hw); struct clk_pll14xx *pll = to_clk_pll14xx(hw);
const struct imx_pll14xx_rate_table *rate; const struct imx_pll14xx_rate_table *rate;
u32 tmp, div_val; u32 gnrl_ctl, div_ctl0;
int ret; int ret;
rate = imx_get_pll_settings(pll, drate); rate = imx_get_pll_settings(pll, drate);
@ -248,32 +248,32 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
return -EINVAL; return -EINVAL;
} }
tmp = readl_relaxed(pll->base + DIV_CTL0); div_ctl0 = readl_relaxed(pll->base + DIV_CTL0);
if (!clk_pll14xx_mp_change(rate, tmp)) { if (!clk_pll14xx_mp_change(rate, div_ctl0)) {
tmp &= ~SDIV_MASK; div_ctl0 &= ~SDIV_MASK;
tmp |= FIELD_PREP(SDIV_MASK, rate->sdiv); div_ctl0 |= FIELD_PREP(SDIV_MASK, rate->sdiv);
writel_relaxed(tmp, pll->base + DIV_CTL0); writel_relaxed(div_ctl0, pll->base + DIV_CTL0);
tmp = FIELD_PREP(KDIV_MASK, rate->kdiv); writel_relaxed(FIELD_PREP(KDIV_MASK, rate->kdiv),
writel_relaxed(tmp, pll->base + DIV_CTL1); pll->base + DIV_CTL1);
return 0; return 0;
} }
/* Enable RST */ /* Enable RST */
tmp = readl_relaxed(pll->base + GNRL_CTL); gnrl_ctl = readl_relaxed(pll->base + GNRL_CTL);
tmp &= ~RST_MASK; gnrl_ctl &= ~RST_MASK;
writel_relaxed(tmp, pll->base + GNRL_CTL); writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
/* Enable BYPASS */ /* Enable BYPASS */
tmp |= BYPASS_MASK; gnrl_ctl |= BYPASS_MASK;
writel_relaxed(tmp, pll->base + GNRL_CTL); writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
div_val = FIELD_PREP(MDIV_MASK, rate->mdiv) | div_ctl0 = FIELD_PREP(MDIV_MASK, rate->mdiv) |
FIELD_PREP(PDIV_MASK, rate->pdiv) | FIELD_PREP(PDIV_MASK, rate->pdiv) |
FIELD_PREP(SDIV_MASK, rate->sdiv); FIELD_PREP(SDIV_MASK, rate->sdiv);
writel_relaxed(div_val, pll->base + DIV_CTL0); writel_relaxed(div_ctl0, pll->base + DIV_CTL0);
writel_relaxed(FIELD_PREP(KDIV_MASK, rate->kdiv), pll->base + DIV_CTL1); writel_relaxed(FIELD_PREP(KDIV_MASK, rate->kdiv), pll->base + DIV_CTL1);
/* /*
@ -285,8 +285,8 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
udelay(3); udelay(3);
/* Disable RST */ /* Disable RST */
tmp |= RST_MASK; gnrl_ctl |= RST_MASK;
writel_relaxed(tmp, pll->base + GNRL_CTL); writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
/* Wait Lock*/ /* Wait Lock*/
ret = clk_pll14xx_wait_lock(pll); ret = clk_pll14xx_wait_lock(pll);
@ -294,8 +294,8 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
return ret; return ret;
/* Bypass */ /* Bypass */
tmp &= ~BYPASS_MASK; gnrl_ctl &= ~BYPASS_MASK;
writel_relaxed(tmp, pll->base + GNRL_CTL); writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL);
return 0; return 0;
} }