aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-osk.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r--arch/arm/mach-omap1/board-osk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e9dd79149a8e..30bdbdb93636 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -284,8 +284,6 @@ static void __init osk_init_irq(void)
284 omap1_init_common_hw(); 284 omap1_init_common_hw();
285 omap_init_irq(); 285 omap_init_irq();
286 omap_gpio_init(); 286 omap_gpio_init();
287 osk_init_smc91x();
288 osk_init_cf();
289} 287}
290 288
291static struct omap_usb_config osk_usb_config __initdata = { 289static struct omap_usb_config osk_usb_config __initdata = {
@@ -541,6 +539,9 @@ static void __init osk_init(void)
541{ 539{
542 u32 l; 540 u32 l;
543 541
542 osk_init_smc91x();
543 osk_init_cf();
544
544 /* Workaround for wrong CS3 (NOR flash) timing 545 /* Workaround for wrong CS3 (NOR flash) timing
545 * There are some U-Boot versions out there which configure 546 * There are some U-Boot versions out there which configure
546 * wrong CS3 memory timings. This mainly leads to CRC 547 * wrong CS3 memory timings. This mainly leads to CRC