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-t3517.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-t3517.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 05c72f4c1b57..88e1f74433e6 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
@@ -254,7 +254,6 @@ static struct omap_board_config_kernel cm_t3517_config[] __initdata = { | |||
254 | static void __init cm_t3517_init_early(void) | 254 | static void __init cm_t3517_init_early(void) |
255 | { | 255 | { |
256 | omap2_init_common_infrastructure(); | 256 | omap2_init_common_infrastructure(); |
257 | omap2_init_common_devices(NULL, NULL); | ||
258 | } | 257 | } |
259 | 258 | ||
260 | #ifdef CONFIG_OMAP_MUX | 259 | #ifdef CONFIG_OMAP_MUX |
@@ -289,6 +288,7 @@ static void __init cm_t3517_init(void) | |||
289 | { | 288 | { |
290 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 289 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
291 | omap_serial_init(); | 290 | omap_serial_init(); |
291 | omap_sdrc_init(NULL, NULL); | ||
292 | omap_board_config = cm_t3517_config; | 292 | omap_board_config = cm_t3517_config; |
293 | omap_board_config_size = ARRAY_SIZE(cm_t3517_config); | 293 | omap_board_config_size = ARRAY_SIZE(cm_t3517_config); |
294 | cm_t3517_init_leds(); | 294 | cm_t3517_init_leds(); |