1 files changed, 21 insertions, 9 deletions

diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index 1686acaaf45a..5eebbd7f4c21 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -19,54 +19,66 @@
 #include <linux/usb/ohci_pdriver.h>
 
 static struct plat_sci_port scif0_platform_data = {
-        .mapbase        = 0xffe00000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0x700)),
         .regtype        = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
 };
 
+static struct resource scif0_resources[] = {
+        DEFINE_RES_MEM(0xffe00000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0x700)),
+};
+
 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        = 0xffe08000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xb80)),
         .regtype        = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
 };
 
+static struct resource scif1_resources[] = {
+        DEFINE_RES_MEM(0xffe08000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xb80)),
+};
+
 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        = 0xffe10000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_REIE,
-        .scbrr_algo_id  = SCBRR_ALGO_2,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xf00)),
         .regtype        = SCIx_SH4_SCIF_FIFODATA_REGTYPE,
 };
 
+static struct resource scif2_resources[] = {
+        DEFINE_RES_MEM(0xffe10000, 0x100),
+        DEFINE_RES_IRQ(evt2irq(0xf00)),
+};
+
 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,
         },