diff options
author | Tony Lindgren <tony@atomide.com> | 2011-08-23 02:57:23 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-08-24 07:48:10 -0400 |
commit | a4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6 (patch) | |
tree | d035c4251bdd45aff89e9e6c72ba644ec679f7b7 /arch/arm/mach-omap2/board-overo.c | |
parent | f41caddbe73f52a42f529d668ce47b4d693fd2c0 (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-overo.c')
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index f949a9954d76..c3bd1af7a15d 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -481,8 +481,6 @@ static int __init overo_spi_init(void) | |||
481 | static void __init overo_init_early(void) | 481 | static void __init overo_init_early(void) |
482 | { | 482 | { |
483 | omap2_init_common_infrastructure(); | 483 | omap2_init_common_infrastructure(); |
484 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
485 | mt46h32m32lf6_sdrc_params); | ||
486 | } | 484 | } |
487 | 485 | ||
488 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { | 486 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
@@ -514,6 +512,8 @@ static void __init overo_init(void) | |||
514 | overo_i2c_init(); | 512 | overo_i2c_init(); |
515 | omap_display_init(&overo_dss_data); | 513 | omap_display_init(&overo_dss_data); |
516 | omap_serial_init(); | 514 | omap_serial_init(); |
515 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
516 | mt46h32m32lf6_sdrc_params); | ||
517 | omap_nand_flash_init(0, overo_nand_partitions, | 517 | omap_nand_flash_init(0, overo_nand_partitions, |
518 | ARRAY_SIZE(overo_nand_partitions)); | 518 | ARRAY_SIZE(overo_nand_partitions)); |
519 | usb_musb_init(NULL); | 519 | usb_musb_init(NULL); |