| Message ID | 20230803110813.175956-2-massimo.pegorer+oss@gmail.com |
|---|---|
| State | Accepted |
| Commit | e4c6ccc6875638766970d249a6cb5dacce6822fe |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3308: Fix two minor UART warnings | expand |
On 2023/8/3 19:08, Massimo Pegorer wrote: > As per definitions of masks and shift offsets in cru_rk3308.h, values > read from registers must be first masked and then shifted. By the way, > this fix is binary invariant, because in all of fixed cases the shift > offset is zero. > > Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > drivers/clk/rockchip/clk_rk3308.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c > index 64f33587e2..d27673c454 100644 > --- a/drivers/clk/rockchip/clk_rk3308.c > +++ b/drivers/clk/rockchip/clk_rk3308.c > @@ -150,7 +150,7 @@ static ulong rk3308_i2c_get_clk(struct clk *clk) > } > > con = readl(&cru->clksel_con[con_id]); > - div = con >> CLK_I2C_DIV_CON_SHIFT & CLK_I2C_DIV_CON_MASK; > + div = (con & CLK_I2C_DIV_CON_MASK) >> CLK_I2C_DIV_CON_SHIFT; > > return DIV_TO_RATE(priv->dpll_hz, div); > } > @@ -314,7 +314,7 @@ static ulong rk3308_saradc_get_clk(struct clk *clk) > u32 div, con; > > con = readl(&cru->clksel_con[34]); > - div = con >> CLK_SARADC_DIV_CON_SHIFT & CLK_SARADC_DIV_CON_MASK; > + div = (con & CLK_SARADC_DIV_CON_MASK) >> CLK_SARADC_DIV_CON_SHIFT; > > return DIV_TO_RATE(OSC_HZ, div); > } > @@ -342,7 +342,7 @@ static ulong rk3308_tsadc_get_clk(struct clk *clk) > u32 div, con; > > con = readl(&cru->clksel_con[33]); > - div = con >> CLK_SARADC_DIV_CON_SHIFT & CLK_SARADC_DIV_CON_MASK; > + div = (con & CLK_SARADC_DIV_CON_MASK) >> CLK_SARADC_DIV_CON_SHIFT; > > return DIV_TO_RATE(OSC_HZ, div); > } > @@ -385,7 +385,7 @@ static ulong rk3308_spi_get_clk(struct clk *clk) > } > > con = readl(&cru->clksel_con[con_id]); > - div = con >> CLK_SPI_DIV_CON_SHIFT & CLK_SPI_DIV_CON_MASK; > + div = (con & CLK_SPI_DIV_CON_MASK) >> CLK_SPI_DIV_CON_SHIFT; > > return DIV_TO_RATE(priv->dpll_hz, div); > } > @@ -429,7 +429,7 @@ static ulong rk3308_pwm_get_clk(struct clk *clk) > u32 div, con; > > con = readl(&cru->clksel_con[29]); > - div = con >> CLK_PWM_DIV_CON_SHIFT & CLK_PWM_DIV_CON_MASK; > + div = (con & CLK_PWM_DIV_CON_MASK) >> CLK_PWM_DIV_CON_SHIFT; > > return DIV_TO_RATE(priv->dpll_hz, div); > }
diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c index 64f33587e2..d27673c454 100644 --- a/drivers/clk/rockchip/clk_rk3308.c +++ b/drivers/clk/rockchip/clk_rk3308.c @@ -150,7 +150,7 @@ static ulong rk3308_i2c_get_clk(struct clk *clk) } con = readl(&cru->clksel_con[con_id]); - div = con >> CLK_I2C_DIV_CON_SHIFT & CLK_I2C_DIV_CON_MASK; + div = (con & CLK_I2C_DIV_CON_MASK) >> CLK_I2C_DIV_CON_SHIFT; return DIV_TO_RATE(priv->dpll_hz, div); } @@ -314,7 +314,7 @@ static ulong rk3308_saradc_get_clk(struct clk *clk) u32 div, con; con = readl(&cru->clksel_con[34]); - div = con >> CLK_SARADC_DIV_CON_SHIFT & CLK_SARADC_DIV_CON_MASK; + div = (con & CLK_SARADC_DIV_CON_MASK) >> CLK_SARADC_DIV_CON_SHIFT; return DIV_TO_RATE(OSC_HZ, div); } @@ -342,7 +342,7 @@ static ulong rk3308_tsadc_get_clk(struct clk *clk) u32 div, con; con = readl(&cru->clksel_con[33]); - div = con >> CLK_SARADC_DIV_CON_SHIFT & CLK_SARADC_DIV_CON_MASK; + div = (con & CLK_SARADC_DIV_CON_MASK) >> CLK_SARADC_DIV_CON_SHIFT; return DIV_TO_RATE(OSC_HZ, div); } @@ -385,7 +385,7 @@ static ulong rk3308_spi_get_clk(struct clk *clk) } con = readl(&cru->clksel_con[con_id]); - div = con >> CLK_SPI_DIV_CON_SHIFT & CLK_SPI_DIV_CON_MASK; + div = (con & CLK_SPI_DIV_CON_MASK) >> CLK_SPI_DIV_CON_SHIFT; return DIV_TO_RATE(priv->dpll_hz, div); } @@ -429,7 +429,7 @@ static ulong rk3308_pwm_get_clk(struct clk *clk) u32 div, con; con = readl(&cru->clksel_con[29]); - div = con >> CLK_PWM_DIV_CON_SHIFT & CLK_PWM_DIV_CON_MASK; + div = (con & CLK_PWM_DIV_CON_MASK) >> CLK_PWM_DIV_CON_SHIFT; return DIV_TO_RATE(priv->dpll_hz, div); }
As per definitions of masks and shift offsets in cru_rk3308.h, values read from registers must be first masked and then shifted. By the way, this fix is binary invariant, because in all of fixed cases the shift offset is zero. Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com> --- drivers/clk/rockchip/clk_rk3308.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)