Merge branch 'master' into sh/clkfwk

1 files changed, 195 insertions, 0 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index 080f541ae08d..191f0e2a7e08 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -268,8 +268,197 @@ static struct platform_device cmt_device = {
         .num_resources  = ARRAY_SIZE(cmt_resources),
 };
 
+static struct sh_timer_config tmu0_platform_data = {
+        .name = "TMU0",
+        .channel_offset = 0x04,
+        .timer_bit = 0,
+        .clk = "tmu0",
+        .clockevent_rating = 200,
+};
+
+static struct resource tmu0_resources[] = {
+        [0] = {
+                .name   = "TMU0",
+                .start  = 0xffd80008,
+                .end    = 0xffd80013,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 16,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device tmu0_device = {
+        .name           = "sh_tmu",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &tmu0_platform_data,
+        },
+        .resource       = tmu0_resources,
+        .num_resources  = ARRAY_SIZE(tmu0_resources),
+};
+
+static struct sh_timer_config tmu1_platform_data = {
+        .name = "TMU1",
+        .channel_offset = 0x10,
+        .timer_bit = 1,
+        .clk = "tmu0",
+        .clocksource_rating = 200,
+};
+
+static struct resource tmu1_resources[] = {
+        [0] = {
+                .name   = "TMU1",
+                .start  = 0xffd80014,
+                .end    = 0xffd8001f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 17,
+                .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 = {
+        .name = "TMU2",
+        .channel_offset = 0x1c,
+        .timer_bit = 2,
+        .clk = "tmu0",
+};
+
+static struct resource tmu2_resources[] = {
+        [0] = {
+                .name   = "TMU2",
+                .start  = 0xffd80020,
+                .end    = 0xffd8002b,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 18,
+                .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 = {
+        .name = "TMU3",
+        .channel_offset = 0x04,
+        .timer_bit = 0,
+        .clk = "tmu1",
+};
+
+static struct resource tmu3_resources[] = {
+        [0] = {
+                .name   = "TMU3",
+                .start  = 0xffd90008,
+                .end    = 0xffd90013,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 57,
+                .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 = {
+        .name = "TMU4",
+        .channel_offset = 0x10,
+        .timer_bit = 1,
+        .clk = "tmu1",
+};
+
+static struct resource tmu4_resources[] = {
+        [0] = {
+                .name   = "TMU4",
+                .start  = 0xffd90014,
+                .end    = 0xffd9001f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 58,
+                .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 = {
+        .name = "TMU5",
+        .channel_offset = 0x1c,
+        .timer_bit = 2,
+        .clk = "tmu1",
+};
+
+static struct resource tmu5_resources[] = {
+        [0] = {
+                .name   = "TMU5",
+                .start  = 0xffd90020,
+                .end    = 0xffd9002b,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 57,
+                .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 *sh7724_devices[] __initdata = {
         &cmt_device,
+        &tmu0_device,
+        &tmu1_device,
+        &tmu2_device,
+        &tmu3_device,
+        &tmu4_device,
+        &tmu5_device,
         &sci_device,
         &rtc_device,
         &iic0_device,
@@ -292,6 +481,12 @@ device_initcall(sh7724_devices_setup);
 
 static struct platform_device *sh7724_early_devices[] __initdata = {
         &cmt_device,
+        &tmu0_device,
+        &tmu1_device,
+        &tmu2_device,
+        &tmu3_device,
+        &tmu4_device,
+        &tmu5_device,
 };
 
 void __init plat_early_device_setup(void)