From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 7 Feb 2024 13:48:37 +0000 (+0100)
Subject: ipq40xx: drop redundant label with new LED color/function format
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=502ac21e8fdeedb4b192ff960fecc44b3db35af5;p=openwrt%2Fstaging%2Fmans0n.git

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 a688a8aa58..3784e62d0b 100644
--- 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 ae0d8524e5..9bcfab4487 100644
--- 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 16951da47f..dd56cb215e 100644
--- 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 bbb2cb902a..7c0194ccc0 100644
--- 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 1566dc39a9..90e5455b25 100644
--- 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 963c0915bb..7b3f1c8bb7 100644
--- 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";