LF-1688: arm64: dts: imx8mn: Resolve conflict for assigned-clocks in clk node

The assigned-clocks in imx8mn-evk.dtsi will replace the assigned-clocks in
imx8mn.dtsi, which is wrong operation.

The correct way is to merge them together in imx8mn.dtsi.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
index 4cdac78..05aa8da 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
@@ -113,11 +113,6 @@
        status = "okay";
 };
 
-&clk {
-       assigned-clocks = <&clk IMX8MN_AUDIO_PLL1>, <&clk IMX8MN_AUDIO_PLL2>;
-       assigned-clock-rates = <393216000>, <361267200>;
-};
-
 &easrc {
        fsl,asrc-rate  = <48000>;
        status = "okay";

diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index ea4c94c..0341189 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -821,7 +821,9 @@
                                                <&clk IMX8MN_CLK_NOC>,
                                                <&clk IMX8MN_CLK_AUDIO_AHB>,
                                                <&clk IMX8MN_CLK_IPG_AUDIO_ROOT>,
-                                               <&clk IMX8MN_SYS_PLL3>;
+                                               <&clk IMX8MN_SYS_PLL3>,
+                                               <&clk IMX8MN_AUDIO_PLL1>,
+                                               <&clk IMX8MN_AUDIO_PLL2>;
                                assigned-clock-parents = <&clk IMX8MN_SYS_PLL1_800M>,
                                                         <&clk IMX8MN_ARM_PLL_OUT>,
                                                         <&clk IMX8MN_SYS_PLL3_OUT>,
@@ -829,7 +831,9 @@
                                assigned-clock-rates = <0>, <0>, <0>,
                                                        <400000000>,
                                                        <400000000>,
-                                                       <600000000>;
+                                                       <600000000>,
+                                                       <393216000>,
+                                                       <361267200>;
                        };
 
                        src: reset-controller@30390000 {