3.16.40-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Geert Uytterhoeven <[email protected]> commit 2cf9a57811bddb6fa6b0f8d7376da164d5534813 upstream. clk-divider uses clk_readl()/clk_writel() everywhere, except in clk_divider_round_rate(), where plain readl() is used. Change this to clk_readl(), as it makes a difference on powerpc. Fixes: e6d5e7d90be92cee ("clk-divider: Fix READ_ONLY when divider > 1") Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: James Hogan <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings <[email protected]> --- drivers/clk/clk-divider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -263,7 +263,7 @@ static int clk_divider_bestdiv(struct cl /* if read only, just return current value */ if (divider->flags & CLK_DIVIDER_READ_ONLY) { - bestdiv = readl(divider->reg) >> divider->shift; + bestdiv = clk_readl(divider->reg) >> divider->shift; bestdiv &= div_mask(divider); bestdiv = _get_div(divider, bestdiv); return bestdiv;
