aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-05-10 10:01:02 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-05-10 22:48:31 -0400
commitf3d51e13fea901729fef15bf1c32ca004d45476e (patch)
tree205a278e6e3d19ee7b57d39f30d4e50c2aaf6eaf /arch/sh/kernel/cpu/sh4a/clock-sh7722.c
parent9b7a37853a8cd69829eb1d9715a6c09aae01eeec (diff)
sh: hwblk index rework
Rework the sh7722/sh7723/sh7724 hwblk code to use the hwblk id as index in the mstp clock array. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7722.c')
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7722.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index 107b200e78bd..e5b6f47ea8b0 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -157,7 +157,7 @@ struct clk div6_clks[] = {
157#define B_CLK &div4_clks[DIV4_B] 157#define B_CLK &div4_clks[DIV4_B]
158#define U_CLK &div4_clks[DIV4_U] 158#define U_CLK &div4_clks[DIV4_U]
159 159
160static struct clk mstp_clks[] = { 160static struct clk mstp_clks[HWBLK_NR] = {
161 SH_HWBLK_CLK("uram0", -1, U_CLK, HWBLK_URAM, CLK_ENABLE_ON_INIT), 161 SH_HWBLK_CLK("uram0", -1, U_CLK, HWBLK_URAM, CLK_ENABLE_ON_INIT),
162 SH_HWBLK_CLK("xymem0", -1, B_CLK, HWBLK_XYMEM, CLK_ENABLE_ON_INIT), 162 SH_HWBLK_CLK("xymem0", -1, B_CLK, HWBLK_XYMEM, CLK_ENABLE_ON_INIT),
163 SH_HWBLK_CLK("tmu_fck", -1, P_CLK, HWBLK_TMU, 0), 163 SH_HWBLK_CLK("tmu_fck", -1, P_CLK, HWBLK_TMU, 0),
@@ -213,7 +213,7 @@ int __init arch_clk_init(void)
213 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 213 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks));
214 214
215 if (!ret) 215 if (!ret)
216 ret = sh_hwblk_clk_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 216 ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
217 217
218 return ret; 218 return ret;
219} 219}