[PATCH v3 2/8] clk: imx: pll14xx: Drop wrong shifting

Sascha Hauer
2022-03-04T12:53:11Z

The code tries to mask the bits in SDIV_MASK from 'tmp'. SDIV_MASK
already contains the shifted value, so shifting it again is wrong.
No functional change though as SDIV_SHIFT is zero.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
---

Notes:
Changes since v1:
- Avoid the word 'fix' in the subject to prevent stable guys from picking this patch
- Add note to the commit message that there's no functional change

drivers/clk/imx/clk-pll14xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index cae64d750672e..b295d8a049009 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -195,7 +195,7 @@ static int clk_pll1416x_set_rate(struct clk_hw *hw, unsigned long drate,
tmp = readl_relaxed(pll->base + DIV_CTL0);

if (!clk_pll14xx_mp_change(rate, tmp)) {
- tmp &= ~(SDIV_MASK) << SDIV_SHIFT;
+ tmp &= ~SDIV_MASK;
tmp |= rate->sdiv << SDIV_SHIFT;
writel_relaxed(tmp, pll->base + DIV_CTL0);

@@ -261,7 +261,7 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate,
tmp = readl_relaxed(pll->base + DIV_CTL0);

if (!clk_pll14xx_mp_change(rate, tmp)) {
- tmp &= ~(SDIV_MASK) << SDIV_SHIFT;
+ tmp &= ~SDIV_MASK;
tmp |= rate->sdiv << SDIV_SHIFT;
writel_relaxed(tmp, pll->base + DIV_CTL0);

--
2.30.2