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

MCAN 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 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-5-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 6cee708e0d170e3e9e7f59d85dbecc1ed1a1a6de..1861598f3bb40ebd2d513a66aeb978a87e811b2a 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
@@ -878,73 +878,29 @@
 };
 
 &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 = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_mcan0_pins_default>;
        phys = <&transceiver3>;
 };
 
-&main_mcan1 {
-       status = "disabled";
-};
-
 &main_mcan2 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_mcan2_pins_default>;
        phys = <&transceiver4>;
 };
-
-&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";
-};

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 3706b319c46c6ae903b405ba97261424ef8fc5a0..646885dd9f533611786a4eddcc0645bdd3e17fa4 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -2056,6 +2056,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 {
@@ -2070,6 +2071,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 {
@@ -2084,6 +2086,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 {
@@ -2098,6 +2101,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 {
@@ -2112,6 +2116,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 {
@@ -2126,6 +2131,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 {
@@ -2140,6 +2146,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 {
@@ -2154,6 +2161,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 {
@@ -2168,6 +2176,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 {
@@ -2182,6 +2191,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 {
@@ -2196,6 +2206,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 {
@@ -2210,6 +2221,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 {
@@ -2224,6 +2236,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 {
@@ -2238,5 +2251,6 @@
                             <GIC_SPI 592 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-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
index 7bb6613796eab41c424d216ecb6456921fe35984..f79e8100a7ac0c9f27658b421af28cc4af0e6f61 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
@@ -408,6 +408,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 {
@@ -422,5 +423,6 @@
                             <GIC_SPI 836 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 };