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>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index fc86c88223f4..390bdb5cabc5 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@ -218,32 +218,32 @@ static struct clk_lookup lookups[] = {
                 /* TMU0 */
                 .dev_id         = "sh_tmu.0",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[11],       /* tmu012_fck */
+                .clk            = &mstp_clks[HWBLK_TMU0],
         }, {
                 /* TMU1 */
                 .dev_id         = "sh_tmu.1",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[11],
+                .clk            = &mstp_clks[HWBLK_TMU0],
         }, {
                 /* TMU2 */
                 .dev_id         = "sh_tmu.2",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[11],
+                .clk            = &mstp_clks[HWBLK_TMU0],
         }, {
                 /* TMU3 */
                 .dev_id         = "sh_tmu.3",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[15],       /* tmu345_fck */
+                .clk            = &mstp_clks[HWBLK_TMU1],
         }, {
                 /* TMU4 */
                 .dev_id         = "sh_tmu.4",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[15],
+                .clk            = &mstp_clks[HWBLK_TMU1],
         }, {
                 /* TMU5 */
                 .dev_id         = "sh_tmu.5",
                 .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[15],
+                .clk            = &mstp_clks[HWBLK_TMU1],
         },
 };
 
@@ -277,7 +277,7 @@ int __init arch_clk_init(void)
                 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks));
 
         if (!ret)
-                ret = sh_hwblk_clk_register(mstp_clks, ARRAY_SIZE(mstp_clks));
+                ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
 
         return ret;
 }