Commit a9834cb2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pm' 

* acpi-pm: (35 commits)
  ACPI / PM: Handle missing _PSC in acpi_bus_update_power()
  ACPI / PM: Do not power manage devices in unknown initial states
  ACPI / PM: Fix acpi_bus_get_device() check in drivers/acpi/device_pm.c
  ACPI / PM: Fix /proc/acpi/wakeup for devices w/o bus or parent
  ACPI / PM: Fix consistency check for power resources during resume
  ACPI / PM: Expose lists of device power resources to user space
  sysfs: Functions for adding/removing symlinks to/from attribute groups
  ACPI / PM: Expose current status of ACPI power resources
  ACPI / PM: Expose power states of ACPI devices to user space
  ACPI / scan: Prevent device add uevents from racing with user space
  ACPI / PM: Fix device power state value after transitions to D3cold
  ACPI / PM: Use string "D3cold" to represent ACPI_STATE_D3_COLD
  ACPI / PM: Sanitize checks in acpi_power_on_resources()
  ACPI / PM: Always evaluate _PSn after setting power resources
  ACPI / PM: Introduce helper for executing _PSn methods
  ACPI / PM: Make acpi_bus_init_power() more robust
  ACPI / PM: Fix build for unusual combination of Kconfig options
  ACPI / PM: remove leading whitespace from #ifdef
  ACPI / PM: Consolidate suspend-specific and hibernate-specific code
  ACPI / PM: Move device power management functions to device_pm.c
  ...
parents 48694bdb 511d5c42

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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE