Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / sh / kernel / cpu / sh4a / setup-sh7757.c

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index e43e5db..7b24ec4 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -87,25 +87,17 @@ static struct platform_device scif4_device = {
 };
 
 static struct sh_timer_config tmu0_platform_data = {
-       .channel_offset = 0x04,
-       .timer_bit = 0,
-       .clockevent_rating = 200,
+       .channels_mask = 3,
 };
 
 static struct resource tmu0_resources[] = {
-       [0] = {
-               .start  = 0xfe430008,
-               .end    = 0xfe430013,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x580),
-               .flags  = IORESOURCE_IRQ,
-       },
+       DEFINE_RES_MEM(0xfe430000, 0x20),
+       DEFINE_RES_IRQ(evt2irq(0x580)),
+       DEFINE_RES_IRQ(evt2irq(0x5a0)),
 };
 
 static struct platform_device tmu0_device = {
-       .name           = "sh_tmu",
+       .name           = "sh-tmu",
        .id             = 0,
        .dev = {
                .platform_data  = &tmu0_platform_data,
@@ -114,34 +106,6 @@ static struct platform_device tmu0_device = {
        .num_resources  = ARRAY_SIZE(tmu0_resources),
 };
 
-static struct sh_timer_config tmu1_platform_data = {
-       .channel_offset = 0x10,
-       .timer_bit = 1,
-       .clocksource_rating = 200,
-};
-
-static struct resource tmu1_resources[] = {
-       [0] = {
-               .start  = 0xfe430014,
-               .end    = 0xfe43001f,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x5a0),
-               .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 resource spi0_resources[] = {
        [0] = {
                .start  = 0xfe002000,
@@ -782,7 +746,6 @@ static struct platform_device *sh7757_devices[] __initdata = {
        &scif3_device,
        &scif4_device,
        &tmu0_device,
-       &tmu1_device,
        &dma0_device,
        &dma1_device,
        &dma2_device,
@@ -806,7 +769,6 @@ static struct platform_device *sh7757_early_devices[] __initdata = {
        &scif3_device,
        &scif4_device,
        &tmu0_device,
-       &tmu1_device,
 };
 
 void __init plat_early_device_setup(void)