ARM: OMAP: Change CONFIG_OMAP_SERIAL_WAKE to use late_initcall

Change CONFIG_OMAP_SERIAL_WAKE to use late_initcall. This avoids
need for early GPIO init.

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 2bef59aee51e0ca7b66522c62874939b0b51a050..efcae93566d7c6bb7a703769b010d605f037f837 100644 (file)
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -259,7 +259,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
        enable_irq_wake(OMAP_GPIO_IRQ(gpio_nr));
 }
 
-static void __init omap_serial_wakeup_init(void)
+static int __init omap_serial_wakeup_init(void)
 {
        if (!cpu_is_omap16xx())
                return;
@@ -270,15 +270,15 @@ static void __init omap_serial_wakeup_init(void)
                omap_serial_set_port_wakeup(18);
        if (uart3_ck != NULL)
                omap_serial_set_port_wakeup(49);
+
+       return 0;
 }
+late_initcall(omap_serial_wakeup_init);
 
 #endif /* CONFIG_OMAP_SERIAL_WAKE */
 
 static int __init omap_init(void)
 {
-#ifdef CONFIG_PM
-       omap_serial_wakeup_init();
-#endif
        return platform_device_register(&serial_device);
 }
 arch_initcall(omap_init);

diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h
index 5a493071053f846ff3d2e70c50e1b460bf956364..fbd742d0c49997fc46e5ddc1299dd9d399242389 100644 (file)
--- a/include/asm-arm/arch-omap/pm.h
+++ b/include/asm-arm/arch-omap/pm.h
@@ -115,7 +115,6 @@ extern void omap1610_idle_loop_suspend(void);
 #ifdef CONFIG_OMAP_SERIAL_WAKE
 extern void omap_serial_wake_trigger(int enable);
 #else
-#define omap_serial_wakeup_init()      {}
 #define omap_serial_wake_trigger(x)    {}
 #endif /* CONFIG_OMAP_SERIAL_WAKE */