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-generic.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-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 54db41a84a9b..5223898f50e4 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -36,12 +36,12 @@ static struct omap_board_config_kernel generic_config[] = { | |||
36 | static void __init omap_generic_init_early(void) | 36 | static void __init omap_generic_init_early(void) |
37 | { | 37 | { |
38 | omap2_init_common_infrastructure(); | 38 | omap2_init_common_infrastructure(); |
39 | omap2_init_common_devices(NULL, NULL); | ||
40 | } | 39 | } |
41 | 40 | ||
42 | static void __init omap_generic_init(void) | 41 | static void __init omap_generic_init(void) |
43 | { | 42 | { |
44 | omap_serial_init(); | 43 | omap_serial_init(); |
44 | omap_sdrc_init(NULL, NULL); | ||
45 | omap_board_config = generic_config; | 45 | omap_board_config = generic_config; |
46 | omap_board_config_size = ARRAY_SIZE(generic_config); | 46 | omap_board_config_size = ARRAY_SIZE(generic_config); |
47 | } | 47 | } |