Commit 3092d3b8 authored Feb 18, 2016 by Geert Uytterhoeven

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>

parent 31aeb5a5

drivers/clk/shmobile/clk-div6.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,9 +82,8 @@ static unsigned long cpg_div6_clock_recalc_rate(struct clk_hw *hw,
	unsigned long parent_rate)		unsigned long parent_rate)
	{		{
	struct div6_clock *clock = to_div6_clock(hw);		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,		static unsigned int cpg_div6_clock_calc_div(unsigned long rate,