diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-06 04:59:30 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-24 07:09:11 -0500 |
commit | d39f98b3bb1f56180997442ee59e0d60ef2b71b8 (patch) | |
tree | 9ac18f862853a5ad2ea6e683dbcce39f562fa206 /arch/arm | |
parent | 302d8898ade1ad5f84cfedc7e8d43ff7720f3f25 (diff) |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 9 |
1 files 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) | |||
90 | #define SH7372_SCIF(scif_type, index, baseaddr, irq) \ | 90 | #define SH7372_SCIF(scif_type, index, baseaddr, irq) \ |
91 | static struct plat_sci_port scif##index##_platform_data = { \ | 91 | static struct plat_sci_port scif##index##_platform_data = { \ |
92 | .type = scif_type, \ | 92 | .type = scif_type, \ |
93 | .mapbase = baseaddr, \ | ||
94 | .flags = UPF_BOOT_AUTOCONF, \ | 93 | .flags = UPF_BOOT_AUTOCONF, \ |
95 | .irqs = SCIx_IRQ_MUXED(irq), \ | ||
96 | .scbrr_algo_id = SCBRR_ALGO_4, \ | 94 | .scbrr_algo_id = SCBRR_ALGO_4, \ |
97 | .scscr = SCSCR_RE | SCSCR_TE, \ | 95 | .scscr = SCSCR_RE | SCSCR_TE, \ |
98 | }; \ | 96 | }; \ |
99 | \ | 97 | \ |
98 | static struct resource scif##index##_resources[] = { \ | ||
99 | DEFINE_RES_MEM(baseaddr, 0x100), \ | ||
100 | DEFINE_RES_IRQ(irq), \ | ||
101 | }; \ | ||
102 | \ | ||
100 | static struct platform_device scif##index##_device = { \ | 103 | static struct platform_device scif##index##_device = { \ |
101 | .name = "sh-sci", \ | 104 | .name = "sh-sci", \ |
102 | .id = index, \ | 105 | .id = index, \ |
106 | .resource = scif##index##_resources, \ | ||
107 | .num_resources = ARRAY_SIZE(scif##index##_resources), \ | ||
103 | .dev = { \ | 108 | .dev = { \ |
104 | .platform_data = &scif##index##_platform_data, \ | 109 | .platform_data = &scif##index##_platform_data, \ |
105 | }, \ | 110 | }, \ |