aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-08-23 02:57:23 -0400
committerTony Lindgren <tony@atomide.com>2011-08-24 07:48:10 -0400
commita4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6 (patch)
treed035c4251bdd45aff89e9e6c72ba644ec679f7b7 /arch/arm/mach-omap2/board-n8x0.c
parentf41caddbe73f52a42f529d668ce47b4d693fd2c0 (diff)
ARM: OMAP: Move omap2_init_common_devices out of init_early
There's no need to call omap2_init_common_devices from init_early. It no longer does anything else except reprogram the memory timings for some boards, so it's better to do it later so we have a chance to get console messages if something goes wrong. Move it to happen after omap_serial_init gets called. And while patching it anyways, rename it to omap_sdrc_init as suggested by Benoit Cousson <b-cousson@ti.com>. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index e11f0c5d608a..2545a4aaee5a 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -625,7 +625,6 @@ static void __init n8x0_map_io(void)
625static void __init n8x0_init_early(void) 625static void __init n8x0_init_early(void)
626{ 626{
627 omap2_init_common_infrastructure(); 627 omap2_init_common_infrastructure();
628 omap2_init_common_devices(NULL, NULL);
629} 628}
630 629
631#ifdef CONFIG_OMAP_MUX 630#ifdef CONFIG_OMAP_MUX
@@ -689,6 +688,7 @@ static void __init n8x0_init_machine(void)
689 i2c_register_board_info(2, n810_i2c_board_info_2, 688 i2c_register_board_info(2, n810_i2c_board_info_2,
690 ARRAY_SIZE(n810_i2c_board_info_2)); 689 ARRAY_SIZE(n810_i2c_board_info_2));
691 board_serial_init(); 690 board_serial_init();
691 omap_sdrc_init(NULL, NULL);
692 gpmc_onenand_init(board_onenand_data); 692 gpmc_onenand_init(board_onenand_data);
693 n8x0_mmc_init(); 693 n8x0_mmc_init();
694 n8x0_usb_init(); 694 n8x0_usb_init();