Commit 273395f0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.4-rockchip-drivers1' of... 

Merge tag 'v4.4-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/drivers

Merge "Rockchip power-domain drivers for 4.4" from Heiko Stuebner:

Add the power-domain base-driver which currently contains
support for the rk3288 powerdomain layout but can be easily
extended for the socs (including arm64) later on.
A big thanks to Ceasar Wang for pulling through on this
during 18 revisions.
Also included is a fix to the pm-clock handling in the generic
powerdomains to adapt it to the per-user clock handling we now
do, Acked by Rafael Wysocki.

* tag 'v4.4-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: power-domain: Add power domain driver
  dt-bindings: add document of Rockchip power domains
  PM / clk: Do not __clk_get passed in clock-references
  dt-bindings: add power-domain header for RK3288 SoCs
parents f3c65c28 7c696693

Documentation/devicetree/bindings/soc/rockchip/power_domain.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
* Rockchip Power Domains



Rockchip processors include support for multiple power domains which can be

powered up/down by software based on different application scenes to save power.



Required properties for power domain controller:

- compatible: Should be one of the following.

	"rockchip,rk3288-power-controller" - for RK3288 SoCs.

- #power-domain-cells: Number of cells in a power-domain specifier.

	Should be 1 for multiple PM domains.

- #address-cells: Should be 1.

- #size-cells: Should be 0.



Required properties for power domain sub nodes:

- reg: index of the power domain, should use macros in:

	"include/dt-bindings/power-domain/rk3288.h" - for RK3288 type power domain.

- clocks (optional): phandles to clocks which need to be enabled while power domain

	switches state.



Example:



	power: power-controller {

		compatible = "rockchip,rk3288-power-controller";

		#power-domain-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;



		pd_gpu {

			reg = <RK3288_PD_GPU>;

			clocks = <&cru ACLK_GPU>;

		};

	};



Node of a device using power domains must have a power-domains property,

containing a phandle to the power device node and an index specifying which

power domain to use.

The index should use macros in:

	"include/dt-bindings/power-domain/rk3288.h" - for rk3288 type power domain.



Example of the node using power domain:



	node {

		/* ... */

		power-domains = <&power RK3288_PD_GPU>;

		/* ... */

	};

drivers/base/power/clock_ops.c

+4 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id, 
			return -ENOMEM;

		}

	} else {

		if (IS_ERR(clk) || !__clk_get(clk)) {

		if (IS_ERR(clk)) {

			kfree(ce);

			return -ENOENT;

		}
@@ -127,7 +127,9 @@ int pm_clk_add(struct device *dev, const char *con_id) 
 * @clk: Clock pointer

 *

 * Add the clock to the list of clocks used for the power management of @dev.

 * It will increment refcount on clock pointer, use clk_put() on it when done.

 * The power-management code will take control of the clock reference, so

 * callers should not call clk_put() on @clk after this function sucessfully

 * returned.

 */

int pm_clk_add_clk(struct device *dev, struct clk *clk)

{

drivers/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menu "SOC (System On Chip) specific Drivers" 


source "drivers/soc/mediatek/Kconfig"

source "drivers/soc/qcom/Kconfig"

source "drivers/soc/rockchip/Kconfig"

source "drivers/soc/sunxi/Kconfig"

source "drivers/soc/ti/Kconfig"

source "drivers/soc/versatile/Kconfig"

drivers/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
obj-$(CONFIG_MACH_DOVE)		+= dove/

obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/

obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/

obj-$(CONFIG_ARCH_TEGRA)	+= tegra/

obj-$(CONFIG_SOC_TI)		+= ti/

drivers/soc/rockchip/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#

# Rockchip Soc drivers

#

config ROCKCHIP_PM_DOMAINS

        bool "Rockchip generic power domain"

        depends on PM

        select PM_GENERIC_DOMAINS

        help

          Say y here to enable power domain support.

          In order to meet high performance and low power requirements, a power

          management unit is designed or saving power when RK3288 in low power

          mode. The RK3288 PMU is dedicated for managing the power of the whole chip.



          If unsure, say N.

CRA Git | Maintained and supported by SUSTech CRA and CCSE