| From fafb6403c8132d0af74661d37b99a140ff6ce052 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:30 +0100 |
| Subject: ARM: shmobile: sh7372: 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 d39f98b3bb1f56180997442ee59e0d60ef2b71b8) |
| (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-sh7372.c | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c |
| index 77627dd422b0..798f8acc6195 100644 |
| --- a/arch/arm/mach-shmobile/setup-sh7372.c |
| +++ b/arch/arm/mach-shmobile/setup-sh7372.c |
| @@ -90,16 +90,21 @@ void __init sh7372_pinmux_init(void) |
| #define SH7372_SCIF(scif_type, index, baseaddr, irq) \ |
| static struct plat_sci_port scif##index##_platform_data = { \ |
| .type = scif_type, \ |
| - .mapbase = baseaddr, \ |
| .flags = UPF_BOOT_AUTOCONF, \ |
| - .irqs = SCIx_IRQ_MUXED(irq), \ |
| .scbrr_algo_id = SCBRR_ALGO_4, \ |
| .scscr = SCSCR_RE | SCSCR_TE, \ |
| }; \ |
| \ |
| +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 |
| |
