[v1,5/8] clk: rockchip: allow more than 2 parents for cpuclk
diff mbox

Message ID 1449651853-1667-6-git-send-email-jeffy.chen@rock-chips.com
State New
Headers show

Commit Message

JeffyChen Dec. 9, 2015, 9:04 a.m. UTC
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>
---

 drivers/clk/rockchip/clk-cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Heiko Stuebner Dec. 9, 2015, 9:35 p.m. UTC | #1
Am Mittwoch, 9. Dezember 2015, 17:04:10 schrieb Jeffy Chen:
> 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>

applied to my clk branch for 4.5

Thanks
Heiko

Patch
diff mbox

diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index 330870a..d07374f 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);
 	}