diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-11-25 22:01:46 -0800 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2013-01-11 20:57:58 +0900 |
commit | 5a799b824b6046befa7e10107a3d65f40816f645 (patch) | |
tree | 924d89586fea6b4e384ced4e6d5ab438f31f8971 /drivers/sh | |
parent | 30c254ff5c6510877c4fa3c3e87bb6d7172a7fcf (diff) | |
download | linux-stable-5a799b824b6046befa7e10107a3d65f40816f645.tar.gz linux-stable-5a799b824b6046befa7e10107a3d65f40816f645.tar.bz2 linux-stable-5a799b824b6046befa7e10107a3d65f40816f645.zip |
sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
764f4e4e33d18cde4dcaf8a0d860b749c6d6d08b
(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>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/clk/cpg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 5aedcdf4ac5c..1ebe67cd1833 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c @@ -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; } |