aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-12-06 04:59:35 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-12-24 07:09:14 -0500
commit23399a6ff8e2070e7695fa6c1283212d1d69b372 (patch)
tree040db9843dbffead4ce165176da9c3b3de660597
parentd910224928058b6632010987dfed5ca72022e4b4 (diff)
ARM: shmobile: r8a7778: 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>
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7778.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 210c66315dd9..3e583cd79bea 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -46,12 +46,15 @@
46/* SCIF */ 46/* SCIF */
47#define R8A7778_SCIF(index, baseaddr, irq) \ 47#define R8A7778_SCIF(index, baseaddr, irq) \
48static struct plat_sci_port scif##index##_platform_data = { \ 48static struct plat_sci_port scif##index##_platform_data = { \
49 .mapbase = baseaddr, \
50 .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \ 49 .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
51 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \ 50 .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \
52 .scbrr_algo_id = SCBRR_ALGO_2, \ 51 .scbrr_algo_id = SCBRR_ALGO_2, \
53 .type = PORT_SCIF, \ 52 .type = PORT_SCIF, \
54 .irqs = SCIx_IRQ_MUXED(irq), \ 53}; \
54 \
55static struct resource scif##index##_resources[] = { \
56 DEFINE_RES_MEM(baseaddr, 0x100), \
57 DEFINE_RES_IRQ(irq), \
55} 58}
56 59
57R8A7778_SCIF(0, 0xffe40000, gic_iid(0x66)); 60R8A7778_SCIF(0, 0xffe40000, gic_iid(0x66));
@@ -62,9 +65,11 @@ R8A7778_SCIF(4, 0xffe44000, gic_iid(0x6a));
62R8A7778_SCIF(5, 0xffe45000, gic_iid(0x6b)); 65R8A7778_SCIF(5, 0xffe45000, gic_iid(0x6b));
63 66
64#define r8a7778_register_scif(index) \ 67#define r8a7778_register_scif(index) \
65 platform_device_register_data(&platform_bus, "sh-sci", index, \ 68 platform_device_register_resndata(&platform_bus, "sh-sci", index, \
66 &scif##index##_platform_data, \ 69 scif##index##_resources, \
67 sizeof(scif##index##_platform_data)) 70 ARRAY_SIZE(scif##index##_resources), \
71 &scif##index##_platform_data, \
72 sizeof(scif##index##_platform_data))
68 73
69/* TMU */ 74/* TMU */
70static struct resource sh_tmu0_resources[] __initdata = { 75static struct resource sh_tmu0_resources[] __initdata = {