[openwrt/openwrt] ath79: add support for TP-Link TL-WPA8630 v1
LEDE Commits
lede-commits at lists.infradead.org
Thu Aug 13 14:54:50 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7ef7dbaf7057da37afeefa3753bc4d0f0453e51f
commit 7ef7dbaf7057da37afeefa3753bc4d0f0453e51f
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Thu Jul 9 12:49:17 2020 +0200
ath79: add support for TP-Link TL-WPA8630 v1
This ports the TP-Link TL-WPA8630 v1 from ar71xx to ath79.
Specifications:
SoC: QCA9563
CPU: 750 MHz
Flash/RAM: 8 / 128 MiB
Ethernet: 3x 1G ports (QCA8337 switch)
WLAN: 2.4 GHz b/g/n, 5 GHz a/n/ac (ath10k)
Buttons, LEDs and network setup appear to be almost identical
to the v2 revision.
Powerline interface is connected to switch port 5 (Label LAN4).
Installation:
No "fresh" device was available for testing the factory image.
It is not known whether flashing via OEM firmware GUI is possible
or not. A discussion from 2018 [1] about that indicates a few
adjustments are necessary, but it is not clear whether those
are already implemented with the TPLINK_HEADER_VERSION = 2 or not.
Note that for the TL-WPA8630P v1, the TPLINK_HWID needs to be
changed to 0x86310001 to allow factory flashing.
[1] https://forum.openwrt.org/t/solved-tl-wpa8630p-lede-does-not-install/8161/27
Recovery:
Recovery is only possible via serial.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
.../ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts | 56 ++++++++
...630p-v2.dtsi => qca9563_tplink_tl-wpa8630.dtsi} | 103 ++++----------
.../ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi | 158 ++++-----------------
.../ath79/generic/base-files/etc/board.d/01_leds | 1 +
.../generic/base-files/etc/board.d/02_network | 1 +
.../etc/hotplug.d/firmware/11-ath10k-caldata | 4 +
.../base-files/etc/uci-defaults/04_led_migration | 4 +
target/linux/ath79/image/generic-tp-link.mk | 11 ++
8 files changed, 134 insertions(+), 204 deletions(-)
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
new file mode 100644
index 0000000000..8912e2fc7c
--- /dev/null
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "qca9563_tplink_tl-wpa8630.dtsi"
+
+/ {
+ compatible = "tplink,tl-wpa8630-v1", "qca,qca9563";
+ model = "TP-Link TL-WPA8630 v1";
+
+ aliases {
+ label-mac-device = ð0;
+ };
+};
+
+&keys {
+ wifi {
+ label = "WiFi button";
+ linux,code = <KEY_RFKILL>;
+ gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
+ };
+};
+
+&partitions {
+ uboot: partition at 0 {
+ label = "u-boot";
+ reg = <0x000000 0x010000>;
+ read-only;
+ };
+
+ partition at 10000 {
+ compatible = "tplink,firmware";
+ label = "firmware";
+ reg = <0x010000 0x7d0000>;
+ };
+
+ partition at 7e0000 {
+ label = "mib0";
+ reg = <0x7e0000 0x010000>;
+ read-only;
+ };
+
+ art: partition at 7f0000 {
+ label = "art";
+ reg = <0x7f0000 0x010000>;
+ read-only;
+ };
+};
+
+ð0 {
+ mtd-mac-address = <&uboot 0x0fc00>;
+};
+
+&wmac {
+ mtd-mac-address = <&uboot 0x0fc00>;
+};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
similarity index 70%
copy from target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
copy to target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
index 16c055b6d7..68b455c66a 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
@@ -11,45 +11,9 @@
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
- label-mac-device = ð0;
};
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "tp-link:green:power";
- gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
- };
-
- wifi2g {
- label = "tp-link:green:wifi2g";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy1tpt";
- };
-
- wifi5g {
- label = "tp-link:green:wifi5g";
- gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- lan {
- label = "tp-link:green:lan";
- gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
- };
- };
-
- gpio-export {
- compatible = "gpio-export";
-
- led_control {
- gpio-export,name = "tp-link:led:control";
- gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
- };
- };
-
- keys {
+ keys: keys {
compatible = "gpio-keys";
reset {
@@ -59,25 +23,44 @@
debounce-interval = <60>;
};
+ leds {
+ label = "LED control button";
+ linux,code = <BTN_0>;
+ gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
+ };
+
pair {
label = "Pair button";
linux,code = <BTN_1>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
+ };
- leds {
- label = "LED control button";
- linux,code = <BTN_0>;
- gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
+ leds {
+ compatible = "gpio-leds";
+
+ led_power: power {
+ label = "tp-link:green:power";
+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
- wps {
- label = "WPS button";
- linux,code = <KEY_WPS_BUTTON>;
- gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
+ lan {
+ label = "tp-link:green:lan";
+ gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+ };
+
+ wifi2g {
+ label = "tp-link:green:wifi2g";
+ gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy1tpt";
+ };
+
+ wifi5g {
+ label = "tp-link:green:wifi5g";
+ gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy0tpt";
};
};
};
@@ -96,30 +79,6 @@
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
-
- partition at 0 {
- label = "factory-uboot";
- reg = <0x000000 0x020000>;
- read-only;
- };
-
- partition at 20000 {
- label = "u-boot";
- reg = <0x020000 0x020000>;
- read-only;
- };
-
- partition at 40000 {
- compatible = "tplink,firmware";
- label = "firmware";
- reg = <0x040000 0x5e0000>;
- };
-
- partition at 620000 {
- label = "partition-table";
- reg = <0x620000 0x010000>;
- read-only;
- };
};
};
};
@@ -154,12 +113,10 @@
phy-handle = <&phy0>;
phy-mode = "sgmii";
- mtd-mac-address = <&mac 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&mac 0x8>;
};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
index 16c055b6d7..97eeb45d65 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
@@ -1,45 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "qca956x.dtsi"
+#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
label-mac-device = ð0;
};
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "tp-link:green:power";
- gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
- };
-
- wifi2g {
- label = "tp-link:green:wifi2g";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy1tpt";
- };
-
- wifi5g {
- label = "tp-link:green:wifi5g";
- gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- lan {
- label = "tp-link:green:lan";
- gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
- };
- };
-
gpio-export {
compatible = "gpio-export";
@@ -48,118 +15,47 @@
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
};
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "Reset button";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
-
- pair {
- label = "Pair button";
- linux,code = <BTN_1>;
- gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
-
- leds {
- label = "LED control button";
- linux,code = <BTN_0>;
- gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
-
- wps {
- label = "WPS button";
- linux,code = <KEY_WPS_BUTTON>;
- gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
- };
};
-&spi {
- status = "okay";
-
- num-cs = <1>;
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <25000000>;
-
- partitions: partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "factory-uboot";
- reg = <0x000000 0x020000>;
- read-only;
- };
-
- partition at 20000 {
- label = "u-boot";
- reg = <0x020000 0x020000>;
- read-only;
- };
-
- partition at 40000 {
- compatible = "tplink,firmware";
- label = "firmware";
- reg = <0x040000 0x5e0000>;
- };
-
- partition at 620000 {
- label = "partition-table";
- reg = <0x620000 0x010000>;
- read-only;
- };
- };
+&keys {
+ wps {
+ label = "WPS button";
+ linux,code = <KEY_WPS_BUTTON>;
+ gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
};
};
-&pcie {
- status = "okay";
-};
-
-&uart {
- status = "okay";
-};
-
-&mdio0 {
- status = "okay";
+&partitions {
+ partition at 0 {
+ label = "factory-uboot";
+ reg = <0x000000 0x020000>;
+ read-only;
+ };
- phy-mask = <0>;
+ partition at 20000 {
+ label = "u-boot";
+ reg = <0x020000 0x020000>;
+ read-only;
+ };
- phy0: ethernet-phy at 0 {
- reg = <0>;
- phy-mode = "sgmii";
- qca,mib-poll-interval = <500>;
+ partition at 40000 {
+ compatible = "tplink,firmware";
+ label = "firmware";
+ reg = <0x040000 0x5e0000>;
+ };
- qca,ar8327-initvals = <
- 0x04 0x00080080 /* PORT0 PAD MODE CTRL */
- 0x7c 0x0000007e /* PORT0_STATUS */
- >;
+ partition at 620000 {
+ label = "partition-table";
+ reg = <0x620000 0x010000>;
+ read-only;
};
};
ð0 {
- status = "okay";
-
- phy-handle = <&phy0>;
- phy-mode = "sgmii";
mtd-mac-address = <&mac 0x8>;
};
&wmac {
- status = "okay";
-
- mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&mac 0x8>;
};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index 4f1b76a65a..32101ed5b0 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -297,6 +297,7 @@ tplink,tl-mr6400-v1)
ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1"
ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0"
;;
+tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x3c"
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 01b083ddad..4195332ae2 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -294,6 +294,7 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0 at eth0" "1:lan:1" "2:lan:3" "3:lan:2"
;;
+ tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
# port 5 (internal) is the power-line port
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 37f1792fad..19e20c7d36 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -129,6 +129,10 @@ case "$FIRMWARE" in
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
;;
+ tplink,tl-wpa8630-v1)
+ caldata_extract "art" 0x5000 0x844
+ ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x0fc00) +1)
+ ;;
tplink,tl-wr902ac-v1)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary tplink 0x8) -1)
diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
index 0f68209c9b..2dcdf7b007 100644
--- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
@@ -45,6 +45,10 @@ tplink,re355-v1)
tplink,re450-v1)
migrate_leds "re450:=tp-link:"
;;
+tplink,tl-wpa8630-v1)
+ migrate_leds "^tl-wpa8630:=tp-link:" \
+ ':wlan$=:wifi2g' ':wlan5$=:wifi5g'
+ ;;
wd,mynet-n750)
migrate_leds "wd:=mynet-n750:"
;;
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index c2cda6b3df..fdc94b738a 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -500,6 +500,17 @@ define Device/tplink_tl-wdr4900-v2
endef
TARGET_DEVICES += tplink_tl-wdr4900-v2
+define Device/tplink_tl-wpa8630-v1
+ $(Device/tplink-8mlzma)
+ SOC := qca9563
+ DEVICE_MODEL := TL-WPA8630
+ DEVICE_VARIANT := v1
+ DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
+ TPLINK_HWID := 0x86300001
+ SUPPORTED_DEVICES += tl-wpa8630
+endef
+TARGET_DEVICES += tplink_tl-wpa8630-v1
+
define Device/tplink_tl-wpa8630p-v2
$(Device/tplink-safeloader)
SOC := qca9563
More information about the lede-commits
mailing list