diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2015-12-09 17:04:10 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@rock-chips.com> | 2016-01-15 17:52:15 +0800 |
| commit | b260018adbcaa02fe30d34912300de251a1cbd05 (patch) | |
| tree | b07c5f836ca293e144dc78263bb3912dcf8141c1 | |
| parent | a10ca571fcccae7d452c5d3e5daffdbdb588e9ac (diff) | |
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>
(cherry picked from linux-next.git
commit ea03835fb8ea4abbad2a2154187401f55c0b932d)
Change-Id: Iddb60e4f7bda91b98b4a3e42f196eee510173dce
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
| -rw-r--r-- | drivers/clk/rockchip/clk-cpu.c | 4 |
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); } |