ARM: shmobile: r8a7791: 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-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 3fe0d7d..f15b537 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -87,11 +87,14 @@ void __init r8a7791_pinmux_init(void)
 #define __R8A7791_SCIF(scif_type, algo, index, baseaddr, irq)          \
 static struct plat_sci_port scif##index##_platform_data = {            \
        .type           = scif_type,                                    \
-       .mapbase        = baseaddr,                                     \
        .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,              \
        .scbrr_algo_id  = algo,                                         \
        .scscr          = SCSCR_RE | SCSCR_TE,                          \
-       .irqs           = SCIx_IRQ_MUXED(irq),                          \
+};                                                                     \
+                                                                       \
+static struct resource scif##index##_resources[] = {                   \
+       DEFINE_RES_MEM(baseaddr, 0x100),                                \
+       DEFINE_RES_IRQ(irq),                                            \
 }
 
 #define R8A7791_SCIF(index, baseaddr, irq)                             \
@@ -120,9 +123,11 @@ R8A7791_SCIFA(13, 0xe6c78000, gic_spi(30)); /* SCIFA4 */
 R8A7791_SCIFA(14, 0xe6c80000, gic_spi(31)); /* SCIFA5 */
 
 #define r8a7791_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 const struct sh_timer_config cmt00_platform_data __initconst = {
        .name = "CMT00",