sh: Rework sh7724 hwblk index
PATCH 2/13 sh: Rework sh7724 hwblk index
From: Magnus Damm <[email protected]>
Convert the sh7724 hwblk code to use HWBLK_ as index. Prototype code only, needs to be done for all processors.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/include/asm/hwblk.h | 2 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/sh/include/asm/hwblk.h +1 -1
@@ -59,7 +59,7 @@ void hwblk_cnt_dec(struct hwblk_info *in/* allow clocks to enable and disable hardware blocks */ #define SH_HWBLK_CLK (_name, _id, _parent, _hwblk, _flags) \ -{ \ +[_hwblk] = { \ .name = _name, \ .id = _id, \ .parent = _parent, \
arch/sh/kernel/cpu/sh4a/clock-sh7724.c +7 -7
@@ -178,7 +178,7 @@ struct clk div6_clks[] = {#define I_CLK (&div4_clks[DIV4_I])#define SH_CLK (&div4_clks[DIV4_SH]) -static struct clk mstp_clks[] = { +static struct clk mstp_clks[HWBLK_NR ] = {SH_HWBLK_CLK ("tlb0" ,-1 ,I_CLK ,HWBLK_TLB ,CLK_ENABLE_ON_INIT ),SH_HWBLK_CLK ("ic0" ,-1 ,I_CLK ,HWBLK_IC ,CLK_ENABLE_ON_INIT ),SH_HWBLK_CLK ("oc0" ,-1 ,I_CLK ,HWBLK_OC ,CLK_ENABLE_ON_INIT ),
@@ -240,32 +240,32 @@ static struct clk_lookup lookups[] = {/* TMU0 */ .dev_id = "sh_tmu.0", .con_id = "tmu_fck", - .clk = &mstp_clks[12], /* tmu012_fck */ + .clk = &mstp_clks[HWBLK_TMU0], }, { /* TMU1 */ .dev_id = "sh_tmu.1", .con_id = "tmu_fck", - .clk = &mstp_clks[12], + .clk = &mstp_clks[HWBLK_TMU0], }, { /* TMU2 */ .dev_id = "sh_tmu.2", .con_id = "tmu_fck", - .clk = &mstp_clks[12], + .clk = &mstp_clks[HWBLK_TMU0], }, { /* TMU3 */ .dev_id = "sh_tmu.3", .con_id = "tmu_fck", - .clk = &mstp_clks[16], /* tmu345_fck */ + .clk = &mstp_clks[HWBLK_TMU1], }, { /* TMU4 */ .dev_id = "sh_tmu.4", .con_id = "tmu_fck", - .clk = &mstp_clks[16], + .clk = &mstp_clks[HWBLK_TMU1], }, { /* TMU5 */ .dev_id = "sh_tmu.5", .con_id = "tmu_fck", - .clk = &mstp_clks[16], + .clk = &mstp_clks[HWBLK_TMU1], }, };