aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 323c3809ce39..c2a0fca4aa53 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -625,13 +625,12 @@ static struct spi_board_info omap3evm_spi_board_info[] = {
625static struct omap_board_config_kernel omap3_evm_config[] __initdata = { 625static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
626}; 626};
627 627
628static void __init omap3_evm_init_irq(void) 628static void __init omap3_evm_init_early(void)
629{ 629{
630 omap_board_config = omap3_evm_config; 630 omap_board_config = omap3_evm_config;
631 omap_board_config_size = ARRAY_SIZE(omap3_evm_config); 631 omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
632 omap2_init_common_infrastructure(); 632 omap2_init_common_infrastructure();
633 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); 633 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
634 omap_init_irq();
635} 634}
636 635
637static struct platform_device *omap3_evm_devices[] __initdata = { 636static struct platform_device *omap3_evm_devices[] __initdata = {
@@ -720,9 +719,10 @@ static void __init omap3_evm_init(void)
720MACHINE_START(OMAP3EVM, "OMAP3 EVM") 719MACHINE_START(OMAP3EVM, "OMAP3 EVM")
721 /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ 720 /* Maintainer: Syed Mohammed Khasim - Texas Instruments */
722 .boot_params = 0x80000100, 721 .boot_params = 0x80000100,
723 .map_io = omap3_map_io,
724 .reserve = omap_reserve, 722 .reserve = omap_reserve,
725 .init_irq = omap3_evm_init_irq, 723 .map_io = omap3_map_io,
724 .init_early = omap3_evm_init_early,
725 .init_irq = omap_init_irq,
726 .init_machine = omap3_evm_init, 726 .init_machine = omap3_evm_init,
727 .timer = &omap_timer, 727 .timer = &omap_timer,
728MACHINE_END 728MACHINE_END