diff options
-rw-r--r-- | Documentation/ABI/testing/sysfs-devices-power | 32 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-power | 22 | ||||
-rw-r--r-- | MAINTAINERS | 12 |
3 files changed, 33 insertions, 33 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 9d43e7670841..efe449bdf811 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/devices/.../power/ | 1 | What: /sys/devices/.../power/ |
2 | Date: January 2009 | 2 | Date: January 2009 |
3 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 3 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
4 | Description: | 4 | Description: |
5 | The /sys/devices/.../power directory contains attributes | 5 | The /sys/devices/.../power directory contains attributes |
6 | allowing the user space to check and modify some power | 6 | allowing the user space to check and modify some power |
@@ -8,7 +8,7 @@ Description: | |||
8 | 8 | ||
9 | What: /sys/devices/.../power/wakeup | 9 | What: /sys/devices/.../power/wakeup |
10 | Date: January 2009 | 10 | Date: January 2009 |
11 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 11 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
12 | Description: | 12 | Description: |
13 | The /sys/devices/.../power/wakeup attribute allows the user | 13 | The /sys/devices/.../power/wakeup attribute allows the user |
14 | space to check if the device is enabled to wake up the system | 14 | space to check if the device is enabled to wake up the system |
@@ -34,7 +34,7 @@ Description: | |||
34 | 34 | ||
35 | What: /sys/devices/.../power/control | 35 | What: /sys/devices/.../power/control |
36 | Date: January 2009 | 36 | Date: January 2009 |
37 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 37 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
38 | Description: | 38 | Description: |
39 | The /sys/devices/.../power/control attribute allows the user | 39 | The /sys/devices/.../power/control attribute allows the user |
40 | space to control the run-time power management of the device. | 40 | space to control the run-time power management of the device. |
@@ -53,7 +53,7 @@ Description: | |||
53 | 53 | ||
54 | What: /sys/devices/.../power/async | 54 | What: /sys/devices/.../power/async |
55 | Date: January 2009 | 55 | Date: January 2009 |
56 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 56 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
57 | Description: | 57 | Description: |
58 | The /sys/devices/.../async attribute allows the user space to | 58 | The /sys/devices/.../async attribute allows the user space to |
59 | enable or diasble the device's suspend and resume callbacks to | 59 | enable or diasble the device's suspend and resume callbacks to |
@@ -79,7 +79,7 @@ Description: | |||
79 | 79 | ||
80 | What: /sys/devices/.../power/wakeup_count | 80 | What: /sys/devices/.../power/wakeup_count |
81 | Date: September 2010 | 81 | Date: September 2010 |
82 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 82 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
83 | Description: | 83 | Description: |
84 | The /sys/devices/.../wakeup_count attribute contains the number | 84 | The /sys/devices/.../wakeup_count attribute contains the number |
85 | of signaled wakeup events associated with the device. This | 85 | of signaled wakeup events associated with the device. This |
@@ -88,7 +88,7 @@ Description: | |||
88 | 88 | ||
89 | What: /sys/devices/.../power/wakeup_active_count | 89 | What: /sys/devices/.../power/wakeup_active_count |
90 | Date: September 2010 | 90 | Date: September 2010 |
91 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 91 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
92 | Description: | 92 | Description: |
93 | The /sys/devices/.../wakeup_active_count attribute contains the | 93 | The /sys/devices/.../wakeup_active_count attribute contains the |
94 | number of times the processing of wakeup events associated with | 94 | number of times the processing of wakeup events associated with |
@@ -98,7 +98,7 @@ Description: | |||
98 | 98 | ||
99 | What: /sys/devices/.../power/wakeup_abort_count | 99 | What: /sys/devices/.../power/wakeup_abort_count |
100 | Date: February 2012 | 100 | Date: February 2012 |
101 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 101 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
102 | Description: | 102 | Description: |
103 | The /sys/devices/.../wakeup_abort_count attribute contains the | 103 | The /sys/devices/.../wakeup_abort_count attribute contains the |
104 | number of times the processing of a wakeup event associated with | 104 | number of times the processing of a wakeup event associated with |
@@ -109,7 +109,7 @@ Description: | |||
109 | 109 | ||
110 | What: /sys/devices/.../power/wakeup_expire_count | 110 | What: /sys/devices/.../power/wakeup_expire_count |
111 | Date: February 2012 | 111 | Date: February 2012 |
112 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 112 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
113 | Description: | 113 | Description: |
114 | The /sys/devices/.../wakeup_expire_count attribute contains the | 114 | The /sys/devices/.../wakeup_expire_count attribute contains the |
115 | number of times a wakeup event associated with the device has | 115 | number of times a wakeup event associated with the device has |
@@ -119,7 +119,7 @@ Description: | |||
119 | 119 | ||
120 | What: /sys/devices/.../power/wakeup_active | 120 | What: /sys/devices/.../power/wakeup_active |
121 | Date: September 2010 | 121 | Date: September 2010 |
122 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 122 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
123 | Description: | 123 | Description: |
124 | The /sys/devices/.../wakeup_active attribute contains either 1, | 124 | The /sys/devices/.../wakeup_active attribute contains either 1, |
125 | or 0, depending on whether or not a wakeup event associated with | 125 | or 0, depending on whether or not a wakeup event associated with |
@@ -129,7 +129,7 @@ Description: | |||
129 | 129 | ||
130 | What: /sys/devices/.../power/wakeup_total_time_ms | 130 | What: /sys/devices/.../power/wakeup_total_time_ms |
131 | Date: September 2010 | 131 | Date: September 2010 |
132 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 132 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
133 | Description: | 133 | Description: |
134 | The /sys/devices/.../wakeup_total_time_ms attribute contains | 134 | The /sys/devices/.../wakeup_total_time_ms attribute contains |
135 | the total time of processing wakeup events associated with the | 135 | the total time of processing wakeup events associated with the |
@@ -139,7 +139,7 @@ Description: | |||
139 | 139 | ||
140 | What: /sys/devices/.../power/wakeup_max_time_ms | 140 | What: /sys/devices/.../power/wakeup_max_time_ms |
141 | Date: September 2010 | 141 | Date: September 2010 |
142 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 142 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
143 | Description: | 143 | Description: |
144 | The /sys/devices/.../wakeup_max_time_ms attribute contains | 144 | The /sys/devices/.../wakeup_max_time_ms attribute contains |
145 | the maximum time of processing a single wakeup event associated | 145 | the maximum time of processing a single wakeup event associated |
@@ -149,7 +149,7 @@ Description: | |||
149 | 149 | ||
150 | What: /sys/devices/.../power/wakeup_last_time_ms | 150 | What: /sys/devices/.../power/wakeup_last_time_ms |
151 | Date: September 2010 | 151 | Date: September 2010 |
152 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 152 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
153 | Description: | 153 | Description: |
154 | The /sys/devices/.../wakeup_last_time_ms attribute contains | 154 | The /sys/devices/.../wakeup_last_time_ms attribute contains |
155 | the value of the monotonic clock corresponding to the time of | 155 | the value of the monotonic clock corresponding to the time of |
@@ -160,7 +160,7 @@ Description: | |||
160 | 160 | ||
161 | What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms | 161 | What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms |
162 | Date: February 2012 | 162 | Date: February 2012 |
163 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 163 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
164 | Description: | 164 | Description: |
165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute | 165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute |
166 | contains the total time the device has been preventing | 166 | contains the total time the device has been preventing |
@@ -189,7 +189,7 @@ Description: | |||
189 | 189 | ||
190 | What: /sys/devices/.../power/pm_qos_latency_us | 190 | What: /sys/devices/.../power/pm_qos_latency_us |
191 | Date: March 2012 | 191 | Date: March 2012 |
192 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 192 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
193 | Description: | 193 | Description: |
194 | The /sys/devices/.../power/pm_qos_resume_latency_us attribute | 194 | The /sys/devices/.../power/pm_qos_resume_latency_us attribute |
195 | contains the PM QoS resume latency limit for the given device, | 195 | contains the PM QoS resume latency limit for the given device, |
@@ -207,7 +207,7 @@ Description: | |||
207 | 207 | ||
208 | What: /sys/devices/.../power/pm_qos_no_power_off | 208 | What: /sys/devices/.../power/pm_qos_no_power_off |
209 | Date: September 2012 | 209 | Date: September 2012 |
210 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 210 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
211 | Description: | 211 | Description: |
212 | The /sys/devices/.../power/pm_qos_no_power_off attribute | 212 | The /sys/devices/.../power/pm_qos_no_power_off attribute |
213 | is used for manipulating the PM QoS "no power off" flag. If | 213 | is used for manipulating the PM QoS "no power off" flag. If |
@@ -222,7 +222,7 @@ Description: | |||
222 | 222 | ||
223 | What: /sys/devices/.../power/pm_qos_remote_wakeup | 223 | What: /sys/devices/.../power/pm_qos_remote_wakeup |
224 | Date: September 2012 | 224 | Date: September 2012 |
225 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 225 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
226 | Description: | 226 | Description: |
227 | The /sys/devices/.../power/pm_qos_remote_wakeup attribute | 227 | The /sys/devices/.../power/pm_qos_remote_wakeup attribute |
228 | is used for manipulating the PM QoS "remote wakeup required" | 228 | is used for manipulating the PM QoS "remote wakeup required" |
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power index 217772615d02..205a73878441 100644 --- a/Documentation/ABI/testing/sysfs-power +++ b/Documentation/ABI/testing/sysfs-power | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/power/ | 1 | What: /sys/power/ |
2 | Date: August 2006 | 2 | Date: August 2006 |
3 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 3 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
4 | Description: | 4 | Description: |
5 | The /sys/power directory will contain files that will | 5 | The /sys/power directory will contain files that will |
6 | provide a unified interface to the power management | 6 | provide a unified interface to the power management |
@@ -8,7 +8,7 @@ Description: | |||
8 | 8 | ||
9 | What: /sys/power/state | 9 | What: /sys/power/state |
10 | Date: August 2006 | 10 | Date: August 2006 |
11 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 11 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
12 | Description: | 12 | Description: |
13 | The /sys/power/state file controls the system power state. | 13 | The /sys/power/state file controls the system power state. |
14 | Reading from this file returns what states are supported, | 14 | Reading from this file returns what states are supported, |
@@ -22,7 +22,7 @@ Description: | |||
22 | 22 | ||
23 | What: /sys/power/disk | 23 | What: /sys/power/disk |
24 | Date: September 2006 | 24 | Date: September 2006 |
25 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 25 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
26 | Description: | 26 | Description: |
27 | The /sys/power/disk file controls the operating mode of the | 27 | The /sys/power/disk file controls the operating mode of the |
28 | suspend-to-disk mechanism. Reading from this file returns | 28 | suspend-to-disk mechanism. Reading from this file returns |
@@ -67,7 +67,7 @@ Description: | |||
67 | 67 | ||
68 | What: /sys/power/image_size | 68 | What: /sys/power/image_size |
69 | Date: August 2006 | 69 | Date: August 2006 |
70 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 70 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
71 | Description: | 71 | Description: |
72 | The /sys/power/image_size file controls the size of the image | 72 | The /sys/power/image_size file controls the size of the image |
73 | created by the suspend-to-disk mechanism. It can be written a | 73 | created by the suspend-to-disk mechanism. It can be written a |
@@ -84,7 +84,7 @@ Description: | |||
84 | 84 | ||
85 | What: /sys/power/pm_trace | 85 | What: /sys/power/pm_trace |
86 | Date: August 2006 | 86 | Date: August 2006 |
87 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 87 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
88 | Description: | 88 | Description: |
89 | The /sys/power/pm_trace file controls the code which saves the | 89 | The /sys/power/pm_trace file controls the code which saves the |
90 | last PM event point in the RTC across reboots, so that you can | 90 | last PM event point in the RTC across reboots, so that you can |
@@ -133,7 +133,7 @@ Description: | |||
133 | 133 | ||
134 | What: /sys/power/pm_async | 134 | What: /sys/power/pm_async |
135 | Date: January 2009 | 135 | Date: January 2009 |
136 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 136 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
137 | Description: | 137 | Description: |
138 | The /sys/power/pm_async file controls the switch allowing the | 138 | The /sys/power/pm_async file controls the switch allowing the |
139 | user space to enable or disable asynchronous suspend and resume | 139 | user space to enable or disable asynchronous suspend and resume |
@@ -146,7 +146,7 @@ Description: | |||
146 | 146 | ||
147 | What: /sys/power/wakeup_count | 147 | What: /sys/power/wakeup_count |
148 | Date: July 2010 | 148 | Date: July 2010 |
149 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 149 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
150 | Description: | 150 | Description: |
151 | The /sys/power/wakeup_count file allows user space to put the | 151 | The /sys/power/wakeup_count file allows user space to put the |
152 | system into a sleep state while taking into account the | 152 | system into a sleep state while taking into account the |
@@ -161,7 +161,7 @@ Description: | |||
161 | 161 | ||
162 | What: /sys/power/reserved_size | 162 | What: /sys/power/reserved_size |
163 | Date: May 2011 | 163 | Date: May 2011 |
164 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 164 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
165 | Description: | 165 | Description: |
166 | The /sys/power/reserved_size file allows user space to control | 166 | The /sys/power/reserved_size file allows user space to control |
167 | the amount of memory reserved for allocations made by device | 167 | the amount of memory reserved for allocations made by device |
@@ -175,7 +175,7 @@ Description: | |||
175 | 175 | ||
176 | What: /sys/power/autosleep | 176 | What: /sys/power/autosleep |
177 | Date: April 2012 | 177 | Date: April 2012 |
178 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 178 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
179 | Description: | 179 | Description: |
180 | The /sys/power/autosleep file can be written one of the strings | 180 | The /sys/power/autosleep file can be written one of the strings |
181 | returned by reads from /sys/power/state. If that happens, a | 181 | returned by reads from /sys/power/state. If that happens, a |
@@ -192,7 +192,7 @@ Description: | |||
192 | 192 | ||
193 | What: /sys/power/wake_lock | 193 | What: /sys/power/wake_lock |
194 | Date: February 2012 | 194 | Date: February 2012 |
195 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 195 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
196 | Description: | 196 | Description: |
197 | The /sys/power/wake_lock file allows user space to create | 197 | The /sys/power/wake_lock file allows user space to create |
198 | wakeup source objects and activate them on demand (if one of | 198 | wakeup source objects and activate them on demand (if one of |
@@ -219,7 +219,7 @@ Description: | |||
219 | 219 | ||
220 | What: /sys/power/wake_unlock | 220 | What: /sys/power/wake_unlock |
221 | Date: February 2012 | 221 | Date: February 2012 |
222 | Contact: Rafael J. Wysocki <rjw@sisk.pl> | 222 | Contact: Rafael J. Wysocki <rjw@rjwysocki.net> |
223 | Description: | 223 | Description: |
224 | The /sys/power/wake_unlock file allows user space to deactivate | 224 | The /sys/power/wake_unlock file allows user space to deactivate |
225 | wakeup sources created with the help of /sys/power/wake_lock. | 225 | wakeup sources created with the help of /sys/power/wake_lock. |
diff --git a/MAINTAINERS b/MAINTAINERS index 8a0cbf3cf2c8..99daaf5e2a92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -237,7 +237,7 @@ F: drivers/platform/x86/acer-wmi.c | |||
237 | 237 | ||
238 | ACPI | 238 | ACPI |
239 | M: Len Brown <lenb@kernel.org> | 239 | M: Len Brown <lenb@kernel.org> |
240 | M: Rafael J. Wysocki <rjw@sisk.pl> | 240 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
241 | L: linux-acpi@vger.kernel.org | 241 | L: linux-acpi@vger.kernel.org |
242 | W: http://www.lesswatts.org/projects/acpi/ | 242 | W: http://www.lesswatts.org/projects/acpi/ |
243 | Q: http://patchwork.kernel.org/project/linux-acpi/list/ | 243 | Q: http://patchwork.kernel.org/project/linux-acpi/list/ |
@@ -2300,7 +2300,7 @@ S: Maintained | |||
2300 | F: drivers/net/ethernet/ti/cpmac.c | 2300 | F: drivers/net/ethernet/ti/cpmac.c |
2301 | 2301 | ||
2302 | CPU FREQUENCY DRIVERS | 2302 | CPU FREQUENCY DRIVERS |
2303 | M: Rafael J. Wysocki <rjw@sisk.pl> | 2303 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
2304 | M: Viresh Kumar <viresh.kumar@linaro.org> | 2304 | M: Viresh Kumar <viresh.kumar@linaro.org> |
2305 | L: cpufreq@vger.kernel.org | 2305 | L: cpufreq@vger.kernel.org |
2306 | L: linux-pm@vger.kernel.org | 2306 | L: linux-pm@vger.kernel.org |
@@ -2331,7 +2331,7 @@ S: Maintained | |||
2331 | F: drivers/cpuidle/cpuidle-big_little.c | 2331 | F: drivers/cpuidle/cpuidle-big_little.c |
2332 | 2332 | ||
2333 | CPUIDLE DRIVERS | 2333 | CPUIDLE DRIVERS |
2334 | M: Rafael J. Wysocki <rjw@sisk.pl> | 2334 | M: Rafael J. Wysocki <rjw@rjwysocki.net> |
2335 | M: Daniel Lezcano <daniel.lezcano@linaro.org> | 2335 | M: Daniel Lezcano <daniel.lezcano@linaro.org> |
2336 | L: linux-pm@vger.kernel.org | 2336 | L: linux-pm@vger.kernel.org |
2337 | S: Maintained | 2337 | S: Maintained |
@@ -3553,7 +3553,7 @@ F: fs/freevxfs/ | |||
3553 | 3553 | ||
3554 | FREEZER | 3554 | FREEZER |
3555 | M: Pavel Machek <pavel@ucw.cz> | 3555 | M: Pavel Machek <pavel@ucw.cz> |
3556 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 3556 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
3557 | L: linux-pm@vger.kernel.org | 3557 | L: linux-pm@vger.kernel.org |
3558 | S: Supported | 3558 | S: Supported |
3559 | F: Documentation/power/freezing-of-tasks.txt | 3559 | F: Documentation/power/freezing-of-tasks.txt |
@@ -3889,7 +3889,7 @@ F: drivers/video/hgafb.c | |||
3889 | 3889 | ||
3890 | HIBERNATION (aka Software Suspend, aka swsusp) | 3890 | HIBERNATION (aka Software Suspend, aka swsusp) |
3891 | M: Pavel Machek <pavel@ucw.cz> | 3891 | M: Pavel Machek <pavel@ucw.cz> |
3892 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 3892 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
3893 | L: linux-pm@vger.kernel.org | 3893 | L: linux-pm@vger.kernel.org |
3894 | S: Supported | 3894 | S: Supported |
3895 | F: arch/x86/power/ | 3895 | F: arch/x86/power/ |
@@ -8095,7 +8095,7 @@ F: drivers/sh/ | |||
8095 | SUSPEND TO RAM | 8095 | SUSPEND TO RAM |
8096 | M: Len Brown <len.brown@intel.com> | 8096 | M: Len Brown <len.brown@intel.com> |
8097 | M: Pavel Machek <pavel@ucw.cz> | 8097 | M: Pavel Machek <pavel@ucw.cz> |
8098 | M: "Rafael J. Wysocki" <rjw@sisk.pl> | 8098 | M: "Rafael J. Wysocki" <rjw@rjwysocki.net> |
8099 | L: linux-pm@vger.kernel.org | 8099 | L: linux-pm@vger.kernel.org |
8100 | S: Supported | 8100 | S: Supported |
8101 | F: Documentation/power/ | 8101 | F: Documentation/power/ |