mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
clk: sunxi-ng: mux: Fix determine_rate for mux clocks with pre-dividers
The determine_rate helper used ccu_mux_helper_adjust_parent_for_prediv() to adjust the parent_rate to account for pre-dividers, but then passed the pristine parent clock rate from clk_hw_get_rate() to the round() callback, thereby ignoring the pre-divider adjustment. In addition, it was saving the adjusted parent rate back into struct clk_rate_request. This patch fixes this by saving the pristine parent clock rate, and adding a copy that is adjusted and passed to the round() callback. The pristine copy, if it is the best solution, would be saved back to struct clk_rate_request. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
parent
64afa89ff6
commit
ed48205fb4
1 changed files with 4 additions and 3 deletions
|
@ -71,7 +71,7 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,
|
|||
unsigned int i;
|
||||
|
||||
for (i = 0; i < clk_hw_get_num_parents(hw); i++) {
|
||||
unsigned long tmp_rate, parent_rate;
|
||||
unsigned long tmp_rate, parent_rate, adj_parent_rate;
|
||||
struct clk_hw *parent;
|
||||
|
||||
parent = clk_hw_get_parent_by_index(hw, i);
|
||||
|
@ -79,10 +79,11 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,
|
|||
continue;
|
||||
|
||||
parent_rate = clk_hw_get_rate(parent);
|
||||
adj_parent_rate = parent_rate;
|
||||
ccu_mux_helper_adjust_parent_for_prediv(common, cm, i,
|
||||
&parent_rate);
|
||||
&adj_parent_rate);
|
||||
|
||||
tmp_rate = round(cm, clk_hw_get_rate(parent), req->rate, data);
|
||||
tmp_rate = round(cm, adj_parent_rate, req->rate, data);
|
||||
if (tmp_rate == req->rate) {
|
||||
best_parent = parent;
|
||||
best_parent_rate = parent_rate;
|
||||
|
|
Loading…
Reference in a new issue