Merge tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more power management updates deom Rafael Wysocki:
 "These fix two bugs introduced by recent power management updates (in
  the cpuidle menu governor and intel_pstate) and a few other issues,
  clean up things and remove unused code.

  Specifics:

   - Fix for a cpuidle menu governor problem that started to take an
     unnecessary spinlock after one of the recent updates and that did
     not play well with the RT patch (Rafael Wysocki).

   - Fix for the new intel_pstate operation mode switching feature added
     recently that did not reinitialize P-state limits properly when
     switching operation modes (Rafael Wysocki).

   - Removal of unused global notifiers from the PM QoS framework
     (Viresh Kumar).

   - Generic power domains framework update to make it handle
     asynchronous invocations of PM callbacks in the "noirq" phases of
     system suspend/hibernation correctly (Ulf Hansson).

   - Two hibernation core cleanups (Rafael Wysocki).

   - intel_idle cleanup related to the sysfs interface (Len Brown).

   - Off-by-one bug fix in the OPP (Operating Performance Points)
     framework (Andrzej Hajda).

   - OPP framework's documentation fix (Viresh Kumar).

   - cpufreq qoriq driver cleanup (Tang Yuantian).

   - Fixes for typos in comments in the device runtime PM framework
     (Christophe Jaillet)"

* tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / OPP: Documentation: Fix opp-microvolt in examples
  intel_idle: stop exposing platform acronyms in sysfs
  cpufreq: intel_pstate: Fix limits issue with operation mode switching
  PM / hibernate: Define pr_fmt() and use pr_*() instead of printk()
  PM / hibernate: Untangle power_down()
  cpuidle: menu: Avoid taking spinlock for accessing QoS values
  PM / QoS: Remove global notifiers
  PM / runtime: Fix some typos
  cpufreq: qoriq: clean up unused code
  PM / OPP: fix off-by-one bug in dev_pm_opp_get_max_volt_latency loop
  PM / Domains: Power off masters immediately in the power off sequence
  PM / Domains: Rename is_async to one_dev_on for genpd_power_off()
  PM / Domains: Move genpd_power_off() above genpd_power_on()

3 files changed, 26 insertions, 37 deletions

diff --git a/Documentation/devicetree/bindings/opp/opp.txt b/Documentation/devicetree/bindings/opp/opp.txt
index ecdcfb790704..63725498bd20 100644
--- a/Documentation/devicetree/bindings/opp/opp.txt
+++ b/Documentation/devicetree/bindings/opp/opp.txt
@@ -188,14 +188,14 @@ Example 1: Single cluster Dual-core ARM cortex A9, switch DVFS states together.
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt = <970000 975000 985000>;
+                        opp-microvolt = <975000 970000 985000>;
                         opp-microamp = <70000>;
                         clock-latency-ns = <300000>;
                         opp-suspend;
                 };
                 opp@1100000000 {
                         opp-hz = /bits/ 64 <1100000000>;
-                        opp-microvolt = <980000 1000000 1010000>;
+                        opp-microvolt = <1000000 980000 1010000>;
                         opp-microamp = <80000>;
                         clock-latency-ns = <310000>;
                 };
@@ -267,14 +267,14 @@ independently.
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt = <970000 975000 985000>;
+                        opp-microvolt = <975000 970000 985000>;
                         opp-microamp = <70000>;
                         clock-latency-ns = <300000>;
                         opp-suspend;
                 };
                 opp@1100000000 {
                         opp-hz = /bits/ 64 <1100000000>;
-                        opp-microvolt = <980000 1000000 1010000>;
+                        opp-microvolt = <1000000 980000 1010000>;
                         opp-microamp = <80000>;
                         clock-latency-ns = <310000>;
                 };
@@ -343,14 +343,14 @@ DVFS state together.
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt = <970000 975000 985000>;
+                        opp-microvolt = <975000 970000 985000>;
                         opp-microamp = <70000>;
                         clock-latency-ns = <300000>;
                         opp-suspend;
                 };
                 opp@1100000000 {
                         opp-hz = /bits/ 64 <1100000000>;
-                        opp-microvolt = <980000 1000000 1010000>;
+                        opp-microvolt = <1000000 980000 1010000>;
                         opp-microamp = <80000>;
                         clock-latency-ns = <310000>;
                 };
@@ -369,7 +369,7 @@ DVFS state together.
 
                 opp@1300000000 {
                         opp-hz = /bits/ 64 <1300000000>;
-                        opp-microvolt = <1045000 1050000 1055000>;
+                        opp-microvolt = <1050000 1045000 1055000>;
                         opp-microamp = <95000>;
                         clock-latency-ns = <400000>;
                         opp-suspend;
@@ -382,7 +382,7 @@ DVFS state together.
                 };
                 opp@1500000000 {
                         opp-hz = /bits/ 64 <1500000000>;
-                        opp-microvolt = <1010000 1100000 1110000>;
+                        opp-microvolt = <1100000 1010000 1110000>;
                         opp-microamp = <95000>;
                         clock-latency-ns = <400000>;
                         turbo-mode;
@@ -424,9 +424,9 @@ Example 4: Handling multiple regulators
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt = <970000 975000 985000>, /* Supply 0 */
-                                        <960000 965000 975000>, /* Supply 1 */
-                                        <960000 965000 975000>; /* Supply 2 */
+                        opp-microvolt = <975000 970000 985000>, /* Supply 0 */
+                                        <965000 960000 975000>, /* Supply 1 */
+                                        <965000 960000 975000>; /* Supply 2 */
                         opp-microamp =  <70000>,                /* Supply 0 */
                                         <70000>,                /* Supply 1 */
                                         <70000>;                /* Supply 2 */
@@ -437,9 +437,9 @@ Example 4: Handling multiple regulators
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt = <970000 975000 985000>, /* Supply 0 */
-                                        <960000 965000 975000>, /* Supply 1 */
-                                        <960000 965000 975000>; /* Supply 2 */
+                        opp-microvolt = <975000 970000 985000>, /* Supply 0 */
+                                        <965000 960000 975000>, /* Supply 1 */
+                                        <965000 960000 975000>; /* Supply 2 */
                         opp-microamp =  <70000>,                /* Supply 0 */
                                         <0>,                    /* Supply 1 doesn't need this */
                                         <70000>;                /* Supply 2 */
@@ -474,7 +474,7 @@ Example 5: opp-supported-hw
                          */
                         opp-supported-hw = <0xF 0xFFFFFFFF 0xFFFFFFFF>
                         opp-hz = /bits/ 64 <600000000>;
-                        opp-microvolt = <900000 915000 925000>;
+                        opp-microvolt = <915000 900000 925000>;
                         ...
                 };
 
