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-am3517evm.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-am3517evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index f3006c304150..b5391a1148d2 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -365,7 +365,6 @@ static struct omap_dss_board_info am3517_evm_dss_data = { | |||
365 | static void __init am3517_evm_init_early(void) | 365 | static void __init am3517_evm_init_early(void) |
366 | { | 366 | { |
367 | omap2_init_common_infrastructure(); | 367 | omap2_init_common_infrastructure(); |
368 | omap2_init_common_devices(NULL, NULL); | ||
369 | } | 368 | } |
370 | 369 | ||
371 | static struct omap_musb_board_data musb_board_data = { | 370 | static struct omap_musb_board_data musb_board_data = { |
@@ -469,6 +468,7 @@ static void __init am3517_evm_init(void) | |||
469 | am3517_evm_i2c_init(); | 468 | am3517_evm_i2c_init(); |
470 | omap_display_init(&am3517_evm_dss_data); | 469 | omap_display_init(&am3517_evm_dss_data); |
471 | omap_serial_init(); | 470 | omap_serial_init(); |
471 | omap_sdrc_init(NULL, NULL); | ||
472 | 472 | ||
473 | /* Configure GPIO for EHCI port */ | 473 | /* Configure GPIO for EHCI port */ |
474 | omap_mux_init_gpio(57, OMAP_PIN_OUTPUT); | 474 | omap_mux_init_gpio(57, OMAP_PIN_OUTPUT); |