summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-10 09:51:29 -0800
committerTony Lindgren <tony@atomide.com>2011-03-10 09:51:29 -0800
commit42924355204bd83d799bd151211ae6e014982849 (patch)
treea2938faaefb04c6f430e7fc10031f5187a7bf0a2
parent0dde52a9f5330eec240660191a94b51bd911ffcd (diff)
downloadop-kernel-dev-42924355204bd83d799bd151211ae6e014982849.zip
op-kernel-dev-42924355204bd83d799bd151211ae6e014982849.tar.gz
omap: Fix H4 init_irq to not call h4_init_flash
There should be no reason to call h4_init_flash this early. It causes problems as things are not yet initialized. Tested-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/board-h4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 7e6bf4f..bac7933 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -299,7 +299,6 @@ static void __init omap_h4_init_early(void)
static void __init omap_h4_init_irq(void)
{
omap_init_irq();
- h4_init_flash();
}
static struct at24_platform_data m24c01 = {
@@ -372,6 +371,7 @@ static void __init omap_h4_init(void)
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
+ h4_init_flash();
}
static void __init omap_h4_map_io(void)
OpenPOWER on IntegriCloud