ar71xx: wpa8630: change board name to tl-wpa8630

Signed-off-by: Henryk Heisig <hyniu@o2.pl>

6 files changed, 19 insertions, 19 deletions

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index 01308b5f57..cde3a947e9 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -521,6 +521,11 @@ archer-c7)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy1tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy0tpt"
 	;;
+tl-wpa8630)
+	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
+	ucidef_set_led_netdev "wlan" "WLAN" "$board:green:wlan" "wlan1"
+	ucidef_set_led_netdev "wlan5" "WLAN5" "$board:green:wlan5" "wlan0"
+	;;
 tl-wr802n-v1)
 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:system" "phy0tpt"
 	;;
@@ -638,11 +643,6 @@ wnr612-v2)
 	ucidef_set_led_switch "lan1" "LAN1" "netgear:green:lan1" "switch0" "0x02" "0x0f"
 	ucidef_set_led_switch "lan2" "LAN2" "netgear:green:lan2" "switch0" "0x04" "0x0f"
 	;;
-wpa8630)
-	ucidef_set_led_netdev "wlan5" "WLAN5" "$board:green:wlan5" "wlan0"
-	ucidef_set_led_netdev "wlan" "WLAN" "$board:green:wlan" "wlan1"
-	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
-	;;
 wpn824n)
 	ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
 	ucidef_set_led_wlan "wlan" "WLAN" "netgear:blue:wlan" "phy0tpt"
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index e6489af876..24dfced4ae 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -366,6 +366,10 @@ ar71xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
 		;;
+	tl-wpa8630)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "5:lan:4"
+		;;
 	tl-wr1043nd)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
@@ -398,10 +402,6 @@ ar71xx_setup_interfaces()
 		ucidef_add_switch_port_attr "switch0" 2 led 9
 		ucidef_add_switch_port_attr "switch0" 5 led 2
 		;;
-	wpa8630)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "5:lan:4"
-		;;
 	wpj344)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "3:lan" "2:wan"
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 8b038e47ee..881b3c65e5 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -44,7 +44,7 @@ get_status_led() {
 	mr12|\
 	mr16|\
 	nbg6616|\
-	wpa8630)
+	tl-wpa8630)
 		status_led="$board:green:power"
 		;;
 	ap96)
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index c95cfb9ec4..872e6a8427 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -86,14 +86,14 @@ case "$FIRMWARE" in
 		ath10kcal_extract "ART" 20480 2116
 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
 		;;
+	tl-wpa8630)
+		ath10kcal_extract "ART" 20480 2116
+		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
+		;;
 	unifiac-lite | \
 	unifiac-pro)
 		ath10kcal_extract "EEPROM" 20480 2116
 		;;
-	wpa8630)
-		ath10kcal_extract "ART" 20480 2116
-		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
-		;;
 	esac
 	;;
 "ath10k/cal-pci-0000:01:00.0.bin")
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index d7c4131f7b..75542470ba 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -985,6 +985,9 @@ ar71xx_board_detect() {
 	*"TL-WDR6500 v2")
 		name="tl-wdr6500-v2"
 		;;
+	*TL-WPA8630)
+		name="tl-wpa8630"
+		;;
 	*TL-WR741ND)
 		name="tl-wr741nd"
 		;;
@@ -1129,9 +1132,6 @@ ar71xx_board_detect() {
 	*"WNR1000 V2")
 		name="wnr1000-v2"
 		;;
-	*WPA8630)
-		name="wpa8630"
-		;;
 	*WPN824N)
 		name="wpn824n"
 		;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 3c7976d6bf..c4a9f8a9f1 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -366,6 +366,7 @@ platform_check_image() {
 	tl-wdr4300|\
 	tl-wdr4900-v2|\
 	tl-wdr6500-v2|\
+	tl-wpa8630|\
 	tl-wr1041n-v2|\
 	tl-wr1043nd-v2|\
 	tl-wr1043nd|\
@@ -386,8 +387,7 @@ platform_check_image() {
 	tl-wr842n-v3|\
 	tl-wr941nd-v5|\
 	tl-wr941nd-v6|\
-	tl-wr941nd|\
-	wpa8630)
+	tl-wr941nd)
 		local magic_ver="0100"
 
 		case "$board" in