* [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl()
@ 2016-08-12 12:37 Geert Uytterhoeven
2016-08-12 13:16 ` James Hogan
2016-08-13 0:33 ` Stephen Boyd
0 siblings, 2 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2016-08-12 12:37 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd
Cc: James Hogan, linux-clk, linux-kernel, Geert Uytterhoeven
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>
---
Found by code inspection, untested on powerpc.
---
drivers/clk/clk-divider.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index a0f55bc1ad3d277f..96386ffc84835f12 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -352,7 +352,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);
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl()
2016-08-12 12:37 [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl() Geert Uytterhoeven
@ 2016-08-12 13:16 ` James Hogan
2016-08-13 0:33 ` Stephen Boyd
1 sibling, 0 replies; 3+ messages in thread
From: James Hogan @ 2016-08-12 13:16 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Michael Turquette, Stephen Boyd, linux-clk, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]
On Fri, Aug 12, 2016 at 02:37:54PM +0200, Geert Uytterhoeven wrote:
> 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")
Hmm yes, sorry. I don't know how I managed to do that considering the
prevalance of clk_readl() at the time.
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Found by code inspection, untested on powerpc.
> ---
> drivers/clk/clk-divider.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
> index a0f55bc1ad3d277f..96386ffc84835f12 100644
> --- a/drivers/clk/clk-divider.c
> +++ b/drivers/clk/clk-divider.c
> @@ -352,7 +352,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);
> --
> 1.9.1
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl()
2016-08-12 12:37 [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl() Geert Uytterhoeven
2016-08-12 13:16 ` James Hogan
@ 2016-08-13 0:33 ` Stephen Boyd
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Boyd @ 2016-08-13 0:33 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Michael Turquette, James Hogan, linux-clk, linux-kernel
On 08/12, Geert Uytterhoeven wrote:
> 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>
> ---
Applied to clk-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-13 0:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-12 12:37 [PATCH] clk: divider: Fix clk_divider_round_rate() to use clk_readl() Geert Uytterhoeven
2016-08-12 13:16 ` James Hogan
2016-08-13 0:33 ` Stephen Boyd
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.