diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-08-12 14:37:54 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:53:55 +0000 |
| commit | f68c511d0b0c00957132934a2f155d489329f0b6 (patch) | |
| tree | dd36a996a59b366f2c08b57c32ab1d9f834f04bb /drivers/clk | |
| parent | c23ef4c163ad2271ee6bd30526b8fa1d0cecdcd9 (diff) | |
| download | linux-stable-f68c511d0b0c00957132934a2f155d489329f0b6.tar.gz linux-stable-f68c511d0b0c00957132934a2f155d489329f0b6.tar.bz2 linux-stable-f68c511d0b0c00957132934a2f155d489329f0b6.zip | |
clk: divider: Fix clk_divider_round_rate() to use clk_readl()
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 <geert+renesas@glider.be>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-divider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index a52154caf526..ff91b6cceff6 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -263,7 +263,7 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate, /* 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; |