renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

ARM: shmobile: r8a7778: Don't define SCIF platform data in an array

Browse Source 
The SCIF driver is transitioning to platform resources. Board code will
thus need to define an array of resources for each SCIF device. This is
incompatible with the macro-based SCIF platform data definition as an
array. Rework the macro to define platform data as individual
structures.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Laurent Pinchart 2013-12-06 10:59:27 +01:00 committed by Simon Horman
parent a958a31eb0
commit ecbcd715f0
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/mach-shmobile/setup-r8a7778.c
View File

@ -44,8 +44,8 @@
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
/* SCIF */ /* SCIF */
#define SCIF_INFO(baseaddr, irq) \ #define R8A7778_SCIF(index, baseaddr, irq) \
{ \ static struct plat_sci_port scif##index##_platform_data = { \
.mapbase = baseaddr, \ .mapbase = baseaddr, \
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \ .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
.scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \ .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \
@ -54,14 +54,17 @@
.irqs = SCIx_IRQ_MUXED(irq), \ .irqs = SCIx_IRQ_MUXED(irq), \
} }
static struct plat_sci_port scif_platform_data[] __initdata = { R8A7778_SCIF(0, 0xffe40000, gic_iid(0x66));
SCIF_INFO(0xffe40000, gic_iid(0x66)), R8A7778_SCIF(1, 0xffe41000, gic_iid(0x67));
SCIF_INFO(0xffe41000, gic_iid(0x67)), R8A7778_SCIF(2, 0xffe42000, gic_iid(0x68));
SCIF_INFO(0xffe42000, gic_iid(0x68)), R8A7778_SCIF(3, 0xffe43000, gic_iid(0x69));
SCIF_INFO(0xffe43000, gic_iid(0x69)), R8A7778_SCIF(4, 0xffe44000, gic_iid(0x6a));
SCIF_INFO(0xffe44000, gic_iid(0x6a)), R8A7778_SCIF(5, 0xffe45000, gic_iid(0x6b));
SCIF_INFO(0xffe45000, gic_iid(0x6b)),
}; #define r8a7778_register_scif(index) \
platform_device_register_data(&platform_bus, "sh-sci", index, \
&scif##index##_platform_data, \
sizeof(scif##index##_platform_data))
/* TMU */ /* TMU */
static struct resource sh_tmu0_resources[] __initdata = { static struct resource sh_tmu0_resources[] __initdata = {
@ -287,8 +290,6 @@ static void __init r8a7778_register_hspi(int id)
void __init r8a7778_add_dt_devices(void) void __init r8a7778_add_dt_devices(void)
{ {
int i;
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
void __iomem *base = ioremap_nocache(0xf0100000, 0x1000); void __iomem *base = ioremap_nocache(0xf0100000, 0x1000);
if (base) { if (base) {
@ -300,11 +301,12 @@ void __init r8a7778_add_dt_devices(void)
} }
#endif #endif
for (i = 0; i < ARRAY_SIZE(scif_platform_data); i++) r8a7778_register_scif(0);
platform_device_register_data(&platform_bus, "sh-sci", i, r8a7778_register_scif(1);
&scif_platform_data[i], r8a7778_register_scif(2);
sizeof(struct plat_sci_port)); r8a7778_register_scif(3);
r8a7778_register_scif(4);
r8a7778_register_scif(5);
r8a7778_register_tmu(0); r8a7778_register_tmu(0);
r8a7778_register_tmu(1); r8a7778_register_tmu(1);
} }