ARM: shmobile: r7s72100: Declare SCIF register base and IRQ as resources

Passing the register base address and IRQ through platform data is
deprecated. Use resources instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 6ae7e3257bf3ea384ab8ac64e0a14b8466cea46a..81b995bb1a567c95ccfc2aacf616d7d41c125654 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -36,9 +36,15 @@ static const struct plat_sci_port scif##index##_platform_data = {    \
        .scbrr_algo_id  = SCBRR_ALGO_2,                                 \
        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | \
                          SCSCR_REIE,                                   \
-       .mapbase        = baseaddr,                                     \
-       .irqs           = { irq + 1, irq + 2, irq + 3, irq },           \
-}
+};                                                                     \
+                                                                       \
+static struct resource scif##index##_resources[] = {                   \
+       DEFINE_RES_MEM(baseaddr, 0x100),                                \
+       DEFINE_RES_IRQ(irq + 1),                                        \
+       DEFINE_RES_IRQ(irq + 2),                                        \
+       DEFINE_RES_IRQ(irq + 3),                                        \
+       DEFINE_RES_IRQ(irq),                                            \
+}                                                                      \
 
 R7S72100_SCIF(0, 0xe8007000, gic_iid(221));
 R7S72100_SCIF(1, 0xe8007800, gic_iid(225));
@@ -50,9 +56,11 @@ R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
 R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
 
 #define r7s72100_register_scif(index)                                         \
-       platform_device_register_data(&platform_bus, "sh-sci", index,          \
-                                     &scif##index##_platform_data,            \
-                                     sizeof(scif##index##_platform_data))
+       platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+                                         scif##index##_resources,             \
+                                         ARRAY_SIZE(scif##index##_resources), \
+                                         &scif##index##_platform_data,        \
+                                         sizeof(scif##index##_platform_data))
 
 
 static struct sh_timer_config mtu2_0_platform_data __initdata = {