diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-28 13:33:25 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:27 +0200 |
commit | f0ab282c5b22278ab4f63d2318bb837ab01b9868 (patch) | |
tree | 2164a1c04bc72699c66180b1d81225aa0313b473 /arch | |
parent | 85b43afa6aaf27b9c41c71569f570788fa24c5b5 (diff) |
PM: ux500: Change ux500 PM runtime for 3.3 support
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ux500/pm/runtime.c | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/arch/arm/mach-ux500/pm/runtime.c b/arch/arm/mach-ux500/pm/runtime.c index 5772abc45e2..a91e90443d9 100644 --- a/arch/arm/mach-ux500/pm/runtime.c +++ b/arch/arm/mach-ux500/pm/runtime.c @@ -453,50 +453,23 @@ static int ux500_pd_bus_notify(struct notifier_block *nb, struct dev_pm_domain ux500_amba_dev_power_domain = { .ops = { - /* USE_AMBA_PM_SLEEP_OPS minus the two we replace */ - .prepare = amba_pm_prepare, - .complete = amba_pm_complete, - .suspend = amba_pm_suspend, - .resume = amba_pm_resume, - .freeze = amba_pm_freeze, - .thaw = amba_pm_thaw, - .poweroff = amba_pm_poweroff, - .restore = amba_pm_restore, - .freeze_noirq = amba_pm_freeze_noirq, - .thaw_noirq = amba_pm_thaw_noirq, - .poweroff_noirq = amba_pm_poweroff_noirq, - .restore_noirq = amba_pm_restore_noirq, - - .suspend_noirq = ux500_pd_amba_suspend_noirq, - .resume_noirq = ux500_pd_amba_resume_noirq, - SET_RUNTIME_PM_OPS(ux500_pd_amba_runtime_suspend, ux500_pd_amba_runtime_resume, ux500_pd_amba_runtime_idle) + USE_PLATFORM_PM_SLEEP_OPS + .suspend_noirq = ux500_pd_amba_suspend_noirq, + .resume_noirq = ux500_pd_amba_resume_noirq, }, }; struct dev_pm_domain ux500_dev_power_domain = { .ops = { - /* USE_PLATFORM_PM_SLEEP_OPS minus the two we replace */ - .prepare = platform_pm_prepare, - .complete = platform_pm_complete, - .suspend = platform_pm_suspend, - .resume = platform_pm_resume, - .freeze = platform_pm_freeze, - .thaw = platform_pm_thaw, - .poweroff = platform_pm_poweroff, - .restore = platform_pm_restore, - .freeze_noirq = platform_pm_freeze_noirq, - .thaw_noirq = platform_pm_thaw_noirq, - .poweroff_noirq = platform_pm_poweroff_noirq, - .restore_noirq = platform_pm_restore_noirq, - + SET_RUNTIME_PM_OPS(ux500_pd_runtime_suspend, + ux500_pd_runtime_resume, + ux500_pd_runtime_idle) + USE_PLATFORM_PM_SLEEP_OPS .suspend_noirq = ux500_pd_suspend_noirq, .resume_noirq = ux500_pd_resume_noirq, - .runtime_idle = ux500_pd_runtime_idle, - .runtime_suspend = ux500_pd_runtime_suspend, - .runtime_resume = ux500_pd_runtime_resume, }, }; |