1 files changed, 11 insertions, 35 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index 9d23a36f0647..c9a48088ad47 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -175,8 +175,6 @@ static struct clk mstp_clks[HWBLK_NR] = {
         SH_HWBLK_CLK(HWBLK_LCDC, &div4_clks[DIV4_P], 0),
 };
 
-#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
-
 static struct clk_lookup lookups[] = {
         /* main clocks */
         CLKDEV_CON_ID("rclk", &r_clk),
@@ -201,42 +199,20 @@ static struct clk_lookup lookups[] = {
         /* MSTP clocks */
         CLKDEV_CON_ID("uram0", &mstp_clks[HWBLK_URAM]),
         CLKDEV_CON_ID("xymem0", &mstp_clks[HWBLK_XYMEM]),
-        {
-                /* TMU0 */
-                .dev_id         = "sh_tmu.0",
-                .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[HWBLK_TMU],
-        }, {
-                /* TMU1 */
-                .dev_id         = "sh_tmu.1",
-                .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[HWBLK_TMU],
-        }, {
-                /* TMU2 */
-                .dev_id         = "sh_tmu.2",
-                .con_id         = "tmu_fck",
-                .clk            = &mstp_clks[HWBLK_TMU],
-        },
+
+        CLKDEV_ICK_ID("tmu_fck", "sh_tmu.0", &mstp_clks[HWBLK_TMU]),
+        CLKDEV_ICK_ID("tmu_fck", "sh_tmu.1", &mstp_clks[HWBLK_TMU]),
+        CLKDEV_ICK_ID("tmu_fck", "sh_tmu.2", &mstp_clks[HWBLK_TMU]),
+
         CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]),
         CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]),
         CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]),
-        {
-                /* 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],
-        },
-        CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC]),
+
+        CLKDEV_ICK_ID("sci_fck", "sh-sci.0", &mstp_clks[HWBLK_SCIF0]),
+        CLKDEV_ICK_ID("sci_fck", "sh-sci.1", &mstp_clks[HWBLK_SCIF1]),
+        CLKDEV_ICK_ID("sci_fck", "sh-sci.2", &mstp_clks[HWBLK_SCIF2]),
+
+        CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[HWBLK_IIC]),
         CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
         CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI]),
         CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),