diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-08-12 14:37:54 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-31 04:14:01 -0600 |
commit | c869f386bbfdd9e19148b7ab60b8ea4fec676ec8 (patch) | |
tree | 638602453693af09a32fd239d2baee778786b16c /drivers/clk | |
parent | 122b5c3c15b3ff8e5fc06c2ea318603ede85acc7 (diff) | |
download | linux-stable-c869f386bbfdd9e19148b7ab60b8ea4fec676ec8.tar.gz linux-stable-c869f386bbfdd9e19148b7ab60b8ea4fec676ec8.tar.bz2 linux-stable-c869f386bbfdd9e19148b7ab60b8ea4fec676ec8.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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 bbf206e3da0d..ac9582de64a5 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -354,7 +354,7 @@ static long clk_divider_round_rate(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->width); bestdiv = _get_div(divider->table, bestdiv, divider->flags, divider->width); |