mvebu: 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/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts
index 3de9ac5473e5733c03cd6fe522d38500933d0194..11be6a40286c1cb3df37f6b0132688dc9c2adfe1 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-buffalo-ls220de.dts
@@ -134,7 +134,6 @@
                };
 
                led_power: power_white {
-                       label = "white:power";
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
@@ -142,21 +141,18 @@
                };
 
                led_failsafe: power_red {
-                       label = "red:power";
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
                };
 
                led_upgrade: power_orange {
-                       label = "amber:power";
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
                };
 
                led_boot: indicator_white {
-                       label = "white:indicator";
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-c200-v2.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-c200-v2.dts
index c1c227a5e9107847b30ca66c675c3ccfa70ae27d..0d5ec567eab4307957b9f56293c0c754a8b01d05 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-c200-v2.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-370-c200-v2.dts
@@ -178,7 +178,6 @@
                };
 
                led_status_red: led-10 {
-                       label = "red:status";
                        function = LED_FUNCTION_STATUS;
                        color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
@@ -193,7 +192,6 @@
                };
 
                led_status_green: led-12 {
-                       label = "green:status";
                        function = LED_FUNCTION_STATUS;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts
index 09604e20176f90dd80e1cd712d958b8cbd05da3c..335a2ecf96e840c266f8ca80660477f994b51e65 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-380-iij-sa-w2.dts
@@ -66,71 +66,60 @@
                pinctrl-0 = <&pmx_leds_pins>;
 
                led-0 {
-                       label = "green:wlan5g";
                        gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led-1 {
-                       label = "red:wlan5g";
                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led-2 {
-                       label = "green:status";
                        gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-3 {
-                       label = "red:status";
                        gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-4 {
-                       label = "green:mobile";
                        gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-5 {
-                       label = "red:mobile";
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led-6 {
-                       label = "green:wlan2g";
                        gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "phy1tpt";
                };
 
                led-7 {
-                       label = "red:wlan2g";
                        gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_power_green: led-8 {
-                       label = "green:power";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led_power_red: led-9 {
-                       label = "red:power";
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led-10 {
-                       label = "green:usb1";
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "usbport";
@@ -138,7 +127,6 @@
                };
 
                led-11 {
-                       label = "green:usb0";
                        gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts
index 8788f022f23fea2cc3771222da2942dbab217d70..c0900d7126d7ce324223fab6b66c27ec1fd1d7d1 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-30e.dts
@@ -14,14 +14,12 @@
 
 &gpio_leds {
        led-14 {
-               label = "amber:speed_wan";
                gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_AMBER>;
                linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
        };
 
        led-15 {
-               label = "green:speed_wan";
                gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "mv88e6xxx-1:00:1Gbps";

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
index 4deca093c2dda999d2ed76545fbd62564c7d13b3..d202d71c7f721d6ef535f6ffb3860f8e6318c052 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
@@ -14,28 +14,24 @@
 
 &gpio_leds {
        led-14 {
-               label = "green:speed_wan1";
                gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "f1072004.mdio-mii:00:1Gbps";
        };
 
        led-15 {
-               label = "green:speed_wan2";
                gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "f1072004.mdio-mii:01:1Gbps";
        };
 
        led-16 {
-               label = "amber:speed_lan5";
                gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_AMBER>;
                linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
        };
 
        led-17 {
-               label = "green:speed_lan5";
                gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "mv88e6xxx-1:00:1Gbps";

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi
index 91458299a209ec1b460f4c877aa0a4ab7b9532de..8cc2d6bc4afc8aa4a80003e873de91928eed2367 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-x0e.dtsi
@@ -46,96 +46,82 @@
                pinctrl-0 = <&pmx_gpio_leds_pins>;
 
                led-0 {
-                       label = "red:alarm";
                        gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_ALARM;
                };
 
                led-1 {
-                       label = "red:ha";
                        gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_status_green: led-2 {
-                       label = "green:sta";
                        gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-3 {
-                       label = "green:ha";
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-4 {
-                       label = "amber:alarm";
                        gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_ALARM;
                };
 
                led_status_red: led-5 {
-                       label = "red:sta";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-6 {
-                       label = "green:speed_lan4";
                        gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "mv88e6xxx-1:01:1Gbps";
                };
 
                led-7 {
-                       label = "amber:speed_lan4";
                        gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        linux,default-trigger = "mv88e6xxx-1:01:100Mbps";
                };
 
                led-8 {
-                       label = "amber:speed_lan3";
                        gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        linux,default-trigger = "mv88e6xxx-1:02:100Mbps";
                };
 
                led-9 {
-                       label = "green:speed_lan3";
                        gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "mv88e6xxx-1:02:1Gbps";
                };
 
                led-10 {
-                       label = "green:speed_lan1";
                        gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "mv88e6xxx-1:04:1Gbps";
                };
 
                led-11 {
-                       label = "amber:speed_lan1";
                        gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        linux,default-trigger = "mv88e6xxx-1:04:100Mbps";
                };
 
                led-12 {
-                       label = "green:speed_lan2";
                        gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        linux,default-trigger = "mv88e6xxx-1:03:1Gbps";
                };
 
                led-13 {
-                       label = "amber:speed_lan2";
                        gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        linux,default-trigger = "mv88e6xxx-1:03:100Mbps";