mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +00:00
clk: sunxi-ng: mux: Don't just rely on the parent for CLK_SET_RATE_PARENT
The current code only rely on the parent to change its rate in the case where CLK_SET_RATE_PARENT is set. However, some clock rates might be obtained only through a modification of the parent and the clock divider. Just rely on the round rate of the clocks to give us the best computation that might be achieved for a given rate. round_rate functions now need to honor CLK_SET_RATE_PARENT, but either the functions already do that if they modify the parent, or don't modify the praents at all. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
parent
e69b2afa87
commit
73e3e04fc0
@ -95,19 +95,7 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,
|
||||
if (!parent)
|
||||
continue;
|
||||
|
||||
if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
|
||||
struct clk_rate_request parent_req = *req;
|
||||
int ret = __clk_determine_rate(parent, &parent_req);
|
||||
|
||||
if (ret)
|
||||
continue;
|
||||
|
||||
parent_rate = parent_req.rate;
|
||||
} else {
|
||||
parent_rate = clk_hw_get_rate(parent);
|
||||
}
|
||||
|
||||
adj_parent_rate = parent_rate;
|
||||
adj_parent_rate = parent_rate = clk_hw_get_rate(parent);
|
||||
ccu_mux_helper_adjust_parent_for_prediv(common, cm, i,
|
||||
&adj_parent_rate);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user