Skip to content

Commit 358fece

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd: "One small fix for the Allwinner clk driver so that display clks figure out the correct rate to use. This fixes displays running 4k@60Hz and some other resolutions that haven't been exercised and fully understood until now" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: sunxi-ng: mp: fix parent rate change flag check
2 parents 0001ec9 + 245090a commit 358fece

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/clk/sunxi-ng/ccu_mp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
108108
max_m = cmp->m.max ?: 1 << cmp->m.width;
109109
max_p = cmp->p.max ?: 1 << ((1 << cmp->p.width) - 1);
110110

111-
if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) {
111+
if (!clk_hw_can_set_rate_parent(&cmp->common.hw)) {
112112
ccu_mp_find_best(*parent_rate, rate, max_m, max_p, &m, &p);
113113
rate = *parent_rate / p / m;
114114
} else {

0 commit comments

Comments
 (0)