ath79: 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/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
index de138658180760eb2fdd670a357a4b8a0fb484f7..a5d684cf99520fdd72e31ca88d05d3ad66830c9f 100644 (file)
--- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
+++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
@@ -25,7 +25,6 @@
                compatible = "gpio-leds";
 
                led_system: led-0 {
-                       label = "green:system";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts b/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts
index d2c51714020ac624cc4243f3b14e6dd1e26b2950..01b1053142c3035db17ff0ea81214b0cb5b47122 100644 (file)
--- a/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts
+++ b/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts
@@ -34,7 +34,6 @@
                pinctrl-names = "default";
 
                led_status_green: led-0 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        function-enumerator = <0>;
@@ -42,7 +41,6 @@
                };
 
                led_status_red: led-1 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        function-enumerator = <1>;
@@ -50,7 +48,6 @@
                };
 
                led-2 {
-                       label = "green:wifi";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                        function-enumerator = <0>;
@@ -59,21 +56,18 @@
                };
 
                led-3 {
-                       label = "green:lan1";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WAN;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led-4 {
-                       label = "green:lan2";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_LAN;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led-5 {
-                       label = "yellow:wifi";
                        color = <LED_COLOR_ID_YELLOW>;
                        function = LED_FUNCTION_WLAN;
                        function-enumerator = <1>;

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts
index 3c0e9c56a1c81b60be922b7532ecd36fb92b3a3c..c7149953be3e5a1e5a0834576b03f7f5d8e0b441 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts
@@ -24,7 +24,6 @@
                };
 
                led_power: led-1 {
-                       label = "blue:power";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
index 414db556cade3773024b06811f1e4f664ae8cdff..64f5eabb522c8eae7cbf04aacf016958d9a9c74a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
+++ b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts
@@ -33,21 +33,18 @@
                compatible = "gpio-leds";
 
                led_status_blue: led-0 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: led-2 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index d4bf64ab40bba8c29e6e874aea063e63dbaaa61b..6ade40bfe1e6070330056f8cc52b8114d4b28af0 100644 (file)
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -32,14 +32,12 @@
                compatible = "gpio-leds";
 
                led_power_amber: power-amber {
-                       label = "amber:power";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power-green {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9557_meraki_mr18.dts b/target/linux/ath79/dts/qca9557_meraki_mr18.dts
index a88e2bcd377a1040d3b51533376a4f95070c133d..9189c6e55161c739ec55aa25d760ee3efeb10f61 100644 (file)
--- a/target/linux/ath79/dts/qca9557_meraki_mr18.dts
+++ b/target/linux/ath79/dts/qca9557_meraki_mr18.dts
@@ -66,17 +66,14 @@
 
 #else
                red {
-                       label = "red:tricolor";
                        color = <LED_COLOR_ID_RED>;
                };
 
                green: green {
-                       label = "green:tricolor";
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                blue {
-                       label = "blue:tricolor";
                        color = <LED_COLOR_ID_BLUE>;
                };
 #endif

diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
index e5c2cbcb72c75a3ab0a1e66ac8687bd6a168b322..137bff732cf8b6391e6cd4685df7ef48f7004094 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
@@ -46,7 +46,6 @@
                };
 
                led_power: led-1 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
index ee2e82ef10b5886c2207d40f30a59ef6b6673628..0f3c23d4748fdb57ef267cf2692328d57487ca45 100644 (file)
--- a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
+++ b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts
@@ -21,7 +21,6 @@
                compatible = "gpio-leds";
 
                led_power: led-0 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts
index 164e0802f9fb6f12c22d57adb5bd7bf0b0743a01..f067df0fb724410de770e74fb8b6bf00510ba6ac 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts
@@ -20,7 +20,6 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
index 9d06a49626e2e1866a73cb0a63aa205d837825eb..a660c1593c4453ec73de8b77111d0833d853bb82 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
@@ -18,7 +18,6 @@
                compatible = "gpio-leds";
 
                led_status_green: led-0 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
@@ -26,14 +25,12 @@
                };
 
                led_status_amber: led-1 {
-                       label = "amber:status";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_red: led-2 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts
index 8fcd093d66f494f0d667cb2e2c4e296ca11b7418..d0693658a4dbdd4b8a3143910dc2beaa3be70980 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf281.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts
@@ -16,7 +16,6 @@
 };
 
 &led_debug {
-       label = "green:debug";
        color = <LED_COLOR_ID_GREEN>;
 };
 

diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts
index 439cc1af4af943b2d82d9f988748652672d8a2de..12c8f00d1f3b114fadd018be87dd281601df7f31 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf282.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts
@@ -28,7 +28,6 @@
 };
 
 &led_debug {
-       label = "blue:debug";
        color = <LED_COLOR_ID_BLUE>;
 };