[PATCH 1/4] arm: dts: k3-j721e: Refine MAIN domain ESM support

[Neha Malcom Francis]

MAIN domain ESM support was already added for J721E to configure main
domain watchdog interrupts to generate ESM pin events. Move the main_esm
node to be in sync with kernel dts. Also add register mapping for ESM in
J721E.

Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
---
 arch/arm/dts/k3-j721e-main.dtsi                | 7 +++++++
 arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 9 ---------
 arch/arm/dts/k3-j721e.dtsi                     | 1 +
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/arm/dts/k3-j721e-main.dtsi b/arch/arm/dts/k3-j721e-main.dtsi
index cf3482376c..2142f9c163 100644
--- a/arch/arm/dts/k3-j721e-main.dtsi
+++ b/arch/arm/dts/k3-j721e-main.dtsi
@@ -1940,4 +1940,11 @@
 			bus_freq = <1000000>;
 		};
 	};
+
+	main_esm: esm at 700000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x700000 0x0 0x1000>;
+		ti,esm-pins = <344>, <345>;
+		bootph-pre-ram;
+	};
 };
diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
index 1b40cf2580..376d511446 100644
--- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
@@ -88,15 +88,6 @@
 	};
 };
 
-&cbass_main {
-	main_esm: esm at 700000 {
-		compatible = "ti,j721e-esm";
-		reg = <0x0 0x700000 0x0 0x1000>;
-		ti,esm-pins = <344>, <345>;
-		bootph-pre-ram;
-	};
-};
-
 &dmsc {
 	mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
 	mbox-names = "tx", "rx", "notify";
diff --git a/arch/arm/dts/k3-j721e.dtsi b/arch/arm/dts/k3-j721e.dtsi
index f0587fde14..d7f73f61db 100644
--- a/arch/arm/dts/k3-j721e.dtsi
+++ b/arch/arm/dts/k3-j721e.dtsi
@@ -126,6 +126,7 @@
 		#size-cells = <2>;
 		ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */
 			 <0x00 0x00600000 0x00 0x00600000 0x00 0x00031100>, /* GPIO */
+			 <0x00 0x00700000 0x00 0x00700000 0x00 0x00001000>, /* ESM */
 			 <0x00 0x00900000 0x00 0x00900000 0x00 0x00012000>, /* serdes */
 			 <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* timesync router */
 			 <0x00 0x06000000 0x00 0x06000000 0x00 0x00400000>, /* USBSS0 */
-- 
2.34.1