1 files changed, 2 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index e37feb2f05a3..5cc92874be7e 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -170,9 +170,6 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
                         r->name = dev_name(&pdev->dev);
         }
 
-        if (of_get_property(node, "ti,no_idle_on_suspend", NULL))
-                omap_device_disable_idle_on_suspend(pdev);
-
         pdev->dev.pm_domain = &omap_device_pm_domain;
 
 odbfd_exit1:
@@ -616,8 +613,7 @@ static int _od_suspend_noirq(struct device *dev)
 
         if (!ret && !pm_runtime_status_suspended(dev)) {
                 if (pm_generic_runtime_suspend(dev) == 0) {
-                        if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
-                                omap_device_idle(pdev);
+                        omap_device_idle(pdev);
                         od->flags |= OMAP_DEVICE_SUSPENDED;
                 }
         }
@@ -633,8 +629,7 @@ static int _od_resume_noirq(struct device *dev)
         if ((od->flags & OMAP_DEVICE_SUSPENDED) &&
             !pm_runtime_status_suspended(dev)) {
                 od->flags &= ~OMAP_DEVICE_SUSPENDED;
-                if (!(od->flags & OMAP_DEVICE_NO_IDLE_ON_SUSPEND))
-                        omap_device_enable(pdev);
+                omap_device_enable(pdev);
                 pm_generic_runtime_resume(dev);
         }