projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ad0df3
)
clk: rockchip: allow more than 2 parents for cpuclk
author
Jeffy Chen
<jeffy.chen@rock-chips.com>
Wed, 9 Dec 2015 09:04:10 +0000
(17:04 +0800)
committer
Heiko Stuebner
<heiko@sntech.de>
Wed, 9 Dec 2015 21:30:42 +0000
(22:30 +0100)
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>
drivers/clk/rockchip/clk-cpu.c
patch
|
blob
|
history
diff --git
a/drivers/clk/rockchip/clk-cpu.c
b/drivers/clk/rockchip/clk-cpu.c
index
330870a
..
d07374f
100644
(file)
--- 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);
}