From: Shengjiu Wang Date: Mon, 6 May 2019 06:15:00 +0000 (+0800) Subject: MLK-21635: ARM: imx6sll-evk: fix clock reparent issue X-Git-Tag: rel_imx_4.19.35_1.1.0~579 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=c6efb33cc5a05fcfe30411e7ba7720b00dfa2ae9;p=linux.git MLK-21635: ARM: imx6sll-evk: fix clock reparent issue There is error log: [ 0.000000] clk: failed to reparent pll4_audio_div to osc: -22 [ 0.000000] clk: failed to reparent pll4_audio_div to osc: -22 The reason is that the assigned-clocks is used in imx6sll.dtsi clks node, so the assigned-clocks in imx6sll-evk.dts will override the previous one, then cause the reparent error issue. Redefine the assigned-clocks in imx6sll-evk.dts. Signed-off-by: Shengjiu Wang Reviewed-by: Viorel Suman --- diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts index c671b472f344..65973faa9a07 100644 --- a/arch/arm/boot/dts/imx6sll-evk.dts +++ b/arch/arm/boot/dts/imx6sll-evk.dts @@ -158,8 +158,10 @@ }; &clks { - assigned-clocks = <&clks IMX6SLL_CLK_PLL4_AUDIO_DIV>; - assigned-clock-rates = <393216000>; + assigned-clocks = <&clks IMX6SLL_CLK_PERCLK_SEL>, + <&clks IMX6SLL_CLK_PLL4_AUDIO_DIV>; + assigned-clock-parents = <&clks IMX6SLL_CLK_OSC>; + assigned-clock-rates = <0>, <393216000>; }; &cpu0 {