ipq40xx: 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 <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
index a688a8aa58664eda7c7f3d0d681990f847891856..3784e62d0b10edb86b4c833b27fdff9003b305a5 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
@@ -29,7 +29,6 @@
                compatible = "gpio-leds";
 
                led_status: led-0 {
-                       label = "blue:power";
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_BLUE>;
                };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
index ae0d8524e5216f2197e6016d69df33e1287773e9..9bcfab44873148c581fc39da47defe1119a1aa39 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts
@@ -93,7 +93,6 @@
                compatible = "gpio-leds";
 
                led_power_amber: led-0 {
-                       label = "amber:power";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&ssr 6 GPIO_ACTIVE_LOW>;
@@ -101,7 +100,6 @@
                };
 
                led_power_green: led-1 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&ssr 5 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
index 16951da47fc013cc2c94d4a26db498b40c3f24c4..dd56cb215e8e0e34563677c7cbc4d201c2eedb46 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
@@ -36,14 +36,12 @@
                pinctrl-names = "default";
 
                led_power: power {
-                       label = "blue:power";
                        gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                };
 
                wlan2g {
-                       label = "blue:wlan2g";
                        gpios = <&tlmm 1 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_WLAN;
@@ -51,7 +49,6 @@
                };
 
                wlan5g {
-                       label = "blue:wlan5g";
                        gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_WLAN;

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
index bbb2cb902a2e5c4b3020ec10f55ce2a0d88e9ce4..7c0194ccc0243c5889cf7e4870518cb5cdcc208a 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
@@ -40,7 +40,6 @@
                compatible = "gpio-leds";
 
                led_status: led-0 {
-                       label = "blue:power";
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
index 1566dc39a9dfc2768e511cf4f655b970f943620a..90e5455b25a9697dedd67262e4f133a79ee0aff1 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi
@@ -74,14 +74,12 @@
                compatible = "gpio-leds";
 
                led_sys: led-0 {
-                       label = "blue:sys";
                        gpios = <&tlmm 39 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                };
 
                led-1 {
-                       label = "blue:wlan2g";
                        gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                        color = <LED_COLOR_ID_BLUE>;
@@ -90,7 +88,6 @@
                };
 
                led-2 {
-                       label = "blue:wlan5g";
                        gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy1tpt";
                        color = <LED_COLOR_ID_BLUE>;

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
index 963c0915bb37125a14b8930dac5adb5fb32a834a..7b3f1c8bb736272ccf8247b834e58b7b1bf45425 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts
@@ -275,7 +275,6 @@
                #size-cells = <0>;
 
                led_red: red@0 {
-                       label = "red";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_INDICATOR;
                        linux,default-trigger = "none";
@@ -283,7 +282,6 @@
                };
 
                led_green: green@1 {
-                       label = "green";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
                        linux,default-trigger = "none";
@@ -291,7 +289,6 @@
                };
 
                led_blue: blue@2 {
-                       label = "blue";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_INDICATOR;
                        linux,default-trigger = "default-on";