From: Christian Lamparter <chunkeey@gmail.com>
Date: Fri, 24 Jun 2022 18:55:15 +0000 (+0200)
Subject: apm821xx: WNDAP660: fix ethernet port ordering
X-Git-Tag: v22.03.0-rc5~60
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a4390ea283893fd3166bf660c32f263a6501d5b5;p=openwrt%2Fopenwrt.git

apm821xx: WNDAP660: fix ethernet port ordering

Tim Small reported:
| Viewing the 'Network' -> 'Switch' config page in LuCI:
|
| The LuCI LAN 1 port corresponds to the port physically
|     labelled 2 at the rear of the device.
| [...]
|
| When a patch cord is attached to the port labelled 1 [...],
| the LED labelled °2 illuminates.

=> essentially, the Ports and LEDs are reversed.

Reported-by: Tim Small
Fixes: #10111
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(cherry picked from commit 36483600d337ab3ec8a6dabeaa160614d07f5588)
---

diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds
index 0b203fd8a7..c384d24a30 100644
--- a/target/linux/apm821xx/base-files/etc/board.d/01_leds
+++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds
@@ -30,10 +30,10 @@ netgear,wndap620)
 
 netgear,wndap660)
 	ucidef_set_led_netdev "lan_act" "LAN (Activity)" "green:activity" "eth0"
-	ucidef_set_led_switch "lan1_100" "LAN 100Mbps" "amber:lan-0" "switch0" "0x04" "0x04" "link"
-	ucidef_set_led_switch "lan1_1000" "LAN 1000Mbps" "green:lan-0" "switch0" "0x04" "0x08" "link"
-	ucidef_set_led_switch "lan2_100" "LAN 100Mbps" "amber:lan-1" "switch0" "0x02" "0x04" "link"
-	ucidef_set_led_switch "lan2_1000" "LAN 1000Mbps" "green:lan-1" "switch0" "0x02" "0x08" "link"
+	ucidef_set_led_switch "lan1_100" "LAN 100Mbps" "amber:lan-1" "switch0" "0x02" "0x04" "link"
+	ucidef_set_led_switch "lan1_1000" "LAN 1000Mbps" "green:lan-1" "switch0" "0x02" "0x08" "link"
+	ucidef_set_led_switch "lan2_100" "LAN 100Mbps" "amber:lan-2" "switch0" "0x04" "0x04" "link"
+	ucidef_set_led_switch "lan2_1000" "LAN 1000Mbps" "green:lan-2" "switch0" "0x04" "0x08" "link"
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan-0" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan-1" "phy1tpt"
 	;;
diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network
index 3a97c67f28..756ea348b4 100644
--- a/target/linux/apm821xx/base-files/etc/board.d/02_network
+++ b/target/linux/apm821xx/base-files/etc/board.d/02_network
@@ -16,7 +16,7 @@ netgear,wndap620)
 	ucidef_add_switch "switch0" "2:lan" "5@eth0"
 	;;
 netgear,wndap660)
-	ucidef_add_switch "switch0" "1:lan:2" "2:lan:1" "5@eth0"
+	ucidef_add_switch "switch0" "1:lan" "2:lan" "5@eth0"
 	;;
 meraki,mx60|\
 netgear,wndr4700)
diff --git a/target/linux/apm821xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/apm821xx/base-files/etc/uci-defaults/04_led_migration
index b15ffa34af..0152f2f47b 100644
--- a/target/linux/apm821xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/apm821xx/base-files/etc/uci-defaults/04_led_migration
@@ -32,9 +32,9 @@ netgear,wndap660)
 		":test=:fault" \
 		":wlan2g=:wlan-0" \
 		":wlan5g=:wlan-1" \
-		":lan1-link100=:lan-0" \
+		":lan1-link100=:lan-1" \
 		":lan1-link1000=:lan-1" \
-		":lan2-link100=:lan-1" \
+		":lan2-link100=:lan-2" \
 		":lan2-link1000=:lan-2"
 	;;
 netgear,wndr4700)
diff --git a/target/linux/apm821xx/dts/netgear-wndap660.dts b/target/linux/apm821xx/dts/netgear-wndap660.dts
index f01d1b3be0..7cef1f5a45 100644
--- a/target/linux/apm821xx/dts/netgear-wndap660.dts
+++ b/target/linux/apm821xx/dts/netgear-wndap660.dts
@@ -14,28 +14,28 @@
 		color = <LED_COLOR_ID_GREEN>;
 		function = LED_FUNCTION_LAN;
 		function-enumerator = <1>;
-		gpios = <&GPIO0 22 GPIO_ACTIVE_HIGH>;
+		gpios = <&GPIO0 9 GPIO_ACTIVE_HIGH>;
 	};
 
 	led-6 {
 		color = <LED_COLOR_ID_AMBER>;
 		function = LED_FUNCTION_LAN;
-		function-enumerator = <0>;
-		gpios = <&GPIO0 23 GPIO_ACTIVE_HIGH>;
+		function-enumerator = <1>;
+		gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
 	};
 
 	led-7 {
 		color = <LED_COLOR_ID_GREEN>;
 		function = LED_FUNCTION_LAN;
 		function-enumerator = <2>;
-		gpios = <&GPIO0 9 GPIO_ACTIVE_HIGH>;
+		gpios = <&GPIO0 22 GPIO_ACTIVE_HIGH>;
 	};
 
 	led-8 {
 		color = <LED_COLOR_ID_AMBER>;
 		function = LED_FUNCTION_LAN;
-		function-enumerator = <1>;
-		gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
+		function-enumerator = <2>;
+		gpios = <&GPIO0 23 GPIO_ACTIVE_HIGH>;
 	};
 };