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

MCAN nodes defined in the top-level AM64x SoC dtsi files are incomplete
and will 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>
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20221017192532.23825-10-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 7ea07f7fe5a2a6848a918e25b94f657c21ebb11c..d6218038055aedda805f9bf4b839f43b7196705e 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -1326,6 +1326,7 @@
                             <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        main_mcan1: can@20711000 {
@@ -1340,6 +1341,7 @@
                             <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "int0", "int1";
                bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+               status = "disabled";
        };
 
        crypto: crypto@40900000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 9a3bf852810c0d794fe314f6d2b28b1bbdcfb499..666f5d3a2d951002738fe08495e6b25c3850f490 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -577,12 +577,14 @@
 };
 
 &main_mcan0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_mcan0_pins_default>;
        phys = <&transceiver1>;
 };
 
 &main_mcan1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_mcan1_pins_default>;
        phys = <&transceiver2>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 451e1483f3e4be577a9a9f28a88b834626c61fb9..3e6df16fcb5915ecf186a05ee074c5b9ddeab320 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -567,14 +567,6 @@
        pinctrl-0 = <&main_ecap0_pins_default>;
 };
 
-&main_mcan0 {
-       status = "disabled";
-};
-
-&main_mcan1 {
-       status = "disabled";
-};
-
 &gpmc0 {
        status = "disabled";
 };