ARM: OMAP: Convert to use ->reserve method to reserve boot time memory

+1

arch/arm/mach-omap1/board-ams-delta.c

··· 301 301 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 302 302 .boot_params = 0x10000100, 303 303 .map_io = ams_delta_map_io, 304 + .reserve = omap_reserve, 304 305 .init_irq = ams_delta_init_irq, 305 306 .init_machine = ams_delta_init, 306 307 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-fsample.c

··· 378 378 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 379 379 .boot_params = 0x10000100, 380 380 .map_io = omap_fsample_map_io, 381 + .reserve = omap_reserve, 381 382 .init_irq = omap_fsample_init_irq, 382 383 .init_machine = omap_fsample_init, 383 384 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-generic.c

··· 98 98 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 99 99 .boot_params = 0x10000100, 100 100 .map_io = omap_generic_map_io, 101 + .reserve = omap_reserve, 101 102 .init_irq = omap_generic_init_irq, 102 103 .init_machine = omap_generic_init, 103 104 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-h2.c

··· 467 467 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 468 468 .boot_params = 0x10000100, 469 469 .map_io = h2_map_io, 470 + .reserve = omap_reserve, 470 471 .init_irq = h2_init_irq, 471 472 .init_machine = h2_init, 472 473 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-h3.c

··· 437 437 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 438 438 .boot_params = 0x10000100, 439 439 .map_io = h3_map_io, 440 + .reserve = omap_reserve, 440 441 .init_irq = h3_init_irq, 441 442 .init_machine = h3_init, 442 443 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-htcherald.c

··· 304 304 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 305 305 .boot_params = 0x10000100, 306 306 .map_io = htcherald_map_io, 307 + .reserve = omap_reserve, 307 308 .init_irq = htcherald_init_irq, 308 309 .init_machine = htcherald_init, 309 310 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-innovator.c

··· 463 463 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 464 464 .boot_params = 0x10000100, 465 465 .map_io = innovator_map_io, 466 + .reserve = omap_reserve, 466 467 .init_irq = innovator_init_irq, 467 468 .init_machine = innovator_init, 468 469 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-nokia770.c

··· 400 400 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 401 401 .boot_params = 0x10000100, 402 402 .map_io = omap_nokia770_map_io, 403 + .reserve = omap_reserve, 403 404 .init_irq = omap_nokia770_init_irq, 404 405 .init_machine = omap_nokia770_init, 405 406 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-osk.c

··· 584 584 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 585 585 .boot_params = 0x10000100, 586 586 .map_io = osk_map_io, 587 + .reserve = omap_reserve, 587 588 .init_irq = osk_init_irq, 588 589 .init_machine = osk_init, 589 590 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-palmte.c

··· 373 373 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 374 374 .boot_params = 0x10000100, 375 375 .map_io = omap_palmte_map_io, 376 + .reserve = omap_reserve, 376 377 .init_irq = omap_palmte_init_irq, 377 378 .init_machine = omap_palmte_init, 378 379 .timer = &omap_timer,

+1

arch/arm/mach-omap1/board-palmtt.c

··· 321 321 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 322 322 .boot_params = 0x10000100, 323 323 .map_io = omap_palmtt_map_io, 324 + .reserve = omap_reserve, 324 325 .init_irq = omap_palmtt_init_irq, 325 326 .init_machine = omap_palmtt_init, 326 327 .timer = &omap_timer,

+8 -6

arch/arm/mach-omap1/board-palmz71.c

··· 338 338 } 339 339 340 340 MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") 341 - .phys_io = 0xfff00000, 342 - .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 343 - .boot_params = 0x10000100,.map_io = omap_palmz71_map_io, 344 - .init_irq = omap_palmz71_init_irq, 345 - .init_machine = omap_palmz71_init, 346 - .timer = &omap_timer, 341 + .phys_io = 0xfff00000, 342 + .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 343 + .boot_params = 0x10000100, 344 + .map_io = omap_palmz71_map_io, 345 + .reserve = omap_reserve, 346 + .init_irq = omap_palmz71_init_irq, 347 + .init_machine = omap_palmz71_init, 348 + .timer = &omap_timer, 347 349 MACHINE_END

+1

arch/arm/mach-omap1/board-perseus2.c

··· 339 339 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 340 340 .boot_params = 0x10000100, 341 341 .map_io = omap_perseus2_map_io, 342 + .reserve = omap_reserve, 342 343 .init_irq = omap_perseus2_init_irq, 343 344 .init_machine = omap_perseus2_init, 344 345 .timer = &omap_timer,

+2 -1

arch/arm/mach-omap1/board-sx1.c

··· 423 423 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 424 424 .boot_params = 0x10000100, 425 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 428 .init_machine = omap_sx1_init, 428 429 .timer = &omap_timer, 429 430 MACHINE_END

+1

arch/arm/mach-omap1/board-voiceblue.c

