1 files changed, 6 insertions, 72 deletions

diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index c76b2543b85f..6a72fd14de21 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -143,25 +143,18 @@ static struct platform_device rtc_device = {
 };
 
 static struct sh_timer_config tmu0_platform_data = {
-        .channel_offset = 0x02,
-        .timer_bit = 0,
-        .clockevent_rating = 200,
+        .channels_mask = 7,
 };
 
 static struct resource tmu0_resources[] = {
-        [0] = {
-                .start  = 0xfffffe94,
-                .end    = 0xfffffe9f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x400),
-                .flags  = IORESOURCE_IRQ,
-        },
+        DEFINE_RES_MEM(0xfffffe90, 0x2c),
+        DEFINE_RES_IRQ(evt2irq(0x400)),
+        DEFINE_RES_IRQ(evt2irq(0x420)),
+        DEFINE_RES_IRQ(evt2irq(0x440)),
 };
 
 static struct platform_device tmu0_device = {
-        .name           = "sh_tmu",
+        .name           = "sh-tmu-sh3",
         .id             = 0,
         .dev = {
                 .platform_data  = &tmu0_platform_data,
@@ -170,67 +163,10 @@ static struct platform_device tmu0_device = {
         .num_resources  = ARRAY_SIZE(tmu0_resources),
 };
 
-static struct sh_timer_config tmu1_platform_data = {
-        .channel_offset = 0xe,
-        .timer_bit = 1,
-        .clocksource_rating = 200,
-};
-
-static struct resource tmu1_resources[] = {
-        [0] = {
-                .start  = 0xfffffea0,
-                .end    = 0xfffffeab,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x420),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device tmu1_device = {
-        .name           = "sh_tmu",
-        .id             = 1,
-        .dev = {
-                .platform_data  = &tmu1_platform_data,
-        },
-        .resource       = tmu1_resources,
-        .num_resources  = ARRAY_SIZE(tmu1_resources),
-};
-
-static struct sh_timer_config tmu2_platform_data = {
-        .channel_offset = 0x1a,
-        .timer_bit = 2,
-};
-
-static struct resource tmu2_resources[] = {
-        [0] = {
-                .start  = 0xfffffeac,
-                .end    = 0xfffffebb,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x440),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device tmu2_device = {
-        .name           = "sh_tmu",
-        .id             = 2,
-        .dev = {
-                .platform_data  = &tmu2_platform_data,
-        },
-        .resource       = tmu2_resources,
-        .num_resources  = ARRAY_SIZE(tmu2_resources),
-};
-
 static struct platform_device *sh7705_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &tmu0_device,
-        &tmu1_device,
-        &tmu2_device,
         &rtc_device,
 };
 
@@ -245,8 +181,6 @@ static struct platform_device *sh7705_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &tmu0_device,
-        &tmu1_device,
-        &tmu2_device,
 };
 
 void __init plat_early_device_setup(void)