ramips: drop redundant label with new LED color/function format

Drop redundant label with new LED color/function format declared.
This was needed previously when the new format wasn't supported by
leds.sh functions script. Now that is supported this property
can be removed in favor of the new format.

Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
index 52739f511461f90e4e771374bfe401061b0b91e7..3880051a8a435f5e36bc9e1a22ac7c2c063b4ce2 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-806a-b1.dts
@@ -31,14 +31,12 @@
                compatible = "gpio-leds";
 
                wifi_led: 2.4g {
-                       label = "green:wlan";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;     // #72
                };
 
                wps_led: wps {
-                       label = "green:wps";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WPS;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;    // #39

diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
index 34b62a025aa0ad83a8e3735df65ad6a7a676a732..717609f6a77335f7ddf874ac4c6a619ff5292fc6 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6208ac-v2.dts
@@ -37,7 +37,6 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
@@ -45,14 +44,12 @@
 
                // RALINK_REG_PIO3924DATA 39-24
                led_internet: internet {
-                       label = "green:internet";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
 
                // RALINK_REG_PIO7140DATA 44-40
                led_wlan_2_4ghz: wlan_2_4ghz {
-                       label = "green:wlan2g";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
@@ -61,7 +58,6 @@
 
                // RALINK_REG_PIO7140DATA 43-40
                led_wlan_5ghz: wlan_5ghz {
-                       label = "green:wlan5g";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
@@ -70,7 +66,6 @@
 
                // RALINK_REG_PIO7140DATA 42-40
                led_firmware: firmware {
-                       label = "green:firmware";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                        // default-state = "keep";
@@ -78,7 +73,6 @@
 
                // RALINK_REG_PIO7140DATA 41-40
                led_vpn: vpn {
-                       label = "green:vpn";
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };

diff --git a/target/linux/ramips/dts/mt7620a_wevo_air-duo.dts b/target/linux/ramips/dts/mt7620a_wevo_air-duo.dts
index 05e61fe614e34e94dc53833a64b3acbb9efacfca..90bafdabdb13cbf57a8989d4c3fc9dfef2fe6231 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_wevo_air-duo.dts
+++ b/target/linux/ramips/dts/mt7620a_wevo_air-duo.dts
@@ -22,7 +22,6 @@
                compatible = "gpio-leds";
 
                led_status: led-0 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7620n_snr_cpe-w4n-mt.dts b/target/linux/ramips/dts/mt7620n_snr_cpe-w4n-mt.dts
index 25af8d5330147765ba0035626542c9adcaca9e89..b960162a092d097ad2541556494fe90263f4435f 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_snr_cpe-w4n-mt.dts
+++ b/target/linux/ramips/dts/mt7620n_snr_cpe-w4n-mt.dts
@@ -21,7 +21,6 @@
                compatible = "gpio-leds";
 
                led_sys: sys {
-                       label = "green:sys";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; // GPIO#38
@@ -29,14 +28,12 @@
                };
 
                led_wps: wps {
-                       label = "green:wps";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WPS;
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; // GPIO#39
                };
 
                wlan {
-                       label = "green:wlan";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; // GPIO#72

diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts
index 2241b27673a6522025cd5291e94f0581add4693f..64630816dc314d06eed2e8e7b7a191966ae4a83e 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts
+++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-lite-iii-a.dts
@@ -55,14 +55,12 @@
                compatible = "gpio-leds";
 
                led_wan: wan {
-                       label = "green:wan";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; // #GPIO38
                };
 
                wifi {
-                       label = "green:wifi";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>; // #GPIO72

diff --git a/target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts b/target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts
index e07cddefc5804487c8dcaa89b72400013837159f..85fda96ce5c606508e1ee938633bb26eb4c5f994 100644 (file)
--- a/target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts
+++ b/target/linux/ramips/dts/mt7621_alfa-network_ax1800rm.dts
@@ -42,42 +42,36 @@
                compatible = "gpio-leds";
 
                lan1 {
-                       label = "green:lan1";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_LAN;
                        gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
                };
 
                lan2 {
-                       label = "green:lan2";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_LAN;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "green:lan3";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_LAN;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
-                       label = "green:wan";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_wan_red: wan_red {
-                       label = "red:wan";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts b/target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts
index fbf276c320e15bf8024dc1b2fc35c1ba71c5bdf2..7e181bd12cc14aa9858b98a4de13f5ba547862ab 100644 (file)
--- a/target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts
+++ b/target/linux/ramips/dts/mt7621_arcadyan_we420223-99.dts
@@ -42,7 +42,6 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
                        gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
@@ -50,48 +49,41 @@
                };
 
                led_power_red: power_red {
-                       label = "red:power";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_FAULT;
                };
 
                led_wifi_blue: wifi_blue {
-                       label = "blue:wifi";
                        gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_WLAN;
                };
 
                led_wifi_green: wifi_green {
-                       label = "green:wifi";
                        gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                };
 
                led_wps_red: wps_red {
-                       label = "red:wps";
                        gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_WPS;
                };
 
                led_wps_green: wps_green {
-                       label = "green:wps";
                        gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WPS;
                };
 
                led_followme_r: followme_red {
-                       label = "red:followme";
                        gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_followme_g: followme_green {
-                       label = "green:followme";
                        gpios = <&gpio 48 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                };

diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts b/target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts
index c7d0e1e748d3a0da6d9a14cbce3a4872f0fa2877..efb761540c3a4953630fb3e014e855a9660d78ec 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts
+++ b/target/linux/ramips/dts/mt7621_asus_rt-ax53u.dts
@@ -27,14 +27,12 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "blue:power";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_usb {
-                       label = "blue:usb";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_USB;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ax54.dts b/target/linux/ramips/dts/mt7621_asus_rt-ax54.dts
index 94825f9de3d95f2cb0b9f8a5051b550efb5a178a..04d0d827046ed404368c7e3946c883d0bfac9651 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asus_rt-ax54.dts
+++ b/target/linux/ramips/dts/mt7621_asus_rt-ax54.dts
@@ -27,7 +27,6 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "blue:power";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi
index 618b07e798ded94fb68664a917a4c0da739fc1eb..4d3a6f02449a0a00646462e02e15497ad6196cdf 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533ghbk.dtsi
@@ -18,21 +18,18 @@
                compatible = "gpio-leds";
 
                wps {
-                       label = "red:wps";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_WPS;
                };
 
                led_power: power {
-                       label = "white:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_POWER;
                };
 
                wlan2g {
-                       label = "white:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_WLAN;
@@ -41,7 +38,6 @@
                };
 
                wlan5g {
-                       label = "white:wlan5g";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_WLAN;

diff --git a/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi b/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
index 59b49fbefc8b0231612781a78ce428ac2209cdfb..5639f7176b765bfbc2bec5a21a5cd283c5905e07 100644 (file)
--- a/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
+++ b/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
@@ -39,14 +39,12 @@
                compatible = "gpio-leds";
 
                led_status_amber: led-0 {
-                       label = "amber:status";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi b/target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi
index 6549abaec956973dbba21c547f7293631dad61b9..99b589ecfec3965efaf13125cf33161548ba11a2 100644 (file)
--- a/target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi
+++ b/target/linux/ramips/dts/mt7621_haier-sim_wr1800k.dtsi
@@ -40,21 +40,18 @@
                compatible = "gpio-leds";
 
                led_status_blue: led-0 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: led-2 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts
index c21f456a7450565e4e769a72927b865e18856298..4543f45a9fee406b3044e9eed3cc60a7938447c1 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-deax1800gr.dts
@@ -25,28 +25,24 @@
                compatible = "gpio-leds";
 
                led_status_green: led-0 {
-                       label = "green:status";
                        gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led_status_red: led-1 {
-                       label = "red:status";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-2 {
-                       label = "green:wps_wifi";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WPS;
                };
 
                led-3 {
-                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
@@ -54,14 +50,12 @@
                };
 
                led-4 {
-                       label = "green:router";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
                };
 
                led-5 {
-                       label = "green:internet";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WAN;

diff --git a/target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts b/target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts
index 05346a10d4a7d59451e8f5b07d733d8a78026439..286c4dda49ac64bdcf14e04be1faa8ebe885f76d 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_a3002mesh.dts
@@ -21,7 +21,6 @@
                compatible = "gpio-leds";
 
                led_cpu: led-0 {
-                       label = "amber:cpu";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_CPU;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_iptime_a3004t.dts b/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
index 2394a343c2464e7550d3406118f19fa08a6ee752..f33b4843509fd5608f75fab86381b88a321728cc 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_a3004t.dts
@@ -21,7 +21,6 @@
                compatible = "gpio-leds";
 
                led_cpu: led-0 {
-                       label = "amber:cpu";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_CPU;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_iptime_t5004.dts b/target/linux/ramips/dts/mt7621_iptime_t5004.dts
index ee82ffbd85742d8ab29c7d9c6189639065ac56c7..bba039a63ccdfc40124ae97e86f9fd3c33bf6e72 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iptime_t5004.dts
+++ b/target/linux/ramips/dts/mt7621_iptime_t5004.dts
@@ -21,7 +21,6 @@
                compatible = "gpio-leds";
 
                led_cpu: led-0 {
-                       label = "blue:cpu";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_CPU;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts
index 51425b9a1569f1df3f68a00d54d5a9090dbf1db5..5cdf05fae6ca1bfee6111aa5497c67cfe3f0bd04 100644 (file)
--- a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts
+++ b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-lite.dts
@@ -13,14 +13,12 @@
                compatible = "gpio-leds";
 
                led_sys: led-0 {
-                       label = "green:sys";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                led_vpn: led-1 {
-                       label = "green:vpn";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
index 65f33f615bec2e1b8edab2b098d194bf00d5d061..7728ded22b851fc0b803f2008c0c58faa53621f4 100644 (file)
--- a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
+++ b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
@@ -20,21 +20,18 @@
                compatible = "gpio-leds";
 
                led_sys: sys {
-                       label = "green:sys";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                vpn {
-                       label = "green:vpn";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "green:usb";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_USB;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi b/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
index d3db8cd602cb76443e59b98bfc8e9281190dd2a8..3f792ec2a547a3a6b63e828d7df12854737d0c85 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
+++ b/target/linux/ramips/dts/mt7621_tplink_archer-x6-v3.dtsi
@@ -41,7 +41,6 @@
                compatible = "gpio-leds";
 
                led_power: led-power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts b/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
index a91a18efc75808c1e26c8d9baa804fc6a86a5935..4528cfe1beae727538d521e0d384c874cb874549 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
@@ -22,7 +22,6 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "white:status";
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_eap613-v1.dts b/target/linux/ramips/dts/mt7621_tplink_eap613-v1.dts
index 6c66401580cc825fbf31ff916837b3ccf9b574b9..ab8a3227bb772e3662072f17357088dc5d7790ad 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_eap613-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_eap613-v1.dts
@@ -26,7 +26,6 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts b/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
index b8564885393cdcb12f88545d30e667ea2d585483..8109ec86b5e8bd438c84b8856dd0ee54feaa54f6 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_eap615-wall-v1.dts
@@ -26,7 +26,6 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "white:status";
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts b/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
index 04935e3e99b4386fedfc4bf60aedac1bb878e7a0..ce2fcce75edab735d98fff2af1963bd977f6db0e 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
@@ -29,14 +29,12 @@
                compatible = "gpio-leds";
 
                led_usb: usb {
-                       label = "green:usb";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
                led_power: power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
@@ -44,7 +42,6 @@
                };
 
                led_system: system {
-                       label = "green:system";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/ramips/dts/mt7621_tplink_ex220-v1.dts b/target/linux/ramips/dts/mt7621_tplink_ex220-v1.dts
index ffefd07d85324976f967ea91342bef8e7fcd2bb2..2266b850ed514473abfe8e35d1c79efc79a30bba 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_ex220-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_ex220-v1.dts
@@ -82,7 +82,6 @@
                };
 
                led_power: led-power {
-                       label = "green:power"; // to be removed once #13837 is merged
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
index a403cd3e14ff18d69d5afcf9725f606a7eaa4bab..c655150aae9836aec978a79fc36eb7828ae4b24a 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
@@ -26,28 +26,24 @@
                compatible = "gpio-leds";
 
                led_status_red: led-0 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: led-1 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_status_yellow: led-2 {
-                       label = "yellow:status";
                        color = <LED_COLOR_ID_YELLOW>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                };
 
                led-3 {
-                       label = "amber:wan";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
@@ -55,7 +51,6 @@
                };
 
                led-4 {
-                       label = "amber:lan3";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_LAN;
                        function-enumerator = <3>;
@@ -64,7 +59,6 @@
                };
 
                led-5 {
-                       label = "amber:lan2";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_LAN;
                        function-enumerator = <2>;
@@ -73,7 +67,6 @@
                };
 
                led-6 {
-                       label = "amber:lan1";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_LAN;
                        function-enumerator = <1>;

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
index bd8400c8985a095fcb4091db4b9653a84a8a2869..ad9c18f8ffb628befe2f81077bfa1675e93988af 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
@@ -17,28 +17,24 @@
                compatible = "gpio-leds";
 
                led_status_red: led-0 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: led-1 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_status_yellow: led-2 {
-                       label = "yellow:status";
                        color = <LED_COLOR_ID_YELLOW>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                };
 
                led-3 {
-                       label = "amber:wan";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
@@ -46,7 +42,6 @@
                };
 
                led-4 {
-                       label = "amber:lan1";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_LAN;
                        function-enumerator = <1>;
@@ -55,7 +50,6 @@
                };
 
                led-5 {
-                       label = "amber:lan2";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_LAN;
                        function-enumerator = <2>;