aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-12-11 22:02:09 -0500
committerPaul Mundt <lethal@linux-sh.org>2012-01-09 23:30:30 -0500
commit7784f4da1a1b8b2519e008551fc4f69713451f89 (patch)
treeed208fa21c9f15f3f629b0acb7a5aa21563b832b
parent2dacb97d9269e303ed761937a0e9db8711515e08 (diff)
sh: clkfwk: sh_clk_init_parent() should be called after clk_register()
sh_clk_init_parent() are using clk->mapped_reg which is mapped in clk_register() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/sh/clk/cpg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index a0d8faa40baa..45fee368b092 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -222,11 +222,11 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,
222 clkp->ops = ops; 222 clkp->ops = ops;
223 clkp->freq_table = freq_table + (k * freq_table_size); 223 clkp->freq_table = freq_table + (k * freq_table_size);
224 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END; 224 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
225 ret = sh_clk_init_parent(clkp); 225 ret = clk_register(clkp);
226 if (ret < 0) 226 if (ret < 0)
227 break; 227 break;
228 228
229 ret = clk_register(clkp); 229 ret = sh_clk_init_parent(clkp);
230 } 230 }
231 231
232 return ret; 232 return ret;