From: Paul Wassi <p.wassi@gmx.at>
Date: Fri, 4 Jan 2019 21:44:08 +0000 (+0100)
Subject: ath79: rename TP-LINK to TP-Link
X-Git-Tag: v19.07.0-rc1~1312
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79cc48ff608e0c9c9dcdf6197631783b9646ff82;p=oweals%2Fopenwrt.git

ath79: rename TP-LINK to TP-Link

Remove inconsistencies in the vendor's name.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
---

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
index 4a3fc59623..b79e3c735f 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
@@ -5,7 +5,7 @@
 
 / {
 	compatible = "tplink,tl-wr841-v7", "qca,ar7241";
-	model = "TP-LINK TL-WR841N/ND v7";
+	model = "TP-Link TL-WR841N/ND v7";
 
 	ath9k-leds {
 		compatible = "gpio-leds";
diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
index 9a135df1a0..c42207e6cf 100644
--- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
@@ -8,7 +8,7 @@
 
 / {
 	compatible = "tplink,tl-wr2543-v1", "qca,ar7242";
-	model = "TP-LINK TL-WR2543N/ND";
+	model = "TP-Link TL-WR2543N/ND";
 
 	aliases {
 		led-boot = &system;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
index 59a81e4976..fdc5713fad 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts
@@ -8,7 +8,7 @@
 
 / {
 	compatible = "tplink,archer-c58-v1", "qca,qca9560";
-	model = "TP-LINK Archer C58 v1";
+	model = "TP-Link Archer C58 v1";
 
 	aliases {
 		led-boot = &power;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index 5470d9e49c..6ac5f3811e 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -8,7 +8,7 @@
 
 / {
 	compatible = "tplink,archer-c59-v1", "qca,qca9560";
-	model = "TP-LINK Archer C59 v1";
+	model = "TP-Link Archer C59 v1";
 
 	aliases {
 		led-boot = &power;
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 4208878210..2e8897396b 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -4,7 +4,7 @@ define Device/tplink_archer-a7-v5
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9563
   IMAGE_SIZE := 15104k
-  DEVICE_TITLE := TP-LINK Archer A7 v5
+  DEVICE_TITLE := TP-Link Archer A7 v5
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-A7-V5
   BOARDNAME := ARCHER-A7-V5
@@ -16,7 +16,7 @@ define Device/tplink_archer-c2-v3
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9563
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-LINK Archer C2 v3
+  DEVICE_TITLE := TP-Link Archer C2 v3
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
   TPLINK_BOARD_ID := ARCHER-C2-V3
 endef
@@ -26,7 +26,7 @@ define Device/tplink_archer-c58-v1
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9561
   IMAGE_SIZE := 7936k
-  DEVICE_TITLE := TP-LINK Archer C58 v1
+  DEVICE_TITLE := TP-Link Archer C58 v1
   TPLINK_BOARD_ID := ARCHER-C58-V1
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c58-v1
@@ -37,7 +37,7 @@ define Device/tplink_archer-c59-v1
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9561
   IMAGE_SIZE := 14528k
-  DEVICE_TITLE := TP-LINK Archer C59 v1
+  DEVICE_TITLE := TP-Link Archer C59 v1
   TPLINK_BOARD_ID := ARCHER-C59-V1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct
   SUPPORTED_DEVICES += archer-c59-v1
@@ -48,7 +48,7 @@ define Device/tplink_archer-c6-v2
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9563
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-LINK Archer C6 v2
+  DEVICE_TITLE := TP-Link Archer C6 v2
   TPLINK_BOARD_ID := ARCHER-C6-V2
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
 endef
@@ -57,7 +57,7 @@ TARGET_DEVICES += tplink_archer-c6-v2
 define Device/tplink_archer-c7-v1
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
-  DEVICE_TITLE := TP-LINK Archer C7 v1
+  DEVICE_TITLE := TP-Link Archer C7 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0x75000001
 endef
@@ -66,7 +66,7 @@ TARGET_DEVICES += tplink_archer-c7-v1
 define Device/tplink_archer-c7-v2
   $(Device/tplink-16mlzma)
   ATH_SOC := qca9558
-  DEVICE_TITLE := TP-LINK Archer C7 v2
+  DEVICE_TITLE := TP-Link Archer C7 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0xc7000002
   IMAGES += factory-us.bin factory-eu.bin
@@ -79,7 +79,7 @@ define Device/tplink_archer-c7-v4
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9563
   IMAGE_SIZE := 15104k
-  DEVICE_TITLE := TP-LINK Archer C7 v4
+  DEVICE_TITLE := TP-Link Archer C7 v4
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-C7-V4
   BOARDNAME := ARCHER-C7-V4
@@ -91,7 +91,7 @@ define Device/tplink_archer-c7-v5
   $(Device/tplink-safeloader-uimage)
   ATH_SOC := qca9563
   IMAGE_SIZE := 15360k
-  DEVICE_TITLE := TP-LINK Archer C7 v5
+  DEVICE_TITLE := TP-Link Archer C7 v5
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_BOARD_ID := ARCHER-C7-V5
   BOARDNAME := ARCHER-C7-V5
@@ -103,7 +103,7 @@ define Device/tplink_re450-v2
   $(Device/tplink)
   ATH_SOC := qca9563
   IMAGE_SIZE := 6016k
-  DEVICE_TITLE := TP-LINK RE450 v2
+  DEVICE_TITLE := TP-Link RE450 v2
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
   TPLINK_HWID := 0x0
   TPLINK_HWREV := 0
@@ -119,7 +119,7 @@ TARGET_DEVICES += tplink_re450-v2
 define Device/tplink_tl-wdr3600
   $(Device/tplink-8mlzma)
   ATH_SOC := ar9344
-  DEVICE_TITLE := TP-LINK TL-WDR3600
+  DEVICE_TITLE := TP-Link TL-WDR3600
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x36000001
   SUPPORTED_DEVICES += tl-wdr3600
@@ -129,7 +129,7 @@ TARGET_DEVICES += tplink_tl-wdr3600
 define Device/tplink_tl-wdr4300
   $(Device/tplink-8mlzma)
   ATH_SOC := ar9344
-  DEVICE_TITLE := TP-LINK TL-WDR4300
+  DEVICE_TITLE := TP-Link TL-WDR4300
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x43000001
   SUPPORTED_DEVICES += tl-wdr4300
@@ -139,7 +139,7 @@ TARGET_DEVICES += tplink_tl-wdr4300
 define Device/tplink_tl-wdr4900-v2
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
-  DEVICE_TITLE := TP-LINK TL-WDR4900 v2
+  DEVICE_TITLE := TP-Link TL-WDR4900 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x49000002
 endef
@@ -148,7 +148,7 @@ TARGET_DEVICES += tplink_tl-wdr4900-v2
 define Device/tplink_tl-wr1043nd-v1
   $(Device/tplink-8m)
   ATH_SOC := ar9132
-  DEVICE_TITLE := TP-LINK TL-WR1043N/ND v1
+  DEVICE_TITLE := TP-Link TL-WR1043N/ND v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430001
   SUPPORTED_DEVICES += tl-wr1043nd
@@ -158,7 +158,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v1
 define Device/tplink_tl-wr810n-v1
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9531
-  DEVICE_TITLE := TP-LINK TL-WR810N v1
+  DEVICE_TITLE := TP-Link TL-WR810N v1
   TPLINK_HWID := 0x8100001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
 endef
@@ -167,7 +167,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v1
 define Device/tplink_tl-wr810n-v2
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9533
-  DEVICE_TITLE := TP-LINK TL-WR810N v2
+  DEVICE_TITLE := TP-Link TL-WR810N v2
   TPLINK_HWID := 0x8100002
 endef
 TARGET_DEVICES += tplink_tl-wr810n-v2
@@ -175,7 +175,7 @@ TARGET_DEVICES += tplink_tl-wr810n-v2
 define Device/tplink_tl-wr842n-v1
   $(Device/tplink-8m)
   ATH_SOC := ar7241
-  DEVICE_TITLE := TP-LINK TL-WR842N/ND v1
+  DEVICE_TITLE := TP-Link TL-WR842N/ND v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x8420001
 endef
@@ -184,7 +184,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v1
 define Device/tplink_tl-wr842n-v2
   $(Device/tplink-8mlzma)
   ATH_SOC := ar9341
-  DEVICE_TITLE := TP-LINK TL-WR842N/ND v2
+  DEVICE_TITLE := TP-Link TL-WR842N/ND v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x8420002
   SUPPORTED_DEVICES += tl-wr842n-v2
@@ -194,7 +194,7 @@ TARGET_DEVICES += tplink_tl-wr842n-v2
 define Device/tplink_tl-wr1043nd-v2
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
-  DEVICE_TITLE := TP-LINK TL-WR1043N/ND v2
+  DEVICE_TITLE := TP-Link TL-WR1043N/ND v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430002
   SUPPORTED_DEVICES += tl-wr1043nd-v2
@@ -204,7 +204,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v2
 define Device/tplink_tl-wr1043nd-v3
   $(Device/tplink-8mlzma)
   ATH_SOC := qca9558
-  DEVICE_TITLE := TP-LINK TL-WR1043N/ND v3
+  DEVICE_TITLE := TP-Link TL-WR1043N/ND v3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430003
   SUPPORTED_DEVICES += tl-wr1043nd-v3
@@ -215,7 +215,7 @@ define Device/tplink_tl-wr1043nd-v4
   $(Device/tplink)
   ATH_SOC := qca9563
   IMAGE_SIZE := 15552k
-  DEVICE_TITLE := TP-LINK TL-WR1043N/ND v4
+  DEVICE_TITLE := TP-Link TL-WR1043N/ND v4
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x10430004
   TPLINK_BOARD_ID := TLWR1043NDV4
@@ -230,7 +230,7 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v4
 define Device/tplink_tl-wr2543-v1
   $(Device/tplink-8mlzma)
   ATH_SOC := ar7242
-  DEVICE_TITLE := TP-LINK TL-WR2543N/ND v1
+  DEVICE_TITLE := TP-Link TL-WR2543N/ND v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x25430001
   IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \
diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 41bea334d3..8847ca57e5 100644
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -14,7 +14,7 @@ TARGET_DEVICES += tplink_tl-mr10u
 define Device/tplink_tl-mr3020-v1
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
-  DEVICE_TITLE := TP-LINK TL-MR3020 v1
+  DEVICE_TITLE := TP-Link TL-MR3020 v1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x30200001
   SUPPORTED_DEVICES += tl-mr3020
@@ -24,7 +24,7 @@ TARGET_DEVICES += tplink_tl-mr3020-v1
 define Device/tplink_tl-mr3040-v2
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
-  DEVICE_TITLE := TP-LINK TL-MR3040 v2
+  DEVICE_TITLE := TP-Link TL-MR3040 v2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport
   TPLINK_HWID := 0x30400002
   SUPPORTED_DEVICES += tl-mr3040-v2
@@ -88,7 +88,7 @@ TARGET_DEVICES += tplink_tl-wr740n-v3
 define Device/tplink_tl-wr740n-v4
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
-  DEVICE_TITLE := TP-LINK TL-WR740N v4
+  DEVICE_TITLE := TP-Link TL-WR740N v4
   TPLINK_HWID := 0x07400004
   SUPPORTED_DEVICES += tl-wr740n-v4
 endef
@@ -105,7 +105,7 @@ TARGET_DEVICES += tplink_tl-wr741-v1
 define Device/tplink_tl-wr741nd-v4
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9331
-  DEVICE_TITLE := TP-LINK TL-WR741N/ND v4
+  DEVICE_TITLE := TP-Link TL-WR741N/ND v4
   TPLINK_HWID := 0x07410004
   SUPPORTED_DEVICES += tl-wr741n-v4
 endef
@@ -130,7 +130,7 @@ TARGET_DEVICES += tplink_tl-wr841-v5
 define Device/tplink_tl-wr841-v7
   $(Device/tplink-4m)
   ATH_SOC := ar7241
-  DEVICE_TITLE := TP-LINK TL-WR841N/ND v7
+  DEVICE_TITLE := TP-Link TL-WR841N/ND v7
   TPLINK_HWID := 0x08410007
   SUPPORTED_DEVICES += tl-wr841-v7
 endef
@@ -139,7 +139,7 @@ TARGET_DEVICES += tplink_tl-wr841-v7
 define Device/tplink_tl-wr841-v8
   $(Device/tplink-4mlzma)
   ATH_SOC := ar9341
-  DEVICE_TITLE := TP-LINK TL-WR841N/ND v8
+  DEVICE_TITLE := TP-Link TL-WR841N/ND v8
   TPLINK_HWID := 0x08410008
   SUPPORTED_DEVICES += tl-wr841n-v8
 endef
@@ -148,7 +148,7 @@ TARGET_DEVICES += tplink_tl-wr841-v8
 define Device/tplink_tl-wr841-v9
   $(Device/tplink-4mlzma)
   ATH_SOC := qca9533
-  DEVICE_TITLE := TP-LINK TL-WR841N/ND v9
+  DEVICE_TITLE := TP-Link TL-WR841N/ND v9
   TPLINK_HWID := 0x08410009
 endef
 TARGET_DEVICES += tplink_tl-wr841-v9
@@ -156,7 +156,7 @@ TARGET_DEVICES += tplink_tl-wr841-v9
 define Device/tplink_tl-wr841-v11
   $(Device/tplink-4mlzma)
   ATH_SOC := qca9533
-  DEVICE_TITLE := TP-LINK TL-WR841N/ND v11
+  DEVICE_TITLE := TP-Link TL-WR841N/ND v11
   TPLINK_HWID := 0x08410011
   IMAGES += factory-us.bin factory-eu.bin
   IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US