| From c9ad8f867b7b1df486c6e35a8d5e7753fa129461 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:36 +0100 |
| Subject: 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> |
| (cherry picked from commit aa61ee2ee3bdeee17242bb7357f3edc19d417f41) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7779.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c |
| index df418f16d82d..85371ee77b63 100644 |
| --- 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, \ |
| }, \ |
| -- |
| 1.8.5.rc3 |
| |
