4 files changed, 58 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index 9529842ae054..48e5eced6b51 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -87,6 +87,8 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
                 return PTR_ERR(od);
         }
 
+        omap_device_disable_idle_on_suspend(od);
+
         gpio_bank_count++;
         return 0;
 }
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 1ac361b7b8cb..466fc722fa0f 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -805,6 +805,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
         WARN(IS_ERR(od), "Could not build omap_device for %s: %s.\n",
              name, oh->name);
 
+        omap_device_disable_idle_on_suspend(od);
         oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
 
         uart->irq = oh->mpu_irqs[0].irq;
diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h
index e4c349ff9fd8..ee405b36df4b 100644
--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
@@ -44,6 +44,10 @@ extern struct device omap_device_parent;
 #define OMAP_DEVICE_STATE_IDLE          2
 #define OMAP_DEVICE_STATE_SHUTDOWN      3
 
+/* omap_device.flags values */
+#define OMAP_DEVICE_SUSPENDED BIT(0)
+#define OMAP_DEVICE_NO_IDLE_ON_SUSPEND BIT(1)
+
 /**
  * struct omap_device - omap_device wrapper for platform_devices
  * @pdev: platform_device
@@ -73,6 +77,7 @@ struct omap_device {
         s8                              pm_lat_level;
         u8                              hwmods_cnt;
         u8                              _state;
+        u8                              flags;
 };
 
 /* Device driver interface (call via platform_data fn ptrs) */
@@ -117,6 +122,10 @@ int omap_device_enable_hwmods(struct omap_device *od);
 int omap_device_disable_clocks(struct omap_device *od);
 int omap_device_enable_clocks(struct omap_device *od);
 
+static inline void omap_device_disable_idle_on_suspend(struct omap_device *od)
+{
+        od->flags |= OMAP_DEVICE_NO_IDLE_ON_SUSPEND;
+}
 
 /*
  * Entries should be kept in latency order ascending
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index d21579b2c11e..2526fa312b8a 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -537,6 +537,7 @@ int omap_early_device_register(struct omap_device *od)
         return 0;
 }
 
+#ifdef CONFIG_PM_RUNTIME
 static int _od_runtime_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -563,13 +564,55 @@ static int _od_runtime_resume(struct device *dev)
 
         return pm_generic_runtime_resume(dev);
 }
+#endif
+
+#ifdef CONFIG_SUSPEND
+static int _od_suspend_noirq(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct omap_device *od = to_omap_device(pdev);
+        int ret;
+
+        if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
+                return pm_generic_suspend_noirq(dev);
+
+        ret = pm_generic_suspend_noirq(dev);
+
+        if (!ret && !pm_runtime_status_suspended(dev)) {
+                if (pm_generic_runtime_suspend(dev) == 0) {
+                        omap_device_idle(pdev);
+                        od->flags |= OMAP_DEVICE_SUSPENDED;
+                }
+        }
+
+        return ret;
+}
+
+static int _od_resume_noirq(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct omap_device *od = to_omap_device(pdev);
+
+        if (od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND)
+                return pm_generic_resume_noirq(dev);
+
+        if ((od->flags & OMAP_DEVICE_SUSPENDED) &&
+            !pm_runtime_status_suspended(dev)) {
+                od->flags &= ~OMAP_DEVICE_SUSPENDED;
+                omap_device_enable(pdev);
+                pm_generic_runtime_resume(dev);
+        }
+
+        return pm_generic_resume_noirq(dev);
+}
+#endif
 
 static struct dev_pm_domain omap_device_pm_domain = {
         .ops = {
-                .runtime_suspend = _od_runtime_suspend,
-                .runtime_idle = _od_runtime_idle,
-                .runtime_resume = _od_runtime_resume,
+                SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,
+                                   _od_runtime_idle)
                 USE_PLATFORM_PM_SLEEP_OPS
+                SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)
         }
 };