From: Sungbo Eo <mans0n@gorani.run>
Date: Sun, 16 Jan 2022 16:55:37 +0000 (+0900)
Subject: ipq40xx: rename RT-AC42U WLAN/LAN LEDs
X-Git-Tag: v22.03.0-rc1~694
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=266b5c83c32c13dbd05f0d6f251815cbe6f55621;p=openwrt%2Fstaging%2Fhauke.git

ipq40xx: rename RT-AC42U WLAN/LAN LEDs

Assign LED numbers properly by adding function-enumerator property in DTS.

While at it, remove default trigger of LAN LEDs as it will be handled in
01_leds anyway.

Fixes: 51b9aef553a8 ("ipq40xx: add support for ASUS RT-ACRH17/RT-AC42U")
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index 26acfb6037..bc2ec58806 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -13,10 +13,10 @@ alfa-network,ap120c-ac)
 	ucidef_set_led_netdev "wan" "WAN" "amber:wan" "eth1"
 	;;
 asus,rt-ac42u)
-	ucidef_set_led_switch "lan1" "LAN1" "blue:lan" "switch0" "0x02"
-	ucidef_set_led_switch "lan2" "LAN2" "blue:lan_1" "switch0" "0x04"
-	ucidef_set_led_switch "lan3" "LAN3" "blue:lan_2" "switch0" "0x08"
-	ucidef_set_led_switch "lan4" "LAN4" "blue:lan_3" "switch0" "0x10"
+	ucidef_set_led_switch "lan1" "LAN1" "blue:lan-1" "switch0" "0x02"
+	ucidef_set_led_switch "lan2" "LAN2" "blue:lan-2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "LAN3" "blue:lan-3" "switch0" "0x08"
+	ucidef_set_led_switch "lan4" "LAN4" "blue:lan-4" "switch0" "0x10"
 	;;
 asus,rt-ac58u)
 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts
index 31e2e40ac0..3d58eac09e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts
@@ -138,6 +138,7 @@
 		led-3 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_WLAN;
+			function-enumerator = <0>;
 			gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
@@ -145,6 +146,7 @@
 		led-4 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_WLAN;
+			function-enumerator = <1>;
 			gpios = <&tlmm 54 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
@@ -152,29 +154,29 @@
 		led-5 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_LAN;
+			function-enumerator = <1>;
 			gpios = <&tlmm 45 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "switch0";
 		};
 
 		led-6 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_LAN;
+			function-enumerator = <2>;
 			gpios = <&tlmm 43 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "switch0";
 		};
 
 		led-7 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_LAN;
+			function-enumerator = <3>;
 			gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "switch0";
 		};
 
 		led-8 {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_LAN;
+			function-enumerator = <4>;
 			gpios = <&tlmm 49 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "switch0";
 		};
 	};
 };