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-omap3logic.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-omap3logic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 703aeb5b8fd..2e0b0116a83 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -185,7 +185,6 @@ static inline void __init board_smsc911x_init(void) | |||
185 | static void __init omap3logic_init_early(void) | 185 | static void __init omap3logic_init_early(void) |
186 | { | 186 | { |
187 | omap2_init_common_infrastructure(); | 187 | omap2_init_common_infrastructure(); |
188 | omap2_init_common_devices(NULL, NULL); | ||
189 | } | 188 | } |
190 | 189 | ||
191 | #ifdef CONFIG_OMAP_MUX | 190 | #ifdef CONFIG_OMAP_MUX |
@@ -200,6 +199,7 @@ static void __init omap3logic_init(void) | |||
200 | omap3torpedo_fix_pbias_voltage(); | 199 | omap3torpedo_fix_pbias_voltage(); |
201 | omap3logic_i2c_init(); | 200 | omap3logic_i2c_init(); |
202 | omap_serial_init(); | 201 | omap_serial_init(); |
202 | omap_sdrc_init(NULL, NULL); | ||
203 | board_mmc_init(); | 203 | board_mmc_init(); |
204 | board_smsc911x_init(); | 204 | board_smsc911x_init(); |
205 | 205 | ||