··· 287 287 .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, 288 288 .boot_params = 0x10000100, 289 289 .map_io = voiceblue_map_io, 290 + .reserve = omap_reserve, 290 291 .init_irq = voiceblue_init_irq, 291 292 .init_machine = voiceblue_init, 292 293 .timer = &omap_timer,

-2

arch/arm/mach-omap1/io.c

··· 22 22 23 23 extern void omap_check_revision(void); 24 24 extern void omap_sram_init(void); 25 - extern void omapfb_reserve_sdram(void); 26 25 27 26 /* 28 27 * The machine specific code may provide the extra mapping besides the ··· 121 122 #endif 122 123 123 124 omap_sram_init(); 124 - omapfb_reserve_sdram(); 125 125 } 126 126 127 127 /*

+1

arch/arm/mach-omap2/board-2430sdp.c

··· 248 248 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 249 249 .boot_params = 0x80000100, 250 250 .map_io = omap_2430sdp_map_io, 251 + .reserve = omap_reserve, 251 252 .init_irq = omap_2430sdp_init_irq, 252 253 .init_machine = omap_2430sdp_init, 253 254 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-3430sdp.c

··· 815 815 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 816 816 .boot_params = 0x80000100, 817 817 .map_io = omap_3430sdp_map_io, 818 + .reserve = omap_reserve, 818 819 .init_irq = omap_3430sdp_init_irq, 819 820 .init_machine = omap_3430sdp_init, 820 821 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-3630sdp.c

··· 108 108 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 109 109 .boot_params = 0x80000100, 110 110 .map_io = omap_sdp_map_io, 111 + .reserve = omap_reserve, 111 112 .init_irq = omap_sdp_init_irq, 112 113 .init_machine = omap_sdp_init, 113 114 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-4430sdp.c

··· 402 402 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 403 403 .boot_params = 0x80000100, 404 404 .map_io = omap_4430sdp_map_io, 405 + .reserve = omap_reserve, 405 406 .init_irq = omap_4430sdp_init_irq, 406 407 .init_machine = omap_4430sdp_init, 407 408 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-am3517evm.c

··· 472 472 .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, 473 473 .boot_params = 0x80000100, 474 474 .map_io = am3517_evm_map_io, 475 + .reserve = omap_reserve, 475 476 .init_irq = am3517_evm_init_irq, 476 477 .init_machine = am3517_evm_init, 477 478 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-apollon.c

··· 346 346 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 347 347 .boot_params = 0x80000100, 348 348 .map_io = omap_apollon_map_io, 349 + .reserve = omap_reserve, 349 350 .init_irq = omap_apollon_init_irq, 350 351 .init_machine = omap_apollon_init, 351 352 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-cm-t35.c

··· 837 837 .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, 838 838 .boot_params = 0x80000100, 839 839 .map_io = cm_t35_map_io, 840 + .reserve = omap_reserve, 840 841 .init_irq = cm_t35_init_irq, 841 842 .init_machine = cm_t35_init, 842 843 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-devkit8000.c

··· 825 825 .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, 826 826 .boot_params = 0x80000100, 827 827 .map_io = devkit8000_map_io, 828 + .reserve = omap_reserve, 828 829 .init_irq = devkit8000_init_irq, 829 830 .init_machine = devkit8000_init, 830 831 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-generic.c

··· 59 59 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 60 60 .boot_params = 0x80000100, 61 61 .map_io = omap_generic_map_io, 62 + .reserve = omap_reserve, 62 63 .init_irq = omap_generic_init_irq, 63 64 .init_machine = omap_generic_init, 64 65 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-h4.c

··· 378 378 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 379 379 .boot_params = 0x80000100, 380 380 .map_io = omap_h4_map_io, 381 + .reserve = omap_reserve, 381 382 .init_irq = omap_h4_init_irq, 382 383 .init_machine = omap_h4_init, 383 384 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-igep0020.c

··· 543 543 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 544 544 .boot_params = 0x80000100, 545 545 .map_io = igep2_map_io, 546 + .reserve = omap_reserve, 546 547 .init_irq = igep2_init_irq, 547 548 .init_machine = igep2_init, 548 549 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-ldp.c

··· 417 417 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 418 418 .boot_params = 0x80000100, 419 419 .map_io = omap_ldp_map_io, 420 + .reserve = omap_reserve, 420 421 .init_irq = omap_ldp_init_irq, 421 422 .init_machine = omap_ldp_init, 422 423 .timer = &omap_timer,

+3

arch/arm/mach-omap2/board-n8x0.c

··· 667 667 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 668 668 .boot_params = 0x80000100, 669 669 .map_io = n8x0_map_io, 670 + .reserve = omap_reserve, 670 671 .init_irq = n8x0_init_irq, 671 672 .init_machine = n8x0_init_machine, 672 673 .timer = &omap_timer, ··· 678 677 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 679 678 .boot_params = 0x80000100, 680 679 .map_io = n8x0_map_io, 680 + .reserve = omap_reserve, 681 681 .init_irq = n8x0_init_irq, 682 682 .init_machine = n8x0_init_machine, 683 683 .timer = &omap_timer, ··· 689 687 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 690 688 .boot_params = 0x80000100, 691 689 .map_io = n8x0_map_io, 690 + .reserve = omap_reserve, 692 691 .init_irq = n8x0_init_irq, 693 692 .init_machine = n8x0_init_machine, 694 693 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-omap3beagle.c

··· 519 519 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 520 520 .boot_params = 0x80000100, 521 521 .map_io = omap3_beagle_map_io, 522 + .reserve = omap_reserve, 522 523 .init_irq = omap3_beagle_init_irq, 523 524 .init_machine = omap3_beagle_init, 524 525 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-omap3evm.c

··· 727 727 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 728 728 .boot_params = 0x80000100, 729 729 .map_io = omap3_evm_map_io, 730 + .reserve = omap_reserve, 730 731 .init_irq = omap3_evm_init_irq, 731 732 .init_machine = omap3_evm_init, 732 733 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-omap3pandora.c

··· 601 601 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 602 602 .boot_params = 0x80000100, 603 603 .map_io = omap3pandora_map_io, 604 + .reserve = omap_reserve, 604 605 .init_irq = omap3pandora_init_irq, 605 606 .init_machine = omap3pandora_init, 606 607 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-omap3touchbook.c

··· 571 571 .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, 572 572 .boot_params = 0x80000100, 573 573 .map_io = omap3_touchbook_map_io, 574 + .reserve = omap_reserve, 574 575 .init_irq = omap3_touchbook_init_irq, 575 576 .init_machine = omap3_touchbook_init, 576 577 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-overo.c

··· 495 495 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 496 496 .boot_params = 0x80000100, 497 497 .map_io = overo_map_io, 498 + .reserve = omap_reserve, 498 499 .init_irq = overo_init_irq, 499 500 .init_machine = overo_init, 500 501 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-rx51.c

··· 154 154 .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, 155 155 .boot_params = 0x80000100, 156 156 .map_io = rx51_map_io, 157 + .reserve = omap_reserve, 157 158 .init_irq = rx51_init_irq, 158 159 .init_machine = rx51_init, 159 160 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-zoom2.c

··· 95 95 .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, 96 96 .boot_params = 0x80000100, 97 97 .map_io = omap_zoom2_map_io, 98 + .reserve = omap_reserve, 98 99 .init_irq = omap_zoom2_init_irq, 99 100 .init_machine = omap_zoom2_init, 100 101 .timer = &omap_timer,

+1

arch/arm/mach-omap2/board-zoom3.c

··· 77 77 .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, 78 78 .boot_params = 0x80000100, 79 79 .map_io = omap_zoom_map_io, 80 + .reserve = omap_reserve, 80 81 .init_irq = omap_zoom_init_irq, 81 82 .init_machine = omap_zoom_init, 82 83 .timer = &omap_timer,

-3

arch/arm/mach-omap2/io.c

··· 33 33 #include <plat/sdrc.h> 34 34 #include <plat/gpmc.h> 35 35 #include <plat/serial.h> 36 - #include <plat/vram.h> 37 36 38 37 #include "clock2xxx.h" 39 38 #include "clock3xxx.h" ··· 240 241 241 242 omap2_check_revision(); 242 243 omap_sram_init(); 243 - omapfb_reserve_sdram(); 244 - omap_vram_reserve_sdram(); 245 244 } 246 245 247 246 #ifdef CONFIG_ARCH_OMAP2420

+8

arch/arm/plat-omap/common.c

··· 22 22 #include <linux/serial_reg.h> 23 23 #include <linux/clk.h> 24 24 #include <linux/io.h> 25 + #include <linux/omapfb.h> 25 26 26 27 #include <mach/hardware.h> 27 28 #include <asm/system.h> ··· 36 35 #include <plat/mux.h> 37 36 #include <plat/fpga.h> 38 37 #include <plat/serial.h> 38 + #include <plat/vram.h> 39 39 40 40 #include <plat/clock.h> 41 41 ··· 82 80 return get_config(tag, NO_LENGTH_CHECK, 0, len); 83 81 } 84 82 EXPORT_SYMBOL(omap_get_var_config); 83 + 84 + void __init omap_reserve(void) 85 + { 86 + omapfb_reserve_sdram(); 87 + omap_vram_reserve_sdram(); 88 + } 85 89 86 90 /* 87 91 * 32KHz clocksource ... always available, on pretty most chips except

+2

arch/arm/plat-omap/include/plat/common.h

··· 34 34 extern void omap_map_common_io(void); 35 35 extern struct sys_timer omap_timer; 36 36 37 + extern void omap_reserve(void); 38 + 37 39 /* 38 40 * IO bases for various OMAP processors 39 41 * Except the tap base, rest all the io bases