1 files changed, 12 insertions, 138 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 0856bcbb1da0..a78c5feb4e3b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -100,25 +100,18 @@ static struct platform_device scif2_device = {
 };
 
 static struct sh_timer_config tmu0_platform_data = {
-        .channel_offset = 0x04,
-        .timer_bit = 0,
-        .clockevent_rating = 200,
+        .channels_mask = 7,
 };
 
 static struct resource tmu0_resources[] = {
-        [0] = {
-                .start  = 0xffc10008,
-                .end    = 0xffc10013,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x400),
-                .flags  = IORESOURCE_IRQ,
-        },
+        DEFINE_RES_MEM(0xffc10000, 0x30),
+        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",
         .id             = 0,
         .dev = {
                 .platform_data  = &tmu0_platform_data,
@@ -128,25 +121,18 @@ static struct platform_device tmu0_device = {
 };
 
 static struct sh_timer_config tmu1_platform_data = {
-        .channel_offset = 0x10,
-        .timer_bit = 1,
-        .clocksource_rating = 200,
+        .channels_mask = 7,
 };
 
 static struct resource tmu1_resources[] = {
-        [0] = {
-                .start  = 0xffc10014,
-                .end    = 0xffc1001f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x420),
-                .flags  = IORESOURCE_IRQ,
-        },
+        DEFINE_RES_MEM(0xffc20000, 0x2c),
+        DEFINE_RES_IRQ(evt2irq(0x460)),
+        DEFINE_RES_IRQ(evt2irq(0x480)),
+        DEFINE_RES_IRQ(evt2irq(0x4a0)),
 };
 
 static struct platform_device tmu1_device = {
-        .name           = "sh_tmu",
+        .name           = "sh-tmu",
         .id             = 1,
         .dev = {
                 .platform_data  = &tmu1_platform_data,
@@ -155,124 +141,12 @@ static struct platform_device tmu1_device = {
         .num_resources  = ARRAY_SIZE(tmu1_resources),
 };
 
-static struct sh_timer_config tmu2_platform_data = {
-        .channel_offset = 0x1c,
-        .timer_bit = 2,
-};
-
-static struct resource tmu2_resources[] = {
-        [0] = {
-                .start  = 0xffc10020,
-                .end    = 0xffc1002f,
-                .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 sh_timer_config tmu3_platform_data = {
-        .channel_offset = 0x04,
-        .timer_bit = 0,
-};
-
-static struct resource tmu3_resources[] = {
-        [0] = {
-                .start  = 0xffc20008,
-                .end    = 0xffc20013,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x460),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device tmu3_device = {
-        .name           = "sh_tmu",
-        .id             = 3,
-        .dev = {
-                .platform_data  = &tmu3_platform_data,
-        },
-        .resource       = tmu3_resources,
-        .num_resources  = ARRAY_SIZE(tmu3_resources),
-};
-
-static struct sh_timer_config tmu4_platform_data = {
-        .channel_offset = 0x10,
-        .timer_bit = 1,
-};
-
-static struct resource tmu4_resources[] = {
-        [0] = {
-                .start  = 0xffc20014,
-                .end    = 0xffc2001f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x480),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device tmu4_device = {
-        .name           = "sh_tmu",
-        .id             = 4,
-        .dev = {
-                .platform_data  = &tmu4_platform_data,
-        },
-        .resource       = tmu4_resources,
-        .num_resources  = ARRAY_SIZE(tmu4_resources),
-};
-
-static struct sh_timer_config tmu5_platform_data = {
-        .channel_offset = 0x1c,
-        .timer_bit = 2,
-};
-
-static struct resource tmu5_resources[] = {
-        [0] = {
-                .start  = 0xffc20020,
-                .end    = 0xffc2002b,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x4a0),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device tmu5_device = {
-        .name           = "sh_tmu",
-        .id             = 5,
-        .dev = {
-                .platform_data  = &tmu5_platform_data,
-        },
-        .resource       = tmu5_resources,
-        .num_resources  = ARRAY_SIZE(tmu5_resources),
-};
-
 static struct platform_device *shx3_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &scif2_device,
         &tmu0_device,
         &tmu1_device,
-        &tmu2_device,
-        &tmu3_device,
-        &tmu4_device,
-        &tmu5_device,
 };
 
 static int __init shx3_devices_setup(void)