1 files changed, 7 insertions, 74 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index e7fa2a92fc1f..89fe16d20fdb 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -31,7 +31,7 @@
 #include <cpu/sh7724.h>
 
 /* DMA */
-static struct sh_dmae_channel sh7724_dmae0_channels[] = {
+static const struct sh_dmae_channel sh7724_dmae_channels[] = {
         {
                 .offset = 0,
                 .dmars = 0,
@@ -59,51 +59,11 @@ static struct sh_dmae_channel sh7724_dmae0_channels[] = {
         }
 };
 
-static struct sh_dmae_channel sh7724_dmae1_channels[] = {
-        {
-                .offset = 0,
-                .dmars = 0,
-                .dmars_bit = 0,
-        }, {
-                .offset = 0x10,
-                .dmars = 0,
-                .dmars_bit = 8,
-        }, {
-                .offset = 0x20,
-                .dmars = 4,
-                .dmars_bit = 0,
-        }, {
-                .offset = 0x30,
-                .dmars = 4,
-                .dmars_bit = 8,
-        }, {
-                .offset = 0x50,
-                .dmars = 8,
-                .dmars_bit = 0,
-        }, {
-                .offset = 0x60,
-                .dmars = 8,
-                .dmars_bit = 8,
-        }
-};
-
-static unsigned int ts_shift[] = TS_SHIFT;
-
-static struct sh_dmae_pdata dma0_platform_data = {
-        .channel        = sh7724_dmae0_channels,
-        .channel_num    = ARRAY_SIZE(sh7724_dmae0_channels),
-        .ts_low_shift   = CHCR_TS_LOW_SHIFT,
-        .ts_low_mask    = CHCR_TS_LOW_MASK,
-        .ts_high_shift  = CHCR_TS_HIGH_SHIFT,
-        .ts_high_mask   = CHCR_TS_HIGH_MASK,
-        .ts_shift       = ts_shift,
-        .ts_shift_num   = ARRAY_SIZE(ts_shift),
-        .dmaor_init     = DMAOR_INIT,
-};
+static const unsigned int ts_shift[] = TS_SHIFT;
 
-static struct sh_dmae_pdata dma1_platform_data = {
-        .channel        = sh7724_dmae1_channels,
-        .channel_num    = ARRAY_SIZE(sh7724_dmae1_channels),
+static struct sh_dmae_pdata dma_platform_data = {
+        .channel        = sh7724_dmae_channels,
+        .channel_num    = ARRAY_SIZE(sh7724_dmae_channels),
         .ts_low_shift   = CHCR_TS_LOW_SHIFT,
         .ts_low_mask    = CHCR_TS_LOW_MASK,
         .ts_high_shift  = CHCR_TS_HIGH_SHIFT,
@@ -187,7 +147,7 @@ static struct platform_device dma0_device = {
         .resource       = sh7724_dmae0_resources,
         .num_resources  = ARRAY_SIZE(sh7724_dmae0_resources),
         .dev            = {
-                .platform_data  = &dma0_platform_data,
+                .platform_data  = &dma_platform_data,
         },
         .archdata = {
                 .hwblk_id = HWBLK_DMAC0,
@@ -200,7 +160,7 @@ static struct platform_device dma1_device = {
         .resource       = sh7724_dmae1_resources,
         .num_resources  = ARRAY_SIZE(sh7724_dmae1_resources),
         .dev            = {
-                .platform_data  = &dma1_platform_data,
+                .platform_data  = &dma_platform_data,
         },
         .archdata = {
                 .hwblk_id = HWBLK_DMAC1,
@@ -213,7 +173,6 @@ static struct plat_sci_port scif0_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIF,
         .irqs           = { 80, 80, 80, 80 },
-        .clk            = "scif0",
 };
 
 static struct platform_device scif0_device = {
@@ -229,7 +188,6 @@ static struct plat_sci_port scif1_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIF,
         .irqs           = { 81, 81, 81, 81 },
-        .clk            = "scif1",
 };
 
 static struct platform_device scif1_device = {
@@ -245,7 +203,6 @@ static struct plat_sci_port scif2_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIF,
         .irqs           = { 82, 82, 82, 82 },
-        .clk            = "scif2",
 };
 
 static struct platform_device scif2_device = {
@@ -261,7 +218,6 @@ static struct plat_sci_port scif3_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIFA,
         .irqs           = { 56, 56, 56, 56 },
-        .clk            = "scif3",
 };
 
 static struct platform_device scif3_device = {
@@ -277,7 +233,6 @@ static struct plat_sci_port scif4_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIFA,
         .irqs           = { 88, 88, 88, 88 },
-        .clk            = "scif4",
 };
 
 static struct platform_device scif4_device = {
@@ -293,7 +248,6 @@ static struct plat_sci_port scif5_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .type           = PORT_SCIFA,
         .irqs           = { 109, 109, 109, 109 },
-        .clk            = "scif5",
 };
 
 static struct platform_device scif5_device = {
@@ -485,17 +439,14 @@ static struct platform_device veu1_device = {
 };
 
 static struct sh_timer_config cmt_platform_data = {
-        .name = "CMT",
         .channel_offset = 0x60,
         .timer_bit = 5,
-        .clk = "cmt0",
         .clockevent_rating = 125,
         .clocksource_rating = 200,
 };
 
 static struct resource cmt_resources[] = {
         [0] = {
-                .name   = "CMT",
                 .start  = 0x044a0060,
                 .end    = 0x044a006b,
                 .flags  = IORESOURCE_MEM,
@@ -520,16 +471,13 @@ static struct platform_device cmt_device = {
 };
 
 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,
@@ -554,16 +502,13 @@ static struct platform_device tmu0_device = {
 };
 
 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,
@@ -588,15 +533,12 @@ static struct platform_device tmu1_device = {
 };
 
 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,
@@ -622,15 +564,12 @@ static struct platform_device tmu2_device = {
 
 
 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,
@@ -655,15 +594,12 @@ static struct platform_device tmu3_device = {
 };
 
 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,
@@ -688,15 +624,12 @@ static struct platform_device tmu4_device = {
 };
 
 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,