sh: Rework sh7724 SCIF clock lookup
PATCH 3/13 sh: Rework sh7724 SCIF clock lookup
From: Magnus Damm <[email protected]>
Rework sh7724 SCIFS to use clkdev for lookup. Prototype code only, needs to be done for all processors.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 42 +++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-)
arch/sh/kernel/cpu/sh4a/clock-sh7724.c +36 -6
@@ -196,12 +196,12 @@ static struct clk mstp_clks[HWBLK_NR] =SH_HWBLK_CLK ("rwdt0" ,-1 ,R_CLK ,HWBLK_RWDT ,0 ),SH_HWBLK_CLK ("dmac1" ,-1 ,B_CLK ,HWBLK_DMAC1 ,0 ),SH_HWBLK_CLK ("tmu345_fck" ,-1 ,P_CLK ,HWBLK_TMU1 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,0 ,P_CLK ,HWBLK_SCIF0 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,1 ,P_CLK ,HWBLK_SCIF1 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,2 ,P_CLK ,HWBLK_SCIF2 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,3 ,B_CLK ,HWBLK_SCIF3 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,4 ,B_CLK ,HWBLK_SCIF4 ,0 ), -SH_HWBLK_CLK ("sci_fck" ,5 ,B_CLK ,HWBLK_SCIF5 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,P_CLK ,HWBLK_SCIF0 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,P_CLK ,HWBLK_SCIF1 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,P_CLK ,HWBLK_SCIF2 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,B_CLK ,HWBLK_SCIF3 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,B_CLK ,HWBLK_SCIF4 ,0 ), +SH_HWBLK_CLK ("sci_fck" ,-1 ,B_CLK ,HWBLK_SCIF5 ,0 ),SH_HWBLK_CLK ("msiof0" ,-1 ,B_CLK ,HWBLK_MSIOF0 ,0 ), SH_HWBLK_CLK("msiof1", -1, B_CLK, HWBLK_MSIOF1, 0),
@@ -266,6 +266,36 @@ static struct clk_lookup lookups[] = { .dev_id = "sh_tmu.5", .con_id = "tmu_fck", .clk = &mstp_clks[HWBLK_TMU1], + }, { + /* SCIF0 */ + .dev_id = "sh-sci.0", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF0], + }, { + /* SCIF1 */ + .dev_id = "sh-sci.1", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF1], + }, { + /* SCIF2 */ + .dev_id = "sh-sci.2", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF2], + }, { + /* SCIF3 */ + .dev_id = "sh-sci.3", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF3], + }, { + /* SCIF4 */ + .dev_id = "sh-sci.4", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF4], + }, { + /* SCIF5 */ + .dev_id = "sh-sci.5", + .con_id = "sci_fck", + .clk = &mstp_clks[HWBLK_SCIF5], }, };