summaryrefslogtreecommitdiff
path: root/drivers/clk/rockchip/clk-cpu.c
diff options
context:
space:
mode:
authorJeffy Chen <jeffy.chen@rock-chips.com>2015-12-09 17:04:10 +0800
committerHeiko Stuebner <heiko@sntech.de>2015-12-09 22:30:42 +0100
commitea03835fb8ea4abbad2a2154187401f55c0b932d (patch)
tree2e490ae15f77b269147660d4ffc08b556c9d7746 /drivers/clk/rockchip/clk-cpu.c
parent8ad0df33c62d706f925a5910701255759a68c2e5 (diff)
downloadlinux-next-ea03835fb8ea4abbad2a2154187401f55c0b932d.tar.gz
clk: rockchip: allow more than 2 parents for cpuclk
RK3228's armclk has 3 parents, so allow cpuclk to have more than 2 parents. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/clk/rockchip/clk-cpu.c')
-rw-r--r--drivers/clk/rockchip/clk-cpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index 330870a6d8bf..d07374f48caf 100644
--- a/drivers/clk/rockchip/clk-cpu.c
+++ b/drivers/clk/rockchip/clk-cpu.c
@@ -242,8 +242,8 @@ struct clk *rockchip_clk_register_cpuclk(const char *name,
struct clk *clk, *cclk;
int ret;
- if (num_parents != 2) {
- pr_err("%s: needs two parent clocks\n", __func__);
+ if (num_parents < 2) {
+ pr_err("%s: needs at least two parent clocks\n", __func__);
return ERR_PTR(-EINVAL);
}