arm64: dts: ti: k3-j721e: Enable MCASP nodes at the board level

MCASP nodes defined in the top-level J721e SoC dtsi files are incomplete
and may not be functional unless they are extended with pinmux
information.

As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.

Disable the MCASP nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221020160305.18711-4-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index 24e9db563b2341f089894aaede7fe8b8bd2db596..6cee708e0d170e3e9e7f59d85dbecc1ed1a1a6de 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -709,47 +709,8 @@
        };
 };
 
-&mcasp0 {
-       status = "disabled";
-};
-
-&mcasp1 {
-       status = "disabled";
-};
-
-&mcasp2 {
-       status = "disabled";
-};
-
-&mcasp3 {
-       status = "disabled";
-};
-
-&mcasp4 {
-       status = "disabled";
-};
-
-&mcasp5 {
-       status = "disabled";
-};
-
-&mcasp6 {
-       status = "disabled";
-};
-
-&mcasp7 {
-       status = "disabled";
-};
-
-&mcasp8 {
-       status = "disabled";
-};
-
-&mcasp9 {
-       status = "disabled";
-};
-
 &mcasp10 {
+       status = "okay";
        #sound-dai-cells = <0>;
 
        pinctrl-names = "default";
@@ -767,10 +728,6 @@
        rx-num-evt = <0>;
 };
 
-&mcasp11 {
-       status = "disabled";
-};
-
 &cmn_refclk1 {
        clock-frequency = <100000000>;
 };

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 61bba78ce354e46e1a433c904156a1be97d2fb4e..3706b319c46c6ae903b405ba97261424ef8fc5a0 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -1425,6 +1425,7 @@
                clocks = <&k3_clks 174 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 174 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp1: mcasp@2b10000 {
@@ -1442,6 +1443,7 @@
                clocks = <&k3_clks 175 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 175 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp2: mcasp@2b20000 {
@@ -1459,6 +1461,7 @@
                clocks = <&k3_clks 176 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 176 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp3: mcasp@2b30000 {
@@ -1476,6 +1479,7 @@
                clocks = <&k3_clks 177 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 177 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp4: mcasp@2b40000 {
@@ -1493,6 +1497,7 @@
                clocks = <&k3_clks 178 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp5: mcasp@2b50000 {
@@ -1510,6 +1515,7 @@
                clocks = <&k3_clks 179 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp6: mcasp@2b60000 {
@@ -1527,6 +1533,7 @@
                clocks = <&k3_clks 180 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 180 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp7: mcasp@2b70000 {
@@ -1544,6 +1551,7 @@
                clocks = <&k3_clks 181 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 181 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp8: mcasp@2b80000 {
@@ -1561,6 +1569,7 @@
                clocks = <&k3_clks 182 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 182 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp9: mcasp@2b90000 {
@@ -1578,6 +1587,7 @@
                clocks = <&k3_clks 183 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 183 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp10: mcasp@2ba0000 {
@@ -1595,6 +1605,7 @@
                clocks = <&k3_clks 184 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcasp11: mcasp@2bb0000 {
@@ -1612,6 +1623,7 @@
                clocks = <&k3_clks 185 1>;
                clock-names = "fck";
                power-domains = <&k3_pds 185 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        watchdog0: watchdog@2200000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 1d5a90d968497aa74de04af7cb4d5a392066092d..b7cb34007fb680a06bd1ec5b50552eca546c7387 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -796,66 +796,6 @@
        };
 };
 
-&mcasp0 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp1 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp2 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp3 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp4 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp5 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp6 {
-       /* Brought out on RPi header */
-       status = "disabled";
-};
-
-&mcasp7 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp8 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp9 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp10 {
-       /* Unused */
-       status = "disabled";
-};
-
-&mcasp11 {
-       /* Brought out on M.2 E Key */
-       status = "disabled";
-};
-
 &serdes0 {
        serdes0_pcie_link: phy@0 {
                reg = <0>;