sh: Switch to new style MTU2 device

The MTU2 (Multi-Function Timer Pulse Unit 2) driver implements a new
style of platform data that handles the timer as a single device with
multiple channel. Switch from the old-style platform data to the
new-style platform data.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Wolfram Sang <wsa@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 121ef690763f7dbac7663fe7d89fdcb9cdd48b40..8525a671266fe1491edbd383a6bedd542152ecae 100644 (file)
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -60,7 +60,7 @@ int __init __deprecated cpg_clk_init(void)
        clk_add_alias("fck", "sh-tmu.0", "peripheral_clk", NULL);
        clk_add_alias("fck", "sh-tmu.1", "peripheral_clk", NULL);
        clk_add_alias("fck", "sh-tmu.2", "peripheral_clk", NULL);
-       clk_add_alias("mtu2_fck", NULL, "peripheral_clk", NULL);
+       clk_add_alias("fck", "sh-mtu2", "peripheral_clk", NULL);
        clk_add_alias("fck", "sh-cmt-16.0", "peripheral_clk", NULL);
        clk_add_alias("fck", "sh-cmt-32.0", "peripheral_clk", NULL);
        clk_add_alias("sci_ick", NULL, "peripheral_clk", NULL);

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
index c7f3c666a0acee1ee863cc68aa77ba045b64df33..8638fba6cd7fbf08686eedea85323ebfa7970df9 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7264.c
@@ -119,7 +119,7 @@ static struct clk_lookup lookups[] = {
        CLKDEV_CON_ID("vdc3", &mstp_clks[MSTP74]),
        CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
        CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
-       CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP35]),
+       CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP35]),
        CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP34]),
        CLKDEV_CON_ID("sdhi1", &mstp_clks[MSTP33]),
        CLKDEV_CON_ID("adc0", &mstp_clks[MSTP32]),

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
index 4f47464f2fb692b91233d1d2c994da3152ed026f..f8a5c2abdfb3caa18799b7e0fabe4f80204c6999 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7269.c
@@ -160,7 +160,7 @@ static struct clk_lookup lookups[] = {
        CLKDEV_ICK_ID("sci_fck", "sh-sci.7", &mstp_clks[MSTP40]),
        CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[MSTP72]),
        CLKDEV_CON_ID("usb0", &mstp_clks[MSTP60]),
-       CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP35]),
+       CLKDEV_ICK_ID("fck", "sh-mtu2", &mstp_clks[MSTP35]),
        CLKDEV_CON_ID("adc0", &mstp_clks[MSTP32]),
        CLKDEV_CON_ID("rtc0", &mstp_clks[MSTP30]),
 };

diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 63e996f9a7ed776b251626c6c98ddd533fa19552..26fcdbd4127a5f19caeb00aecd5b74e083e0577b 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -114,88 +114,18 @@ static struct intc_mask_reg mask_registers[] __initdata = {
 static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
                         mask_registers, prio_registers, NULL);
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xff801000, 0x400),
+       DEFINE_RES_IRQ_NAMED(228, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(234, "tgi1a"),
+       DEFINE_RES_IRQ_NAMED(240, "tgi2a"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .start  = 0xff801300,
-               .end    = 0xff801326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 228,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .start  = 0xff801380,
-               .end    = 0xff801390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 234,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
-};
-
-static struct sh_timer_config mtu2_2_platform_data = {
-       .channel_offset = 0x80,
-       .timer_bit = 2,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_2_resources[] = {
-       [0] = {
-               .start  = 0xff801000,
-               .end    = 0xff80100a,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 240,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_2_device = {
-       .name           = "sh_mtu2",
-       .id             = 2,
-       .dev = {
-               .platform_data  = &mtu2_2_platform_data,
-       },
-       .resource       = mtu2_2_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_2_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct plat_sci_port scif0_platform_data = {
@@ -221,9 +151,7 @@ static struct platform_device scif0_device = {
 
 static struct platform_device *mxg_devices[] __initdata = {
        &scif0_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 static int __init mxg_devices_setup(void)
@@ -240,9 +168,7 @@ void __init plat_irq_setup(void)
 
 static struct platform_device *mxg_early_devices[] __initdata = {
        &scif0_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 void __init plat_early_device_setup(void)

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 2c68744615367ef32427968b3036394d5a1e1acb..abc0ce9fb800073622524de4a22974d0a6fbc15f 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -365,88 +365,18 @@ static struct platform_device rtc_device = {
        .resource       = rtc_resources,
 };
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(108, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(116, "tgi1a"),
+       DEFINE_RES_IRQ_NAMED(124, "tgi1b"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 108,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .start  = 0xfffe4380,
-               .end    = 0xfffe4390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 116,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
-};
-
-static struct sh_timer_config mtu2_2_platform_data = {
-       .channel_offset = 0x80,
-       .timer_bit = 2,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_2_resources[] = {
-       [0] = {
-               .start  = 0xfffe4000,
-               .end    = 0xfffe400a,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 124,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_2_device = {
-       .name           = "sh_mtu2",
-       .id             = 2,
-       .dev = {
-               .platform_data  = &mtu2_2_platform_data,
-       },
-       .resource       = mtu2_2_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_2_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct platform_device *sh7201_devices[] __initdata = {
@@ -459,9 +389,7 @@ static struct platform_device *sh7201_devices[] __initdata = {
        &scif6_device,
        &scif7_device,
        &rtc_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 static int __init sh7201_devices_setup(void)
@@ -485,9 +413,7 @@ static struct platform_device *sh7201_early_devices[] __initdata = {
        &scif5_device,
        &scif6_device,
        &scif7_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 #define STBCR3 0xfffe0408

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 374f8c09d9249ff68666e8116f37eb97732561a0..3b4894cba92f5828c3ce29ed6fd7ca395b7025ee 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -285,60 +285,17 @@ static struct platform_device cmt_device = {
        .num_resources  = ARRAY_SIZE(cmt_resources),
 };
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(146, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(153, "tgi1a"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 146,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .start  = 0xfffe4380,
-               .end    = 0xfffe4390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 153,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct resource rtc_resources[] = {
@@ -367,8 +324,7 @@ static struct platform_device *sh7203_devices[] __initdata = {
        &scif2_device,
        &scif3_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
        &rtc_device,
 };
 
@@ -390,8 +346,7 @@ static struct platform_device *sh7203_early_devices[] __initdata = {
        &scif2_device,
        &scif3_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
 };
 
 #define STBCR3 0xfffe0408

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index d00e6fd998ec2f1ee9addcc231415cdc77aaaf49..49bc5a34bec1ace1638f3608b237bf9b5460db45 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -237,88 +237,18 @@ static struct platform_device cmt_device = {
        .num_resources  = ARRAY_SIZE(cmt_resources),
 };
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(156, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(164, "tgi1a"),
+       DEFINE_RES_IRQ_NAMED(180, "tgi2a"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 156,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .start  = 0xfffe4380,
-               .end    = 0xfffe4390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 164,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
-};
-
-static struct sh_timer_config mtu2_2_platform_data = {
-       .channel_offset = 0x80,
-       .timer_bit = 2,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_2_resources[] = {
-       [0] = {
-               .start  = 0xfffe4000,
-               .end    = 0xfffe400a,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 180,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_2_device = {
-       .name           = "sh_mtu2",
-       .id             = 2,
-       .dev = {
-               .platform_data  = &mtu2_2_platform_data,
-       },
-       .resource       = mtu2_2_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_2_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2s",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct platform_device *sh7206_devices[] __initdata = {
@@ -327,9 +257,7 @@ static struct platform_device *sh7206_devices[] __initdata = {
        &scif2_device,
        &scif3_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 static int __init sh7206_devices_setup(void)
@@ -350,9 +278,7 @@ static struct platform_device *sh7206_early_devices[] __initdata = {
        &scif2_device,
        &scif3_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
-       &mtu2_2_device,
+       &mtu2_device,
 };
 
 #define STBCR3 0xfffe0408

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7264.c b/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
index e95250e8275236c4c481799a31f01dbb6dd22e53..608146455562d7fa0b0c7c8ffc8daf49273e9547 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
@@ -453,64 +453,17 @@ static struct platform_device cmt_device = {
        .num_resources  = ARRAY_SIZE(cmt_resources),
 };
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .name = "MTU2_0",
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(179, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(186, "tgi1a"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .name   = "MTU2_0",
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 179,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .name = "MTU2_1",
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .name   = "MTU2_1",
-               .start  = 0xfffe4380,
-               .end    = 0xfffe4390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 186,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct resource rtc_resources[] = {
@@ -580,8 +533,7 @@ static struct platform_device *sh7264_devices[] __initdata = {
        &scif6_device,
        &scif7_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
        &rtc_device,
        &r8a66597_usb_host_device,
 };
@@ -608,8 +560,7 @@ static struct platform_device *sh7264_early_devices[] __initdata = {
        &scif6_device,
        &scif7_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
 };
 
 void __init plat_early_device_setup(void)

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7269.c b/arch/sh/kernel/cpu/sh2a/setup-sh7269.c
index 0191e1ae8411db155b1079eb18714c1f2bcfe368..16ce5aa77bdd74a7b0d3940c5a7b9962b675e64a 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7269.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7269.c
@@ -475,60 +475,17 @@ static struct platform_device cmt_device = {
        .num_resources  = ARRAY_SIZE(cmt_resources),
 };
 
-static struct sh_timer_config mtu2_0_platform_data = {
-       .channel_offset = -0x80,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+static struct resource mtu2_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(192, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(203, "tgi1a"),
 };
 
-static struct resource mtu2_0_resources[] = {
-       [0] = {
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 192,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &mtu2_0_platform_data,
-       },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
-};
-
-static struct sh_timer_config mtu2_1_platform_data = {
-       .channel_offset = -0x100,
-       .timer_bit = 1,
-       .clockevent_rating = 200,
-};
-
-static struct resource mtu2_1_resources[] = {
-       [0] = {
-               .start  = 0xfffe4380,
-               .end    = 0xfffe4390,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 203,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mtu2_1_device = {
-       .name           = "sh_mtu2",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &mtu2_1_platform_data,
-       },
-       .resource       = mtu2_1_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_1_resources),
+static struct platform_device mtu2_device = {
+       .name           = "sh-mtu2",
+       .id             = -1,
+       .resource       = mtu2_resources,
+       .num_resources  = ARRAY_SIZE(mtu2_resources),
 };
 
 static struct resource rtc_resources[] = {
@@ -592,8 +549,7 @@ static struct platform_device *sh7269_devices[] __initdata = {
        &scif6_device,
        &scif7_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
        &rtc_device,
        &r8a66597_usb_host_device,
 };
@@ -620,8 +576,7 @@ static struct platform_device *sh7269_early_devices[] __initdata = {
        &scif6_device,
        &scif7_device,
        &cmt_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &mtu2_device,
 };
 
 void __init plat_early_device_setup(void)