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-apollon.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-apollon.c')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 70211703ff9f..6d88ffa2477d 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -276,7 +276,6 @@ static struct omap_board_config_kernel apollon_config[] __initdata = { | |||
276 | static void __init omap_apollon_init_early(void) | 276 | static void __init omap_apollon_init_early(void) |
277 | { | 277 | { |
278 | omap2_init_common_infrastructure(); | 278 | omap2_init_common_infrastructure(); |
279 | omap2_init_common_devices(NULL, NULL); | ||
280 | } | 279 | } |
281 | 280 | ||
282 | static struct gpio apollon_gpio_leds[] __initdata = { | 281 | static struct gpio apollon_gpio_leds[] __initdata = { |
@@ -340,6 +339,7 @@ static void __init omap_apollon_init(void) | |||
340 | */ | 339 | */ |
341 | platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices)); | 340 | platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices)); |
342 | omap_serial_init(); | 341 | omap_serial_init(); |
342 | omap_sdrc_init(NULL, NULL); | ||
343 | } | 343 | } |
344 | 344 | ||
345 | static void __init omap_apollon_map_io(void) | 345 | static void __init omap_apollon_map_io(void) |