Having switched over all of the users of CONFIG_PM_RUNTIME to use CONFIG_PM directly, turn the latter into a user-selectable option and drop the former entirely from the tree.
Showing the changes to kernel (1 of 37 files). Show all
Unified · Split
| @@ -94,7 +94,7 @@ config PM_STD_PARTITION · 93 unmodified lines | ||
| 94 | 94 | config PM_SLEEP |
| 95 | 95 | def_bool y |
| 96 | 96 | depends on SUSPEND || HIBERNATE_CALLBACKS |
| 97 | − select PM_RUNTIME | |
| 97 | + select PM | |
| 98 | 98 | |
| 99 | 99 | config PM_SLEEP_SMP |
| 100 | 100 | def_bool y |
| @@ -130,23 +130,19 @@ config PM_WAKELOCKS_GC · 29 unmodified lines | ||
| 130 | 130 | depends on PM_WAKELOCKS |
| 131 | 131 | default y |
| 132 | 132 | |
| 133 | −config PM_RUNTIME | |
| 134 | − bool "Run-time PM core functionality" | |
| 133 | +config PM | |
| 134 | + bool "Device power management core functionality" | |
| 135 | 135 | ---help--- |
| 136 | 136 | Enable functionality allowing I/O devices to be put into energy-saving |
| 137 | − (low power) states at run time (or autosuspended) after a specified | |
| 138 | − period of inactivity and woken up in response to a hardware-generated | |
| 137 | + (low power) states, for example after a specified period of inactivity | |
| 138 | + (autosuspended), and woken up in response to a hardware-generated | |
| 139 | 139 | wake-up event or a driver's request. |
| 140 | 140 | |
| 141 | 141 | Hardware support is generally required for this functionality to work |
| 142 | 142 | and the bus type drivers of the buses the devices are on are |
| 143 | − responsible for the actual handling of the autosuspend requests and | |
| 143 | + responsible for the actual handling of device suspend requests and | |
| 144 | 144 | wake-up events. |
| 145 | 145 | |
| 146 | −config PM | |
| 147 | − def_bool y | |
| 148 | − depends on PM_SLEEP || PM_RUNTIME | |
| 149 | − | |
| 150 | 146 | config PM_DEBUG |
| 151 | 147 | bool "Power Management Debug Support" |
| 152 | 148 | depends on PM |