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

Commit fe9990f9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Some fixes for the new power-domain driver, including restricting
Rockchip Kconfig options, fixing a possible null-pointer and a
typo in the dt-bindings.

* tag 'v4.4-rockchip-drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip

:
  dt-bindings: Correct paths in Rockchip power domains binding document
  soc: rockchip: power-domain: don't try to print the clock name in error case
  soc: rockchip: Restrict to ARCH_ROCKCHIP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 056a72a5 46813471

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ Required properties for power domain controller: 




Required properties for power domain sub nodes:

Required properties for power domain sub nodes:

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

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

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

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

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

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

	switches state.

	switches state.
@@ -35,7 +35,7 @@ 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

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

power domain to use.

power domain to use.

The index should use macros in:

The index should use macros in:

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

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





Example of the node using power domain:

Example of the node using power domain:

drivers/soc/rockchip/Kconfig

+4 −0
Original line number Original line Diff line number Diff line 
if ARCH_ROCKCHIP || COMPILE_TEST



#

#

# Rockchip Soc drivers

# Rockchip Soc drivers

#

#
@@ -12,3 +14,5 @@ config ROCKCHIP_PM_DOMAINS 
          mode. The RK3288 PMU is dedicated for managing the power of the whole chip.

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





          If unsure, say N.

          If unsure, say N.



endif

drivers/soc/rockchip/pm_domains.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -265,8 +265,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu, 
		if (IS_ERR(clk)) {

		if (IS_ERR(clk)) {

			error = PTR_ERR(clk);

			error = PTR_ERR(clk);

			dev_err(pmu->dev,

			dev_err(pmu->dev,

				"%s: failed to get clk %pC (index %d): %d\n",

				"%s: failed to get clk at index %d: %d\n",

				node->name, clk, i, error);

				node->name, i, error);

			goto err_out;

			goto err_out;

		}

		}