1 files changed, 28 insertions, 12 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index b91ea8300a3e..245d19254489 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -18,68 +18,84 @@
 
 /* Serial */
 static struct plat_sci_port scif0_platform_data = {
-        .mapbase        = 0xffe00000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc00)),
+};
+
+static struct resource scif0_resources[] = {
+        DEFINE_RES_MEM(0xffe00000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xc00)),
 };
 
 static struct platform_device scif0_device = {
         .name           = "sh-sci",
         .id             = 0,
+        .resource       = scif0_resources,
+        .num_resources  = ARRAY_SIZE(scif0_resources),
         .dev            = {
                 .platform_data  = &scif0_platform_data,
         },
 };
 
 static struct plat_sci_port scif1_platform_data = {
-        .mapbase        = 0xffe10000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc20)),
+};
+
+static struct resource scif1_resources[] = {
+        DEFINE_RES_MEM(0xffe10000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xc20)),
 };
 
 static struct platform_device scif1_device = {
         .name           = "sh-sci",
         .id             = 1,
+        .resource       = scif1_resources,
+        .num_resources  = ARRAY_SIZE(scif1_resources),
         .dev            = {
                 .platform_data  = &scif1_platform_data,
         },
 };
 
 static struct plat_sci_port scif2_platform_data = {
-        .mapbase        = 0xffe20000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc40)),
+};
+
+static struct resource scif2_resources[] = {
+        DEFINE_RES_MEM(0xffe20000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xc40)),
 };
 
 static struct platform_device scif2_device = {
         .name           = "sh-sci",
         .id             = 2,
+        .resource       = scif2_resources,
+        .num_resources  = ARRAY_SIZE(scif2_resources),
         .dev            = {
                 .platform_data  = &scif2_platform_data,
         },
 };
 
 static struct plat_sci_port scif3_platform_data = {
-        .mapbase        = 0xffe30000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc60)),
+};
+
+static struct resource scif3_resources[] = {
+        DEFINE_RES_MEM(0xffe30000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xc60)),
 };
 
 static struct platform_device scif3_device = {
         .name           = "sh-sci",
         .id             = 3,
+        .resource       = scif3_resources,
+        .num_resources  = ARRAY_SIZE(scif3_resources),
         .dev            = {
                 .platform_data  = &scif3_platform_data,
         },