diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 112 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 39 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 91 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 160 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 149 |
5 files changed, 358 insertions, 193 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index ac4d5672ec1a..45eb1bfd42c9 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |||
@@ -15,6 +15,71 @@ | |||
15 | #include <linux/sh_timer.h> | 15 | #include <linux/sh_timer.h> |
16 | #include <asm/clock.h> | 16 | #include <asm/clock.h> |
17 | 17 | ||
18 | /* Serial */ | ||
19 | static struct plat_sci_port scif0_platform_data = { | ||
20 | .mapbase = 0xffe00000, | ||
21 | .flags = UPF_BOOT_AUTOCONF, | ||
22 | .type = PORT_SCIF, | ||
23 | .irqs = { 80, 80, 80, 80 }, | ||
24 | .clk = "scif0", | ||
25 | }; | ||
26 | |||
27 | static struct platform_device scif0_device = { | ||
28 | .name = "sh-sci", | ||
29 | .id = 0, | ||
30 | .dev = { | ||
31 | .platform_data = &scif0_platform_data, | ||
32 | }, | ||
33 | }; | ||
34 | |||
35 | static struct plat_sci_port scif1_platform_data = { | ||
36 | .mapbase = 0xffe10000, | ||
37 | .flags = UPF_BOOT_AUTOCONF, | ||
38 | .type = PORT_SCIF, | ||
39 | .irqs = { 81, 81, 81, 81 }, | ||
40 | .clk = "scif1", | ||
41 | }; | ||
42 | |||
43 | static struct platform_device scif1_device = { | ||
44 | .name = "sh-sci", | ||
45 | .id = 1, | ||
46 | .dev = { | ||
47 | .platform_data = &scif1_platform_data, | ||
48 | }, | ||
49 | }; | ||
50 | |||
51 | static struct plat_sci_port scif2_platform_data = { | ||
52 | .mapbase = 0xffe20000, | ||
53 | .flags = UPF_BOOT_AUTOCONF, | ||
54 | .type = PORT_SCIF, | ||
55 | .irqs = { 82, 82, 82, 82 }, | ||
56 | .clk = "scif2", | ||
57 | }; | ||
58 | |||
59 | static struct platform_device scif2_device = { | ||
60 | .name = "sh-sci", | ||
61 | .id = 2, | ||
62 | .dev = { | ||
63 | .platform_data = &scif2_platform_data, | ||
64 | }, | ||
65 | }; | ||
66 | |||
67 | static struct plat_sci_port scif3_platform_data = { | ||
68 | .mapbase = 0xffe30000, | ||
69 | .flags = UPF_BOOT_AUTOCONF, | ||
70 | .type = PORT_SCIF, | ||
71 | .irqs = { 83, 83, 83, 83 }, | ||
72 | .clk = "scif3", | ||
73 | }; | ||
74 | |||
75 | static struct platform_device scif3_device = { | ||
76 | .name = "sh-sci", | ||
77 | .id = 3, | ||
78 | .dev = { | ||
79 | .platform_data = &scif3_platform_data, | ||
80 | }, | ||
81 | }; | ||
82 | |||
18 | static struct resource iic0_resources[] = { | 83 | static struct resource iic0_resources[] = { |
19 | [0] = { | 84 | [0] = { |
20 | .name = "IIC0", | 85 | .name = "IIC0", |
@@ -265,52 +330,17 @@ static struct platform_device tmu2_device = { | |||
265 | .num_resources = ARRAY_SIZE(tmu2_resources), | 330 | .num_resources = ARRAY_SIZE(tmu2_resources), |
266 | }; | 331 | }; |
267 | 332 | ||
268 | static struct plat_sci_port sci_platform_data[] = { | ||
269 | { | ||
270 | .mapbase = 0xffe00000, | ||
271 | .flags = UPF_BOOT_AUTOCONF, | ||
272 | .type = PORT_SCIF, | ||
273 | .irqs = { 80, 80, 80, 80 }, | ||
274 | .clk = "scif0", | ||
275 | }, { | ||
276 | .mapbase = 0xffe10000, | ||
277 | .flags = UPF_BOOT_AUTOCONF, | ||
278 | .type = PORT_SCIF, | ||
279 | .irqs = { 81, 81, 81, 81 }, | ||
280 | .clk = "scif1", | ||
281 | }, { | ||
282 | .mapbase = 0xffe20000, | ||
283 | .flags = UPF_BOOT_AUTOCONF, | ||
284 | .type = PORT_SCIF, | ||
285 | .irqs = { 82, 82, 82, 82 }, | ||
286 | .clk = "scif2", | ||
287 | }, { | ||
288 | .mapbase = 0xffe30000, | ||
289 | .flags = UPF_BOOT_AUTOCONF, | ||
290 | .type = PORT_SCIF, | ||
291 | .irqs = { 83, 83, 83, 83 }, | ||
292 | .clk = "scif3", | ||
293 | }, { | ||
294 | .flags = 0, | ||
295 | } | ||
296 | }; | ||
297 | |||
298 | static struct platform_device sci_device = { | ||
299 | .name = "sh-sci", | ||
300 | .id = -1, | ||
301 | .dev = { | ||
302 | .platform_data = sci_platform_data, | ||
303 | }, | ||
304 | }; | ||
305 | |||
306 | static struct platform_device *sh7343_devices[] __initdata = { | 333 | static struct platform_device *sh7343_devices[] __initdata = { |
334 | &scif0_device, | ||
335 | &scif1_device, | ||
336 | &scif2_device, | ||
337 | &scif3_device, | ||
307 | &cmt_device, | 338 | &cmt_device, |
308 | &tmu0_device, | 339 | &tmu0_device, |
309 | &tmu1_device, | 340 | &tmu1_device, |
310 | &tmu2_device, | 341 | &tmu2_device, |
311 | &iic0_device, | 342 | &iic0_device, |
312 | &iic1_device, | 343 | &iic1_device, |
313 | &sci_device, | ||
314 | &vpu_device, | 344 | &vpu_device, |
315 | &veu_device, | 345 | &veu_device, |
316 | &jpu_device, | 346 | &jpu_device, |
@@ -328,6 +358,10 @@ static int __init sh7343_devices_setup(void) | |||
328 | arch_initcall(sh7343_devices_setup); | 358 | arch_initcall(sh7343_devices_setup); |
329 | 359 | ||
330 | static struct platform_device *sh7343_early_devices[] __initdata = { | 360 | static struct platform_device *sh7343_early_devices[] __initdata = { |
361 | &scif0_device, | ||
362 | &scif1_device, | ||
363 | &scif2_device, | ||
364 | &scif3_device, | ||
331 | &cmt_device, | 365 | &cmt_device, |
332 | &tmu0_device, | 366 | &tmu0_device, |
333 | &tmu1_device, | 367 | &tmu1_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c index 4a9010bf4fd3..c494c193e3b6 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | |||
@@ -18,6 +18,22 @@ | |||
18 | #include <linux/usb/r8a66597.h> | 18 | #include <linux/usb/r8a66597.h> |
19 | #include <asm/clock.h> | 19 | #include <asm/clock.h> |
20 | 20 | ||
21 | static struct plat_sci_port scif0_platform_data = { | ||
22 | .mapbase = 0xffe00000, | ||
23 | .flags = UPF_BOOT_AUTOCONF, | ||
24 | .type = PORT_SCIF, | ||
25 | .irqs = { 80, 80, 80, 80 }, | ||
26 | .clk = "scif0", | ||
27 | }; | ||
28 | |||
29 | static struct platform_device scif0_device = { | ||
30 | .name = "sh-sci", | ||
31 | .id = 0, | ||
32 | .dev = { | ||
33 | .platform_data = &scif0_platform_data, | ||
34 | }, | ||
35 | }; | ||
36 | |||
21 | static struct resource iic_resources[] = { | 37 | static struct resource iic_resources[] = { |
22 | [0] = { | 38 | [0] = { |
23 | .name = "IIC", | 39 | .name = "IIC", |
@@ -276,33 +292,13 @@ static struct platform_device tmu2_device = { | |||
276 | .num_resources = ARRAY_SIZE(tmu2_resources), | 292 | .num_resources = ARRAY_SIZE(tmu2_resources), |
277 | }; | 293 | }; |
278 | 294 | ||
279 | static struct plat_sci_port sci_platform_data[] = { | ||
280 | { | ||
281 | .mapbase = 0xffe00000, | ||
282 | .flags = UPF_BOOT_AUTOCONF, | ||
283 | .type = PORT_SCIF, | ||
284 | .irqs = { 80, 80, 80, 80 }, | ||
285 | .clk = "scif0", | ||
286 | }, { | ||
287 | .flags = 0, | ||
288 | } | ||
289 | }; | ||
290 | |||
291 | static struct platform_device sci_device = { | ||
292 | .name = "sh-sci", | ||
293 | .id = -1, | ||
294 | .dev = { | ||
295 | .platform_data = sci_platform_data, | ||
296 | }, | ||
297 | }; | ||
298 | |||
299 | static struct platform_device *sh7366_devices[] __initdata = { | 295 | static struct platform_device *sh7366_devices[] __initdata = { |
296 | &scif0_device, | ||
300 | &cmt_device, | 297 | &cmt_device, |
301 | &tmu0_device, | 298 | &tmu0_device, |
302 | &tmu1_device, | 299 | &tmu1_device, |
303 | &tmu2_device, | 300 | &tmu2_device, |
304 | &iic_device, | 301 | &iic_device, |
305 | &sci_device, | ||
306 | &usb_host_device, | 302 | &usb_host_device, |
307 | &vpu_device, | 303 | &vpu_device, |
308 | &veu0_device, | 304 | &veu0_device, |
@@ -321,6 +317,7 @@ static int __init sh7366_devices_setup(void) | |||
321 | arch_initcall(sh7366_devices_setup); | 317 | arch_initcall(sh7366_devices_setup); |
322 | 318 | ||
323 | static struct platform_device *sh7366_early_devices[] __initdata = { | 319 | static struct platform_device *sh7366_early_devices[] __initdata = { |
320 | &scif0_device, | ||
324 | &cmt_device, | 321 | &cmt_device, |
325 | &tmu0_device, | 322 | &tmu0_device, |
326 | &tmu1_device, | 323 | &tmu1_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 5491b094cf05..b5335b5e309c 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -20,6 +20,55 @@ | |||
20 | #include <asm/dma-sh.h> | 20 | #include <asm/dma-sh.h> |
21 | #include <cpu/sh7722.h> | 21 | #include <cpu/sh7722.h> |
22 | 22 | ||
23 | /* Serial */ | ||
24 | static struct plat_sci_port scif0_platform_data = { | ||
25 | .mapbase = 0xffe00000, | ||
26 | .flags = UPF_BOOT_AUTOCONF, | ||
27 | .type = PORT_SCIF, | ||
28 | .irqs = { 80, 80, 80, 80 }, | ||
29 | .clk = "scif0", | ||
30 | }; | ||
31 | |||
32 | static struct platform_device scif0_device = { | ||
33 | .name = "sh-sci", | ||
34 | .id = 0, | ||
35 | .dev = { | ||
36 | .platform_data = &scif0_platform_data, | ||
37 | }, | ||
38 | }; | ||
39 | |||
40 | static struct plat_sci_port scif1_platform_data = { | ||
41 | .mapbase = 0xffe10000, | ||
42 | .flags = UPF_BOOT_AUTOCONF, | ||
43 | .type = PORT_SCIF, | ||
44 | .irqs = { 81, 81, 81, 81 }, | ||
45 | .clk = "scif1", | ||
46 | }; | ||
47 | |||
48 | static struct platform_device scif1_device = { | ||
49 | .name = "sh-sci", | ||
50 | .id = 1, | ||
51 | .dev = { | ||
52 | .platform_data = &scif1_platform_data, | ||
53 | }, | ||
54 | }; | ||
55 | |||
56 | static struct plat_sci_port scif2_platform_data = { | ||
57 | .mapbase = 0xffe20000, | ||
58 | .flags = UPF_BOOT_AUTOCONF, | ||
59 | .type = PORT_SCIF, | ||
60 | .irqs = { 82, 82, 82, 82 }, | ||
61 | .clk = "scif2", | ||
62 | }; | ||
63 | |||
64 | static struct platform_device scif2_device = { | ||
65 | .name = "sh-sci", | ||
66 | .id = 2, | ||
67 | .dev = { | ||
68 | .platform_data = &scif2_platform_data, | ||
69 | }, | ||
70 | }; | ||
71 | |||
23 | static struct resource rtc_resources[] = { | 72 | static struct resource rtc_resources[] = { |
24 | [0] = { | 73 | [0] = { |
25 | .start = 0xa465fec0, | 74 | .start = 0xa465fec0, |
@@ -339,41 +388,6 @@ static struct platform_device tmu2_device = { | |||
339 | }, | 388 | }, |
340 | }; | 389 | }; |
341 | 390 | ||
342 | static struct plat_sci_port sci_platform_data[] = { | ||
343 | { | ||
344 | .mapbase = 0xffe00000, | ||
345 | .flags = UPF_BOOT_AUTOCONF, | ||
346 | .type = PORT_SCIF, | ||
347 | .irqs = { 80, 80, 80, 80 }, | ||
348 | .clk = "scif0", | ||
349 | }, | ||
350 | { | ||
351 | .mapbase = 0xffe10000, | ||
352 | .flags = UPF_BOOT_AUTOCONF, | ||
353 | .type = PORT_SCIF, | ||
354 | .irqs = { 81, 81, 81, 81 }, | ||
355 | .clk = "scif1", | ||
356 | }, | ||
357 | { | ||
358 | .mapbase = 0xffe20000, | ||
359 | .flags = UPF_BOOT_AUTOCONF, | ||
360 | .type = PORT_SCIF, | ||
361 | .irqs = { 82, 82, 82, 82 }, | ||
362 | .clk = "scif2", | ||
363 | }, | ||
364 | { | ||
365 | .flags = 0, | ||
366 | } | ||
367 | }; | ||
368 | |||
369 | static struct platform_device sci_device = { | ||
370 | .name = "sh-sci", | ||
371 | .id = -1, | ||
372 | .dev = { | ||
373 | .platform_data = sci_platform_data, | ||
374 | }, | ||
375 | }; | ||
376 | |||
377 | static struct sh_dmae_pdata dma_platform_data = { | 391 | static struct sh_dmae_pdata dma_platform_data = { |
378 | .mode = 0, | 392 | .mode = 0, |
379 | }; | 393 | }; |
@@ -387,6 +401,9 @@ static struct platform_device dma_device = { | |||
387 | }; | 401 | }; |
388 | 402 | ||
389 | static struct platform_device *sh7722_devices[] __initdata = { | 403 | static struct platform_device *sh7722_devices[] __initdata = { |
404 | &scif0_device, | ||
405 | &scif1_device, | ||
406 | &scif2_device, | ||
390 | &cmt_device, | 407 | &cmt_device, |
391 | &tmu0_device, | 408 | &tmu0_device, |
392 | &tmu1_device, | 409 | &tmu1_device, |
@@ -394,7 +411,6 @@ static struct platform_device *sh7722_devices[] __initdata = { | |||
394 | &rtc_device, | 411 | &rtc_device, |
395 | &usbf_device, | 412 | &usbf_device, |
396 | &iic_device, | 413 | &iic_device, |
397 | &sci_device, | ||
398 | &vpu_device, | 414 | &vpu_device, |
399 | &veu_device, | 415 | &veu_device, |
400 | &jpu_device, | 416 | &jpu_device, |
@@ -413,6 +429,9 @@ static int __init sh7722_devices_setup(void) | |||
413 | arch_initcall(sh7722_devices_setup); | 429 | arch_initcall(sh7722_devices_setup); |
414 | 430 | ||
415 | static struct platform_device *sh7722_early_devices[] __initdata = { | 431 | static struct platform_device *sh7722_early_devices[] __initdata = { |
432 | &scif0_device, | ||
433 | &scif1_device, | ||
434 | &scif2_device, | ||
416 | &cmt_device, | 435 | &cmt_device, |
417 | &tmu0_device, | 436 | &tmu0_device, |
418 | &tmu1_device, | 437 | &tmu1_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 4caa5a7ca86e..772b9265d0e4 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -20,6 +20,103 @@ | |||
20 | #include <asm/mmzone.h> | 20 | #include <asm/mmzone.h> |
21 | #include <cpu/sh7723.h> | 21 | #include <cpu/sh7723.h> |
22 | 22 | ||
23 | /* Serial */ | ||
24 | static struct plat_sci_port scif0_platform_data = { | ||
25 | .mapbase = 0xffe00000, | ||
26 | .flags = UPF_BOOT_AUTOCONF, | ||
27 | .type = PORT_SCIF, | ||
28 | .irqs = { 80, 80, 80, 80 }, | ||
29 | .clk = "scif0", | ||
30 | }; | ||
31 | |||
32 | static struct platform_device scif0_device = { | ||
33 | .name = "sh-sci", | ||
34 | .id = 0, | ||
35 | .dev = { | ||
36 | .platform_data = &scif0_platform_data, | ||
37 | }, | ||
38 | }; | ||
39 | |||
40 | static struct plat_sci_port scif1_platform_data = { | ||
41 | .mapbase = 0xffe10000, | ||
42 | .flags = UPF_BOOT_AUTOCONF, | ||
43 | .type = PORT_SCIF, | ||
44 | .irqs = { 81, 81, 81, 81 }, | ||
45 | .clk = "scif1", | ||
46 | }; | ||
47 | |||
48 | static struct platform_device scif1_device = { | ||
49 | .name = "sh-sci", | ||
50 | .id = 1, | ||
51 | .dev = { | ||
52 | .platform_data = &scif1_platform_data, | ||
53 | }, | ||
54 | }; | ||
55 | |||
56 | static struct plat_sci_port scif2_platform_data = { | ||
57 | .mapbase = 0xffe20000, | ||
58 | .flags = UPF_BOOT_AUTOCONF, | ||
59 | .type = PORT_SCIF, | ||
60 | .irqs = { 82, 82, 82, 82 }, | ||
61 | .clk = "scif2", | ||
62 | }; | ||
63 | |||
64 | static struct platform_device scif2_device = { | ||
65 | .name = "sh-sci", | ||
66 | .id = 2, | ||
67 | .dev = { | ||
68 | .platform_data = &scif2_platform_data, | ||
69 | }, | ||
70 | }; | ||
71 | |||
72 | static struct plat_sci_port scif3_platform_data = { | ||
73 | .mapbase = 0xa4e30000, | ||
74 | .flags = UPF_BOOT_AUTOCONF, | ||
75 | .type = PORT_SCIFA, | ||
76 | .irqs = { 56, 56, 56, 56 }, | ||
77 | .clk = "scif3", | ||
78 | }; | ||
79 | |||
80 | static struct platform_device scif3_device = { | ||
81 | .name = "sh-sci", | ||
82 | .id = 3, | ||
83 | .dev = { | ||
84 | .platform_data = &scif3_platform_data, | ||
85 | }, | ||
86 | }; | ||
87 | |||
88 | static struct plat_sci_port scif4_platform_data = { | ||
89 | .mapbase = 0xa4e40000, | ||
90 | .flags = UPF_BOOT_AUTOCONF, | ||
91 | .type = PORT_SCIFA, | ||
92 | .irqs = { 88, 88, 88, 88 }, | ||
93 | .clk = "scif4", | ||
94 | }; | ||
95 | |||
96 | static struct platform_device scif4_device = { | ||
97 | .name = "sh-sci", | ||
98 | .id = 4, | ||
99 | .dev = { | ||
100 | .platform_data = &scif4_platform_data, | ||
101 | }, | ||
102 | }; | ||
103 | |||
104 | static struct plat_sci_port scif5_platform_data = { | ||
105 | .mapbase = 0xa4e50000, | ||
106 | .flags = UPF_BOOT_AUTOCONF, | ||
107 | .type = PORT_SCIFA, | ||
108 | .irqs = { 109, 109, 109, 109 }, | ||
109 | .clk = "scif5", | ||
110 | }; | ||
111 | |||
112 | static struct platform_device scif5_device = { | ||
113 | .name = "sh-sci", | ||
114 | .id = 5, | ||
115 | .dev = { | ||
116 | .platform_data = &scif5_platform_data, | ||
117 | }, | ||
118 | }; | ||
119 | |||
23 | static struct uio_info vpu_platform_data = { | 120 | static struct uio_info vpu_platform_data = { |
24 | .name = "VPU5", | 121 | .name = "VPU5", |
25 | .version = "0", | 122 | .version = "0", |
@@ -348,56 +445,6 @@ static struct platform_device tmu5_device = { | |||
348 | }, | 445 | }, |
349 | }; | 446 | }; |
350 | 447 | ||
351 | static struct plat_sci_port sci_platform_data[] = { | ||
352 | { | ||
353 | .mapbase = 0xffe00000, | ||
354 | .flags = UPF_BOOT_AUTOCONF, | ||
355 | .type = PORT_SCIF, | ||
356 | .irqs = { 80, 80, 80, 80 }, | ||
357 | .clk = "scif0", | ||
358 | },{ | ||
359 | .mapbase = 0xffe10000, | ||
360 | .flags = UPF_BOOT_AUTOCONF, | ||
361 | .type = PORT_SCIF, | ||
362 | .irqs = { 81, 81, 81, 81 }, | ||
363 | .clk = "scif1", | ||
364 | },{ | ||
365 | .mapbase = 0xffe20000, | ||
366 | .flags = UPF_BOOT_AUTOCONF, | ||
367 | .type = PORT_SCIF, | ||
368 | .irqs = { 82, 82, 82, 82 }, | ||
369 | .clk = "scif2", | ||
370 | },{ | ||
371 | .mapbase = 0xa4e30000, | ||
372 | .flags = UPF_BOOT_AUTOCONF, | ||
373 | .type = PORT_SCIFA, | ||
374 | .irqs = { 56, 56, 56, 56 }, | ||
375 | .clk = "scif3", | ||
376 | },{ | ||
377 | .mapbase = 0xa4e40000, | ||
378 | .flags = UPF_BOOT_AUTOCONF, | ||
379 | .type = PORT_SCIFA, | ||
380 | .irqs = { 88, 88, 88, 88 }, | ||
381 | .clk = "scif4", | ||
382 | },{ | ||
383 | .mapbase = 0xa4e50000, | ||
384 | .flags = UPF_BOOT_AUTOCONF, | ||
385 | .type = PORT_SCIFA, | ||
386 | .irqs = { 109, 109, 109, 109 }, | ||
387 | .clk = "scif5", | ||
388 | }, { | ||
389 | .flags = 0, | ||
390 | } | ||
391 | }; | ||
392 | |||
393 | static struct platform_device sci_device = { | ||
394 | .name = "sh-sci", | ||
395 | .id = -1, | ||
396 | .dev = { | ||
397 | .platform_data = sci_platform_data, | ||
398 | }, | ||
399 | }; | ||
400 | |||
401 | static struct resource rtc_resources[] = { | 448 | static struct resource rtc_resources[] = { |
402 | [0] = { | 449 | [0] = { |
403 | .start = 0xa465fec0, | 450 | .start = 0xa465fec0, |
@@ -488,6 +535,12 @@ static struct platform_device iic_device = { | |||
488 | }; | 535 | }; |
489 | 536 | ||
490 | static struct platform_device *sh7723_devices[] __initdata = { | 537 | static struct platform_device *sh7723_devices[] __initdata = { |
538 | &scif0_device, | ||
539 | &scif1_device, | ||
540 | &scif2_device, | ||
541 | &scif3_device, | ||
542 | &scif4_device, | ||
543 | &scif5_device, | ||
491 | &cmt_device, | 544 | &cmt_device, |
492 | &tmu0_device, | 545 | &tmu0_device, |
493 | &tmu1_device, | 546 | &tmu1_device, |
@@ -495,7 +548,6 @@ static struct platform_device *sh7723_devices[] __initdata = { | |||
495 | &tmu3_device, | 548 | &tmu3_device, |
496 | &tmu4_device, | 549 | &tmu4_device, |
497 | &tmu5_device, | 550 | &tmu5_device, |
498 | &sci_device, | ||
499 | &rtc_device, | 551 | &rtc_device, |
500 | &iic_device, | 552 | &iic_device, |
501 | &sh7723_usb_host_device, | 553 | &sh7723_usb_host_device, |
@@ -516,6 +568,12 @@ static int __init sh7723_devices_setup(void) | |||
516 | arch_initcall(sh7723_devices_setup); | 568 | arch_initcall(sh7723_devices_setup); |
517 | 569 | ||
518 | static struct platform_device *sh7723_early_devices[] __initdata = { | 570 | static struct platform_device *sh7723_early_devices[] __initdata = { |
571 | &scif0_device, | ||
572 | &scif1_device, | ||
573 | &scif2_device, | ||
574 | &scif3_device, | ||
575 | &scif4_device, | ||
576 | &scif5_device, | ||
519 | &cmt_device, | 577 | &cmt_device, |
520 | &tmu0_device, | 578 | &tmu0_device, |
521 | &tmu1_device, | 579 | &tmu1_device, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c index 845e89c936e7..a52f35117e82 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | |||
@@ -27,53 +27,99 @@ | |||
27 | #include <cpu/sh7724.h> | 27 | #include <cpu/sh7724.h> |
28 | 28 | ||
29 | /* Serial */ | 29 | /* Serial */ |
30 | static struct plat_sci_port sci_platform_data[] = { | 30 | static struct plat_sci_port scif0_platform_data = { |
31 | { | 31 | .mapbase = 0xffe00000, |
32 | .mapbase = 0xffe00000, | 32 | .flags = UPF_BOOT_AUTOCONF, |
33 | .flags = UPF_BOOT_AUTOCONF, | 33 | .type = PORT_SCIF, |
34 | .type = PORT_SCIF, | 34 | .irqs = { 80, 80, 80, 80 }, |
35 | .irqs = { 80, 80, 80, 80 }, | 35 | .clk = "scif0", |
36 | .clk = "scif0", | 36 | }; |
37 | }, { | 37 | |
38 | .mapbase = 0xffe10000, | 38 | static struct platform_device scif0_device = { |
39 | .flags = UPF_BOOT_AUTOCONF, | ||
40 | .type = PORT_SCIF, | ||
41 | .irqs = { 81, 81, 81, 81 }, | ||
42 | .clk = "scif1", | ||
43 | }, { | ||
44 | .mapbase = 0xffe20000, | ||
45 | .flags = UPF_BOOT_AUTOCONF, | ||
46 | .type = PORT_SCIF, | ||
47 | .irqs = { 82, 82, 82, 82 }, | ||
48 | .clk = "scif2", | ||
49 | }, { | ||
50 | .mapbase = 0xa4e30000, | ||
51 | .flags = UPF_BOOT_AUTOCONF, | ||
52 | .type = PORT_SCIFA, | ||
53 | .irqs = { 56, 56, 56, 56 }, | ||
54 | .clk = "scif3", | ||
55 | }, { | ||
56 | .mapbase = 0xa4e40000, | ||
57 | .flags = UPF_BOOT_AUTOCONF, | ||
58 | .type = PORT_SCIFA, | ||
59 | .irqs = { 88, 88, 88, 88 }, | ||
60 | .clk = "scif4", | ||
61 | }, { | ||
62 | .mapbase = 0xa4e50000, | ||
63 | .flags = UPF_BOOT_AUTOCONF, | ||
64 | .type = PORT_SCIFA, | ||
65 | .irqs = { 109, 109, 109, 109 }, | ||
66 | .clk = "scif5", | ||
67 | }, { | ||
68 | .flags = 0, | ||
69 | } | ||
70 | }; | ||
71 | |||
72 | static struct platform_device sci_device = { | ||
73 | .name = "sh-sci", | 39 | .name = "sh-sci", |
74 | .id = -1, | 40 | .id = 0, |
41 | .dev = { | ||
42 | .platform_data = &scif0_platform_data, | ||
43 | }, | ||
44 | }; | ||
45 | |||
46 | static struct plat_sci_port scif1_platform_data = { | ||
47 | .mapbase = 0xffe10000, | ||
48 | .flags = UPF_BOOT_AUTOCONF, | ||
49 | .type = PORT_SCIF, | ||
50 | .irqs = { 81, 81, 81, 81 }, | ||
51 | .clk = "scif1", | ||
52 | }; | ||
53 | |||
54 | static struct platform_device scif1_device = { | ||
55 | .name = "sh-sci", | ||
56 | .id = 1, | ||
57 | .dev = { | ||
58 | .platform_data = &scif1_platform_data, | ||
59 | }, | ||
60 | }; | ||
61 | |||
62 | static struct plat_sci_port scif2_platform_data = { | ||
63 | .mapbase = 0xffe20000, | ||
64 | .flags = UPF_BOOT_AUTOCONF, | ||
65 | .type = PORT_SCIF, | ||
66 | .irqs = { 82, 82, 82, 82 }, | ||
67 | .clk = "scif2", | ||
68 | }; | ||
69 | |||
70 | static struct platform_device scif2_device = { | ||
71 | .name = "sh-sci", | ||
72 | .id = 2, | ||
73 | .dev = { | ||
74 | .platform_data = &scif2_platform_data, | ||
75 | }, | ||
76 | }; | ||
77 | |||
78 | static struct plat_sci_port scif3_platform_data = { | ||
79 | .mapbase = 0xa4e30000, | ||
80 | .flags = UPF_BOOT_AUTOCONF, | ||
81 | .type = PORT_SCIFA, | ||
82 | .irqs = { 56, 56, 56, 56 }, | ||
83 | .clk = "scif3", | ||
84 | }; | ||
85 | |||
86 | static struct platform_device scif3_device = { | ||
87 | .name = "sh-sci", | ||
88 | .id = 3, | ||
89 | .dev = { | ||
90 | .platform_data = &scif3_platform_data, | ||
91 | }, | ||
92 | }; | ||
93 | |||
94 | static struct plat_sci_port scif4_platform_data = { | ||
95 | .mapbase = 0xa4e40000, | ||
96 | .flags = UPF_BOOT_AUTOCONF, | ||
97 | .type = PORT_SCIFA, | ||
98 | .irqs = { 88, 88, 88, 88 }, | ||
99 | .clk = "scif4", | ||
100 | }; | ||
101 | |||
102 | static struct platform_device scif4_device = { | ||
103 | .name = "sh-sci", | ||
104 | .id = 4, | ||
105 | .dev = { | ||
106 | .platform_data = &scif4_platform_data, | ||
107 | }, | ||
108 | }; | ||
109 | |||
110 | static struct plat_sci_port scif5_platform_data = { | ||
111 | .mapbase = 0xa4e50000, | ||
112 | .flags = UPF_BOOT_AUTOCONF, | ||
113 | .type = PORT_SCIFA, | ||
114 | .irqs = { 109, 109, 109, 109 }, | ||
115 | .clk = "scif5", | ||
116 | }; | ||
117 | |||
118 | static struct platform_device scif5_device = { | ||
119 | .name = "sh-sci", | ||
120 | .id = 5, | ||
75 | .dev = { | 121 | .dev = { |
76 | .platform_data = sci_platform_data, | 122 | .platform_data = &scif5_platform_data, |
77 | }, | 123 | }, |
78 | }; | 124 | }; |
79 | 125 | ||
@@ -590,6 +636,12 @@ static struct platform_device spu1_device = { | |||
590 | }; | 636 | }; |
591 | 637 | ||
592 | static struct platform_device *sh7724_devices[] __initdata = { | 638 | static struct platform_device *sh7724_devices[] __initdata = { |
639 | &scif0_device, | ||
640 | &scif1_device, | ||
641 | &scif2_device, | ||
642 | &scif3_device, | ||
643 | &scif4_device, | ||
644 | &scif5_device, | ||
593 | &cmt_device, | 645 | &cmt_device, |
594 | &tmu0_device, | 646 | &tmu0_device, |
595 | &tmu1_device, | 647 | &tmu1_device, |
@@ -597,7 +649,6 @@ static struct platform_device *sh7724_devices[] __initdata = { | |||
597 | &tmu3_device, | 649 | &tmu3_device, |
598 | &tmu4_device, | 650 | &tmu4_device, |
599 | &tmu5_device, | 651 | &tmu5_device, |
600 | &sci_device, | ||
601 | &rtc_device, | 652 | &rtc_device, |
602 | &iic0_device, | 653 | &iic0_device, |
603 | &iic1_device, | 654 | &iic1_device, |
@@ -624,6 +675,12 @@ static int __init sh7724_devices_setup(void) | |||
624 | arch_initcall(sh7724_devices_setup); | 675 | arch_initcall(sh7724_devices_setup); |
625 | 676 | ||
626 | static struct platform_device *sh7724_early_devices[] __initdata = { | 677 | static struct platform_device *sh7724_early_devices[] __initdata = { |
678 | &scif0_device, | ||
679 | &scif1_device, | ||
680 | &scif2_device, | ||
681 | &scif3_device, | ||
682 | &scif4_device, | ||
683 | &scif5_device, | ||
627 | &cmt_device, | 684 | &cmt_device, |
628 | &tmu0_device, | 685 | &tmu0_device, |
629 | &tmu1_device, | 686 | &tmu1_device, |