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

Changed files
+1 -1
drivers
clk
sunxi-ng
+1 -1
drivers/clk/sunxi-ng/ccu_mp.c
··· 108 108 max_m = cmp->m.max ?: 1 << cmp->m.width; 109 109 max_p = cmp->p.max ?: 1 << ((1 << cmp->p.width) - 1); 110 110 111 - if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) { 111 + if (!clk_hw_can_set_rate_parent(&cmp->common.hw)) { 112 112 ccu_mp_find_best(*parent_rate, rate, max_m, max_p, &m, &p); 113 113 rate = *parent_rate / p / m; 114 114 } else {