arm64: dts: imx95-tqma9596sa: move sai config to SOM

The muxing and other features are mostly determined by SOM, so add it
at this level.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
index 02bbaaf298930ae54c6fdc12b3dd62efa19a68e4..5c94d8cf28c4cb397842d36b35d470af48c55ca3 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
+++ b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
@@ -254,39 +254,9 @@
 };
 
 &sai3 {
-       #sound-dai-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sai3>;
-       assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL1>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL2>,
-                         <&scmi_clk IMX95_CLK_SAI3>;
-       assigned-clock-parents = <0>, <0>, <0>, <0>,
-                                <&scmi_clk IMX95_CLK_AUDIOPLL1>;
-       assigned-clock-rates = <3932160000>,
-                              <3612672000>, <393216000>,
-                              <361267200>, <12288000>;
-       fsl,sai-mclk-direction-output;
        status = "okay";
 };
 
-&sai5 {
-       #sound-dai-cells = <0>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_sai5>;
-       assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL1>,
-                         <&scmi_clk IMX95_CLK_AUDIOPLL2>,
-                         <&scmi_clk IMX95_CLK_SAI5>;
-       assigned-clock-parents = <0>, <0>, <0>, <0>,
-                                <&scmi_clk IMX95_CLK_AUDIOPLL1>;
-       assigned-clock-rates = <3932160000>,
-                              <3612672000>, <393216000>,
-                              <361267200>, <12288000>;
-};
-
 /* X4 */
 &usb2 {
        srp-disable;

diff --git a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
index 166439e251c53fb00d2987dd33c177cbf584e80d..e7edeec712dcb2b08bd85e3cfb82164f67390885 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
@@ -391,6 +391,39 @@
        };
 };
 
+&sai3 {
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai3>;
+       assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL1>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL2>,
+                         <&scmi_clk IMX95_CLK_SAI3>;
+       assigned-clock-parents = <0>, <0>, <0>, <0>,
+                                <&scmi_clk IMX95_CLK_AUDIOPLL1>;
+       assigned-clock-rates = <3932160000>,
+                              <3612672000>, <393216000>,
+                              <361267200>, <12288000>;
+       fsl,sai-mclk-direction-output;
+};
+
+&sai5 {
+       #sound-dai-cells = <0>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai5>;
+       assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL1>,
+                         <&scmi_clk IMX95_CLK_AUDIOPLL2>,
+                         <&scmi_clk IMX95_CLK_SAI5>;
+       assigned-clock-parents = <0>, <0>, <0>, <0>,
+                                <&scmi_clk IMX95_CLK_AUDIOPLL1>;
+       assigned-clock-rates = <3932160000>,
+                              <3612672000>, <393216000>,
+                              <361267200>, <12288000>;
+};
+
 &scmi_bbm {
        linux,code = <KEY_POWER>;
 };