From ea2e1e537c47e85d07e11835b6e2506ffda5d5df Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Sun, 26 Jul 2015 00:03:47 +0200 Subject: [PATCH] clk: handle fixed-rate clocks correctly in clk_core_round_rate_nolock Commit 6edc753d8ecc ("clk: change clk_ops' ->determine_rate() prototype") changed the behaviour of clk_core_round_rate_nolock as it forgot to also include the else conditional simply returning the clock rate for clocks that neither have a parent or can determine their rate - for example said fixed clocks. This resulted in failures to set pll rates on rockchip socs, as it returned the target pll rate as suitable rate for the 24MHz xin24m clock, thus making the ccf want to set this fixed clock to 1.6GHz or similar. Fixes: 6edc753d8ecc ("clk: change clk_ops' ->determine_rate() prototype") Reported-by: Romain Perier Signed-off-by: Heiko Stuebner --- ###### was merged into the original offending commit ###### drivers/clk/clk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 67f778b..819ffa6 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -802,6 +802,8 @@ static int clk_core_round_rate_nolock(struct clk_core *core, req->rate = rate; } else if (core->flags & CLK_SET_RATE_PARENT) { return clk_core_round_rate_nolock(parent, req); + } else { + req->rate = core->rate; } return 0; -- 2.1.4