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

Merge branches 'pm-sleep', 'pm-domains' and 'pm-avs' 

* pm-sleep:
  PM / suspend: make sync() on suspend-to-RAM build-time optional
  PM / sleep: Allow devices without runtime PM to do direct-complete
  PM / autosleep: Use workqueue for user space wakeup sources garbage collector

* pm-domains:
  PM / Domains: Fix typo in description of genpd_dev_pm_detach()
  PM / Domains: Remove unusable governor dummies
  PM / Domains: Make pm_genpd_init() available to modules
  PM / domains: Align column headers and data in pm_genpd_summary output
  PM / Domains: Return -EPROBE_DEFER if we fail to init or turn-on domain
  PM / Domains: Correct unit address in power-controller example
  PM / Domains: Remove intermediate states from the power off sequence

* pm-avs:
  PM / AVS: rockchip-io: add io selectors and supplies for rk3368
  PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS
parents 5cf896b3 2fd77fff 8bb6944e 3fc147e9

Documentation/devicetree/bindings/power/power_domain.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ Example 2: 
		#power-domain-cells = <1>;

	};



	child: power-controller@12340000 {

	child: power-controller@12341000 {

		compatible = "foo,power-controller";

		reg = <0x12341000 0x1000>;

		power-domains = <&parent 0>;

Documentation/devicetree/bindings/power/rockchip-io-domain.txt

+14 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ Required properties: 
- compatible: should be one of:

  - "rockchip,rk3188-io-voltage-domain" for rk3188

  - "rockchip,rk3288-io-voltage-domain" for rk3288

  - "rockchip,rk3368-io-voltage-domain" for rk3368

  - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains

- rockchip,grf: phandle to the syscon managing the "general register files"
@@ -64,6 +66,18 @@ Possible supplies for rk3288: 
- sdcard-supply: The supply connected to SDMMC0_VDD.

- wifi-supply:   The supply connected to APIO3_VDD.  Also known as SDIO0.



Possible supplies for rk3368:

- audio-supply:  The supply connected to APIO3_VDD.

- dvp-supply:    The supply connected to DVPIO_VDD.

- flash0-supply: The supply connected to FLASH0_VDD.  Typically for eMMC

- gpio30-supply: The supply connected to APIO1_VDD.

- gpio1830       The supply connected to APIO4_VDD.

- sdcard-supply: The supply connected to SDMMC0_VDD.

- wifi-supply:   The supply connected to APIO2_VDD.  Also known as SDIO0.



Possible supplies for rk3368 pmu-domains:

- pmu-supply:    The supply connected to PMUIO_VDD.

- vop-supply:    The supply connected to LCDC_VDD.



Example:

Documentation/power/devices.txt

+7 −0
Original line number Diff line number Diff line
@@ -341,6 +341,13 @@ the phases are: 
	and is entirely responsible for bringing the device back to the

	functional state as appropriate.



	Note that this direct-complete procedure applies even if the device is

	disabled for runtime PM; only the runtime-PM status matters.  It follows

	that if a device has system-sleep callbacks but does not support runtime

	PM, then its prepare callback must never return a positive value.  This

	is because all devices are initially set to runtime-suspended with

	runtime PM disabled.



    2.	The suspend methods should quiesce the device to stop it from performing

	I/O.  They also may save the device registers and put it into the

	appropriate low-power state, depending on the bus type the device is on,

Documentation/power/runtime_pm.txt

+0 −4
Original line number Diff line number Diff line
@@ -445,10 +445,6 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
  bool pm_runtime_status_suspended(struct device *dev);

    - return true if the device's runtime PM status is 'suspended'



  bool pm_runtime_suspended_if_enabled(struct device *dev);

    - return true if the device's runtime PM status is 'suspended' and its

      'power.disable_depth' field is equal to 1



  void pm_runtime_allow(struct device *dev);

    - set the power.runtime_auto flag for the device and decrease its usage

      counter (used by the /sys/devices/.../power/control interface to

drivers/base/power/domain.c

+76 −310

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE