ramips: remove model name from LED labels

Like in the previous patch for ath79 target, this will remove the
"devicename" from LED labels in ramips as well.

The devicename is removed in DTS files and 01_leds, consolidation
of definitions into DTSI files is done where (easily) possible,
and migration scripts are updated.

For the latter, all existing definitions were actually just
devicename migrations anyway. Therefore, those are removed and
a common migration file is created in target base-files. This is
actually another example of how the devicename removal makes things
easier.

Signed-off-by: Adrian Schmutzler <[email protected]>

target/linux/ramips/base-files/etc/uci-defaults/04_led_migration

@@ -0,0 +1,8 @@
+. /lib/functions.sh
+. /lib/functions/migrations.sh
+
+remove_devicename_leds "rt2800soc-phy0" "rt2800pci-phy0"
+
+migrations_apply system
+
+exit 0

target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts

@@ -18,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "ai-br100:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan: wlan {
-			label = "ai-br100:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts

@@ -62,12 +62,12 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "ac1200rm:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wps: wps {
-			label = "ac1200rm:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts

@@ -81,40 +81,40 @@
 		compatible = "gpio-leds";
 
 		4g {
-			label = "r36m-e4g:orange:4g";
+			label = "orange:4g";
 			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "r36m-e4g:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "r36m-e4g:green:system";
+			label = "green:system";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim1 {
-			label = "r36m-e4g:green:sim1";
+			label = "green:sim1";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim2 {
-			label = "r36m-e4g:green:sim2";
+			label = "green:sim2";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wan {
-			label = "r36m-e4g:green:wan";
+			label = "green:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "r36m-e4g:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0radio";
 		};

target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts

@@ -69,29 +69,29 @@
 		compatible = "gpio-leds";
 
 		4g {
-			label = "tube-e4g:green:4g";
+			label = "green:4g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tube-e4g:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		power: power {
-			label = "tube-e4g:green:power";
+			label = "green:power";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim1 {
-			label = "tube-e4g:green:sim1";
+			label = "green:sim1";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		sim2 {
-			label = "tube-e4g:green:sim2";
+			label = "green:sim2";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};

target/linux/ramips/dts/mt7620a_asus_rp-n53.dts

@@ -39,42 +39,42 @@
 		compatible = "gpio-leds";
 
 		backlight {
-			label = "rp-n53:white:back";
+			label = "white:back";
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi0 {
-			label = "rp-n53:blue:5g3";
+			label = "blue:5g3";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi1 {
-			label = "rp-n53:blue:5g2";
+			label = "blue:5g2";
 			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "rp-n53:blue:5g1";
+			label = "blue:5g1";
 			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi3 {
-			label = "rp-n53:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi4 {
-			label = "rp-n53:blue:2g1";
+			label = "blue:2g1";
 			gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi5 {
-			label = "rp-n53:blue:2g2";
+			label = "blue:2g2";
 			gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi6 {
-			label = "rp-n53:blue:2g3";
+			label = "blue:2g3";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts

@@ -3,42 +3,6 @@
 / {
 	compatible = "asus,rt-ac51u", "ralink,mt7620a-soc";
 	model = "Asus RT-AC51U";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "rt-ac51u:blue:power";
-			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
-		};
-
-		usb {
-			label = "rt-ac51u:blue:usb";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&ohci_port1>, <&ehci_port1>;
-			linux,default-trigger = "usbport";
-		};
-
-		wifi2g {
-			label = "rt-ac51u:blue:wifi2g";
-			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "i2c", "wled", "uartf";
-		function = "gpio";
-	};
 };
 
 &pcie0 {

target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts

@@ -5,42 +5,6 @@
 / {
 	compatible = "asus,rt-ac54u", "ralink,mt7620a-soc";
 	model = "Asus RT-AC54U";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "rt-ac54u:blue:power";
-			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
-		};
-
-		usb {
-			label = "rt-ac54u:blue:usb";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&ohci_port1>, <&ehci_port1>;
-			linux,default-trigger = "usbport";
-		};
-
-		wifi2g {
-			label = "rt-ac54u:blue:wifi2g";
-			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "i2c", "wled", "uartf";
-		function = "gpio";
-	};
 };
 
 &pcie0 {

target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi

@@ -6,6 +6,10 @@
 / {
 	aliases {
 		label-mac-device = &ethernet;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	keys {
@@ -23,6 +27,28 @@
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "blue:power";
+			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+		};
+
+		usb {
+			label = "blue:usb";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
+		};
+
+		wifi2g {
+			label = "blue:wifi2g";
+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+	};
 };
 
 &spi0 {
@@ -88,6 +114,13 @@
 	status = "okay";
 };
 
+&state_default {
+	gpio {
+		groups = "i2c", "wled", "uartf";
+		function = "gpio";
+	};
+};
+
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 

target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts

@@ -22,19 +22,19 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "wap2100-sk:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_power: wps {
-			label = "wap2100-sk:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "wap2100-sk:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts

@@ -18,37 +18,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "whr-1166d:red:power";
+			label = "red:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "whr-1166d:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power2 {
-			label = "whr-1166d:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "whr-1166d:orange:wifi";
+			label = "orange:wifi";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "whr-1166d:green:internet";
+			label = "green:internet";
 			gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "whr-1166d:orange:router";
+			label = "orange:router";
 			gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
 		};
 
 		router2 {
-			label = "whr-1166d:green:router";
+			label = "green:router";
 			gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts

@@ -18,37 +18,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "whr-300hp2:red:power";
+			label = "red:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "whr-300hp2:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power2 {
-			label = "whr-300hp2:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "whr-300hp2:orange:wifi";
+			label = "orange:wifi";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "whr-300hp2:green:internet";
+			label = "green:internet";
 			gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "whr-300hp2:green:router";
+			label = "green:router";
 			gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
 		};
 
 		router2 {
-			label = "whr-300hp2:orange:router";
+			label = "orange:router";
 			gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts

@@ -18,37 +18,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "whr-600d:red:power";
+			label = "red:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "whr-600d:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power2 {
-			label = "whr-600d:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "whr-600d:orange:wifi";
+			label = "orange:wifi";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "whr-600d:green:internet";
+			label = "green:internet";
 			gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "whr-600d:green:router";
+			label = "green:router";
 			gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
 		};
 
 		router2 {
-			label = "whr-600d:orange:router";
+			label = "orange:router";
 			gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_cameo_810.dtsi

@@ -6,6 +6,14 @@
 #include <dt-bindings/input/input.h>
 
 / {
+	aliases {
+		label-mac-device = &ethernet;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -21,6 +29,30 @@
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_green: power_green {
+			label = "green:power";
+			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+		};
+
+		wan_orange {
+			label = "orange:wan";
+			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+		};
+
+		wan_green {
+			label = "green:wan";
+			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+		};
+
+		power_orange {
+			label = "orange:power";
+			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
 };
 
 &spi0 {
@@ -87,6 +119,13 @@
 	};
 };
 
+&state_default {
+	gpio {
+		groups = "i2c", "uartf", "ephy";
+		function = "gpio";
+	};
+};
+
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 

target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts

@@ -34,13 +34,13 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "dch-m225:green:power";
+			label = "green:power";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		status {
-			label = "dch-m225:red:status";
+			label = "red:status";
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts

@@ -40,12 +40,12 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "dir-510l:green:status";
+			label = "green:status";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		status-red {
-			label = "dir-510l:red:status";
+			label = "red:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts

@@ -3,43 +3,4 @@
 / {
 	compatible = "dlink,dir-810l", "ralink,mt7620a-soc";
 	model = "D-Link DIR-810L";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-		label-mac-device = &ethernet;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			label = "dir-810l:green:power";
-			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_orange {
-			label = "dir-810l:orange:wan";
-			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_green {
-			label = "dir-810l:green:wan";
-			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
-		};
-
-		power_orange {
-			label = "dir-810l:orange:power";
-			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "i2c", "uartf", "ephy";
-		function = "gpio";
-	};
 };

target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts

@@ -35,27 +35,27 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "dwr-118-a1:green:wan";
+			label = "green:wan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_internet: internet {
-			label = "dwr-118-a1:green:internet";
+			label = "green:internet";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "dwr-118-a1:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "dwr-118-a1:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "dwr-118-a1:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";

target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts

@@ -32,27 +32,27 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "dwr-118-a2:green:wan";
+			label = "green:wan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_internet: internet {
-			label = "dwr-118-a2:green:internet";
+			label = "green:internet";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "dwr-118-a2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "dwr-118-a2:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "dwr-118-a2:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";

target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts

@@ -36,53 +36,53 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "dwr-960:green:status";
+			label = "green:status";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "dwr-960:green:wan";
+			label = "green:wan";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "dwr-960:green:lan";
+			label = "green:lan";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		sms {
-			label = "dwr-960:green:sms";
+			label = "green:sms";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		signal_green {
-			label = "dwr-960:green:signal";
+			label = "green:signal";
 			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal_red {
-			label = "dwr-960:red:signal";
+			label = "red:signal";
 			gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		4g {
-			label = "dwr-960:green:4g";
+			label = "green:4g";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		3g {
-			label = "dwr-960:green:3g";
+			label = "green:3g";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "dwr-960:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "dwr-960:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};

target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts

@@ -11,14 +11,14 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "tiny-ac:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		wifi {
-			label = "tiny-ac:orange:wifi";
+			label = "orange:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts

@@ -41,22 +41,22 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "br-6478ac-v2:white:power";
+			label = "white:power";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "br-6478ac-v2:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "br-6478ac-v2:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "br-6478ac-v2:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";

target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts

@@ -5,40 +5,4 @@
 / {
 	compatible = "edimax,ew-7476rpc", "ralink,mt7620a-soc";
 	model = "Edimax EW-7476RPC";
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "ew-7476rpc:green:power";
-			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
-		};
-
-		lan {
-			label = "ew-7476rpc:green:lan";
-			gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "ew-7476rpc:blue:wlan2g";
-			gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1radio";
-		};
-
-		wlan5g {
-			label = "ew-7476rpc:blue:wlan5g";
-			gpios = <&gpio2 31 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0radio";
-		};
-
-		wps {
-			label = "ew-7476rpc:green:wps";
-			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-		};
-
-		crossband {
-			label = "ew-7476rpc:green:crossband";
-			gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
-		};
-	};
 };

target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts

@@ -5,40 +5,4 @@
 / {
 	compatible = "edimax,ew-7478ac", "ralink,mt7620a-soc";
 	model = "Edimax EW-7478AC";
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "ew-7478ac:green:power";
-			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
-		};
-
-		lan {
-			label = "ew-7478ac:green:lan";
-			gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "ew-7478ac:blue:wlan2g";
-			gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1radio";
-		};
-
-		wlan5g {
-			label = "ew-7478ac:blue:wlan5g";
-			gpios = <&gpio2 31 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0radio";
-		};
-
-		wps {
-			label = "ew-7478ac:green:wps";
-			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-		};
-
-		crossband {
-			label = "ew-7478ac:green:crossband";
-			gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
-		};
-	};
 };

target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts

@@ -30,22 +30,22 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "ew-7478apc:white:power";
+			label = "white:power";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "ew-7478apc:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "ew-7478apc:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "ew-7478apc:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";

target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi

@@ -38,6 +38,42 @@
 			linux,input-type = <EV_SW>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "green:power";
+			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
+		};
+
+		lan {
+			label = "green:lan";
+			gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan2g {
+			label = "blue:wlan2g";
+			gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1radio";
+		};
+
+		wlan5g {
+			label = "blue:wlan5g";
+			gpios = <&gpio2 31 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0radio";
+		};
+
+		wps {
+			label = "green:wps";
+			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
+		};
+
+		crossband {
+			label = "green:crossband";
+			gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
+		};
+	};
 };
 
 &gpio1 {

target/linux/ramips/dts/mt7620a_engenius_esr600.dts

@@ -24,22 +24,22 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "esr600:amber:power";
+			label = "amber:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wps2g {
-			label = "esr600:amber:wps2g";
+			label = "amber:wps2g";
 			gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "esr600:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "esr600:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_fon_fon2601.dts

@@ -20,22 +20,22 @@
 		compatible = "gpio-leds";
 
 		led_power: power_r {
-			label = "fon2601:red:power";
+			label = "red:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_g {
-			label = "fon2601:green:internet";
+			label = "green:internet";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		net_g {
-			label = "fon2601:green:net";
+			label = "green:net";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_g {
-			label = "fon2601:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts

@@ -24,17 +24,17 @@
 		compatible = "gpio-leds";
 
 		rssi {
-			label = "hdrm200:red:rssi";
+			label = "red:rssi";
 			gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "hdrm200:green:system";
+			label = "green:system";
 			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		air {
-			label = "hdrm200:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts

@@ -15,17 +15,17 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "hc5661:blue:system";
+			label = "blue:system";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "hc5661:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "hc5661:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};

target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts

@@ -15,23 +15,23 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "hc5761:blue:system";
+			label = "blue:system";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "hc5761:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "hc5761:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "hc5761:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};

target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts

@@ -15,29 +15,29 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "hc5861:blue:system";
+			label = "blue:system";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "hc5861:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		internet {
-			label = "hc5861:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "hc5861:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		turbo {
-			label = "hc5861:blue:turbo";
+			label = "blue:turbo";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_hnet_c108.dts

@@ -66,27 +66,27 @@
 		compatible = "gpio-leds";
 
 		sdcard {
-			label = "c108:green:sdcard";
+			label = "green:sdcard";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		modem_green {
-			label = "c108:green:modem";
+			label = "green:modem";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		modem_red {
-			label = "c108:red:modem";
+			label = "red:modem";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan_red {
-			label = "c108:red:lan";
+			label = "red:lan";
 			gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_lan_green: lan_green {
-			label = "c108:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts

@@ -20,23 +20,23 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "wn-ac1167gr:green:power";
+			label = "green:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "wn-ac1167gr:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		notification {
-			label = "wn-ac1167gr:green:notification";
+			label = "green:notification";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "wn-ac1167gr:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts

@@ -20,23 +20,23 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "wn-ac733gr3:green:power";
+			label = "green:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		notification {
-			label = "wn-ac733gr3:green:notification";
+			label = "green:notification";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "wn-ac733gr3:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "wn-ac733gr3:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_iptime_a1004ns.dts

@@ -17,12 +17,12 @@
 		compatible = "gpio-leds";
 
 		led_cpu: cpu {
-			label = "a1004ns:blue:cpu";
+			label = "blue:cpu";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "a1004ns:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";

target/linux/ramips/dts/mt7620a_iptime_a104ns.dts

@@ -17,14 +17,14 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "a104ns:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_cpu: cpu {
-			label = "a104ns:blue:cpu";
+			label = "blue:cpu";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts

@@ -28,12 +28,12 @@
 		compatible = "gpio-leds";
 
 		led_wifi: wifi {
-			label = "u25awf:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "u25awf:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts

@@ -34,17 +34,17 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "lr-25g001:green:status";
+			label = "green:status";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2g {
-			label = "lr-25g001:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi5g {
-			label = "lr-25g001:green:wifi5g";
+			label = "green:wifi5g";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts

@@ -29,7 +29,7 @@
 		compatible = "gpio-leds";
 
 		led_wps: wps {
-			label = "bl-w1200:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts

@@ -16,34 +16,34 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "newifi-y1:blue:power";
+			label = "blue:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan1 {
-			label = "newifi-y1:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2 {
-			label = "newifi-y1:blue:wifi5g";
+			label = "blue:wifi5g";
 			gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "newifi-y1:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		lan {
-			label = "newifi-y1:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "newifi-y1:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts

@@ -37,39 +37,39 @@
 		compatible = "gpio-leds";
 
 		power1 {
-			label = "newifi-y1s:yellow:power";
+			label = "yellow:power";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_blue: power2 {
-			label = "newifi-y1s:blue:power";
+			label = "blue:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan1 {
-			label = "newifi-y1s:yellow:wifi";
+			label = "yellow:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2 {
-			label = "newifi-y1s:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
 		};
 
 		usb1 {
-			label = "newifi-y1s:yellow:usb";
+			label = "yellow:usb";
 			gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
 		};
 
 		usb2 {
-			label = "newifi-y1s:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		internet {
-			label = "newifi-y1s:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_linksys_e1700.dts

@@ -44,12 +44,12 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "e1700:green:power";
+			label = "green:power";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "e1700:green:wps";
+			label = "green:wps";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_netgear_ex2700.dts

@@ -25,38 +25,38 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_g {
-			label = "ex2700:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		power_r {
-			label = "ex2700:red:power";
+			label = "red:power";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		device_g {
-			label = "ex2700:green:device";
+			label = "green:device";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 
 		device_r {
-			label = "ex2700:red:device";
+			label = "red:device";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		router_g {
-			label = "ex2700:green:router";
+			label = "green:router";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		router_r {
-			label = "ex2700:red:router";
+			label = "red:router";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "ex2700:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_netgear_ex3700.dts

@@ -5,51 +5,4 @@
 / {
 	compatible = "netgear,ex3700", "ralink,mt7620a-soc";
 	model = "Netgear EX3700/EX3800";
-
-	aliases {
-		led-boot = &led_power_amber;
-		led-failsafe = &led_power_amber;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			label = "ex3700:green:power";
-			gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		led_power_amber: power_amber {
-			label = "ex3700:amber:power";
-			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-		};
-
-		router_green {
-			label = "ex3700:green:router";
-			gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
-		};
-
-		router_red {
-			label = "ex3700:red:router";
-			gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
-		};
-
-		device_green {
-			label = "ex3700:green:device";
-			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
-		};
-
-		device_red {
-			label = "ex3700:red:device";
-			gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "ex3700:green:wps";
-			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
-		};
-	};
 };

target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi

@@ -4,6 +4,13 @@
 #include <dt-bindings/input/input.h>
 
 / {
+	aliases {
+		led-boot = &led_power_amber;
+		led-failsafe = &led_power_amber;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -19,6 +26,46 @@
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_green: power_green {
+			label = "green:power";
+			gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+
+		led_power_amber: power_amber {
+			label = "amber:power";
+			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
+		};
+
+		router_green {
+			label = "green:router";
+			gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
+		};
+
+		router_red {
+			label = "red:router";
+			gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
+		};
+
+		device_green {
+			label = "green:device";
+			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
+		};
+
+		device_red {
+			label = "red:device";
+			gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "green:wps";
+			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
+		};
+	};
 };
 
 &gpio0 {

target/linux/ramips/dts/mt7620a_netgear_ex6120.dts

@@ -5,51 +5,4 @@
 / {
 	compatible = "netgear,ex6120", "ralink,mt7620a-soc";
 	model = "Netgear EX6120";
-
-	aliases {
-		led-boot = &led_power_amber;
-		led-failsafe = &led_power_amber;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			label = "ex6120:green:power";
-			gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		led_power_amber: power_amber {
-			label = "ex6120:amber:power";
-			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-		};
-
-		router_green {
-			label = "ex6120:green:router";
-			gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
-		};
-
-		router_red {
-			label = "ex6120:red:router";
-			gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
-		};
-
-		device_green {
-			label = "ex6120:green:device";
-			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
-		};
-
-		device_red {
-			label = "ex6120:red:device";
-			gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "ex6120:green:wps";
-			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
-		};
-	};
 };

target/linux/ramips/dts/mt7620a_netgear_ex6130.dts

@@ -7,50 +7,6 @@
 	model = "Netgear EX6130";
 
 	aliases {
-		led-boot = &led_power_amber;
-		led-failsafe = &led_power_amber;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
 		label-mac-device = &ethernet;
 	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			label = "ex6130:green:power";
-			gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		led_power_amber: power_amber {
-			label = "ex6130:amber:power";
-			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
-		};
-
-		router_green {
-			label = "ex6130:green:router";
-			gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
-		};
-
-		router_red {
-			label = "ex6130:red:router";
-			gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
-		};
-
-		device_green {
-			label = "ex6130:green:device";
-			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
-		};
-
-		device_red {
-			label = "ex6130:red:device";
-			gpios = <&gpio2 21 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "ex6130:green:wps";
-			gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
-		};
-	};
 };

target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts

@@ -17,48 +17,48 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_g {
-			label = "wn3000rp-v3:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		power_r {
-			label = "wn3000rp-v3:red:power";
+			label = "red:power";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		client_g {
-			label = "wn3000rp-v3:green:client";
+			label = "green:client";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 
 		client_r {
-			label = "wn3000rp-v3:red:client";
+			label = "red:client";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		router_g {
-			label = "wn3000rp-v3:green:router";
+			label = "green:router";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		router_r {
-			label = "wn3000rp-v3:red:router";
+			label = "red:router";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "wn3000rp-v3:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		l_arrow {
-			label = "wn3000rp-v3:blue:leftarrow";
+			label = "blue:leftarrow";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		r_arrow {
-			label = "wn3000rp-v3:blue:rightarrow";
+			label = "blue:rightarrow";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_netis_wf2770.dts

@@ -13,7 +13,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "wf2770:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};

target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts

@@ -22,12 +22,12 @@
 		compatible = "gpio-leds";
 
 		led_power: powerled {
-			label = "oy-0001:green:power";
+			label = "green:power";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wifiled {
-			label = "oy-0001:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_phicomm_k2g.dts

@@ -19,17 +19,17 @@
 		compatible = "gpio-leds";
 
 		led_blue: blue {
-			label = "k2g:blue:status";
+			label = "blue:status";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		yellow {
-			label = "k2g:yellow:status";
+			label = "yellow:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		red {
-			label = "k2g:red:status";
+			label = "red:status";
 			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts

@@ -18,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		led_wps: wps {
-			label = "psg1208:white:wps";
+			label = "white:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "psg1208:white:wlan2g";
+			label = "white:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi

@@ -6,6 +6,13 @@
 / {
 	compatible = "phicomm,psg1218", "ralink,mt7620a-soc";
 
+	aliases {
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -15,6 +22,26 @@
 			linux,code = <KEY_RESTART>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_blue: blue {
+			label = "blue:status";
+			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+
+		yellow {
+			label = "yellow:status";
+			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+		};
+
+		red {
+			label = "red:status";
+			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
+		};
+	};
 };
 
 &gpio0 {

target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts

@@ -3,33 +3,6 @@
 / {
 	compatible = "phicomm,psg1218a", "phicomm,psg1218", "ralink,mt7620a-soc";
 	model = "Phicomm PSG1218 rev.A";
-
-	aliases {
-		led-boot = &led_blue;
-		led-failsafe = &led_blue;
-		led-running = &led_blue;
-		led-upgrade = &led_blue;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_blue: blue {
-			label = "psg1218a:blue:status";
-			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		yellow {
-			label = "psg1218a:yellow:status";
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-		};
-
-		red {
-			label = "psg1218a:red:status";
-			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
-		};
-	};
 };
 
 &state_default {

target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts

@@ -3,33 +3,6 @@
 / {
 	compatible = "phicomm,psg1218b", "phicomm,psg1218", "ralink,mt7620a-soc";
 	model = "Phicomm PSG1218 rev.B";
-
-	aliases {
-		led-boot = &led_blue;
-		led-failsafe = &led_blue;
-		led-running = &led_blue;
-		led-upgrade = &led_blue;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_blue: blue {
-			label = "psg1218b:blue:status";
-			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		yellow {
-			label = "psg1218b:yellow:status";
-			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-		};
-
-		red {
-			label = "psg1218b:red:status";
-			gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
-		};
-	};
 };
 
 &state_default {

target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts

@@ -18,7 +18,7 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "cs-qr10:red:power";
+			label = "red:power";
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts

@@ -18,7 +18,7 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "db-wrt01:orange:power";
+			label = "orange:power";
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts

@@ -18,17 +18,17 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "mzk-750dhp:green:wps";
+			label = "green:wps";
 			gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "mzk-750dhp:green:power";
+			label = "green:power";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "mzk-750dhp:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts

@@ -18,32 +18,32 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "mzk-ex300np:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wps: wps {
-			label = "mzk-ex300np:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		};
 
 		rep {
-			label = "mzk-ex300np:blue:rep";
+			label = "blue:rep";
 			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi1 {
-			label = "mzk-ex300np:blue:wifi1";
+			label = "blue:wifi1";
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "mzk-ex300np:blue:wifi2";
+			label = "blue:wifi2";
 			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi3 {
-			label = "mzk-ex300np:blue:wifi3";
+			label = "blue:wifi3";
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts

@@ -18,37 +18,37 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "mzk-ex750np:red:power";
+			label = "red:power";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "mzk-ex750np:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "mzk-ex750np:green:wps";
+			label = "green:wps";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		rep {
-			label = "mzk-ex750np:blue:rep";
+			label = "blue:rep";
 			gpios = <&gpio2 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi1 {
-			label = "mzk-ex750np:blue:wifi1";
+			label = "blue:wifi1";
 			gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "mzk-ex750np:blue:wifi2";
+			label = "blue:wifi2";
 			gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi3 {
-			label = "mzk-ex750np:blue:wifi3";
+			label = "blue:wifi3";
 			gpios = <&gpio2 17 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_sanlinking_d240.dts

@@ -72,19 +72,19 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "d240:blue:power";
+			label = "blue:power";
 			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "d240:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		air {
-			label = "d240:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_sercomm_na930.dts

@@ -78,24 +78,24 @@
 		compatible = "gpio-leds";
 
 		zwave {
-			label = "na930:blue:zwave";
+			label = "blue:zwave";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		status {
-			label = "na930:blue:status";
+			label = "blue:status";
 			gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		service {
-			label = "na930:blue:service";
+			label = "blue:service";
 			gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "na930:blue:power";
+			label = "blue:power";
 			gpios = <&gpio2 29 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts

@@ -22,29 +22,29 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "archer-c2-v1:green:lan";
+			label = "green:lan";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "archer-c2-v1:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_wps: wps {
-			label = "archer-c2-v1:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "archer-c2-v1:green:wan";
+			label = "green:wan";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "archer-c2-v1:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};

target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts

@@ -15,47 +15,47 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "archer-c20-v1:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "archer-c20-v1:blue:power";
+			label = "blue:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		usb {
-			label = "archer-c20-v1:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		wan {
-			label = "archer-c20-v1:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_orange {
-			label = "archer-c20-v1:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g {
-			label = "archer-c20-v1:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "archer-c20-v1:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wps {
-			label = "archer-c20-v1:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts

@@ -16,29 +16,29 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "archer-c20i:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "archer-c20i:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_wps: wps {
-			label = "archer-c20i:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "archer-c20i:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "archer-c20i:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};

target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts

@@ -15,47 +15,47 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "archer-c50-v1:green:lan";
+			label = "green:lan";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "archer-c50-v1:green:power";
+			label = "green:power";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		usb {
-			label = "archer-c50-v1:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		wan {
-			label = "archer-c50-v1:green:wan";
+			label = "green:wan";
 			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_orange {
-			label = "archer-c50-v1:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "archer-c50-v1:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "archer-c50-v1:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wps {
-			label = "archer-c50-v1:green:wps";
+			label = "green:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts

@@ -22,52 +22,52 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "archer-mr200:white:lan";
+			label = "white:lan";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "archer-mr200:white:wan";
+			label = "white:wan";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "archer-mr200:white:power";
+			label = "white:power";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		4g {
-			label = "archer-mr200:white:4g";
+			label = "white:4g";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "archer-mr200:white:wps";
+			label = "white:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		signal1 {
-			label = "archer-mr200:white:signal1";
+			label = "white:signal1";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		signal2 {
-			label = "archer-mr200:white:signal2";
+			label = "white:signal2";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		signal3 {
-			label = "archer-mr200:white:signal3";
+			label = "white:signal3";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		signal4 {
-			label = "archer-mr200:white:signal4";
+			label = "white:signal4";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "archer-mr200:white:wlan";
+			label = "white:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};

target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts

@@ -17,32 +17,32 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "re200-v1:green:power";
+			label = "green:power";
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "re200-v1:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "re200-v1:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "re200-v1:green:qss";
+			label = "green:qss";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g_red {
-			label = "re200-v1:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g_green {
-			label = "re200-v1:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};

target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts

@@ -17,28 +17,28 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "re210-v1:green:power";
+			label = "green:power";
 			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi_high {
-			label = "re210-v1:green:rssi-high";
+			label = "green:rssi-high";
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi_low {
-			label = "re210-v1:red:rssi-low";
+			label = "red:rssi-low";
 			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "re210-v1:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "re210-v1:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};

target/linux/ramips/dts/mt7620a_trendnet_tew-810dr.dts

@@ -5,43 +5,4 @@
 / {
 	compatible = "trendnet,tew-810dr", "ralink,mt7620a-soc";
 	model = "TRENDnet TEW-810DR";
-
-	aliases {
-		led-boot = &led_power_green;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_power_green;
-		label-mac-device = &ethernet;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_green: power_green {
-			label = "tew-810dr:green:power";
-			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_orange {
-			label = "tew-810dr:orange:wan";
-			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan_green {
-			label = "tew-810dr:green:wan";
-			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
-		};
-
-		power_orange {
-			label = "tew-810dr:orange:power";
-			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "i2c", "uartf", "ephy";
-		function = "gpio";
-	};
 };

target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts

@@ -23,18 +23,18 @@
 		compatible = "gpio-leds";
 
 		led_blue: blue {
-			label = "miwifi-mini:blue:status";
+			label = "blue:status";
 			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		yellow {
-			label = "miwifi-mini:yellow:status";
+			label = "yellow:status";
 			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
 		};
 
 		red {
-			label = "miwifi-mini:red:status";
+			label = "red:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_youku_yk1.dts

@@ -18,24 +18,24 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "yk1:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		air {
-			label = "yk1:blue:air";
+			label = "blue:air";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "yk1:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_power: power {
-			label = "yk1:blue:power";
+			label = "blue:power";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts

@@ -15,27 +15,27 @@
 		compatible = "gpio-leds";
 
 		sys1 {
-			label = "zbt-ape522ii:green:sys1";
+			label = "green:sys1";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		sys2 {
-			label = "zbt-ape522ii:green:sys2";
+			label = "green:sys2";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		sys3 {
-			label = "zbt-ape522ii:green:sys3";
+			label = "green:sys3";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		sys4 {
-			label = "zbt-ape522ii:green:sys4";
+			label = "green:sys4";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g4 {
-			label = "zbt-ape522ii:green:wlan2g4";
+			label = "green:wlan2g4";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi

@@ -10,19 +10,19 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "we1026-5g:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "we1026-5g:green:usb";
+			label = "green:usb";
 			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		wifi {
-			label = "we1026-5g:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-h.dtsi

@@ -10,22 +10,22 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "we1026-h:green:usb";
+			label = "green:usb";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "we1026-h:green:lan";
+			label = "green:lan";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "we1026-h:green:wan";
+			label = "green:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "we1026-h:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts

@@ -12,22 +12,22 @@
 		compatible = "gpio-leds";
 
 		led_power: gsm {
-			label = "zbt-we826-e:blue:gsm";
+			label = "blue:gsm";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 
 		signal {
-			label = "zbt-we826-e:green:signal";
+			label = "green:signal";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		sim {
-			label = "zbt-we826-e:red:sim";
+			label = "red:sim";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
 		};
 
 		air {
-			label = "zbt-we826-e:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi

@@ -21,19 +21,19 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "zbt-we826:green:power";
+			label = "green:power";
 			gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "zbt-we826:green:usb";
+			label = "green:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		air {
-			label = "zbt-we826:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zte_q7.dts

@@ -18,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		statred {
-			label = "zte-q7:red:status";
+			label = "red:status";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status_blue: statblue {
-			label = "zte-q7:blue:status";
+			label = "blue:status";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts

@@ -18,29 +18,29 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "keenetic-viva:green:wan";
+			label = "green:wan";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "keenetic-viva:green:usb";
+			label = "green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		power_alert {
-			label = "keenetic-viva:red:power";
+			label = "red:power";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "keenetic-viva:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power {
-			label = "keenetic-viva:green:power";
+			label = "green:power";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts

@@ -22,22 +22,22 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "rt-n12p:green:wan";
+			label = "green:wan";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "rt-n12p:green:lan";
+			label = "green:lan";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "rt-n12p:green:power";
+			label = "green:power";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		air {
-			label = "rt-n12p:green:air";
+			label = "green:air";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts

@@ -18,29 +18,29 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "rt-n14u:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "rt-n14u:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "rt-n14u:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_power: power {
-			label = "rt-n14u:blue:power";
+			label = "blue:power";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		air {
-			label = "rt-n14u:blue:air";
+			label = "blue:air";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts

@@ -18,17 +18,17 @@
 		compatible = "gpio-leds";
 
 		aoss1 {
-			label = "wmr-300:red:aoss";
+			label = "red:aoss";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		aoss2 {
-			label = "wmr-300:green:aoss";
+			label = "green:aoss";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status: status {
-			label = "wmr-300:green:status";
+			label = "green:status";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts

@@ -22,17 +22,17 @@
 		compatible = "gpio-leds";
 
 		ethernet {
-			label = "cf-wr800n:white:ethernet";
+			label = "white:ethernet";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "cf-wr800n:white:wifi";
+			label = "white:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wps: wps {
-			label = "cf-wr800n:white:wps";
+			label = "white:wps";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts

@@ -34,12 +34,12 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "dwr-116-a1:green:status";
+			label = "green:status";
 			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi {
-			label = "dwr-116-a1:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts

@@ -32,37 +32,37 @@
 		compatible = "gpio-leds";
 
 		sms {
-			label = "dwr-921-c1:green:sms";
+			label = "green:sms";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "dwr-921-c1:green:lan";
+			label = "green:lan";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_sstrenghg: sstrengthg {
-			label = "dwr-921-c1:green:sigstrength";
+			label = "green:sigstrength";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		sstrengthr {
-			label = "dwr-921-c1:red:sigstrength";
+			label = "red:sigstrength";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		4g {
-			label = "dwr-921-c1:green:4g";
+			label = "green:4g";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		3g {
-			label = "dwr-921-c1:green:3g";
+			label = "green:3g";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "dwr-921-c1:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts

@@ -35,37 +35,37 @@
 		led-boot = &sstrengthg;
 
 		sms {
-			label = "dwr-922-e2:green:sms";
+			label = "green:sms";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "dwr-922-e2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		sstrengthg: sstrengthg {
-			label = "dwr-922-e2:green:sigstrength";
+			label = "green:sigstrength";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		sstrengthr {
-			label = "dwr-922-e2:red:sigstrength";
+			label = "red:sigstrength";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		4g {
-			label = "dwr-922-e2:green:4g";
+			label = "green:4g";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		3g {
-			label = "dwr-922-e2:green:3g";
+			label = "green:3g";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "dwr-922-e2:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts

@@ -18,17 +18,17 @@
 		compatible = "gpio-leds";
 
 		led_wps: wps {
-			label = "wrh-300cr:green:wps";
+			label = "green:wps";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 
 		ethernet {
-			label = "wrh-300cr:green:ethernet";
+			label = "green:ethernet";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "wrh-300cr:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts

@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "ht-tm05:blue:power";
+			label = "blue:power";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wifi {
-			label = "ht-tm05:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};

target/linux/ramips/dts/mt7620n_kimax_u35wf.dts

@@ -28,12 +28,12 @@
 		compatible = "gpio-leds";
 
 		led_wifi: wifi {
-			label = "u35wf:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "u35wf:green:eth";
+			label = "green:eth";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_kingston_mlw221.dts

@@ -18,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "mlw221:blue:system";
+			label = "blue:system";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "mlw221:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts

@@ -18,12 +18,12 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "mlwg2:blue:system";
+			label = "blue:system";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "mlwg2:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts

@@ -18,38 +18,38 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "jwnr2010-v5:green:power";
+			label = "green:power";
 			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "jwnr2010-v5:green:wan";
+			label = "green:wan";
 			gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "jwnr2010-v5:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0radio";
 		};
 
 		lan1 {
-			label = "jwnr2010-v5:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "jwnr2010-v5:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "jwnr2010-v5:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "jwnr2010-v5:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi

@@ -28,7 +28,7 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "wt3020:blue:power";
+			label = "blue:power";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts

@@ -15,12 +15,12 @@
 		compatible = "gpio-leds";
 
 		wifi_green {
-			label = "rp-wd03:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_wifi_blue: wifi_blue {
-			label = "rp-wd03:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts

@@ -18,7 +18,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "var11n-300:blue:system";
+			label = "blue:system";
 			gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts

@@ -17,7 +17,7 @@
 		compatible = "gpio-leds";
 
 		led_indicator: indicator {
-			label = "wrtnode:blue:indicator";
+			label = "blue:indicator";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts

@@ -20,17 +20,17 @@
 		compatible = "gpio-leds";
 
 		led_4g_0: 4g-0 {
-			label = "zbt-cpe102:green:4g-0";
+			label = "green:4g-0";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		4g-1 {
-			label = "zbt-cpe102:green:4g-1";
+			label = "green:4g-1";
 			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
 		};
 
 		4g-2 {
-			label = "zbt-cpe102:green:4g-2";
+			label = "green:4g-2";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts

@@ -22,19 +22,19 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "zbt-wa05:blue:power";
+			label = "blue:power";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "zbt-wa05:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		air {
-			label = "zbt-wa05:blue:air";
+			label = "blue:air";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};

target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts

@@ -22,12 +22,12 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "zbt-we2026:red:power";
+			label = "red:power";
 			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "zbt-we2026:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
 		};
 	};