diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-05-31 16:08:09 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-06-06 16:15:04 -0700 |
| commit | 345f79b3de7f6d651e4dba794af7c7303bdfd649 (patch) | |
| tree | 8b65610e3319b109a939ffc926fe3c31e579b589 | |
| parent | c8fb13d04ad0d08772f637bee873e620fcc064c2 (diff) | |
| download | blackbird-obmc-linux-345f79b3de7f6d651e4dba794af7c7303bdfd649.tar.gz blackbird-obmc-linux-345f79b3de7f6d651e4dba794af7c7303bdfd649.zip | |
OMAP: PM: omap_device: fix device power domain callbacks
After commit 4d27e9dcff00a6425d779b065ec8892e4f391661 (PM: Make power
domain callbacks take precedence over subsystem ones), the power
domain callbacks need to call the driver callbacks instead of relying
on the default subsystem (in this case, platform_bus) to handle the
driver callbacks.
Validated on 3430/n900, 3530/Overo.
Signed-off-by: Kevin Hilman <khilman@ti.com>
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index a37b8eb65b76..49fc0df0c21f 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -84,6 +84,7 @@ #include <linux/io.h> #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/pm_runtime.h> #include <plat/omap_device.h> #include <plat/omap_hwmod.h> @@ -539,20 +540,34 @@ int omap_early_device_register(struct omap_device *od) static int _od_runtime_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); + int ret; + + ret = pm_generic_runtime_suspend(dev); + + if (!ret) + omap_device_idle(pdev); + + return ret; +} - return omap_device_idle(pdev); +static int _od_runtime_idle(struct device *dev) +{ + return pm_generic_runtime_idle(dev); } static int _od_runtime_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); - return omap_device_enable(pdev); + omap_device_enable(pdev); + + return pm_generic_runtime_resume(dev); } static struct dev_power_domain omap_device_power_domain = { .ops = { .runtime_suspend = _od_runtime_suspend, + .runtime_idle = _od_runtime_idle, .runtime_resume = _od_runtime_resume, USE_PLATFORM_PM_SLEEP_OPS } |
