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 / sh2a / setup-sh7264.c

diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7264.c b/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
index ad5b0f4..6081464 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7264.c
@@ -433,125 +433,37 @@ static struct platform_device scif7_device = {
        },
 };
 
-static struct sh_timer_config cmt0_platform_data = {
-       .channel_offset = 0x02,
-       .timer_bit = 0,
-       .clockevent_rating = 125,
-       .clocksource_rating = 0, /* disabled due to code generation issues */
+static struct sh_timer_config cmt_platform_data = {
+       .channels_mask = 3,
 };
 
-static struct resource cmt0_resources[] = {
-       [0] = {
-               .name   = "CMT0",
-               .start  = 0xfffec002,
-               .end    = 0xfffec007,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 175,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device cmt0_device = {
-       .name           = "sh_cmt",
-       .id             = 0,
-       .dev = {
-               .platform_data  = &cmt0_platform_data,
-       },
-       .resource       = cmt0_resources,
-       .num_resources  = ARRAY_SIZE(cmt0_resources),
-};
-
-static struct sh_timer_config cmt1_platform_data = {
-       .name = "CMT1",
-       .channel_offset = 0x08,
-       .timer_bit = 1,
-       .clockevent_rating = 125,
-       .clocksource_rating = 0, /* disabled due to code generation issues */
-};
-
-static struct resource cmt1_resources[] = {
-       [0] = {
-               .name   = "CMT1",
-               .start  = 0xfffec008,
-               .end    = 0xfffec00d,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 176,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device cmt1_device = {
-       .name           = "sh_cmt",
-       .id             = 1,
-       .dev = {
-               .platform_data  = &cmt1_platform_data,
-       },
-       .resource       = cmt1_resources,
-       .num_resources  = ARRAY_SIZE(cmt1_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_0_resources[] = {
-       [0] = {
-               .name   = "MTU2_0",
-               .start  = 0xfffe4300,
-               .end    = 0xfffe4326,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 179,
-               .flags  = IORESOURCE_IRQ,
-       },
+static struct resource cmt_resources[] = {
+       DEFINE_RES_MEM(0xfffec000, 0x10),
+       DEFINE_RES_IRQ(175),
+       DEFINE_RES_IRQ(176),
 };
 
-static struct platform_device mtu2_0_device = {
-       .name           = "sh_mtu2",
+static struct platform_device cmt_device = {
+       .name           = "sh-cmt-16",
        .id             = 0,
        .dev = {
-               .platform_data  = &mtu2_0_platform_data,
+               .platform_data  = &cmt_platform_data,
        },
-       .resource       = mtu2_0_resources,
-       .num_resources  = ARRAY_SIZE(mtu2_0_resources),
+       .resource       = cmt_resources,
+       .num_resources  = ARRAY_SIZE(cmt_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_resources[] = {
+       DEFINE_RES_MEM(0xfffe4000, 0x400),
+       DEFINE_RES_IRQ_NAMED(179, "tgi0a"),
+       DEFINE_RES_IRQ_NAMED(186, "tgi1a"),
 };
 
-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[] = {
@@ -620,10 +532,8 @@ static struct platform_device *sh7264_devices[] __initdata = {
        &scif5_device,
        &scif6_device,
        &scif7_device,
-       &cmt0_device,
-       &cmt1_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &cmt_device,
+       &mtu2_device,
        &rtc_device,
        &r8a66597_usb_host_device,
 };
@@ -649,10 +559,8 @@ static struct platform_device *sh7264_early_devices[] __initdata = {
        &scif5_device,
        &scif6_device,
        &scif7_device,
-       &cmt0_device,
-       &cmt1_device,
-       &mtu2_0_device,
-       &mtu2_1_device,
+       &cmt_device,
+       &mtu2_device,
 };
 
 void __init plat_early_device_setup(void)