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

Merge branch 'pm-runtime' 

* pm-runtime: (25 commits)
  i2c-omap / PM: Drop CONFIG_PM_RUNTIME from i2c-omap.c
  dmaengine / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME
  MMC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  MFD / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  iio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  i2c-hid / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drm / exynos / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  gpio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hwrandom / exynos / PM: Use CONFIG_PM in #ifdef
  block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
  PM: Merge the SET*_RUNTIME_PM_OPS() macros
  PM / Kconfig: Do not select PM directly from Kconfig files
  PCI / PM: Drop CONFIG_PM_RUNTIME from the PCI core
  ...
parents cfc75ed6 2713775b

Documentation/ABI/stable/sysfs-bus-usb

+6 −8
Original line number Original line Diff line number Diff line
@@ -32,10 +32,9 @@ Date: January 2008 
KernelVersion:	2.6.25

KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

Description:

		If CONFIG_PM_RUNTIME is enabled then this file

		If CONFIG_PM is enabled, then this file is present.  When read,

		is present.  When read, it returns the total time (in msec)

		it returns the total time (in msec) that the USB device has been

		that the USB device has been connected to the machine.  This

		connected to the machine.  This file is read-only.

		file is read-only.

Users:

Users:

		PowerTOP <powertop@lists.01.org>

		PowerTOP <powertop@lists.01.org>

		https://01.org/powertop/

		https://01.org/powertop/
@@ -45,10 +44,9 @@ Date: January 2008 
KernelVersion:	2.6.25

KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

Description:

		If CONFIG_PM_RUNTIME is enabled then this file

		If CONFIG_PM is enabled, then this file is present.  When read,

		is present.  When read, it returns the total time (in msec)

		it returns the total time (in msec) that the USB device has been

		that the USB device has been active, i.e. not in a suspended

		active, i.e. not in a suspended state.  This file is read-only.

		state.  This file is read-only.





		Tools can use this file and the connected_duration file to

		Tools can use this file and the connected_duration file to

		compute the percentage of time that a device has been active.

		compute the percentage of time that a device has been active.

Documentation/ABI/testing/sysfs-bus-usb

+9 −10
Original line number Original line Diff line number Diff line
@@ -104,16 +104,15 @@ What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm 
Date:		September 2011

Date:		September 2011

Contact:	Andiry Xu <andiry.xu@amd.com>

Contact:	Andiry Xu <andiry.xu@amd.com>

Description:

Description:

		If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device

		If CONFIG_PM is set and a USB 2.0 lpm-capable device is plugged

		is plugged in to a xHCI host which support link PM, it will

		in to a xHCI host which support link PM, it will perform a LPM

		perform a LPM test; if the test is passed and host supports

		test; if the test is passed and host supports USB2 hardware LPM

		USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will

		(xHCI 1.0 feature), USB2 hardware LPM will be enabled for the

		be enabled for the device and the USB device directory will

		device and the USB device directory will contain a file named

		contain a file named power/usb2_hardware_lpm.  The file holds

		power/usb2_hardware_lpm.  The file holds a string value (enable

		a string value (enable or disable) indicating whether or not

		or disable) indicating whether or not USB2 hardware LPM is

		USB2 hardware LPM is enabled for the device. Developer can

		enabled for the device. Developer can write y/Y/1 or n/N/0 to

		write y/Y/1 or n/N/0 to the file to enable/disable the

		the file to enable/disable the feature.

		feature.





What:		/sys/bus/usb/devices/.../removable

What:		/sys/bus/usb/devices/.../removable

Date:		February 2012

Date:		February 2012

Documentation/usb/power-management.txt

+9 −8
Original line number Original line Diff line number Diff line
@@ -47,14 +47,15 @@ dynamic PM is implemented in the USB subsystem, although system PM is 
covered to some extent (see Documentation/power/*.txt for more

covered to some extent (see Documentation/power/*.txt for more

information about system PM).

information about system PM).





Note: Dynamic PM support for USB is present only if the kernel was

System PM support is present only if the kernel was built with CONFIG_SUSPEND

built with CONFIG_USB_SUSPEND enabled (which depends on

or CONFIG_HIBERNATION enabled.  Dynamic PM support for USB is present whenever

CONFIG_PM_RUNTIME).  System PM support is present only if the kernel

the kernel was built with CONFIG_PM enabled.

was built with CONFIG_SUSPEND or CONFIG_HIBERNATION enabled.





[Historically, dynamic PM support for USB was present only if the

(Starting with the 3.10 kernel release, dynamic PM support for USB is

kernel had been built with CONFIG_USB_SUSPEND enabled (which depended on

present whenever the kernel was built with CONFIG_PM_RUNTIME enabled.

CONFIG_PM_RUNTIME).  Starting with the 3.10 kernel release, dynamic PM support

The CONFIG_USB_SUSPEND option has been eliminated.)

for USB was present whenever the kernel was built with CONFIG_PM_RUNTIME

enabled.  The CONFIG_USB_SUSPEND option had been eliminated.]









	What is Remote Wakeup?

	What is Remote Wakeup?

arch/ia64/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ config IA64 
	select PCI if (!IA64_HP_SIM)

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select PM if (!IA64_HP_SIM)

	select HAVE_UNSTABLE_SCHED_CLOCK

	select HAVE_UNSTABLE_SCHED_CLOCK

	select HAVE_IDE

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_OPROFILE
@@ -233,6 +232,7 @@ config IA64_SGI_UV 
config IA64_HP_SIM

config IA64_HP_SIM

	bool "Ski-simulator"

	bool "Ski-simulator"

	select SWIOTLB

	select SWIOTLB

	depends on !PM_RUNTIME





endchoice

endchoice

arch/sh/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -222,7 +222,6 @@ config CPU_SHX3 
config ARCH_SHMOBILE

config ARCH_SHMOBILE

	bool

	bool

	select ARCH_SUSPEND_POSSIBLE

	select ARCH_SUSPEND_POSSIBLE

	select PM

	select PM_RUNTIME

	select PM_RUNTIME





config CPU_HAS_PMU

config CPU_HAS_PMU

CRA Git | Maintained and supported by SUSTech CRA and CCSE