aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki2013-01-05 17:36:17 -0600
committerRafael J. Wysocki2013-01-05 17:36:17 -0600
commitf67ffa95836b31be5d8fe336aee3bfc6412c5696 (patch)
tree444417975bd55480818ad40a723591465091c6dc /Documentation
parent868b093505d6378df77bc2bb656af082330127a8 (diff)
parent9f6d8f6ab26b42620a914d67f29822f9bba90233 (diff)
downloadkernel-omap-f67ffa95836b31be5d8fe336aee3bfc6412c5696.tar.gz
kernel-omap-f67ffa95836b31be5d8fe336aee3bfc6412c5696.tar.xz
kernel-omap-f67ffa95836b31be5d8fe336aee3bfc6412c5696.zip
Merge branch 'pm-sleep'
* pm-sleep: PM: Move disabling/enabling runtime PM to late suspend/early resume
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/power/runtime_pm.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
index 4abe83e1045a..03591a750f99 100644
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
@@ -642,12 +642,13 @@ out the following operations:
642 * During system suspend it calls pm_runtime_get_noresume() and 642 * During system suspend it calls pm_runtime_get_noresume() and
643 pm_runtime_barrier() for every device right before executing the 643 pm_runtime_barrier() for every device right before executing the
644 subsystem-level .suspend() callback for it. In addition to that it calls 644 subsystem-level .suspend() callback for it. In addition to that it calls
645 pm_runtime_disable() for every device right after executing the 645 __pm_runtime_disable() with 'false' as the second argument for every device
646 subsystem-level .suspend() callback for it. 646 right before executing the subsystem-level .suspend_late() callback for it.
647 647
648 * During system resume it calls pm_runtime_enable() and pm_runtime_put_sync() 648 * During system resume it calls pm_runtime_enable() and pm_runtime_put_sync()
649 for every device right before and right after executing the subsystem-level 649 for every device right after executing the subsystem-level .resume_early()
650 .resume() callback for it, respectively. 650 callback and right after executing the subsystem-level .resume() callback
651 for it, respectively.
651 652
6527. Generic subsystem callbacks 6537. Generic subsystem callbacks
653 654