summaryrefslogtreecommitdiffstats
path: root/drivers/clk/shmobile
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-02-18 15:16:02 +0100
committerGeert Uytterhoeven <geert+renesas@glider.be>2016-02-26 12:03:10 +0100
commit3092d3b8e56e09ff74d7ef9f1c34a4c358e9f0fe (patch)
treea8c2e856d856cbadbe322c5429eebb80ca9bf5d4 /drivers/clk/shmobile
parent31aeb5a523b0f6c1b7cc4f802e6f925168f7d60d (diff)
downloadlinux-stable-3092d3b8e56e09ff74d7ef9f1c34a4c358e9f0fe.tar.gz
linux-stable-3092d3b8e56e09ff74d7ef9f1c34a4c358e9f0fe.tar.bz2
linux-stable-3092d3b8e56e09ff74d7ef9f1c34a4c358e9f0fe.zip
clk: shmobile: div6: Fix .recalc_rate() using a stale divisor
cpg_div6_clock_set_rate() only programs the new divisor if the clock isn't stopped. If the clock is stopped, it will update the cached divisor value only, which will be programmed into the clock registers when enabling the clock later. However, cpg_div6_clock_recalc_rate() reads the divisor from the clock registers instead of using the cached value, leading to an incorrect result if the clock is currently stopped. Make cpg_div6_clock_recalc_rate() use the cached value to fix this. Reported-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com>
Diffstat (limited to 'drivers/clk/shmobile')
-rw-r--r--drivers/clk/shmobile/clk-div6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c
index 999994769450..0627860233cb 100644
--- a/drivers/clk/shmobile/clk-div6.c
+++ b/drivers/clk/shmobile/clk-div6.c
@@ -82,9 +82,8 @@ static unsigned long cpg_div6_clock_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
struct div6_clock *clock = to_div6_clock(hw);
- unsigned int div = (clk_readl(clock->reg) & CPG_DIV6_DIV_MASK) + 1;
- return parent_rate / div;
+ return parent_rate / clock->div;
}
static unsigned int cpg_div6_clock_calc_div(unsigned long rate,