diff options
| author | Alexander Stein <alexander.stein@ew.tq-group.com> | 2021-11-03 13:24:41 +0100 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2021-11-03 17:49:54 -0700 |
| commit | c54ce354637058202621d55fec2ccba3fe62a219 (patch) | |
| tree | d5b2ddcb3075e02877710cba27b4631e87d906e6 /drivers/clk | |
| parent | 9af0cbeb477cf36327eec4246a60c5e981b2bd1a (diff) | |
| download | linux-c54ce354637058202621d55fec2ccba3fe62a219.tar.bz2 | |
clk: composite: Fix 'switching' to same clock
During commit 6594988fd625 ("clk: composite: Use rate_ops.determine_rate
when also a mux is available") setting req->best_parent_hw got lost,
so best_parent_hw stays NULL during switch to the same parent. This
results in the (debug) message:
clk_calc_new_rates: lcdif_pixel not gated but wants to reparent
and the following rate change is dropped.
Fixes: 6594988fd625 ("clk: composite: Use rate_ops.determine_rate when also a mux is available")
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20211103122441.3208576-1-alexander.stein@ew.tq-group.com
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-composite.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index c04ae0e7e4b4..b9c5f904f535 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -97,6 +97,7 @@ static int clk_composite_determine_rate(struct clk_hw *hw, return ret; req->rate = tmp_req.rate; + req->best_parent_hw = tmp_req.best_parent_hw; req->best_parent_rate = tmp_req.best_parent_rate; return 0; |