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-cm-t35.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-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 3af8aab435b5..0f2549659879 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -474,8 +474,6 @@ static void __init cm_t35_init_i2c(void) | |||
474 | static void __init cm_t35_init_early(void) | 474 | static void __init cm_t35_init_early(void) |
475 | { | 475 | { |
476 | omap2_init_common_infrastructure(); | 476 | omap2_init_common_infrastructure(); |
477 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
478 | mt46h32m32lf6_sdrc_params); | ||
479 | } | 477 | } |
480 | 478 | ||
481 | #ifdef CONFIG_OMAP_MUX | 479 | #ifdef CONFIG_OMAP_MUX |
@@ -610,6 +608,8 @@ static void __init cm_t3x_common_init(void) | |||
610 | omap_board_config_size = ARRAY_SIZE(cm_t35_config); | 608 | omap_board_config_size = ARRAY_SIZE(cm_t35_config); |
611 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); | 609 | omap3_mux_init(board_mux, OMAP_PACKAGE_CUS); |
612 | omap_serial_init(); | 610 | omap_serial_init(); |
611 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
612 | mt46h32m32lf6_sdrc_params); | ||
613 | cm_t35_init_i2c(); | 613 | cm_t35_init_i2c(); |
614 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); | 614 | omap_ads7846_init(1, CM_T35_GPIO_PENDOWN, 0, NULL); |
615 | cm_t35_init_ethernet(); | 615 | cm_t35_init_ethernet(); |