arm64: dts: ti: k3-j721s2: Enable MCAN nodes at the board level

MCAN nodes defined in the top-level J721s2 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 MCAN 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-12-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index 9f1a0ca4dc372412749943240e365fb78a3f0fe3..3f4106f76893b97d22c5116337364dc3b7d68c28 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -321,81 +321,15 @@
 };
 
 &mcu_mcan0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_mcan0_pins_default>;
        phys = <&transceiver1>;
 };
 
 &mcu_mcan1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mcu_mcan1_pins_default>;
        phys = <&transceiver2>;
 };
-
-&main_mcan0 {
-       status = "disabled";
-};
-
-&main_mcan1 {
-       status = "disabled";
-};
-
-&main_mcan2 {
-       status = "disabled";
-};
-
-&main_mcan3 {
-       status = "disabled";
-};
-
-&main_mcan4 {
-       status = "disabled";
-};
-
-&main_mcan5 {
-       status = "disabled";
-};
-
-&main_mcan6 {
-       status = "disabled";
-};
-
-&main_mcan7 {
-       status = "disabled";
-};
-
-&main_mcan8 {
-       status = "disabled";
-};
-
-&main_mcan9 {
-       status = "disabled";
-};
-
-&main_mcan10 {
-       status = "disabled";
-};
-
-&main_mcan11 {
-       status = "disabled";
-};
-
-&main_mcan12 {
-       status = "disabled";
-};
-
-&main_mcan13 {
-       status = "disabled";
-};
-
-&main_mcan14 {
-       status = "disabled";
-};
-
-&main_mcan15 {
-       status = "disabled";
-};
-
-&main_mcan17 {
-       status = "disabled";
-};

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index ddc54921d34f6b4355e6c5b910622a60aa69d9ff..1c18d6df6361ada7c9d61fca7b917f3946e96417 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -732,6 +732,7 @@
                             <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan1: can@2711000 {
@@ -746,6 +747,7 @@
                             <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan2: can@2721000 {
@@ -760,6 +762,7 @@
                             <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan3: can@2731000 {
@@ -774,6 +777,7 @@
                             <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan4: can@2741000 {
@@ -788,6 +792,7 @@
                             <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan5: can@2751000 {
@@ -802,6 +807,7 @@
                             <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan6: can@2761000 {
@@ -816,6 +822,7 @@
                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan7: can@2771000 {
@@ -830,6 +837,7 @@
                             <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan8: can@2781000 {
@@ -844,6 +852,7 @@
                             <GIC_SPI 577 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan9: can@2791000 {
@@ -858,6 +867,7 @@
                             <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan10: can@27a1000 {
@@ -872,6 +882,7 @@
                             <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan11: can@27b1000 {
@@ -886,6 +897,7 @@
                             <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan12: can@27c1000 {
@@ -900,6 +912,7 @@
                             <GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan13: can@27d1000 {
@@ -914,6 +927,7 @@
                             <GIC_SPI 592 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan14: can@2681000 {
@@ -928,6 +942,7 @@
                             <GIC_SPI 595 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan15: can@2691000 {
@@ -942,6 +957,7 @@
                             <GIC_SPI 598 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan16: can@26a1000 {
@@ -956,6 +972,7 @@
                             <GIC_SPI 785 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan17: can@26b1000 {
@@ -970,5 +987,6 @@
                             <GIC_SPI 788 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 };

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
index 3de4218e8e125aff59a65e79bf61b6b029b97731..d1dd40a6e42a42e89c0d93992b5e3910939af9dc 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
@@ -182,6 +182,7 @@
                             <GIC_SPI 833 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        mcu_mcan1: can@40568000 {
@@ -196,6 +197,7 @@
                             <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        mcu_navss: bus@28380000{

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
index d25f38d896c01e0e5888405ab5306bdfcf494a22..a2cb0916e4a2fb79a35e49dacfb0f06b60430ffb 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
@@ -73,6 +73,7 @@
 };
 
 &main_mcan16 {
+       status = "okay";
        pinctrl-0 = <&main_mcan16_pins_default>;
        pinctrl-names = "default";
        phys = <&transceiver0>;