Hi,
i think the ordering in the 02_network file is correct since the
device is an "a7" not "c7".
However there was an ordering error in the 01_leds file.
I'll send the next revision when there is confirmation on which
ordering is correct.
On 2018-11-26 10:07:41, John Crispin wrote:
> Hi,
>
> looks good, nitpicks inline ....
>
> On 23/11/2018 22:00, Karl-Felix Glatzer wrote:
> > This patch adds support for TP-Link Archer A7
> >
> > Specification:
> > - SOC: QCA9563
> > - Flash: 16 MiB (SPI)
> > - RAM: 128 MiB (DDR2)
> > - Ethernet: 4x 1Gbps LAN + 1x 1Gbps WAN
> > - Wireless:
> > - 2.4GHz (bgn) SoC internal
> > - 5GHz (ac) QCA988x
> > - USB: 1x USB 2.0 port
> > - Button: 1x power, 1x reset, 1x wps
> > - LED: 10x LEDs
> > - UART: holes in PCB
> > - Vcc, GND, RX, TX from ethernet port side
> > - 115200n8
> >
> > Flash instructions:
> >
> > Upload openwrt-ath79-generic-tplink_archer-a7-v5-squashfs-factory.bin
> > via the Webinterface.
> >
> > Flash instruction using tftp recovery:
> >
> > 1. Connect the computer to one of the LAN ports of the Archer A7
> > 2. Set the computer IP to 192.168.0.66
> > 3. Start a tftp server with the OpenWrt factory image in the tftp
> > root directory renamed to ArcherC7v5_tp_recovery.bin
> > 2. Connect power cable to Archer A7, press and hold the reset button
> > and turn the router on
> > 3. Keep the reset button pressed for ~5 seconds
> > 4. Wait ~150 seconds to complete flashing
> >
> > Changes since first revision:
> >
> > - Flash instructions using stock image webinterface
> > - Changed "Version 5" in model string to "v5"
> > - Split DTS file in qca9563_tplink_archer-x7-v5.dtsi
> > and qca9563_tplink_archer-a7-v5.dts
> > - Firmware image is now build with dynamic partitioning
> > - Default to ath10k-ct
> >
> > Signed-off-by: Karl-Felix Glatzer <karl.glat...@gmx.de>
> > ---
> > .../ath79/base-files/etc/board.d/01_leds | 7 +
> > .../ath79/base-files/etc/board.d/02_network | 4 +
> > .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 +
> > .../ath79/dts/qca9563_tplink_archer-a7-v5.dts | 49 +++++
> > .../dts/qca9563_tplink_archer-x7-v5.dtsi | 202 ++++++++++++++++++
> > target/linux/ath79/image/common-tp-link.mk | 9 +
> > target/linux/ath79/image/generic-tp-link.mk | 16 ++
> > tools/firmware-utils/src/tplink-safeloader.c | 42 +++-
> > 8 files changed, 329 insertions(+), 1 deletion(-)
> > create mode 100644 target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
> > create mode 100644 target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
> >
> > diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds
> > b/target/linux/ath79/base-files/etc/board.d/01_leds
> > index f04eb7f5c6..4ddf04ef84 100755
> > --- a/target/linux/ath79/base-files/etc/board.d/01_leds
> > +++ b/target/linux/ath79/base-files/etc/board.d/01_leds
> > @@ -57,6 +57,13 @@ tplink,tl-mr3020-v1|\
> > tplink,tl-mr3040-v2)
> > ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
> > ;;
> > +tplink,archer-a7-v5)
> > + ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x02"
> > + ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0"
> > "0x04"
> > + ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0"
> > "0x08"
> > + ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0"
> > "0x10"
> > + ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0"
> > "0x20"
> > + ;;
> > tplink,tl-wr1043nd-v4)
> > ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
> > ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0"
> > "0x10"
> > 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 5f02c5769a..7c7c9e14e1 100755
> > --- a/target/linux/ath79/base-files/etc/board.d/02_network
> > +++ b/target/linux/ath79/base-files/etc/board.d/02_network
> > @@ -107,6 +107,10 @@ ath79_setup_interfaces()
> > ucidef_add_switch "switch0" \
> > "0@eth0" "3:lan:1" "5:lan:2" "4:wan"
> > ;;
> > + tplink,archer-a7-v5)
> > + ucidef_add_switch "switch0" \
> > + "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
> > + ;;
>
> i am pretty sure that v5 is ordered after and not before v1 and v2 :-).
> please fix this. there is at least 1 more instance of such an ordering error
> in the patch.
>
> John
>
>
>
> > tplink,archer-c7-v1|\
> > tplink,archer-c7-v2|\
> > tplink,tl-wdr4900-v2)
> > 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 dfe2d3ef31..6001df07bb 100644
> > --- 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
> > @@ -100,6 +100,7 @@ case "$FIRMWARE" in
> > ath10kcal_extract "ART" 20480 2116
> > ath10kcal_patch_mac $(macaddr_add $(cat
> > /sys/class/net/eth0/address) +16)
> > ;;
> > + tplink,archer-a7-v5|\
> > tplink,archer-c7-v2)
> > ath10kcal_extract "art" 20480 2116
> > ath10kcal_patch_mac $(macaddr_add $(cat
> > /sys/class/net/eth1/address) -1)
> > diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
> > b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
> > new file mode 100644
> > index 0000000000..4cc4aaf409
> > --- /dev/null
> > +++ b/target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
> > @@ -0,0 +1,49 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> > +/dts-v1/;
> > +
> > +#include "qca9563_tplink_archer-x7-v5.dtsi"
> > +
> > +/ {
> > + compatible = "tplink,archer-a7-v5", "qca,qca9563";
> > + model = "TP-Link Archer A7 v5";
> > +};
> > +
> > +&mtdparts {
> > + factory-uboot@0 {
> > + label = "factory-uboot";
> > + reg = <0x000000 0x020000>;
> > + read-only;
> > + };
> > +
> > + uboot: u-boot@0 {
> > + label = "u-boot";
> > + reg = <0x020000 0x020000>;
> > + read-only;
> > + };
> > +
> > + firmware@40000 {
> > + label = "firmware";
> > + reg = <0x040000 0xec0000>;
> > + };
> > +
> > + info: info@f40000 {
> > + label = "info";
> > + reg = <0xf40000 0x020000>;
> > + };
> > +
> > + config: config@f60000 {
> > + label = "config";
> > + reg = <0xf60000 0x050000>;
> > + };
> > +
> > + partition@fc0000 {
> > + label = "partition-table";
> > + reg = <0xfc0000 0x010000>;
> > + };
> > +
> > + art: art@ff0000 {
> > + label = "art";
> > + reg = <0xff0000 0x010000>;
> > + read-only;
> > + };
> > +};
> > diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
> > b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
> > new file mode 100644
> > index 0000000000..b182aa2d37
> > --- /dev/null
> > +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
> > @@ -0,0 +1,202 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> > +/dts-v1/;
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/input.h>
> > +
> > +#include "qca956x.dtsi"
> > +
> > +/ {
> > + chosen {
> > + bootargs = "console=ttyS0,115200n8";
> > + };
> > +
> > + aliases {
> > + led-status = &system;
> > + };
> > +
> > + gpio_leds: leds {
> > + compatible = "gpio-leds";
> > +
> > + system: system {
> > + label = "tp-link:green:system";
> > + gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
> > + default-state = "on";
> > + };
> > +
> > + led_wlan2g: wlan2g {
> > + label = "tp-link:green:wlan2g";
> > + gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + linux,default-trigger = "phy1tpt";
> > + };
> > +
> > + usb {
> > + label = "tp-link:green:usb";
> > + gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + trigger-sources = <&hub_port0>;
> > + linux,default-trigger = "usbport";
> > + };
> > + };
> > +
> > + gpio_keys: keys {
> > + compatible = "gpio-keys";
> > +
> > + reset {
> > + label = "Reset button";
> > + linux,code = <KEY_RESTART>;
> > + gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
> > + debounce-interval = <60>;
> > + };
> > +
> > + wps {
> > + label = "WPS button";
> > + linux,code = <KEY_WPS_BUTTON>;
> > + gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
> > + debounce-interval = <60>;
> > + };
> > + };
> > +
> > + gpio-export {
> > + compatible = "gpio-export";
> > +
> > + gpio_usb_power {
> > + gpio-export,name = "tp-link:power:usb";
> > + gpio-export,output = <1>;
> > + gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
> > + };
> > + };
> > +};
> > +
> > +&pcie {
> > + status = "okay";
> > +};
> > +
> > +&uart {
> > + status = "okay";
> > +};
> > +
> > +&gpio {
> > + status = "okay";
> > +};
> > +
> > +&usb_phy0 {
> > + status = "okay";
> > +};
> > +
> > +&usb0 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + status = "okay";
> > +
> > + hub_port0: port@1 {
> > + reg = <1>;
> > + #trigger-source-cells = <0>;
> > + };
> > +};
> > +
> > +&gpio_leds {
> > + wlan5g {
> > + label = "tp-link:green:wlan5g";
> > + gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + linux,default-trigger = "phy0tpt";
> > + };
> > +
> > + wan {
> > + label = "tp-link:green:wan";
> > + gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + wan_fail {
> > + label = "tp-link:orange:wan";
> > + gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + lan1 {
> > + label = "tp-link:green:lan1";
> > + gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + lan2 {
> > + label = "tp-link:green:lan2";
> > + gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + lan3 {
> > + label = "tp-link:green:lan3";
> > + gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + lan4 {
> > + label = "tp-link:green:lan4";
> > + gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +
> > + wps {
> > + label = "tp-link:green:wps";
> > + gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
> > + default-state = "off";
> > + };
> > +};
> > +
> > +&spi {
> > + status = "okay";
> > + num-cs = <1>;
> > +
> > + flash@0 {
> > + compatible = "jedec,spi-nor";
> > + reg = <0>;
> > + spi-max-frequency = <25000000>;
> > +
> > + mtdparts: partitions {
> > + compatible = "fixed-partitions";
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + };
> > + };
> > +};
> > +
> > +&mdio0 {
> > + status = "okay";
> > +
> > + phy-mask = <0>;
> > +
> > + phy0: ethernet-phy@0 {
> > + reg = <0>;
> > + phy-mode = "sgmii";
> > +
> > + qca,ar8327-initvals = <
> > + 0x04 0x00080080 /* PORT0 PAD MODE CTRL */
> > + 0x10 0x81000080 /* POWER_ON_STRIP */
> > + 0x50 0xcc35cc35 /* LED_CTRL0 */
> > + 0x54 0xcb37cb37 /* LED_CTRL1 */
> > + 0x58 0x00000000 /* LED_CTRL2 */
> > + 0x5c 0x00f3cf00 /* LED_CTRL3 */
> > + 0x7c 0x0000007e /* PORT0_STATUS */
> > + >;
> > + };
> > +};
> > +
> > +ð0 {
> > + status = "okay";
> > +
> > + pll-data = <0x03000101 0x00000101 0x00001919>;
> > +
> > + phy-mode = "sgmii";
> > + mtd-mac-address = <&info 0x8>;
> > + phy-handle = <&phy0>;
> > +};
> > +
> > +&wmac {
> > + status = "okay";
> > + mtd-cal-data = <&art 0x1000>;
> > + mtd-mac-address = <&info 0x8>;
> > +};
> > diff --git a/target/linux/ath79/image/common-tp-link.mk
> > b/target/linux/ath79/image/common-tp-link.mk
> > index 7490aeb1f3..4a29459196 100644
> > --- a/target/linux/ath79/image/common-tp-link.mk
> > +++ b/target/linux/ath79/image/common-tp-link.mk
> > @@ -39,6 +39,15 @@ define Build/mktplinkfw-combined
> > @mv $@.new $@
> > endef
> > +define Build/uImageArcher
> > + ${STAGING_DIR_HOST}/bin/mkimage \
> > + -A $(LINUX_KARCH) \
> > + -O linux -T kernel \
> > + -C $(1) -a $(KERNEL_LOADADDR) -e $(if
> > $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
> > + -n '$(call toupper,$(LINUX_KARCH)) OpenWrt
> > Linux-$(LINUX_VERSION)' -d $@ $@.new
> > + @mv $@.new $@
> > +endef
> > +
> > define Device/tplink
> > TPLINK_HWREV := 0x1
> > TPLINK_HEADER_VERSION := 1
> > diff --git a/target/linux/ath79/image/generic-tp-link.mk
> > b/target/linux/ath79/image/generic-tp-link.mk
> > index d65e29e72a..1029726c87 100644
> > --- a/target/linux/ath79/image/generic-tp-link.mk
> > +++ b/target/linux/ath79/image/generic-tp-link.mk
> > @@ -1,5 +1,21 @@
> > include ./common-tp-link.mk
> > +define Device/tplink_archer-a7-v5
> > + $(Device/tplink)
> > + ATH_SOC := qca9563
> > + 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
> > + SUPPORTED_DEVICES := tplink,archer-a7-v5
> > + BOARDNAME := ARCHER-A7-V5
> > + TPLINK_BOARD_ID := ARCHER-A7-V5
> > + IMAGE_SIZE := 15104k
> > + KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma
> > + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
> > + append-metadata | check-size $$$$(IMAGE_SIZE)
> > + IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
> > +endef
> > +TARGET_DEVICES += tplink_archer-a7-v5
> > +
> > define Device/tplink_archer-c7-v1
> > $(Device/tplink-8mlzma)
> > ATH_SOC := qca9558
> > diff --git a/tools/firmware-utils/src/tplink-safeloader.c
> > b/tools/firmware-utils/src/tplink-safeloader.c
> > index a51cca476e..2cf84af20f 100644
> > --- a/tools/firmware-utils/src/tplink-safeloader.c
> > +++ b/tools/firmware-utils/src/tplink-safeloader.c
> > @@ -357,6 +357,46 @@ static struct device_info boards[] = {
> > .last_sysupgrade_partition = "file-system"
> > },
> > + /** Firmware layout for the A7-V5 */
> > + {
> > + .id = "ARCHER-A7-V5",
> > + .support_list =
> > + "SupportList:\n"
> > + "{product_name:Archer
> > A7,product_ver:5.0.0,special_id:45550000}\n"
> > + "{product_name:Archer
> > A7,product_ver:5.0.0,special_id:55530000}\n"
> > + "{product_name:Archer
> > A7,product_ver:5.0.0,special_id:43410000}\n"
> > + "{product_name:Archer
> > A7,product_ver:5.0.0,special_id:4A500000}\n"
> > + "{product_name:Archer
> > A7,product_ver:5.0.0,special_id:54570000}\n",
> > + .support_trail = '\x00',
> > + .soft_ver = "soft_ver:1.0.0\n",
> > +
> > + /* We're using a dynamic kernel/rootfs split here */
> > + .partitions = {
> > + {"factory-boot", 0x00000, 0x20000},
> > + {"fs-uboot", 0x20000, 0x20000},
> > + {"firmware", 0x40000, 0xec0000}, /* Stock: name
> > os-image base 0x40000 size 0x120000 */
> > + /* Stock: name
> > file-system base 0x160000 size 0xda0000 */
> > + {"default-mac", 0xf40000, 0x00200},
> > + {"pin", 0xf40200, 0x00200},
> > + {"device-id", 0xf40400, 0x00100},
> > + {"product-info", 0xf40500, 0x0fb00},
> > + {"soft-version", 0xf50000, 0x00100},
> > + {"extra-para", 0xf51000, 0x01000},
> > + {"support-list", 0xf52000, 0x0a000},
> > + {"profile", 0xf5c000, 0x04000},
> > + {"default-config", 0xf60000, 0x10000},
> > + {"user-config", 0xf70000, 0x40000},
> > + {"certificate", 0xfb0000, 0x10000},
> > + {"partition-table", 0xfc0000, 0x10000},
> > + {"log", 0xfd0000, 0x20000},
> > + {"radio", 0xff0000, 0x10000},
> > + {NULL, 0, 0}
> > + },
> > +
> > + .first_sysupgrade_partition = "os-image",
> > + .last_sysupgrade_partition = "file-system",
> > + },
> > +
> > /** Firmware layout for the C25v1 */
> > {
> > .id = "ARCHER-C25-V1",
> > @@ -1577,7 +1617,7 @@ static void build_image(const char *output,
> > strcasecmp(info->id, "TLWR1043NV5") == 0) {
> > const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
> > 0x00, 0x00, 0x01, 0x00, 0x00};
> > parts[5] = put_data("extra-para", mdat, 11);
> > - } else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0 ||
> > strcasecmp(info->id, "ARCHER-C7-V5") == 0) {
> > + } else if (strcasecmp(info->id, "ARCHER-A7-V5") == 0 ||
> > strcasecmp(info->id, "ARCHER-C7-V4") == 0 || strcasecmp(info->id,
> > "ARCHER-C7-V5") == 0) {
> > const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00,
> > 0xca, 0x00, 0x01, 0x00, 0x00};
> > parts[5] = put_data("extra-para", mdat, 11);
> > }
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
