diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts
index 4e83f8b4..890d6a7a 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart1m0.dts
@@ -9,25 +9,17 @@
 		exclusive = "GPIO4_A7", "GPIO4_A6";
 		description = "Enable FIQ Debugger on UART1-M0.";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-            fiq-debugger {
-                status = "okay";
-                rockchip,serial-id = <1>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&uart1m0_xfer>;
-            };
-		};
+&{/} {
+	fiq-debugger {
+		status = "okay";
+		rockchip,serial-id = <1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&uart1m0_xfer>;
 	};
+};
 
-	fragment@1 {
-		target = <&uart1>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&uart1 {
+    status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts
index 17b88111..d4937d21 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m0.dts
@@ -9,25 +9,17 @@
 		exclusive = "GPIO4_B0", "GPIO4_B1";
 		description = "Enable FIQ Debugger on UART3-M0.";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-            fiq-debugger {
-                status = "okay";
-                rockchip,serial-id = <3>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&uart3m0_xfer>;
-            };
-		};
+&{/} {
+	fiq-debugger {
+		status = "okay";
+		rockchip,serial-id = <3>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&uart3m0_xfer>;
 	};
+};
 
-	fragment@1 {
-		target = <&uart3>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&uart3 {
+    status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts
index 5fe3114b..d007594a 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart3m1.dts
@@ -9,25 +9,17 @@
 		exclusive = "GPIO4_B7", "GPIO4_C0";
 		description = "Enable FIQ Debugger on UART3-M1.";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-            fiq-debugger {
-                status = "okay";
-                rockchip,serial-id = <3>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&uart3m1_xfer>;
-            };
-		};
+&{/} {
+	fiq-debugger {
+		status = "okay";
+		rockchip,serial-id = <3>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&uart3m1_xfer>;
 	};
+};
 
-	fragment@1 {
-		target = <&uart3>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&uart3 {
+    status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts
index 7e2dfad3..dfa858a7 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-fiq-debugger-uart7m0.dts
@@ -9,25 +9,17 @@
 		exclusive = "GPIO3_B3", "GPIO3_B2";
 		description = "Enable FIQ Debugger on UART7-M0.";
 	};
+};
 
-	fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-            fiq-debugger {
-                status = "okay";
-                rockchip,serial-id = <7>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&uart7m0_xfer>;
-            };
-		};
+&{/} {
+	fiq-debugger {
+		status = "okay";
+		rockchip,serial-id = <7>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&uart7m0_xfer>;
 	};
+};
 
-	fragment@1 {
-		target = <&uart7>;
-
-		__overlay__ {
-			status = "disabled";
-		};
-	};
+&uart7 {
+    status = "disabled";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts
index 59431d1d..e00ec2c5 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm0-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_C3";
 		description = "Enable PWM0-M0.\nOn Radxa ROCK 2A this is pin 32.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm0>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "active";
-			pinctrl-0 = <&pwm0m0_pins>;
-		};
-	};
+&pwm0 {
+    status = "disabled";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm0m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts
index f5bb1747..ccecd1f7 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm3-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_C6";
 		description = "Enable PWM3-M0.\nOn Radxa ROCK 2A this is pin 15.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm3>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "active";
-			pinctrl-0 = <&pwm3m0_pins>;
-		};
-	};
+&pwm3 {
+    status = "disabled";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm3m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts
index 2da27dcf..5f971f6f 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm4-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_B7";
 		description = "Enable PWM5-M0.\nOn Radxa ROCK 2A this is pin 11.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm4>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "active";
-			pinctrl-0 = <&pwm4m0_pins>;
-		};
-	};
+&pwm4 {
+    status = "disabled";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm4m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts
index 910609ec..f3b2cc9f 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-pwm5-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_C0";
 		description = "Enable PWM5-M0.\nOn Radxa ROCK 2A this is pin 13.";
 	};
+};
 
-	fragment@0 {
-		target = <&pwm5>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "active";
-			pinctrl-0 = <&pwm5m0_pins>;
-		};
-	};
+&pwm5 {
+    status = "disabled";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm5m0_pins>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts
index 7304cb4b..e6f166b5 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart0-m0.dts
@@ -9,22 +9,14 @@
 		exclusive = "GPIO4_C7", "GPIO4_D0";
 		description = "Enable UART0-M0.\nOn Radxa ROCK 2A this is RX pin 10 & TX pin 8.";
 	};
+};
 
-    fragment@0 {
-		target-path = "/";
-
-		__overlay__ {
-			fiq-debugger {
-                status = "disabled";
-            };
-		};
+&{/} {
+	fiq-debugger {
+		status = "disabled";
 	};
+};
 
-	fragment@1 {
-		target = <&uart0>;
-
-		__overlay__ {
-			status = "okay";
-		};
-	};
+&uart0 {
+    status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts
index 2585cf5e..f38c269d 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart1-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_A7", "GPIO4_A6";
 		description = "Enable UART1-M0.\nOn Radxa ROCK 2A this is RX pin 40 & TX pin 36.";
 	};
+};
 
-	fragment@0 {
-		target = <&uart1>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "default";
-			pinctrl-0 = <&uart1m0_xfer>;
-		};
-	};
+&uart1 {
+    status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1m0_xfer>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts
index 2166a17b..ae955b0f 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_B0", "GPIO4_B1";
 		description = "Enable UART3-M0.\nOn Radxa ROCK 2A this is RX pin 16 & TX pin 18.";
 	};
+};
 
-	fragment@0 {
-		target = <&uart3>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "default";
-			pinctrl-0 = <&uart3m0_xfer>;
-		};
-	};
+&uart3 {
+    status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3m0_xfer>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts
index 953dd48d..880ac3cf 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart3-m1.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO4_B7", "GPIO4_C0";
 		description = "Enable UART3-M1.\nOn Radxa ROCK 2A this is RX pin 11 & TX pin 13.";
 	};
+};
 
-	fragment@0 {
-		target = <&uart3>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "default";
-			pinctrl-0 = <&uart3m1_xfer>;
-		};
-	};
+&uart3 {
+    status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3m1_xfer>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts
index 66b125f3..31a98d90 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts
+++ b/arch/arm64/boot/dts/rockchip/overlays/rk3528-uart7-m0.dts
@@ -9,14 +9,10 @@
 		exclusive = "GPIO3_B3", "GPIO3_B2";
 		description = "Enable UART7-M0.\nOn Radxa ROCK 2A this is RX pin 27 & TX pin 28.";
 	};
+};
 
-	fragment@0 {
-		target = <&uart7>;
-
-		__overlay__ {
-			status = "okay";
-            pinctrl-names = "default";
-			pinctrl-0 = <&uart7m0_xfer>;
-		};
-	};
+&uart7 {
+    status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart7m0_xfer>;
 };