diff options
author | Magnus Damm <damm@opensource.se> | 2009-12-14 07:30:05 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-14 22:06:32 -0500 |
commit | 44658dfb660c4744b862571a3d8e1dae65e8b75a (patch) | |
tree | 0123bb959e8c96d9a49bc3cc7acc5f2293c964a5 /arch/sh/kernel/cpu/sh3/setup-sh7710.c | |
parent | be091d20efe7b045ca02bdf91c63c72d91f5899d (diff) |
sh: sh3 scif pdata (sh7705/sh770x/sh7710/sh7720)
This patch breaks out the sh3 scif serial port platform
data from a shared platform device to one platform
device per port. Also, add serial ports to the list of
early platform devices.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/setup-sh7710.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index 717e90ae1097..0845a3ad006d 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c | |||
@@ -96,28 +96,33 @@ static struct platform_device rtc_device = { | |||
96 | }, | 96 | }, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static struct plat_sci_port sci_platform_data[] = { | 99 | static struct plat_sci_port scif0_platform_data = { |
100 | { | 100 | .mapbase = 0xa4400000, |
101 | .mapbase = 0xa4400000, | 101 | .flags = UPF_BOOT_AUTOCONF, |
102 | .flags = UPF_BOOT_AUTOCONF, | 102 | .type = PORT_SCIF, |
103 | .type = PORT_SCIF, | 103 | .irqs = { 52, 52, 52, 52 }, |
104 | .irqs = { 52, 52, 52, 52 }, | 104 | }; |
105 | }, { | 105 | |
106 | .mapbase = 0xa4410000, | 106 | static struct platform_device scif0_device = { |
107 | .flags = UPF_BOOT_AUTOCONF, | ||
108 | .type = PORT_SCIF, | ||
109 | .irqs = { 56, 56, 56, 56 }, | ||
110 | }, { | ||
111 | |||
112 | .flags = 0, | ||
113 | } | ||
114 | }; | ||
115 | |||
116 | static struct platform_device sci_device = { | ||
117 | .name = "sh-sci", | 107 | .name = "sh-sci", |
118 | .id = -1, | 108 | .id = 0, |
109 | .dev = { | ||
110 | .platform_data = &scif0_platform_data, | ||
111 | }, | ||
112 | }; | ||
113 | |||
114 | static struct plat_sci_port scif1_platform_data = { | ||
115 | .mapbase = 0xa4410000, | ||
116 | .flags = UPF_BOOT_AUTOCONF, | ||
117 | .type = PORT_SCIF, | ||
118 | .irqs = { 56, 56, 56, 56 }, | ||
119 | }; | ||
120 | |||
121 | static struct platform_device scif1_device = { | ||
122 | .name = "sh-sci", | ||
123 | .id = 1, | ||
119 | .dev = { | 124 | .dev = { |
120 | .platform_data = sci_platform_data, | 125 | .platform_data = &scif1_platform_data, |
121 | }, | 126 | }, |
122 | }; | 127 | }; |
123 | 128 | ||
@@ -214,10 +219,11 @@ static struct platform_device tmu2_device = { | |||
214 | }; | 219 | }; |
215 | 220 | ||
216 | static struct platform_device *sh7710_devices[] __initdata = { | 221 | static struct platform_device *sh7710_devices[] __initdata = { |
222 | &scif0_device, | ||
223 | &scif1_device, | ||
217 | &tmu0_device, | 224 | &tmu0_device, |
218 | &tmu1_device, | 225 | &tmu1_device, |
219 | &tmu2_device, | 226 | &tmu2_device, |
220 | &sci_device, | ||
221 | &rtc_device, | 227 | &rtc_device, |
222 | }; | 228 | }; |
223 | 229 | ||
@@ -229,6 +235,8 @@ static int __init sh7710_devices_setup(void) | |||
229 | arch_initcall(sh7710_devices_setup); | 235 | arch_initcall(sh7710_devices_setup); |
230 | 236 | ||
231 | static struct platform_device *sh7710_early_devices[] __initdata = { | 237 | static struct platform_device *sh7710_early_devices[] __initdata = { |
238 | &scif0_device, | ||
239 | &scif1_device, | ||
232 | &tmu0_device, | 240 | &tmu0_device, |
233 | &tmu1_device, | 241 | &tmu1_device, |
234 | &tmu2_device, | 242 | &tmu2_device, |