1 files changed, 9 insertions, 60 deletions
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 9c0b3a9d5f7a..412e179429cd 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -21,77 +21,26 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
-#include <linux/serial_sci.h>
 #include <linux/sh_timer.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r7s72100.h>
 #include <asm/mach/arch.h>
-#define R7S72100_SCIF(index, baseaddr, irq)                             \
+static struct resource mtu2_resources[] __initdata = {
-static const struct plat_sci_port scif##index##_platform_data = {       \
+        DEFINE_RES_MEM(0xfcff0000, 0x400),
-        .type           = PORT_SCIF,                                    \
+        DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
-        .regtype        = SCIx_SH2_SCIF_FIFODATA_REGTYPE,               \
-        .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,              \
-        .scscr          = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | \
-                          SCSCR_REIE,                                   \
-};                                                                      \
-                                                                        \
-static struct resource scif##index##_resources[] = {                    \
-        DEFINE_RES_MEM(baseaddr, 0x100),                                \
-        DEFINE_RES_IRQ(irq + 1),                                        \
-        DEFINE_RES_IRQ(irq + 2),                                        \
-        DEFINE_RES_IRQ(irq + 3),                                        \
-        DEFINE_RES_IRQ(irq),                                            \
-}                                                                       \
-R7S72100_SCIF(0, 0xe8007000, gic_iid(221));
-R7S72100_SCIF(1, 0xe8007800, gic_iid(225));
-R7S72100_SCIF(2, 0xe8008000, gic_iid(229));
-R7S72100_SCIF(3, 0xe8008800, gic_iid(233));
-R7S72100_SCIF(4, 0xe8009000, gic_iid(237));
-R7S72100_SCIF(5, 0xe8009800, gic_iid(241));
-R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
-R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
-#define r7s72100_register_scif(index)                                          \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
-                                          scif##index##_resources,             \
-                                          ARRAY_SIZE(scif##index##_resources), \
-                                          &scif##index##_platform_data,        \
-                                          sizeof(scif##index##_platform_data))
-static struct sh_timer_config mtu2_0_platform_data __initdata = {
-        .name = "MTU2_0",
-        .timer_bit = 0,
-        .channel_offset = -0x80,
-        .clockevent_rating = 200,
-};
-static struct resource mtu2_0_resources[] __initdata = {
-        DEFINE_RES_MEM(0xfcff0300, 0x27),
-        DEFINE_RES_IRQ(gic_iid(139)), /* MTU2 TGI0A */
 };
-#define r7s72100_register_mtu2(idx)                                     \
+#define r7s72100_register_mtu2()                                        \
-        platform_device_register_resndata(&platform_bus, "sh_mtu2",     \
+        platform_device_register_resndata(&platform_bus, "sh-mtu2",     \
-                                          idx, mtu2_##idx##_resources,  \
+                                          -1, mtu2_resources,           \
-                                          ARRAY_SIZE(mtu2_##idx##_resources), \
+                                          ARRAY_SIZE(mtu2_resources),   \
-                                          &mtu2_##idx##_platform_data,  \
+                                          NULL, 0)
-                                          sizeof(struct sh_timer_config))
 void __init r7s72100_add_dt_devices(void)
 {
-        r7s72100_register_scif(0);
+        r7s72100_register_mtu2();
-        r7s72100_register_scif(1);
-        r7s72100_register_scif(2);
-        r7s72100_register_scif(3);
-        r7s72100_register_scif(4);
-        r7s72100_register_scif(5);
-        r7s72100_register_scif(6);
-        r7s72100_register_scif(7);
-        r7s72100_register_mtu2(0);
 }
 void __init r7s72100_init_early(void)

diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c index 9c0b3a9d5f7a..412e179429cd 100644 --- a/arch/arm/mach-shmobile/setup-r7s72100.c +++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -21,77 +21,26 @@
21	#include <linux/irq.h>	21	#include <linux/irq.h>
22	#include <linux/kernel.h>	22	#include <linux/kernel.h>
23	#include <linux/of_platform.h>	23	#include <linux/of_platform.h>
24	#include <linux/serial_sci.h>
25	#include <linux/sh_timer.h>	24	#include <linux/sh_timer.h>
26	#include <mach/common.h>	25	#include <mach/common.h>
27	#include <mach/irqs.h>	26	#include <mach/irqs.h>
28	#include <mach/r7s72100.h>	27	#include <mach/r7s72100.h>
29	#include <asm/mach/arch.h>	28	#include <asm/mach/arch.h>
30		29
31	#define R7S72100_SCIF(index, baseaddr, irq) \	30	static struct resource mtu2_resources[] __initdata = {
32	static const struct plat_sci_port scif##index##_platform_data = { \	31	DEFINE_RES_MEM(0xfcff0000, 0x400),
33	.type = PORT_SCIF, \	32	DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
34	.regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, \
35	.flags = UPF_BOOT_AUTOCONF \| UPF_IOREMAP, \
36	.scscr = SCSCR_RIE \| SCSCR_TIE \| SCSCR_RE \| SCSCR_TE \| \
37	SCSCR_REIE, \
38	}; \
39	\
40	static struct resource scif##index##_resources[] = { \
41	DEFINE_RES_MEM(baseaddr, 0x100), \
42	DEFINE_RES_IRQ(irq + 1), \
43	DEFINE_RES_IRQ(irq + 2), \
44	DEFINE_RES_IRQ(irq + 3), \
45	DEFINE_RES_IRQ(irq), \
46	} \
47
48	R7S72100_SCIF(0, 0xe8007000, gic_iid(221));
49	R7S72100_SCIF(1, 0xe8007800, gic_iid(225));
50	R7S72100_SCIF(2, 0xe8008000, gic_iid(229));
51	R7S72100_SCIF(3, 0xe8008800, gic_iid(233));
52	R7S72100_SCIF(4, 0xe8009000, gic_iid(237));
53	R7S72100_SCIF(5, 0xe8009800, gic_iid(241));
54	R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
55	R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
56
57	#define r7s72100_register_scif(index) \
58	platform_device_register_resndata(&platform_bus, "sh-sci", index, \
59	scif##index##_resources, \
60	ARRAY_SIZE(scif##index##_resources), \
61	&scif##index##_platform_data, \
62	sizeof(scif##index##_platform_data))
63
64
65	static struct sh_timer_config mtu2_0_platform_data __initdata = {
66	.name = "MTU2_0",
67	.timer_bit = 0,
68	.channel_offset = -0x80,
69	.clockevent_rating = 200,
70	};
71
72	static struct resource mtu2_0_resources[] __initdata = {
73	DEFINE_RES_MEM(0xfcff0300, 0x27),
74	DEFINE_RES_IRQ(gic_iid(139)), /* MTU2 TGI0A */
75	};	33	};
76		34
77	#define r7s72100_register_mtu2(idx) \	35	#define r7s72100_register_mtu2() \
78	platform_device_register_resndata(&platform_bus, "sh_mtu2", \	36	platform_device_register_resndata(&platform_bus, "sh-mtu2", \
79	idx, mtu2_##idx##_resources, \	37	-1, mtu2_resources, \
80	ARRAY_SIZE(mtu2_##idx##_resources), \	38	ARRAY_SIZE(mtu2_resources), \
81	&mtu2_##idx##_platform_data, \	39	NULL, 0)
82	sizeof(struct sh_timer_config))
83		40
84	void __init r7s72100_add_dt_devices(void)	41	void __init r7s72100_add_dt_devices(void)
85	{	42	{
86	r7s72100_register_scif(0);	43	r7s72100_register_mtu2();
87	r7s72100_register_scif(1);
88	r7s72100_register_scif(2);
89	r7s72100_register_scif(3);
90	r7s72100_register_scif(4);
91	r7s72100_register_scif(5);
92	r7s72100_register_scif(6);
93	r7s72100_register_scif(7);
94	r7s72100_register_mtu2(0);
95	}	44	}
96		45
97	void __init r7s72100_init_early(void)	46	void __init r7s72100_init_early(void)