mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

Some fixes for the new power-domain driver, including restricting

Browse source 
Rockchip Kconfig options, fixing a possible null-pointer and a
 typo in the dt-bindings.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJWIlknAAoJEPOmecmc0R2BrTkH/3w+1ZZuvtfQmzBkPwJGJ9vJ
 zZFZLZqD0NADib8sOhFnJxTfxrhoE/Bfijqk4wPfjdKta2GABfljGbLDanQB8Yr9
 Ip+fyflQ6cd925dEuPccHMbumZep+QuSIGYjOGFIuRbbjCdOY5MB+I2Yhvognwus
 Xh4FtjS7CL6ruotmyOcMtnpNDCAvc8NSwO7xBqxYRPcgd+DY8+86cD/dUpvmD4Kr
 pGtUXkfQpAjBhV9P6RuP63gO42JD1VMb7c6idd+B/tzbJxI08CTDolwqvyujVkHf
 KeRvu7g8qKKUwL5ffOImR4tR/T2o1wDLwfxuUJXW+mIVJa72qA+h90aNOhM2iC8=
 =Qk94
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-10-23 10:18:34 -07:00
commit fe9990f9fd
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
View file

@ -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:

4
drivers/soc/rockchip/Kconfig
View file

@ -1,3 +1,5 @@
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

4
drivers/soc/rockchip/pm_domains.c
View file

@ -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;
} }