diff --git a/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts b/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
index 15abfec557..f8e68a5789 100644
--- a/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
+++ b/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
@@ -45,13 +45,6 @@
 			default-state = "on";
 		};
 
-		wifi1_green {
-			function = LED_FUNCTION_WLAN_2GHZ;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
 		wifi1_amber {
 			function = LED_FUNCTION_WLAN_2GHZ;
 			color = <LED_COLOR_ID_AMBER>;
@@ -200,6 +193,11 @@
 
 	nvmem-cells = <&calibration_wmac>, <&macaddr_uboot_3ff80 1>;
 	nvmem-cell-names = "calibration", "mac-address";
+
+	led {
+		led-sources = <13>;
+		led-active-low;
+	};
 };
 
 &pcie0 {
diff --git a/target/linux/ath79/dts/qca9557_ruckus_r500.dts b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
index 2e5734e288..a5acb5918c 100644
--- a/target/linux/ath79/dts/qca9557_ruckus_r500.dts
+++ b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
@@ -64,13 +64,6 @@
 			linux,default-trigger = "phy1assoc";
 		};
 
-		led-5 {
-			color = <LED_COLOR_ID_YELLOW>;
-			function = LED_FUNCTION_WLAN_2GHZ;
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
 		led-6 {
 			color = <LED_COLOR_ID_GREEN>;
 			function = LED_FUNCTION_WLAN_5GHZ;
@@ -279,6 +272,11 @@
 
 	nvmem-cells = <&macaddr_board_data_60>, <&cal_board_data_41000>;
 	nvmem-cell-names = "mac-address", "calibration";
+
+	led {
+		led-sources = <2>;
+		led-active-low;
+	};
 };
 
 &usb_phy0 {
diff --git a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
index 5a7fa593ce..a4d29ced49 100644
--- a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
+++ b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
@@ -48,12 +48,6 @@
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
-		radio-24-green {
-			label = "green:radio-24";
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-
 		radio-24-amber {
 			label = "amber:radio-24";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
@@ -199,6 +193,11 @@
 
 	nvmem-cells = <&macaddr_oemdata_1d 0>, <&cal_oemdata_1000>;
 	nvmem-cell-names = "mac-address", "calibration";
+
+	led {
+		led-sources = <13>;
+		led-active-low;
+	};
 };
 
 &mdio0 {
diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index becd5cc44b..95bb6ba5bb 100644
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -53,12 +53,6 @@
 			default-state = "on";
 		};
 
-		wlan2g_green {
-			label = "green:wlan2g";
-			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
 		wlan2g_red {
 			label = "red:wlan2g";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
@@ -209,4 +203,9 @@
 
 	nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
 	nvmem-cell-names = "mac-address", "calibration";
+
+	led {
+		led-sources = <16>;
+		led-active-low;
+	};
 };