1 files changed, 14 insertions, 6 deletions

diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index 42d991f632b1..1d5729dc0724 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -52,38 +52,46 @@ static struct platform_device rtc_device = {
 };
 
 static struct plat_sci_port scif0_platform_data = {
-        .mapbase        = 0xa4430000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
-        .scbrr_algo_id  = SCBRR_ALGO_4,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc00)),
         .ops            = &sh7720_sci_port_ops,
         .regtype        = SCIx_SH7705_SCIF_REGTYPE,
 };
 
+static struct resource scif0_resources[] = {
+        DEFINE_RES_MEM(0xa4430000, 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        = 0xa4438000,
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
-        .scbrr_algo_id  = SCBRR_ALGO_4,
         .type           = PORT_SCIF,
-        .irqs           = SCIx_IRQ_MUXED(evt2irq(0xc20)),
         .ops            = &sh7720_sci_port_ops,
         .regtype        = SCIx_SH7705_SCIF_REGTYPE,
 };
 
+static struct resource scif1_resources[] = {
+        DEFINE_RES_MEM(0xa4438000, 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,
         },