Commit 5a799b82 authored Nov 25, 2012 by Kuninori Morimoto Committed by Paul Mundt Jan 11, 2013

sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6



764f4e4e
(sh: clkfwk: Use shared sh_clk_div_enable/disable())
shared enable/disable funcions for div4/div6.
But new sh_clk_div_enable() didn't care sh_clk_div_set_rate()
which is required on div6 clock.
This patch fixes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 30c254ff

drivers/sh/clk/cpg.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,12 @@ static int sh_clk_div_set_rate(struct clk *clk, unsigned long rate)

		static int sh_clk_div_enable(struct clk *clk)
		{
		if (clk->div_mask == SH_CLK_DIV6_MSK) {
		int ret = sh_clk_div_set_rate(clk, clk->rate);
		if (ret < 0)
		return ret;
		}

		sh_clk_write(sh_clk_read(clk) & ~CPG_CKSTP_BIT, clk);
		return 0;
		}