Merge tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more ACPI and power management fixes and updates from Rafael Wysocki:
 "This is PM and ACPI material that has emerged over the last two weeks
  and one fix for a CPU hotplug regression introduced by the recent CPU
  hotplug notifiers registration series.

  Included are intel_idle and turbostat updates from Len Brown (these
  have been in linux-next for quite some time), a new cpufreq driver for
  powernv (that might spend some more time in linux-next, but BenH was
  asking me so nicely to push it for 3.15 that I couldn't resist), some
  cpufreq fixes and cleanups (including fixes for some silly breakage in
  a couple of cpufreq drivers introduced during the 3.14 cycle),
  assorted ACPI cleanups, wakeup framework documentation fixes, a new
  sysfs attribute for cpuidle and a new command line argument for power
  domains diagnostics.

  Specifics:

   - Fix for a recently introduced CPU hotplug regression in ARM KVM
     from Ming Lei.

   - Fixes for breakage in the at32ap, loongson2_cpufreq, and unicore32
     cpufreq drivers introduced during the 3.14 cycle (-stable material)
     from Chen Gang and Viresh Kumar.

   - New powernv cpufreq driver from Vaidyanathan Srinivasan, with bits
     from Gautham R Shenoy and Srivatsa S Bhat.

   - Exynos cpufreq driver fix preventing it from being included into
     multiplatform builds that aren't supported by it from Sachin Kamat.

   - cpufreq cleanups related to the usage of the driver_data field in
     struct cpufreq_frequency_table from Viresh Kumar.

   - cpufreq ppc driver cleanup from Sachin Kamat.

   - Intel BayTrail support for intel_idle and ACPI idle from Len Brown.

   - Intel CPU model 54 (Atom N2000 series) support for intel_idle from
     Jan Kiszka.

   - intel_idle fix for Intel Ivy Town residency targets from Len Brown.

   - turbostat updates (Intel Broadwell support and output cleanups)
     from Len Brown.

   - New cpuidle sysfs attribute for exporting C-states' target
     residency information to user space from Daniel Lezcano.

   - New kernel command line argument to prevent power domains enabled
     by the bootloader from being turned off even if they are not in use
     (for diagnostics purposes) from Tushar Behera.

   - Fixes for wakeup sysfs attributes documentation from Geert
     Uytterhoeven.

   - New ACPI video blacklist entry for ThinkPad Helix from Stephen
     Chandler Paul.

   - Assorted ACPI cleanups and a Kconfig help update from Jonghwan
     Choi, Zhihui Zhang, Hanjun Guo"

* tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (28 commits)
  ACPI: Update the ACPI spec information in Kconfig
  arm, kvm: fix double lock on cpu_add_remove_lock
  cpuidle: sysfs: Export target residency information
  cpufreq: ppc: Remove duplicate inclusion of fsl_soc.h
  cpufreq: create another field .flags in cpufreq_frequency_table
  cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table
  cpufreq: don't print value of .driver_data from core
  cpufreq: ia64: don't set .driver_data to index
  cpufreq: powernv: Select CPUFreq related Kconfig options for powernv
  cpufreq: powernv: Use cpufreq_frequency_table.driver_data to store pstate ids
  cpufreq: powernv: cpufreq driver for powernv platform
  cpufreq: at32ap: don't declare local variable as static
  cpufreq: loongson2_cpufreq: don't declare local variable as static
  cpufreq: unicore32: fix typo issue for 'clk'
  cpufreq: exynos: Disable on multiplatform build
  PM / wakeup: Correct presence vs. emptiness of wakeup_* attributes
  PM / domains: Add pd_ignore_unused to keep power domains enabled
  ACPI / dock: Drop dock_device_ids[] table
  ACPI / video: Favor native backlight interface for ThinkPad Helix
  ACPI / thermal: Fix wrong variable usage in debug statement
  ...

1 files changed, 30 insertions, 16 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power
index 7dbf96b724ed..676fdf5f2a99 100644
--- a/Documentation/ABI/testing/sysfs-devices-power
+++ b/Documentation/ABI/testing/sysfs-devices-power
@@ -83,8 +83,10 @@ Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_count attribute contains the number
                 of signaled wakeup events associated with the device.  This
-                attribute is read-only.  If the device is not enabled to wake up
+                attribute is read-only.  If the device is not capable to wake up
                 the system from sleep states, this attribute is not present.
+                If the device is not enabled to wake up the system from sleep
+                states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_active_count
 Date:           September 2010
@@ -93,8 +95,10 @@ Description:
                 The /sys/devices/.../wakeup_active_count attribute contains the
                 number of times the processing of wakeup events associated with
                 the device was completed (at the kernel level).  This attribute
-                is read-only.  If the device is not enabled to wake up the
-                system from sleep states, this attribute is not present.
+                is read-only.  If the device is not capable to wake up the
+                system from sleep states, this attribute is not present.  If
+                the device is not enabled to wake up the system from sleep
+                states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_abort_count
 Date:           February 2012
@@ -104,8 +108,9 @@ Description:
                 number of times the processing of a wakeup event associated with
                 the device might have aborted system transition into a sleep
                 state in progress.  This attribute is read-only.  If the device
-                is not enabled to wake up the system from sleep states, this
-                attribute is not present.
+                is not capable to wake up the system from sleep states, this
+                attribute is not present.  If the device is not enabled to wake
+                up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_expire_count
 Date:           February 2012
@@ -114,8 +119,10 @@ Description:
                 The /sys/devices/.../wakeup_expire_count attribute contains the
                 number of times a wakeup event associated with the device has
                 been reported with a timeout that expired.  This attribute is
-                read-only.  If the device is not enabled to wake up the system
-                from sleep states, this attribute is not present.
+                read-only.  If the device is not capable to wake up the system
+                from sleep states, this attribute is not present.  If the
+                device is not enabled to wake up the system from sleep states,
+                this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_active
 Date:           September 2010
@@ -124,8 +131,10 @@ Description:
                 The /sys/devices/.../wakeup_active attribute contains either 1,
                 or 0, depending on whether or not a wakeup event associated with
                 the device is being processed (1).  This attribute is read-only.
-                If the device is not enabled to wake up the system from sleep
-                states, this attribute is not present.
+                If the device is not capable to wake up the system from sleep
+                states, this attribute is not present.  If the device is not
+                enabled to wake up the system from sleep states, this attribute
+                is empty.
 
 What:           /sys/devices/.../power/wakeup_total_time_ms
 Date:           September 2010
@@ -134,8 +143,9 @@ Description:
                 The /sys/devices/.../wakeup_total_time_ms attribute contains
                 the total time of processing wakeup events associated with the
                 device, in milliseconds.  This attribute is read-only.  If the
-                device is not enabled to wake up the system from sleep states,
-                this attribute is not present.
+                device is not capable to wake up the system from sleep states,
+                this attribute is not present.  If the device is not enabled to
+                wake up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_max_time_ms
 Date:           September 2010
@@ -144,8 +154,10 @@ Description:
                 The /sys/devices/.../wakeup_max_time_ms attribute contains
                 the maximum time of processing a single wakeup event associated
                 with the device, in milliseconds.  This attribute is read-only.
-                If the device is not enabled to wake up the system from sleep
-                states, this attribute is not present.
+                If the device is not capable to wake up the system from sleep
+                states, this attribute is not present.  If the device is not
+                enabled to wake up the system from sleep states, this attribute
+                is empty.
 
 What:           /sys/devices/.../power/wakeup_last_time_ms
 Date:           September 2010
@@ -156,7 +168,8 @@ Description:
                 signaling the last wakeup event associated with the device, in
                 milliseconds.  This attribute is read-only.  If the device is
                 not enabled to wake up the system from sleep states, this
-                attribute is not present.
+                attribute is not present.  If the device is not enabled to wake
+                up the system from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/wakeup_prevent_sleep_time_ms
 Date:           February 2012
@@ -165,9 +178,10 @@ Description:
                 The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
                 contains the total time the device has been preventing
                 opportunistic transitions to sleep states from occurring.
-                This attribute is read-only.  If the device is not enabled to
+                This attribute is read-only.  If the device is not capable to
                 wake up the system from sleep states, this attribute is not
-                present.
+                present.  If the device is not enabled to wake up the system
+                from sleep states, this attribute is empty.
 
 What:           /sys/devices/.../power/autosuspend_delay_ms
 Date:           September 2010