ARM: shmobile: r8a7779: 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-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index ceb5bb8..35c2268 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -192,16 +192,21 @@ void __init r8a7779_pinmux_init(void)
 #define R8A7779_SCIF(index, baseaddr, irq)                     \
 static struct plat_sci_port scif##index##_platform_data = {    \
        .type           = PORT_SCIF,                            \
-       .mapbase        = baseaddr,                             \
        .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,      \
-       .irqs           = SCIx_IRQ_MUXED(irq),                  \
        .scbrr_algo_id  = SCBRR_ALGO_2,                         \
        .scscr          = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,     \
 };                                                             \
                                                                \
+static struct resource scif##index##_resources[] = {           \
+       DEFINE_RES_MEM(baseaddr, 0x100),                        \
+       DEFINE_RES_IRQ(irq),                                    \
+};                                                             \
+                                                               \
 static struct platform_device scif##index##_device = {         \
        .name           = "sh-sci",                             \
        .id             = index,                                \
+       .resource       = scif##index##_resources,              \
+       .num_resources  = ARRAY_SIZE(scif##index##_resources),  \
        .dev            = {                                     \
                .platform_data  = &scif##index##_platform_data, \
        },                                                      \