diff options
Diffstat (limited to 'arch/arm/mach-omap2')
23 files changed, 28 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index a11a575745e..42f49f785c9 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
| @@ -248,6 +248,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") | |||
| 248 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 248 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 249 | .boot_params = 0x80000100, | 249 | .boot_params = 0x80000100, |
| 250 | .map_io = omap_2430sdp_map_io, | 250 | .map_io = omap_2430sdp_map_io, |
| 251 | .reserve = omap_reserve, | ||
| 251 | .init_irq = omap_2430sdp_init_irq, | 252 | .init_irq = omap_2430sdp_init_irq, |
| 252 | .init_machine = omap_2430sdp_init, | 253 | .init_machine = omap_2430sdp_init, |
| 253 | .timer = &omap_timer, | 254 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index f474a80b886..dd9c03171a1 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
| @@ -815,6 +815,7 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") | |||
| 815 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 815 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 816 | .boot_params = 0x80000100, | 816 | .boot_params = 0x80000100, |
| 817 | .map_io = omap_3430sdp_map_io, | 817 | .map_io = omap_3430sdp_map_io, |
| 818 | .reserve = omap_reserve, | ||
| 818 | .init_irq = omap_3430sdp_init_irq, | 819 | .init_irq = omap_3430sdp_init_irq, |
| 819 | .init_machine = omap_3430sdp_init, | 820 | .init_machine = omap_3430sdp_init, |
| 820 | .timer = &omap_timer, | 821 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 504d2bd222f..57290fb3fcd 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
| @@ -108,6 +108,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") | |||
| 108 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 108 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 109 | .boot_params = 0x80000100, | 109 | .boot_params = 0x80000100, |
| 110 | .map_io = omap_sdp_map_io, | 110 | .map_io = omap_sdp_map_io, |
| 111 | .reserve = omap_reserve, | ||
| 111 | .init_irq = omap_sdp_init_irq, | 112 | .init_irq = omap_sdp_init_irq, |
| 112 | .init_machine = omap_sdp_init, | 113 | .init_machine = omap_sdp_init, |
| 113 | .timer = &omap_timer, | 114 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index e4a5d66b83b..4bb2c5d151e 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
| @@ -402,6 +402,7 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") | |||
| 402 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 402 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 403 | .boot_params = 0x80000100, | 403 | .boot_params = 0x80000100, |
| 404 | .map_io = omap_4430sdp_map_io, | 404 | .map_io = omap_4430sdp_map_io, |
| 405 | .reserve = omap_reserve, | ||
| 405 | .init_irq = omap_4430sdp_init_irq, | 406 | .init_irq = omap_4430sdp_init_irq, |
| 406 | .init_machine = omap_4430sdp_init, | 407 | .init_machine = omap_4430sdp_init, |
| 407 | .timer = &omap_timer, | 408 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index af383a87694..7da92defcde 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
| @@ -472,6 +472,7 @@ MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM") | |||
| 472 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 472 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, |
| 473 | .boot_params = 0x80000100, | 473 | .boot_params = 0x80000100, |
| 474 | .map_io = am3517_evm_map_io, | 474 | .map_io = am3517_evm_map_io, |
| 475 | .reserve = omap_reserve, | ||
| 475 | .init_irq = am3517_evm_init_irq, | 476 | .init_irq = am3517_evm_init_irq, |
| 476 | .init_machine = am3517_evm_init, | 477 | .init_machine = am3517_evm_init, |
| 477 | .timer = &omap_timer, | 478 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index aa69fb99974..bd75642aee6 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
| @@ -346,6 +346,7 @@ MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon") | |||
| 346 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 346 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 347 | .boot_params = 0x80000100, | 347 | .boot_params = 0x80000100, |
| 348 | .map_io = omap_apollon_map_io, | 348 | .map_io = omap_apollon_map_io, |
| 349 | .reserve = omap_reserve, | ||
| 349 | .init_irq = omap_apollon_init_irq, | 350 | .init_irq = omap_apollon_init_irq, |
| 350 | .init_machine = omap_apollon_init, | 351 | .init_machine = omap_apollon_init, |
| 351 | .timer = &omap_timer, | 352 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index e679a2cc86c..bc4c3f80706 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
| @@ -837,6 +837,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
| 837 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 837 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, |
| 838 | .boot_params = 0x80000100, | 838 | .boot_params = 0x80000100, |
| 839 | .map_io = cm_t35_map_io, | 839 | .map_io = cm_t35_map_io, |
| 840 | .reserve = omap_reserve, | ||
| 840 | .init_irq = cm_t35_init_irq, | 841 | .init_irq = cm_t35_init_irq, |
| 841 | .init_machine = cm_t35_init, | 842 | .init_machine = cm_t35_init, |
| 842 | .timer = &omap_timer, | 843 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 77022b58881..922b7464807 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -825,6 +825,7 @@ MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") | |||
| 825 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 825 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, |
| 826 | .boot_params = 0x80000100, | 826 | .boot_params = 0x80000100, |
| 827 | .map_io = devkit8000_map_io, | 827 | .map_io = devkit8000_map_io, |
| 828 | .reserve = omap_reserve, | ||
| 828 | .init_irq = devkit8000_init_irq, | 829 | .init_irq = devkit8000_init_irq, |
| 829 | .init_machine = devkit8000_init, | 830 | .init_machine = devkit8000_init, |
| 830 | .timer = &omap_timer, | 831 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 16cc0686067..9242902d3a4 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -59,6 +59,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") | |||
| 59 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 59 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 60 | .boot_params = 0x80000100, | 60 | .boot_params = 0x80000100, |
| 61 | .map_io = omap_generic_map_io, | 61 | .map_io = omap_generic_map_io, |
| 62 | .reserve = omap_reserve, | ||
| 62 | .init_irq = omap_generic_init_irq, | 63 | .init_irq = omap_generic_init_irq, |
| 63 | .init_machine = omap_generic_init, | 64 | .init_machine = omap_generic_init, |
| 64 | .timer = &omap_timer, | 65 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 0665f2c8dc8..16703fdb351 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
| @@ -378,6 +378,7 @@ MACHINE_START(OMAP_H4, "OMAP2420 H4 board") | |||
| 378 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 378 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 379 | .boot_params = 0x80000100, | 379 | .boot_params = 0x80000100, |
| 380 | .map_io = omap_h4_map_io, | 380 | .map_io = omap_h4_map_io, |
| 381 | .reserve = omap_reserve, | ||
| 381 | .init_irq = omap_h4_init_irq, | 382 | .init_irq = omap_h4_init_irq, |
| 382 | .init_machine = omap_h4_init, | 383 | .init_machine = omap_h4_init, |
| 383 | .timer = &omap_timer, | 384 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index d55c57b761a..759e39d1a70 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
| @@ -543,6 +543,7 @@ MACHINE_START(IGEP0020, "IGEP v2 board") | |||
| 543 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 543 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 544 | .boot_params = 0x80000100, | 544 | .boot_params = 0x80000100, |
| 545 | .map_io = igep2_map_io, | 545 | .map_io = igep2_map_io, |
| 546 | .reserve = omap_reserve, | ||
| 546 | .init_irq = igep2_init_irq, | 547 | .init_irq = igep2_init_irq, |
| 547 | .init_machine = igep2_init, | 548 | .init_machine = igep2_init, |
| 548 | .timer = &omap_timer, | 549 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index fefd7e6e977..9cd2669113e 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -417,6 +417,7 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") | |||
| 417 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 417 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 418 | .boot_params = 0x80000100, | 418 | .boot_params = 0x80000100, |
| 419 | .map_io = omap_ldp_map_io, | 419 | .map_io = omap_ldp_map_io, |
| 420 | .reserve = omap_reserve, | ||
| 420 | .init_irq = omap_ldp_init_irq, | 421 | .init_irq = omap_ldp_init_irq, |
| 421 | .init_machine = omap_ldp_init, | 422 | .init_machine = omap_ldp_init, |
| 422 | .timer = &omap_timer, | 423 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 3ccc34ebdcc..2565ff08a22 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
| @@ -667,6 +667,7 @@ MACHINE_START(NOKIA_N800, "Nokia N800") | |||
| 667 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 667 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 668 | .boot_params = 0x80000100, | 668 | .boot_params = 0x80000100, |
| 669 | .map_io = n8x0_map_io, | 669 | .map_io = n8x0_map_io, |
| 670 | .reserve = omap_reserve, | ||
| 670 | .init_irq = n8x0_init_irq, | 671 | .init_irq = n8x0_init_irq, |
| 671 | .init_machine = n8x0_init_machine, | 672 | .init_machine = n8x0_init_machine, |
| 672 | .timer = &omap_timer, | 673 | .timer = &omap_timer, |
| @@ -677,6 +678,7 @@ MACHINE_START(NOKIA_N810, "Nokia N810") | |||
| 677 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 678 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 678 | .boot_params = 0x80000100, | 679 | .boot_params = 0x80000100, |
| 679 | .map_io = n8x0_map_io, | 680 | .map_io = n8x0_map_io, |
| 681 | .reserve = omap_reserve, | ||
| 680 | .init_irq = n8x0_init_irq, | 682 | .init_irq = n8x0_init_irq, |
| 681 | .init_machine = n8x0_init_machine, | 683 | .init_machine = n8x0_init_machine, |
| 682 | .timer = &omap_timer, | 684 | .timer = &omap_timer, |
| @@ -687,6 +689,7 @@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX") | |||
| 687 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 689 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 688 | .boot_params = 0x80000100, | 690 | .boot_params = 0x80000100, |
| 689 | .map_io = n8x0_map_io, | 691 | .map_io = n8x0_map_io, |
| 692 | .reserve = omap_reserve, | ||
| 690 | .init_irq = n8x0_init_irq, | 693 | .init_irq = n8x0_init_irq, |
| 691 | .init_machine = n8x0_init_machine, | 694 | .init_machine = n8x0_init_machine, |
| 692 | .timer = &omap_timer, | 695 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 69b154cdc75..0ab0c26db4d 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -519,6 +519,7 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | |||
| 519 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 519 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 520 | .boot_params = 0x80000100, | 520 | .boot_params = 0x80000100, |
| 521 | .map_io = omap3_beagle_map_io, | 521 | .map_io = omap3_beagle_map_io, |
| 522 | .reserve = omap_reserve, | ||
| 522 | .init_irq = omap3_beagle_init_irq, | 523 | .init_irq = omap3_beagle_init_irq, |
| 523 | .init_machine = omap3_beagle_init, | 524 | .init_machine = omap3_beagle_init, |
| 524 | .timer = &omap_timer, | 525 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index b9526101381..a3d2e285e11 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -727,6 +727,7 @@ MACHINE_START(OMAP3EVM, "OMAP3 EVM") | |||
| 727 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 727 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 728 | .boot_params = 0x80000100, | 728 | .boot_params = 0x80000100, |
| 729 | .map_io = omap3_evm_map_io, | 729 | .map_io = omap3_evm_map_io, |
| 730 | .reserve = omap_reserve, | ||
| 730 | .init_irq = omap3_evm_init_irq, | 731 | .init_irq = omap3_evm_init_irq, |
| 731 | .init_machine = omap3_evm_init, | 732 | .init_machine = omap3_evm_init, |
| 732 | .timer = &omap_timer, | 733 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index db06dc910ba..c0f4f12eba5 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
| @@ -601,6 +601,7 @@ MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console") | |||
| 601 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 601 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 602 | .boot_params = 0x80000100, | 602 | .boot_params = 0x80000100, |
| 603 | .map_io = omap3pandora_map_io, | 603 | .map_io = omap3pandora_map_io, |
| 604 | .reserve = omap_reserve, | ||
| 604 | .init_irq = omap3pandora_init_irq, | 605 | .init_irq = omap3pandora_init_irq, |
| 605 | .init_machine = omap3pandora_init, | 606 | .init_machine = omap3pandora_init, |
| 606 | .timer = &omap_timer, | 607 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 2f5f8233dd5..f05b867c585 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
| @@ -571,6 +571,7 @@ MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board") | |||
| 571 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 571 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, |
| 572 | .boot_params = 0x80000100, | 572 | .boot_params = 0x80000100, |
| 573 | .map_io = omap3_touchbook_map_io, | 573 | .map_io = omap3_touchbook_map_io, |
| 574 | .reserve = omap_reserve, | ||
| 574 | .init_irq = omap3_touchbook_init_irq, | 575 | .init_irq = omap3_touchbook_init_irq, |
| 575 | .init_machine = omap3_touchbook_init, | 576 | .init_machine = omap3_touchbook_init, |
| 576 | .timer = &omap_timer, | 577 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 79ac41400c2..87acb2f198e 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -495,6 +495,7 @@ MACHINE_START(OVERO, "Gumstix Overo") | |||
| 495 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 495 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 496 | .boot_params = 0x80000100, | 496 | .boot_params = 0x80000100, |
| 497 | .map_io = overo_map_io, | 497 | .map_io = overo_map_io, |
| 498 | .reserve = omap_reserve, | ||
| 498 | .init_irq = overo_init_irq, | 499 | .init_irq = overo_init_irq, |
| 499 | .init_machine = overo_init, | 500 | .init_machine = overo_init, |
| 500 | .timer = &omap_timer, | 501 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 1b86b5bb87a..3bd956f9e19 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -154,6 +154,7 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") | |||
| 154 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, | 154 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
| 155 | .boot_params = 0x80000100, | 155 | .boot_params = 0x80000100, |
| 156 | .map_io = rx51_map_io, | 156 | .map_io = rx51_map_io, |
| 157 | .reserve = omap_reserve, | ||
| 157 | .init_irq = rx51_init_irq, | 158 | .init_irq = rx51_init_irq, |
| 158 | .init_machine = rx51_init, | 159 | .init_machine = rx51_init, |
| 159 | .timer = &omap_timer, | 160 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index 803ef14cbf2..ffe188cb18e 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
| @@ -95,6 +95,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | |||
| 95 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, | 95 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, |
| 96 | .boot_params = 0x80000100, | 96 | .boot_params = 0x80000100, |
| 97 | .map_io = omap_zoom2_map_io, | 97 | .map_io = omap_zoom2_map_io, |
| 98 | .reserve = omap_reserve, | ||
| 98 | .init_irq = omap_zoom2_init_irq, | 99 | .init_irq = omap_zoom2_init_irq, |
| 99 | .init_machine = omap_zoom2_init, | 100 | .init_machine = omap_zoom2_init, |
| 100 | .timer = &omap_timer, | 101 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 33147042485..5b605eba3e7 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c | |||
| @@ -77,6 +77,7 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | |||
| 77 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, | 77 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, |
| 78 | .boot_params = 0x80000100, | 78 | .boot_params = 0x80000100, |
| 79 | .map_io = omap_zoom_map_io, | 79 | .map_io = omap_zoom_map_io, |
| 80 | .reserve = omap_reserve, | ||
| 80 | .init_irq = omap_zoom_init_irq, | 81 | .init_irq = omap_zoom_init_irq, |
| 81 | .init_machine = omap_zoom_init, | 82 | .init_machine = omap_zoom_init, |
| 82 | .timer = &omap_timer, | 83 | .timer = &omap_timer, |
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 41b155acfca..d33744117ce 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
| @@ -3166,6 +3166,10 @@ static struct clk uart4_ick_am35xx = { | |||
| 3166 | .recalc = &followparent_recalc, | 3166 | .recalc = &followparent_recalc, |
| 3167 | }; | 3167 | }; |
| 3168 | 3168 | ||
| 3169 | static struct clk dummy_apb_pclk = { | ||
| 3170 | .name = "apb_pclk", | ||
| 3171 | .ops = &clkops_null, | ||
| 3172 | }; | ||
| 3169 | 3173 | ||
| 3170 | /* | 3174 | /* |
| 3171 | * clkdev | 3175 | * clkdev |
| @@ -3173,6 +3177,7 @@ static struct clk uart4_ick_am35xx = { | |||
| 3173 | 3177 | ||
| 3174 | /* XXX At some point we should rename this file to clock3xxx_data.c */ | 3178 | /* XXX At some point we should rename this file to clock3xxx_data.c */ |
| 3175 | static struct omap_clk omap3xxx_clks[] = { | 3179 | static struct omap_clk omap3xxx_clks[] = { |
| 3180 | CLK(NULL, "apb_pclk", &dummy_apb_pclk, CK_3XXX), | ||
| 3176 | CLK(NULL, "omap_32k_fck", &omap_32k_fck, CK_3XXX), | 3181 | CLK(NULL, "omap_32k_fck", &omap_32k_fck, CK_3XXX), |
| 3177 | CLK(NULL, "virt_12m_ck", &virt_12m_ck, CK_3XXX), | 3182 | CLK(NULL, "virt_12m_ck", &virt_12m_ck, CK_3XXX), |
| 3178 | CLK(NULL, "virt_13m_ck", &virt_13m_ck, CK_3XXX), | 3183 | CLK(NULL, "virt_13m_ck", &virt_13m_ck, CK_3XXX), |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3cfb425ea67..4e1f53d0b88 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <plat/sdrc.h> | 33 | #include <plat/sdrc.h> |
| 34 | #include <plat/gpmc.h> | 34 | #include <plat/gpmc.h> |
| 35 | #include <plat/serial.h> | 35 | #include <plat/serial.h> |
| 36 | #include <plat/vram.h> | ||
| 37 | 36 | ||
| 38 | #include "clock2xxx.h" | 37 | #include "clock2xxx.h" |
| 39 | #include "clock3xxx.h" | 38 | #include "clock3xxx.h" |
| @@ -241,8 +240,6 @@ static void __init _omap2_map_common_io(void) | |||
| 241 | 240 | ||
| 242 | omap2_check_revision(); | 241 | omap2_check_revision(); |
| 243 | omap_sram_init(); | 242 | omap_sram_init(); |
| 244 | omapfb_reserve_sdram(); | ||
| 245 | omap_vram_reserve_sdram(); | ||
| 246 | } | 243 | } |
| 247 | 244 | ||
| 248 | #ifdef CONFIG_ARCH_OMAP2420 | 245 | #ifdef CONFIG_ARCH_OMAP2420 |
