changes

diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
index a00e85e366d4..81d664bef69d 100644
--- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
@@ -7,17 +7,8 @@
 
 / {
 	chosen {
-		stdout-path = "serial2:115200n8";
 		tick-timer = &mcu_timer0;
 	};
-
-	aliases {
-		ethernet0 = &cpsw_port1;
-		i2c0 = &wkup_i2c0;
-		i2c1 = &mcu_i2c0;
-		i2c2 = &mcu_i2c1;
-		i2c3 = &main_i2c0;
-	};
 };
 
 &cbass_main {
@@ -28,7 +19,7 @@
 	bootph-pre-ram;
 };
 
-&main_esm{
+&main_esm {
 	bootph-pre-ram;
 };
 
@@ -38,32 +29,18 @@
 	chipid@43000014 {
 		bootph-pre-ram;
 	};
+};
 
-	mcu_navss: bus@28380000 {
-		bootph-pre-ram;
+&mcu_navss {
+	bootph-pre-ram;
+};
 
-		ringacc@2b800000 {
-			reg =	<0x0 0x2b800000 0x0 0x400000>,
-				<0x0 0x2b000000 0x0 0x400000>,
-				<0x0 0x28590000 0x0 0x100>,
-				<0x0 0x2a500000 0x0 0x40000>,
-				<0x0 0x28440000 0x0 0x40000>;
-			reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
-			bootph-pre-ram;
-		};
-
-		dma-controller@285c0000 {
-			reg =	<0x0 0x285c0000 0x0 0x100>,
-				<0x0 0x284c0000 0x0 0x4000>,
-				<0x0 0x2a800000 0x0 0x40000>,
-				<0x0 0x284a0000 0x0 0x4000>,
-				<0x0 0x2aa00000 0x0 0x40000>,
-				<0x0 0x28400000 0x0 0x2000>;
-			reg-names = "gcfg", "rchan", "rchanrt", "tchan",
-					    "tchanrt", "rflow";
-			bootph-pre-ram;
-		};
-	};
+&mcu_ringacc {
+	bootph-pre-ram;
+};
+
+&mcu_udmap {
+	bootph-pre-ram;
 };
 
 &secure_proxy_main {
@@ -120,30 +97,18 @@
 
 &wkup_i2c0 {
 	bootph-pre-ram;
-
-	lp876441: lp876441@4c {
-		bootph-pre-ram;
-
-		regulators: regulators {
-			bootph-pre-ram;
-
-			buck1_reg: buck1 {
-				bootph-pre-ram;
-			};
-		};
-	};
 };
 
 &main_i2c0 {
 	bootph-pre-ram;
+};
 
-	exp1: gpio@20 {
-		bootph-pre-ram;
-	};
+&exp1 {
+	bootph-pre-ram;
+};
 
-	exp2: gpio@22 {
-		bootph-pre-ram;
-	};
+&exp2 {
+	bootph-pre-ram;
 };
 
 &mcu_cpsw {
@@ -231,7 +196,3 @@
 &serdes0 {
 	bootph-pre-ram;
 };
-
-&main_r5fss0 {
-	ti,cluster-mode = <0>;
-};
diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
index bd4be7215fc0..28eb655a5116 100644
--- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
@@ -31,6 +31,16 @@
 		ti,sci-host-id = <10>;
 		bootph-pre-ram;
 	};
+
+	dm_tifs: dm-tifs {
+		compatible = "ti,j721e-dm-sci";
+		ti,host-id = <3>;
+		ti,secure-host;
+		mbox-names = "rx", "tx";
+		mboxes= <&secure_proxy_mcu 21>,
+			<&secure_proxy_mcu 23>;
+		bootph-pre-ram;
+	};
 };
 
 &memorycontroller {
@@ -41,18 +51,11 @@
 };
 
 &mcu_timer0 {
-	/delete-property/ power-domains;
-	ti,timer-alwon;
 	clock-frequency = <25000000>;
 	bootph-pre-ram;
 };
 
 &cbass_mcu_wakeup {
-	secure_proxy_mcu: mailbox@2a480000 {
-		bootph-pre-ram;
-		status = "okay";
-	};
-
 	sysctrler: sysctrler {
 		compatible = "ti,am654-system-controller";
 		mboxes= <&secure_proxy_mcu 4>,
@@ -61,15 +64,11 @@
 		bootph-pre-ram;
 	};
 
-	dm_tifs: dm-tifs {
-		compatible = "ti,j721e-dm-sci";
-		ti,host-id = <3>;
-		ti,secure-host;
-		mbox-names = "rx", "tx";
-		mboxes= <&secure_proxy_mcu 21>,
-			<&secure_proxy_mcu 23>;
-		bootph-pre-ram;
-	};
+};
+
+&secure_proxy_mcu {
+	bootph-pre-ram;
+	status = "okay";
 };
 
 &dmsc {