summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-10-23 10:18:34 -0700
committerOlof Johansson <olof@lixom.net>2015-10-23 10:18:34 -0700
commitfe9990f9fd77c7fbdb875799dba79479c5e1276f (patch)
tree309083df89d6db178c64c5570314de873198f32c /drivers/soc
parent056a72a5597e0f3e06260d0b21feb99296f77427 (diff)
parent4681347153dba01836aca18ebcfb4101c927d8ec (diff)
downloadlinux-fe9990f9fd77c7fbdb875799dba79479c5e1276f.tar.bz2
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>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/rockchip/Kconfig4
-rw-r--r--drivers/soc/rockchip/pm_domains.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig
index 6ee03994801c..7140ff825598 100644
--- a/drivers/soc/rockchip/Kconfig
+++ b/drivers/soc/rockchip/Kconfig
@@ -1,3 +1,5 @@
+if ARCH_ROCKCHIP || COMPILE_TEST
+
#
# 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.
If unsure, say N.
+
+endif
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 8268d5d2b852..534c58937a56 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -265,8 +265,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
if (IS_ERR(clk)) {
error = PTR_ERR(clk);
dev_err(pmu->dev,
- "%s: failed to get clk %pC (index %d): %d\n",
- node->name, clk, i, error);
+ "%s: failed to get clk at index %d: %d\n",
+ node->name, i, error);
goto err_out;
}