ath79: rename tl-archer-c7 to archer-c7

This router is called Archer C7 and the tl was used to identify
TP-LINK. Since we have added tplink in dts/board name, the tl
prefix is useless now.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index d88a0f368ae557d757ca3afb3900b985e0e65e7f..f0233b4b282fdfa2e935d916c5420a1a8389c6d4 100755 (executable)
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -64,7 +64,7 @@ ath79_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0@eth0" "3:lan:1" "5:lan:2" "4:wan"
                ;;
-       tplink,tl-archer-c7-v2)
+       tplink,archer-c7-v2)
                ucidef_add_switch "switch0" \
                        "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
                ;;

diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 0d58ea0dd4d57ecaf2bd907d44123e9e55da3308..038573f3e8a14a71ded79b5b67950b3e0a2a0c23 100644 (file)
--- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -91,13 +91,13 @@ case "$FIRMWARE" in
                ath10kcal_extract "ART" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
                ;;
-       tplink,re450-v2)
+       tplink,archer-c7-v2)
                ath10kcal_extract "art" 20480 2116
-               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
+               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
                ;;
-       tplink,tl-archer-c7-v2)
+       tplink,re450-v2)
                ath10kcal_extract "art" 20480 2116
-               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
+               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
                ;;
        ubnt,unifiac-lite|\
        ubnt,unifiac-mesh|\

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
similarity index 87%
rename from target/linux/ath79/dts/qca9558_tplink_tl-archer-c7-v2.dts
rename to target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
index e096db7485fd54eb422ab9927a8669c019ea02a1..10e7a65e8190bf0e88f798d65d547559f13df48e 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
@@ -4,10 +4,10 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9558_tplink_tl-archer-c7.dtsi"
+#include "qca9558_tplink_archer-c7.dtsi"
 
 / {
-       compatible = "tplink,tl-archer-c7-v2", "qca,qca9558";
+       compatible = "tplink,archer-c7-v2", "qca,qca9558";
        model = "TP-Link Archer C7 Version 2";
 };
 

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
similarity index 100%
rename from target/linux/ath79/dts/qca9558_tplink_tl-archer-c7.dtsi
rename to target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi

diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 49b28f7599f7cc33e44b4f6254790acc367fb2ff..6c9e7879cb4473073a8d6fd20e2c420dbc5023d1 100644 (file)
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -1,6 +1,6 @@
 include ./common-tp-link.mk
 
-define Device/tplink_tl-archer-c7-v2
+define Device/tplink_archer-c7-v2
   $(Device/tplink-16mlzma)
   ATH_SOC := qca9558
   DEVICE_TITLE := TP-LINK Archer C7 v2
@@ -10,7 +10,7 @@ define Device/tplink_tl-archer-c7-v2
   IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
   IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
 endef
-TARGET_DEVICES += tplink_tl-archer-c7-v2
+TARGET_DEVICES += tplink_archer-c7-v2
 
 define Device/tplink_tl-re450-v2
   $(Device/tplink)