Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8793422f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI and power management updates from Rafael Wysocki:

 - Rework of the ACPI namespace scanning code from Rafael J.  Wysocki
   with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
   Toshi Kani, and Yinghai Lu.

 - ACPI power resources handling and ACPI device PM update from Rafael
   J Wysocki.

 - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
   contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.

 - Support for Intel Lynxpoint LPSS from Mika Westerberg.

 - cpuidle update from Len Brown including Intel Haswell support, C1
   state for intel_idle, removal of global pm_idle.

 - cpuidle fixes and cleanups from Daniel Lezcano.

 - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
   contributions from Stratos Karafotis and Rickard Andersson.

 - Intel P-states driver for Sandy Bridge processors from Dirk
   Brandewie.

 - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.

 - cpufreq fixes related to ordering issues between acpi-cpufreq and
   powernow-k8 from Borislav Petkov and Matthew Garrett.

 - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
   and Rob Herring.

 - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
   from Shawn Guo.

 - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
   and Inderpal Singh.

 - Support for "lightweight suspend" from Zhang Rui.

 - Removal of the deprecated power trace API from Paul Gortmaker.

 - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
   Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
   Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
   Ishimatsu.

* tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
  PM idle: remove global declaration of pm_idle
  unicore32 idle: delete stray pm_idle comment
  openrisc idle: delete pm_idle
  mn10300 idle: delete pm_idle
  microblaze idle: delete pm_idle
  m32r idle: delete pm_idle, and other dead idle code
  ia64 idle: delete pm_idle
  cris idle: delete idle and pm_idle
  ARM64 idle: delete pm_idle
  ARM idle: delete pm_idle
  blackfin idle: delete pm_idle
  sparc idle: rename pm_idle to sparc_idle
  sh idle: rename global pm_idle to static sh_idle
  x86 idle: rename global pm_idle to static x86_idle
  APM idle: register apm_cpu_idle via cpuidle
  cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
  cpufreq / intel_pstate: Change to disallow module build
  tools/power turbostat: display SMI count by default
  intel_idle: export both C1 and C1E
  ACPI / hotplug: Fix concurrency issues and memory leaks
  ...
parents b3cdda2b 10baf04e

Documentation/ABI/testing/sysfs-devices-power_resources_D0

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D0/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D0/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D0.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D1

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D1/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D1/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D1.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D1.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D2

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D2/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D2/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D2.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D2.  The names

		of the links are the same as the names of the directories they

		point to.

Documentation/ABI/testing/sysfs-devices-power_resources_D3hot

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_resources_D3hot/

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_resources_D3hot/ directory is only

		present for device objects representing ACPI device nodes that

		use ACPI power resources for power management and support ACPI

		power state D3hot.



		If present, it contains symbolic links to device directories

		representing ACPI power resources that need to be turned on for

		the given device node to be in ACPI power state D3hot.  The

		names of the links are the same as the names of the directories

		they point to.

Documentation/ABI/testing/sysfs-devices-power_state

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../power_state

Date:		January 2013

Contact:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Description:

		The /sys/devices/.../power_state attribute is only present for

		device objects representing ACPI device nodes that provide power

		management methods.



		If present, it contains a string representing the current ACPI

		power state of the given device node.  Its possible values,

		"D0", "D1", "D2", "D3hot", and "D3cold", reflect the power state

		names defined by the ACPI specification (ACPI 4 and above).



		If the device node uses shared ACPI power resources, this state

		determines a list of power resources required not to be turned

		off.  However, some power resources needed by the device node in

		higher-power (lower-number) states may also be ON because of

		some other devices using them at the moment.



		This attribute is read-only.