arm64: dts: ti: k3-am64: Enable GPMC and ELM nodes at the board level

The GPMC node defined in the top-level AM64x SoC dtsi files are incomplete
and will not be functional unless it is extended with pinmux information.

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

Disable the GPMC node in the dtsi file. Since the ELM is made to work
with the GPMC, disable it too.

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-11-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 d6218038055aedda805f9bf4b839f43b7196705e..c96df4b9b3d79268644009f95ad8a0389074937f 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -1381,6 +1381,7 @@
                #interrupt-cells = <2>;
                gpio-controller;
                #gpio-cells = <2>;
+               status = "disabled";
        };
 
        elm0: ecc@25010000 {
@@ -1390,5 +1391,6 @@
                power-domains = <&k3_pds 54 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 54 0>;
                clock-names = "fck";
+               status = "disabled";
        };
 };

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 666f5d3a2d951002738fe08495e6b25c3850f490..39feea78a084eeee870ae83318c2e30e470fa673 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -589,11 +589,3 @@
        pinctrl-0 = <&main_mcan1_pins_default>;
        phys = <&transceiver2>;
 };
-
-&gpmc0 {
-       status = "disabled";
-};
-
-&elm0 {
-       status = "disabled";
-};

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 3e6df16fcb5915ecf186a05ee074c5b9ddeab320..2e2d40da360a274e0b2cc9c8164f45b31434b1a7 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -566,11 +566,3 @@
        pinctrl-names = "default";
        pinctrl-0 = <&main_ecap0_pins_default>;
 };
-
-&gpmc0 {
-       status = "disabled";
-};
-
-&elm0 {
-       status = "disabled";
-};