|
@@ -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:
|
|
@@ -621,8 +618,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;
|
|
|
}
|
|
|
}
|
|
@@ -638,8 +634,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);
|
|
|
}
|
|
|
|