@@ -487,7 +487,7 @@ Example 5: opp-supported-hw
                          */
                         opp-supported-hw = <0x20 0xff0000ff 0x0000f4f0>
                         opp-hz = /bits/ 64 <800000000>;
-                        opp-microvolt = <900000 915000 925000>;
+                        opp-microvolt = <915000 900000 925000>;
                         ...
                 };
         };
@@ -512,18 +512,18 @@ Example 6: opp-microvolt-<name>, opp-microamp-<name>:
 
                 opp@1000000000 {
                         opp-hz = /bits/ 64 <1000000000>;
-                        opp-microvolt-slow = <900000 915000 925000>;
-                        opp-microvolt-fast = <970000 975000 985000>;
+                        opp-microvolt-slow = <915000 900000 925000>;
+                        opp-microvolt-fast = <975000 970000 985000>;
                         opp-microamp-slow =  <70000>;
                         opp-microamp-fast =  <71000>;
                 };
 
                 opp@1200000000 {
                         opp-hz = /bits/ 64 <1200000000>;
-                        opp-microvolt-slow = <900000 915000 925000>, /* Supply vcc0 */
-                                              <910000 925000 935000>; /* Supply vcc1 */
-                        opp-microvolt-fast = <970000 975000 985000>, /* Supply vcc0 */
-                                             <960000 965000 975000>; /* Supply vcc1 */
+                        opp-microvolt-slow = <915000 900000 925000>, /* Supply vcc0 */
+                                              <925000 910000 935000>; /* Supply vcc1 */
+                        opp-microvolt-fast = <975000 970000 985000>, /* Supply vcc0 */
+                                             <965000 960000 975000>; /* Supply vcc1 */
                         opp-microamp =  <70000>; /* Will be used for both slow/fast */
                 };
         };
diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt
index 129f7c0e1483..21d2d48f87a2 100644
--- a/Documentation/power/pm_qos_interface.txt
+++ b/Documentation/power/pm_qos_interface.txt
@@ -163,8 +163,7 @@ of flags and remove sysfs attributes pm_qos_no_power_off and pm_qos_remote_wakeu
 under the device's power directory.
 
 Notification mechanisms:
-The per-device PM QoS framework has 2 different and distinct notification trees:
-a per-device notification tree and a global notification tree.
+The per-device PM QoS framework has a per-device notification tree.
 
 int dev_pm_qos_add_notifier(device, notifier):
 Adds a notification callback function for the device.
@@ -174,16 +173,6 @@ is changed (for resume latency device PM QoS only).
 int dev_pm_qos_remove_notifier(device, notifier):
 Removes the notification callback function for the device.
 
-int dev_pm_qos_add_global_notifier(notifier):
-Adds a notification callback function in the global notification tree of the
-framework.
-The callback is called when the aggregated value for any device is changed
-(for resume latency device PM QoS only).
-
-int dev_pm_qos_remove_global_notifier(notifier):
-Removes the notification callback function from the global notification tree
-of the framework.
-
 
 Active state latency tolerance
 
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
index 4870980e967e..64546eb9a16a 100644
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
@@ -100,7 +100,7 @@ knows what to do to handle the device).
   * If the suspend callback returns an error code different from -EBUSY and
     -EAGAIN, the PM core regards this as a fatal error and will refuse to run
     the helper functions described in Section 4 for the device until its status
-    is directly set to  either'active', or 'suspended' (the PM core provides
+    is directly set to  either 'active', or 'suspended' (the PM core provides
     special helper functions for this purpose).
 
 In particular, if the driver requires remote wakeup capability (i.e. hardware
@@ -217,7 +217,7 @@ defined in include/linux/pm.h:
       one to complete
 
   spinlock_t lock;
-    - lock used for synchronisation
+    - lock used for synchronization
 
   atomic_t usage_count;
     - the usage counter of the device
@@ -565,7 +565,7 @@ appropriate to ensure that the device is not put back to sleep during the
 probe. This can happen with systems such as the network device layer.
 
 It may be desirable to suspend the device once ->probe() has finished.
-Therefore the driver core uses the asyncronous pm_request_idle() to submit a
+Therefore the driver core uses the asynchronous pm_request_idle() to submit a
 request to execute the subsystem-level idle callback for the device at that
 time.  A driver that makes use of the runtime autosuspend feature, may want to
 update the last busy mark before returning from ->probe().