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-2430sdp.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-2430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 2028464cf5b9..a4f43ee09934 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -144,7 +144,6 @@ static struct omap_board_config_kernel sdp2430_config[] __initdata = { | |||
144 | static void __init omap_2430sdp_init_early(void) | 144 | static void __init omap_2430sdp_init_early(void) |
145 | { | 145 | { |
146 | omap2_init_common_infrastructure(); | 146 | omap2_init_common_infrastructure(); |
147 | omap2_init_common_devices(NULL, NULL); | ||
148 | } | 147 | } |
149 | 148 | ||
150 | static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = { | 149 | static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = { |
@@ -235,6 +234,7 @@ static void __init omap_2430sdp_init(void) | |||
235 | 234 | ||
236 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); | 235 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); |
237 | omap_serial_init(); | 236 | omap_serial_init(); |
237 | omap_sdrc_init(NULL, NULL); | ||
238 | omap2_hsmmc_init(mmc); | 238 | omap2_hsmmc_init(mmc); |
239 | omap2_usbfs_init(&sdp2430_usb_config); | 239 | omap2_usbfs_init(&sdp2430_usb_config); |
240 | 240 | ||