diff options
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-htcherald.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/io.c | 2 |
16 files changed, 23 insertions, 9 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index fdd1dd53fa9c..0a9d61d2d229 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -301,6 +301,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") | |||
301 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 301 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
302 | .boot_params = 0x10000100, | 302 | .boot_params = 0x10000100, |
303 | .map_io = ams_delta_map_io, | 303 | .map_io = ams_delta_map_io, |
304 | .reserve = omap_reserve, | ||
304 | .init_irq = ams_delta_init_irq, | 305 | .init_irq = ams_delta_init_irq, |
305 | .init_machine = ams_delta_init, | 306 | .init_machine = ams_delta_init, |
306 | .timer = &omap_timer, | 307 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 096f2ed102cb..059bac60b35a 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -378,6 +378,7 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") | |||
378 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 378 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
379 | .boot_params = 0x10000100, | 379 | .boot_params = 0x10000100, |
380 | .map_io = omap_fsample_map_io, | 380 | .map_io = omap_fsample_map_io, |
381 | .reserve = omap_reserve, | ||
381 | .init_irq = omap_fsample_init_irq, | 382 | .init_irq = omap_fsample_init_irq, |
382 | .init_machine = omap_fsample_init, | 383 | .init_machine = omap_fsample_init, |
383 | .timer = &omap_timer, | 384 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index e1195a3467b8..7a65684d2a15 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c | |||
@@ -98,6 +98,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") | |||
98 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 98 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
99 | .boot_params = 0x10000100, | 99 | .boot_params = 0x10000100, |
100 | .map_io = omap_generic_map_io, | 100 | .map_io = omap_generic_map_io, |
101 | .reserve = omap_reserve, | ||
101 | .init_irq = omap_generic_init_irq, | 102 | .init_irq = omap_generic_init_irq, |
102 | .init_machine = omap_generic_init, | 103 | .init_machine = omap_generic_init, |
103 | .timer = &omap_timer, | 104 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index d1100e4f65ac..68b2beda8b99 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -467,6 +467,7 @@ MACHINE_START(OMAP_H2, "TI-H2") | |||
467 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 467 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
468 | .boot_params = 0x10000100, | 468 | .boot_params = 0x10000100, |
469 | .map_io = h2_map_io, | 469 | .map_io = h2_map_io, |
470 | .reserve = omap_reserve, | ||
470 | .init_irq = h2_init_irq, | 471 | .init_irq = h2_init_irq, |
471 | .init_machine = h2_init, | 472 | .init_machine = h2_init, |
472 | .timer = &omap_timer, | 473 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index a53ab8297d25..0b0825fe6751 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -437,6 +437,7 @@ MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board") | |||
437 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 437 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
438 | .boot_params = 0x10000100, | 438 | .boot_params = 0x10000100, |
439 | .map_io = h3_map_io, | 439 | .map_io = h3_map_io, |
440 | .reserve = omap_reserve, | ||
440 | .init_irq = h3_init_irq, | 441 | .init_irq = h3_init_irq, |
441 | .init_machine = h3_init, | 442 | .init_machine = h3_init, |
442 | .timer = &omap_timer, | 443 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index 8e313b4b99a9..d70a4f0923f5 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c | |||
@@ -304,6 +304,7 @@ MACHINE_START(HERALD, "HTC Herald") | |||
304 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 304 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
305 | .boot_params = 0x10000100, | 305 | .boot_params = 0x10000100, |
306 | .map_io = htcherald_map_io, | 306 | .map_io = htcherald_map_io, |
307 | .reserve = omap_reserve, | ||
307 | .init_irq = htcherald_init_irq, | 308 | .init_irq = htcherald_init_irq, |
308 | .init_machine = htcherald_init, | 309 | .init_machine = htcherald_init, |
309 | .timer = &omap_timer, | 310 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 5d12fd35681b..91064b37859a 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -463,6 +463,7 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator") | |||
463 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 463 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
464 | .boot_params = 0x10000100, | 464 | .boot_params = 0x10000100, |
465 | .map_io = innovator_map_io, | 465 | .map_io = innovator_map_io, |
466 | .reserve = omap_reserve, | ||
466 | .init_irq = innovator_init_irq, | 467 | .init_irq = innovator_init_irq, |
467 | .init_machine = innovator_init, | 468 | .init_machine = innovator_init, |
468 | .timer = &omap_timer, | 469 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 71e1a3fad0ea..8c28b10f3dae 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -400,6 +400,7 @@ MACHINE_START(NOKIA770, "Nokia 770") | |||
400 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 400 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
401 | .boot_params = 0x10000100, | 401 | .boot_params = 0x10000100, |
402 | .map_io = omap_nokia770_map_io, | 402 | .map_io = omap_nokia770_map_io, |
403 | .reserve = omap_reserve, | ||
403 | .init_irq = omap_nokia770_init_irq, | 404 | .init_irq = omap_nokia770_init_irq, |
404 | .init_machine = omap_nokia770_init, | 405 | .init_machine = omap_nokia770_init, |
405 | .timer = &omap_timer, | 406 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 80d862001def..e2a72af30890 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -584,6 +584,7 @@ MACHINE_START(OMAP_OSK, "TI-OSK") | |||
584 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 584 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
585 | .boot_params = 0x10000100, | 585 | .boot_params = 0x10000100, |
586 | .map_io = osk_map_io, | 586 | .map_io = osk_map_io, |
587 | .reserve = omap_reserve, | ||
587 | .init_irq = osk_init_irq, | 588 | .init_irq = osk_init_irq, |
588 | .init_machine = osk_init, | 589 | .init_machine = osk_init, |
589 | .timer = &omap_timer, | 590 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 569b4c9085cd..61a2321b9732 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -373,6 +373,7 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E") | |||
373 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 373 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
374 | .boot_params = 0x10000100, | 374 | .boot_params = 0x10000100, |
375 | .map_io = omap_palmte_map_io, | 375 | .map_io = omap_palmte_map_io, |
376 | .reserve = omap_reserve, | ||
376 | .init_irq = omap_palmte_init_irq, | 377 | .init_irq = omap_palmte_init_irq, |
377 | .init_machine = omap_palmte_init, | 378 | .init_machine = omap_palmte_init, |
378 | .timer = &omap_timer, | 379 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 6ad49a2cc1a0..21c01c6afcc1 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -321,6 +321,7 @@ MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T") | |||
321 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 321 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
322 | .boot_params = 0x10000100, | 322 | .boot_params = 0x10000100, |
323 | .map_io = omap_palmtt_map_io, | 323 | .map_io = omap_palmtt_map_io, |
324 | .reserve = omap_reserve, | ||
324 | .init_irq = omap_palmtt_init_irq, | 325 | .init_irq = omap_palmtt_init_irq, |
325 | .init_machine = omap_palmtt_init, | 326 | .init_machine = omap_palmtt_init, |
326 | .timer = &omap_timer, | 327 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 6641de9257ef..f32492451533 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -338,10 +338,12 @@ omap_palmz71_map_io(void) | |||
338 | } | 338 | } |
339 | 339 | ||
340 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") | 340 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") |
341 | .phys_io = 0xfff00000, | 341 | .phys_io = 0xfff00000, |
342 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 342 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
343 | .boot_params = 0x10000100,.map_io = omap_palmz71_map_io, | 343 | .boot_params = 0x10000100, |
344 | .init_irq = omap_palmz71_init_irq, | 344 | .map_io = omap_palmz71_map_io, |
345 | .init_machine = omap_palmz71_init, | 345 | .reserve = omap_reserve, |
346 | .timer = &omap_timer, | 346 | .init_irq = omap_palmz71_init_irq, |
347 | .init_machine = omap_palmz71_init, | ||
348 | .timer = &omap_timer, | ||
347 | MACHINE_END | 349 | MACHINE_END |
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index e854d5741c88..8b5ab1fcc405 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -339,6 +339,7 @@ MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2") | |||
339 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 339 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
340 | .boot_params = 0x10000100, | 340 | .boot_params = 0x10000100, |
341 | .map_io = omap_perseus2_map_io, | 341 | .map_io = omap_perseus2_map_io, |
342 | .reserve = omap_reserve, | ||
342 | .init_irq = omap_perseus2_init_irq, | 343 | .init_irq = omap_perseus2_init_irq, |
343 | .init_machine = omap_perseus2_init, | 344 | .init_machine = omap_perseus2_init, |
344 | .timer = &omap_timer, | 345 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 2fb1e5f8e2ec..995566b862bb 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -423,7 +423,8 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1") | |||
423 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 423 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
424 | .boot_params = 0x10000100, | 424 | .boot_params = 0x10000100, |
425 | .map_io = omap_sx1_map_io, | 425 | .map_io = omap_sx1_map_io, |
426 | .init_irq = omap_sx1_init_irq, | 426 | .reserve = omap_reserve, |
427 | .init_irq = omap_sx1_init_irq, | ||
427 | .init_machine = omap_sx1_init, | 428 | .init_machine = omap_sx1_init, |
428 | .timer = &omap_timer, | 429 | .timer = &omap_timer, |
429 | MACHINE_END | 430 | MACHINE_END |
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 87b9436fe7c0..4c483dc1de5c 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -287,6 +287,7 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910") | |||
287 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 287 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
288 | .boot_params = 0x10000100, | 288 | .boot_params = 0x10000100, |
289 | .map_io = voiceblue_map_io, | 289 | .map_io = voiceblue_map_io, |
290 | .reserve = omap_reserve, | ||
290 | .init_irq = voiceblue_init_irq, | 291 | .init_irq = voiceblue_init_irq, |
291 | .init_machine = voiceblue_init, | 292 | .init_machine = voiceblue_init, |
292 | .timer = &omap_timer, | 293 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index d9b8d82530ae..0ce3fec2d257 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | extern void omap_check_revision(void); | 23 | extern void omap_check_revision(void); |
24 | extern void omap_sram_init(void); | 24 | extern void omap_sram_init(void); |
25 | extern void omapfb_reserve_sdram(void); | ||
26 | 25 | ||
27 | /* | 26 | /* |
28 | * The machine specific code may provide the extra mapping besides the | 27 | * The machine specific code may provide the extra mapping besides the |
@@ -122,7 +121,6 @@ void __init omap1_map_common_io(void) | |||
122 | #endif | 121 | #endif |
123 | 122 | ||
124 | omap_sram_init(); | 123 | omap_sram_init(); |
125 | omapfb_reserve_sdram(); | ||
126 | } | 124 | } |
127 | 125 | ||
128 | /* | 126 | /* |