diff --git a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-10.dts b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-10.dts
index 69a4b1e492..4d217bf67b 100644
--- a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-10.dts
+++ b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-10.dts
@@ -13,33 +13,6 @@
 	compatible = "zyxel,xs1930-10", "realtek,rtl9313-soc";
 	model = "Zyxel XS1930-10";
 
-	leds {
-		led_pwr_green: led-2 {
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-		led_pwr_red: led-3 {
-			color = <LED_COLOR_ID_RED>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_green: led-4 {
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_red: led-5 {
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
-		};
-		led_locator: led-6 {
-			color = <LED_COLOR_ID_BLUE>;
-			function = LED_FUNCTION_INDICATOR;
-			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	led_set: led_set@0 {
 		compatible = "realtek,rtl9300-leds";
 		active-low;
diff --git a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12f.dts b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12f.dts
index 2a5afafb05..34d412b724 100644
--- a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12f.dts
+++ b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12f.dts
@@ -13,33 +13,6 @@
 	compatible = "zyxel,xs1930-12f", "realtek,rtl9313-soc";
 	model = "Zyxel XS1930-12F";
 
-	leds {
-		led_pwr_green: led-2 {
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-		led_pwr_red: led-3 {
-			color = <LED_COLOR_ID_RED>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_green: led-4 {
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_red: led-5 {
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
-		};
-		led_locator: led-6 {
-			color = <LED_COLOR_ID_BLUE>;
-			function = LED_FUNCTION_INDICATOR;
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	led_set: led_set@0 {
 		compatible = "realtek,rtl9300-leds";
 		active-low;
@@ -230,6 +203,12 @@
 	};
 };
 
+&led_pwr_green { gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; };
+&led_pwr_red { gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; };
+&led_cloud_green { gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; };
+&led_cloud_red { gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; };
+&led_locator { gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; };
+
 &mdio_aux {
 	status = "okay";
 
diff --git a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12hp.dts b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12hp.dts
index 5ce41110de..5289c1eaa5 100644
--- a/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12hp.dts
+++ b/target/linux/realtek/dts/rtl9313_zyxel_xs1930-12hp.dts
@@ -13,33 +13,6 @@
 	compatible = "zyxel,xs1930-12hp", "realtek,rtl9313-soc";
 	model = "Zyxel XS1930-12HP";
 
-	leds {
-		led_pwr_green: led-2 {
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-		led_pwr_red: led-3 {
-			color = <LED_COLOR_ID_RED>;
-			function = LED_FUNCTION_POWER;
-			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_green: led-4 {
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
-		};
-		led_cloud_red: led-5 {
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
-		};
-		led_locator: led-6 {
-			color = <LED_COLOR_ID_BLUE>;
-			function = LED_FUNCTION_INDICATOR;
-			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	led_set: led_set@0 {
 		compatible = "realtek,rtl9300-leds";
 		active-low;
diff --git a/target/linux/realtek/dts/rtl9313_zyxel_xs1930.dtsi b/target/linux/realtek/dts/rtl9313_zyxel_xs1930.dtsi
index efb517e485..a594f42d97 100644
--- a/target/linux/realtek/dts/rtl9313_zyxel_xs1930.dtsi
+++ b/target/linux/realtek/dts/rtl9313_zyxel_xs1930.dtsi
@@ -52,6 +52,31 @@
 			function = LED_FUNCTION_INDICATOR;
 			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
 		};
+
+		led_pwr_green: led-2 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
+			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
+		};
+		led_pwr_red: led-3 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_POWER;
+			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+		};
+		led_cloud_green: led-4 {
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+		};
+		led_cloud_red: led-5 {
+			color = <LED_COLOR_ID_RED>;
+			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+		};
+		led_locator: led-6 {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_INDICATOR;
+			gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+		};
 	};
 };