[PATCH v3 6/9] arm64: dts: ti: Split k3-j784s4-j742s2-evm-common.dtsi

[Manorit Chawdhry]

k3-j784s4-j742s2-evm-common.dtsi will be included in k3-j742s2-evm.dts
at a later point so move j784s4 related stuff to k3-j784s4-evm.dts

Signed-off-by: Manorit Chawdhry <m-chawdhry@xxxxxx>
---
 arch/arm64/boot/dts/ti/k3-j784s4-evm.dts           | 49 ++++++++++++++++++++++
 .../boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi   | 42 -------------------
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
index e3730b2bca92..2543983b7fe7 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
@@ -5,4 +5,53 @@
  * EVM Board Schematics: https://www.ti.com/lit/zip/sprr458
  */
 
+/dts-v1/;
+
+#include <dt-bindings/net/ti-dp83867.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "k3-j784s4.dtsi"
 #include "k3-j784s4-j742s2-evm-common.dtsi"
+
+/ {
+	compatible = "ti,j784s4-evm", "ti,j784s4";
+	model = "Texas Instruments J784S4 EVM";
+
+	memory@80000000 {
+		device_type = "memory";
+		bootph-all;
+		/* 32G RAM */
+		reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
+		      <0x00000008 0x80000000 0x00000007 0x80000000>;
+	};
+
+	reserved_memory: reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+
+		c71_3_dma_memory_region: c71-dma-memory@ab000000 {
+			compatible = "shared-dma-pool";
+			reg = <0x00 0xab000000 0x00 0x100000>;
+			no-map;
+		};
+
+		c71_3_memory_region: c71-memory@ab100000 {
+			compatible = "shared-dma-pool";
+			reg = <0x00 0xab100000 0x00 0xf00000>;
+			no-map;
+		};
+	};
+};
+
+&mailbox0_cluster5 {
+	mbox_c71_3: mbox-c71-3 {
+		ti,mbox-rx = <2 0 0>;
+		ti,mbox-tx = <3 0 0>;
+	};
+};
+
+&c71_3 {
+	status = "okay";
+	mboxes = <&mailbox0_cluster5 &mbox_c71_3>;
+	memory-region = <&c71_3_dma_memory_region>,
+			<&c71_3_memory_region>;
+};
diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
index ffa38f41679d..068ceed4ea15 100644
--- a/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi
@@ -4,17 +4,7 @@
  *
  * EVM Board Schematics: https://www.ti.com/lit/zip/sprr458
  */
-
-/dts-v1/;
-
-#include <dt-bindings/net/ti-dp83867.h>
-#include <dt-bindings/gpio/gpio.h>
-#include "k3-j784s4.dtsi"
-
 / {
-	compatible = "ti,j784s4-evm", "ti,j784s4";
-	model = "Texas Instruments J784S4 EVM";
-
 	chosen {
 		stdout-path = "serial2:115200n8";
 	};
@@ -31,14 +21,6 @@ aliases {
 		ethernet1 = &main_cpsw1_port1;
 	};
 
-	memory@80000000 {
-		device_type = "memory";
-		bootph-all;
-		/* 32G RAM */
-		reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
-		      <0x00000008 0x80000000 0x00000007 0x80000000>;
-	};
-
 	reserved_memory: reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -180,18 +162,6 @@ c71_2_memory_region: c71-memory@aa100000 {
 			reg = <0x00 0xaa100000 0x00 0xf00000>;
 			no-map;
 		};
-
-		c71_3_dma_memory_region: c71-dma-memory@ab000000 {
-			compatible = "shared-dma-pool";
-			reg = <0x00 0xab000000 0x00 0x100000>;
-			no-map;
-		};
-
-		c71_3_memory_region: c71-memory@ab100000 {
-			compatible = "shared-dma-pool";
-			reg = <0x00 0xab100000 0x00 0xf00000>;
-			no-map;
-		};
 	};
 
 	evm_12v0: regulator-evm12v0 {
@@ -1133,11 +1103,6 @@ mbox_c71_2: mbox-c71-2 {
 		ti,mbox-rx = <0 0 0>;
 		ti,mbox-tx = <1 0 0>;
 	};
-
-	mbox_c71_3: mbox-c71-3 {
-		ti,mbox-rx = <2 0 0>;
-		ti,mbox-tx = <3 0 0>;
-	};
 };
 
 &mcu_r5fss0_core0 {
@@ -1217,13 +1182,6 @@ &c71_2 {
 			<&c71_2_memory_region>;
 };
 
-&c71_3 {
-	status = "okay";
-	mboxes = <&mailbox0_cluster5 &mbox_c71_3>;
-	memory-region = <&c71_3_dma_memory_region>,
-			<&c71_3_memory_region>;
-};
-
 &tscadc0 {
 	pinctrl-0 = <&mcu_adc0_pins_default>;
 	pinctrl-names = "default";

-- 
2.45.1