patches/lede/0033-ipq806x-upgrade-fix-RAMFS_COPY_.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Mon, 10 Jul 2017 18:03:39 +0200
+Subject: ipq806x: upgrade: fix RAMFS_COPY_*
+
+RAMFS_COPY_* are moved to platform.sh toplevel. The unneeded
+linksys_preupgrade function is removed, and the nand_do_upgrade call is
+moved to platform_do_upgrade.
+
+Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+index 12f25efdae87979e79a252237f735932cb66d42f..0234ce0a51a0a92dcd719102f83e19686442574a 100644
+--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
++++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+@@ -99,12 +99,3 @@ platform_do_upgrade_linksys() {
+ 		fi
+ 	}
+ }
+-
+-linksys_preupgrade() {
+-	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
+-	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
+-	export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
+-
+-}
+-
+-append sysupgrade_pre_upgrade linksys_preupgrade
+diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+index c3741f9ff242cddb3c185c2f638c7b4dff781e1b..6455b57cfb1346b7cc9e103065080d8ae92edc19 100644
+--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+@@ -3,11 +3,14 @@
+ PART_NAME=firmware
+ REQUIRE_IMAGE_METADATA=1
+ 
++RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
++RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
++
+ platform_check_image() {
+ 	return 0;
+ }
+ 
+-platform_pre_upgrade() {
++platform_do_upgrade() {
+ 	local board=$(ipq806x_board_name)
+ 
+ 	case "$board" in
+@@ -17,18 +20,8 @@ platform_pre_upgrade() {
+ 	r7500 |\
+ 	r7500v2 |\
+ 	r7800)
+-		nand_do_upgrade "$1"
+-		;;
+-	ea8500)
+-		linksys_preupgrade "$1"
++		nand_do_upgrade "$ARGV"
+ 		;;
+-	esac
+-}
+-
+-platform_do_upgrade() {
+-	local board=$(ipq806x_board_name)
+-
+-	case "$board" in
+ 	c2600)
+ 		PART_NAME="os-image:rootfs"
+ 		MTD_CONFIG_ARGS="-s 0x200000"

patches/lede/0034-kirkwood-upgrade-fix-RAMFS_COPY_.patch

+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Mon, 10 Jul 2017 18:16:23 +0200
+Subject: kirkwood: upgrade: fix RAMFS_COPY_*
+
+RAMFS_COPY_* are moved to platform.sh toplevel. The nand_do_upgrade call is
+moved to platform_do_upgrade.
+
+Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
+index 13a8f1cb554462acf39a59c9d5c1e6cd4ec222f5..dde3bd1b2190d68ce54e6c2883a45032d58599b2 100644
+--- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
++++ b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
+@@ -69,11 +69,3 @@ platform_do_upgrade_linksys() {
+ 		fi
+ 	}
+ }
+-
+-linksys_preupgrade() {
+-	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
+-	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
+-	export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
+-}
+-
+-append sysupgrade_pre_upgrade linksys_preupgrade
+diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
+index e7c6a1120a90147380f4fcf644eb7078c1bc1659..c8c66c1b9d67759305ee836f9d84b9a2968a9493 100644
+--- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
++++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
+@@ -1,5 +1,8 @@
+ . /lib/kirkwood.sh
+ 
++RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
++RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
++
+ platform_check_image() {
+ 	[ "$#" -gt 1 ] && return 1
+ 	local board="$(kirkwood_board_name)"
+@@ -33,19 +36,7 @@ platform_do_upgrade() {
+ 		platform_do_upgrade_linksys "$ARGV"
+ 		;;
+ 	*)
+-		default_do_upgrade "$@"
+-		;;
+-	esac
+-}
+-
+-platform_pre_upgrade() {
+-	local board=$(kirkwood_board_name)
+-
+-	case "$board" in
+-	"linksys-audi"|\
+-	"linksys-viper") ;;
+-	*)
+-		nand_do_upgrade $1
++		nand_do_upgrade "$ARGV"
+ 		;;
+ 	esac
+ }

patches/lede/0035-ar71xx-add-uImageArcher-to-tp-link.mk.patch

+From: Andreas Ziegler <github@andreas-ziegler.de>
+Date: Sun, 6 Aug 2017 16:27:53 +0200
+Subject: ar71xx: add uImageArcher to tp-link.mk
+
+backport from e39dc8d823c86559eedbbdcee5f5c14b827fed0f
+ar71xx: add support to TP-Link Archer C59v1 and C60v1
+
+Based-on-patch-by: Henryk Heisig <hyniu@o2.pl>
+Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
+
+diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
+index b76ed02ca394fc1a8b15218d64b5dc722552bbfd..9cd6c6372ac8f7e509a0a2422616097c1c19edf6 100644
+--- a/target/linux/ar71xx/image/tp-link.mk
++++ b/target/linux/ar71xx/image/tp-link.mk
+@@ -45,6 +45,14 @@ define Build/mktplinkfw-kernel
+ 	@mv $@.new $@
+ endef
+ 
++define Build/uImageArcher
++	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)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new
++	@mv $@.new $@
++endef
++
+ define Device/tplink
+   TPLINK_HWREV := 0x1
+   TPLINK_HEADER_VERSION := 1

patches/lede/0036-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch

+From: Ludwig Thomeczek <ledesrc@wxorx.net>
+Date: Sat, 22 Apr 2017 18:21:47 +0200
+Subject: ar71xx: add support for TP-Link Archer C25 v1
+
+The TP-Link Archer C25 is a low-cost dual-band router.
+
+Specification:
+
+- CPU: Atheros QCA9561 775 MHz
+- RAM: 64 MB
+- Flash: 8 MB
+- Wifi: 3x3 2.4 GHz (integrated), 1x1 5 GHz QCA9887
+- NET: 5x 10/100 Mbps Ethernet
+
+Some LEDs are controlled by an additional 74HC595 chip.
+
+Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
+[minor code style fixes, boards alphabetical order fixes,
+reworked commit message]
+Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
+
+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 833522f27b61ac2208c2862bc0f29f34dea5e701..e1efb561b33da4dcfcb82ee953cd888170476dfb 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
++++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
+@@ -53,6 +53,15 @@ ap121f)
+ 	ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth0"
+ 	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
+ 	;;
++archer-c25-v1)
++	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
++	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
++	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
++	ucidef_set_led_switch "lan1" "LAN1" "$board:green:lan1" "switch0" "0x10"
++	ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08"
++	ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
++	ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
++	;;
+ arduino-yun)
+ 	ucidef_set_led_wlan "wlan" "WLAN" "arduino:blue:wlan" "phy0tpt"
+ 	ucidef_set_led_usbdev "usb" "USB" "arduino:white:usb" "1-1.1"
+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 cb707f6169f48a9390b622cb26e8fab8de94e4bb..24ead87850f13346ea4be4f9bfb5582e64a2c4ad 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
++++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
+@@ -122,6 +122,7 @@ ar71xx_setup_interfaces()
+ 	a60|\
+ 	alfa-ap96|\
+ 	alfa-nx|\
++	archer-c25-v1|\
+ 	dr344|\
+ 	gl-ar150|\
+ 	gl-ar300m|\
+diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
+index bc2fc2f774c4f2f0bbfa6e43d9b9a55e9b63153d..38cc5d7853c79f2a7800a387310a95abb3b4de1b 100644
+--- a/target/linux/ar71xx/base-files/etc/diag.sh
++++ b/target/linux/ar71xx/base-files/etc/diag.sh
+@@ -50,6 +50,7 @@ get_status_led() {
+ 	ap135-020)
+ 		status_led="ap135:green:status"
+ 		;;
++	archer-c25-v1|\
+ 	mr12|\
+ 	mr16|\
+ 	nbg6616|\
+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 b3e23c9a8f8c56870ef36fb55ae52e6b5ea61134..68f90de802ddd18e09a1da39c0d56292eea9489c 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
+@@ -92,6 +92,7 @@ case "$FIRMWARE" in
+ 		ath10kcal_extract "art" 20480 2116
+ 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
+ 		;;
++	archer-c25-v1|\
+ 	tl-wdr6500-v2)
+ 		ath10kcal_extract "art" 20480 2116
+ 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index bf365988acbd332d5eb4b2f6fb9e7744f8c1b817..46711af2b26159ebb105fa97cd8a85bb9c00911a 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -460,6 +460,9 @@ ar71xx_board_detect() {
+ 	*AP90Q)
+ 		name="ap90q"
+ 		;;
++	*"Archer C25 v1")
++		name="archer-c25-v1"
++		;;
+ 	*"Archer C5")
+ 		name="archer-c5"
+ 		;;
+diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+index 21ad2a617db2fe4ff5801aba3a7fae5ba103570a..e65f6e2f7594ba373fbc9a26620859b9005c8532 100755
+--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+@@ -206,6 +206,7 @@ platform_check_image() {
+ 	ap121f|\
+ 	ap132|\
+ 	ap90q|\
++	archer-c25-v1|\
+ 	bullet-m|\
+ 	c-55|\
+ 	carambola2|\
+diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
+index a8622454b421c1c74a8a71134b53c50399114aa5..e10401d42ae06506f82f2f5538fbc7df79fd4c65 100644
+--- a/target/linux/ar71xx/config-4.4
++++ b/target/linux/ar71xx/config-4.4
+@@ -51,6 +51,7 @@ CONFIG_ATH79_MACH_AP152=y
+ # CONFIG_ATH79_MACH_AP81 is not set
+ CONFIG_ATH79_MACH_AP90Q=y
+ CONFIG_ATH79_MACH_AP96=y
++CONFIG_ATH79_MACH_ARCHER_C25_V1=y
+ CONFIG_ATH79_MACH_ARCHER_C7=y
+ CONFIG_ATH79_MACH_ARDUINO_YUN=y
+ CONFIG_ATH79_MACH_AW_NR580=y
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+index 58d7e435362e0bac105e8183206e593329e4ae96..fb2afb965c4641df7cdcaf0920f2d56b3717fa9b 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
++++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+@@ -1234,6 +1234,16 @@ config ATH79_MACH_BSB
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_ARCHER_C25_V1
++	bool "TP-LINK Archer C25 v1 support"
++	select SOC_QCA956X
++	select ATH79_DEV_AP9X_PCI if PCI
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_ARCHER_C7
+ 	bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support"
+ 	select SOC_QCA955X
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+index 7aee76019552e14ebdbf7bea357859dedb1a5bbb..3365a43ce16fc77b3212b39b92081efe678e8803 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
++++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+@@ -56,6 +56,7 @@ obj-$(CONFIG_ATH79_MACH_AP147)			+= mach-ap147.o
+ obj-$(CONFIG_ATH79_MACH_AP152)			+= mach-ap152.o
+ obj-$(CONFIG_ATH79_MACH_AP90Q)			+= mach-ap90q.o
+ obj-$(CONFIG_ATH79_MACH_AP96)			+= mach-ap96.o
++obj-$(CONFIG_ATH79_MACH_ARCHER_C25_V1)		+= mach-archer-c25-v1.o
+ obj-$(CONFIG_ATH79_MACH_ARCHER_C7)		+= mach-archer-c7.o
+ obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN)		+= mach-arduino-yun.o
+ obj-$(CONFIG_ATH79_MACH_AW_NR580)		+= mach-aw-nr580.o
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c
+new file mode 100644
+index 0000000000000000000000000000000000000000..a0f001cb49af5aa501c6825c40f3a98ab99503b2
+--- /dev/null
++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c25-v1.c
+@@ -0,0 +1,227 @@
++/*
++ *  TP-Link Archer C25 v1 board support
++ *
++ *  Copyright (C) 2017 Ludwig Thomeczek <ledesrc@wxorx.net>
++ *  based on mach-archer-c60/C59-v1.c
++ *  Copyright (C) 2016 Henryk Heisig <hyniu@o2.pl>
++ *
++ *  This program is free software; you can redistribute it and/or modify it
++ *  under the terms of the GNU General Public License version 2 as published
++ *  by the Free Software Foundation.
++ */
++#include <linux/platform_device.h>
++#include <linux/ath9k_platform.h>
++#include <linux/ar8216_platform.h>
++#include <asm/mach-ath79/ar71xx_regs.h>
++#include <linux/gpio.h>
++
++#include "common.h"
++#include "dev-m25p80.h"
++#include "machtypes.h"
++#include "pci.h"
++#include "dev-ap9x-pci.h"
++#include "dev-eth.h"
++#include "dev-gpio-buttons.h"
++#include "dev-leds-gpio.h"
++#include "dev-spi.h"
++#include "dev-usb.h"
++#include "dev-wmac.h"
++#include <linux/spi/spi_gpio.h>
++#include <linux/spi/74x164.h>
++
++#define ARCHER_C25_GPIO_SHIFT_OE	21 /* OE,   Output Enable */
++#define ARCHER_C25_GPIO_SHIFT_SER	14 /* DS,   Data Serial Input */
++#define ARCHER_C25_GPIO_SHIFT_SRCLK	15 /* SHCP, Shift Reg Clock Input */
++#define ARCHER_C25_GPIO_SHIFT_SRCLR	19 /* MR,   Master Reset */
++#define ARCHER_C25_GPIO_SHIFT_RCLK	16 /* STCP, Storage Reg Clock Input */
++
++#define ARCHER_C25_74HC_GPIO_BASE		QCA956X_GPIO_COUNT
++#define ARCHER_C25_74HC_GPIO_LED_WAN_AMBER	27
++#define ARCHER_C25_74HC_GPIO_LED_WAN_GREEN	28
++#define ARCHER_C25_74HC_GPIO_LED_WLAN2		29
++#define ARCHER_C25_74HC_GPIO_LED_WLAN5		30
++#define ARCHER_C25_74HC_GPIO_LED_LAN1		23
++#define ARCHER_C25_74HC_GPIO_LED_LAN2		24
++#define ARCHER_C25_74HC_GPIO_LED_LAN3		25
++#define ARCHER_C25_74HC_GPIO_LED_LAN4		26
++
++#define ARCHER_C25_V1_SSR_BIT_0			0
++#define ARCHER_C25_V1_SSR_BIT_1			1
++#define ARCHER_C25_V1_SSR_BIT_2			2
++#define ARCHER_C25_V1_SSR_BIT_3			3
++#define ARCHER_C25_V1_SSR_BIT_4			4
++#define ARCHER_C25_V1_SSR_BIT_5			5
++#define ARCHER_C25_V1_SSR_BIT_6			6
++#define ARCHER_C25_V1_SSR_BIT_7			7
++
++
++#define ARCHER_C25_V1_KEYS_POLL_INTERVAL	20
++#define ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL	\
++					(3 * ARCHER_C25_V1_KEYS_POLL_INTERVAL)
++
++#define ARCHER_C25_V1_GPIO_BTN_RESET		1
++#define ARCHER_C25_V1_GPIO_BTN_RFKILL		22
++
++#define ARCHER_C25_V1_GPIO_LED_POWER		17
++#define ARCHER_C25_V1_GPIO_LED_WPS		2
++
++#define ARCHER_C25_V1_WMAC_CALDATA_OFFSET	0x1000
++
++static struct spi_gpio_platform_data archer_c25_v1_spi_data = {
++	.sck		= ARCHER_C25_GPIO_SHIFT_SRCLK,
++	.miso		= SPI_GPIO_NO_MISO,
++	.mosi		= ARCHER_C25_GPIO_SHIFT_SER,
++	.num_chipselect	= 1,
++};
++
++static u8 archer_c25_v1_ssr_initdata[] __initdata = {
++	BIT(ARCHER_C25_V1_SSR_BIT_7) |
++	BIT(ARCHER_C25_V1_SSR_BIT_6) |
++	BIT(ARCHER_C25_V1_SSR_BIT_5) |
++	BIT(ARCHER_C25_V1_SSR_BIT_4) |
++	BIT(ARCHER_C25_V1_SSR_BIT_3) |
++	BIT(ARCHER_C25_V1_SSR_BIT_2) |
++	BIT(ARCHER_C25_V1_SSR_BIT_1)
++};
++
++static struct gen_74x164_chip_platform_data archer_c25_v1_ssr_data = {
++	.base = ARCHER_C25_74HC_GPIO_BASE,
++	.num_registers = ARRAY_SIZE(archer_c25_v1_ssr_initdata),
++	.init_data = archer_c25_v1_ssr_initdata,
++};
++
++static struct platform_device archer_c25_v1_spi_device = {
++	.name		= "spi_gpio",
++	.id		= 1,
++	.dev = {
++		.platform_data = &archer_c25_v1_spi_data,
++	},
++};
++
++static struct spi_board_info archer_c25_v1_spi_info[] = {
++	{
++		.bus_num		= 1,
++		.chip_select		= 0,
++		.max_speed_hz		= 10000000,
++		.modalias		= "74x164",
++		.platform_data		= &archer_c25_v1_ssr_data,
++		.controller_data	= (void *) ARCHER_C25_GPIO_SHIFT_RCLK,
++	},
++};
++
++static struct gpio_led archer_c25_v1_leds_gpio[] __initdata = {
++	{
++		.name		= "archer-c25-v1:green:power",
++		.gpio		= ARCHER_C25_V1_GPIO_LED_POWER,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:wps",
++		.gpio		= ARCHER_C25_V1_GPIO_LED_WPS,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:wlan2g",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_WLAN2,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:wlan5g",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_WLAN5,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:lan1",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN1,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:lan2",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN2,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:lan3",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN3,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:lan4",
++		.gpio		= ARCHER_C25_74HC_GPIO_LED_LAN4,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:green:wan",
++		.gpio		=  ARCHER_C25_74HC_GPIO_LED_WAN_GREEN,
++		.active_low	= 1,
++	}, {
++		.name		= "archer-c25-v1:amber:wan",
++		.gpio		=  ARCHER_C25_74HC_GPIO_LED_WAN_AMBER,
++		.active_low	= 1,
++	},
++};
++
++static struct gpio_keys_button archer_c25_v1_gpio_keys[] __initdata = {
++	{
++		.desc			= "Reset button",
++		.type			= EV_KEY,
++		.code			= KEY_RESTART,
++		.debounce_interval	= ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL,
++		.gpio			= ARCHER_C25_V1_GPIO_BTN_RESET,
++		.active_low		= 1,
++	}, {
++		.desc			= "RFKILL button",
++		.type			= EV_KEY,
++		.code			= KEY_RFKILL,
++		.debounce_interval	= ARCHER_C25_V1_KEYS_DEBOUNCE_INTERVAL,
++		.gpio			= ARCHER_C25_V1_GPIO_BTN_RFKILL,
++		.active_low		= 1,
++	},
++};
++
++static void __init archer_c25_v1_setup(void)
++{
++	u8 *mac = (u8 *) KSEG1ADDR(0x1f7e0008);
++	u8 *art = (u8 *) KSEG1ADDR(0x1f7f0000);
++
++	ath79_register_m25p80(NULL);
++
++	spi_register_board_info(archer_c25_v1_spi_info,
++				ARRAY_SIZE(archer_c25_v1_spi_info));
++
++	platform_device_register(&archer_c25_v1_spi_device);
++
++	gpio_request_one(ARCHER_C25_GPIO_SHIFT_OE,
++			 GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED,
++			 "LED control");
++
++	gpio_request_one(ARCHER_C25_GPIO_SHIFT_SRCLR,
++			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
++			 "LED reset");
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c25_v1_leds_gpio),
++				 archer_c25_v1_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, ARCHER_C25_V1_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(archer_c25_v1_gpio_keys),
++					archer_c25_v1_gpio_keys);
++
++	ath79_register_mdio(0, 0x0);
++	ath79_register_mdio(1, 0x0);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
++	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
++
++	/* WAN port */
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
++	ath79_eth0_data.speed = SPEED_100;
++	ath79_eth0_data.duplex = DUPLEX_FULL;
++	ath79_eth0_data.phy_mask = BIT(4);
++	ath79_register_eth(0);
++
++	/* LAN ports */
++	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
++	ath79_eth1_data.speed = SPEED_1000;
++	ath79_eth1_data.duplex = DUPLEX_FULL;
++	ath79_switch_data.phy_poll_mask |= BIT(4);
++	ath79_switch_data.phy4_mii_en = 1;
++	ath79_register_eth(1);
++
++	ath79_register_wmac(art + ARCHER_C25_V1_WMAC_CALDATA_OFFSET, mac);
++	ap91_pci_init(NULL, NULL);
++}
++
++MIPS_MACHINE(ATH79_MACH_ARCHER_C25_V1, "ARCHER-C25-V1", "TP-LINK Archer C25 v1",
++	     archer_c25_v1_setup);
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+index a12685cd11a7a6cefe9b69991a5e41db55ccea85..8864e0deda57b926e88dceebd26056a2f8099380 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
++++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+@@ -40,6 +40,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_AP152,			/* Atheros AP152 reference board */
+ 	ATH79_MACH_AP90Q,			/* YunCore AP90Q */
+ 	ATH79_MACH_AP96,			/* Atheros AP96 */
++	ATH79_MACH_ARCHER_C25_V1,		/* TP-LINK Archer C25 V1 board */
+ 	ATH79_MACH_ARCHER_C5,			/* TP-LINK Archer C5 board */
+ 	ATH79_MACH_ARCHER_C7,			/* TP-LINK Archer C7 board */
+ 	ATH79_MACH_ARCHER_C7_V2,		/* TP-LINK Archer C7 V2 board */
+diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
+index 9cd6c6372ac8f7e509a0a2422616097c1c19edf6..6933654e575a1ef2c92e4c656696a479cba4c594 100644
+--- a/target/linux/ar71xx/image/tp-link.mk
++++ b/target/linux/ar71xx/image/tp-link.mk
+@@ -103,6 +103,22 @@ $(Device/tplink)
+   IMAGE_SIZE := 15872k
+ endef
+ 
++define Device/archer-c25-v1
++  DEVICE_TITLE := TP-LINK Archer C25 v1
++  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887
++  BOARDNAME := ARCHER-C25-V1
++  TPLINK_BOARD_NAME := ARCHER-C25-V1
++  DEVICE_PROFILE := ARCHERC25V1
++  IMAGE_SIZE := 7808k
++  LOADER_TYPE := elf
++  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
++  IMAGES := sysupgrade.bin factory.bin
++  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
++  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
++  MTDPARTS := spi0.0:128k(factory-uboot)ro,64k(u-boot)ro,1536k(kernel),6272k(rootfs),128k(config)ro,64k(art)ro,7808k@0x30000(firmware)
++endef
++TARGET_DEVICES += archer-c25-v1
++
+ define Device/cpe510-520
+   DEVICE_TITLE := TP-LINK CPE510/520
+   DEVICE_PACKAGES := rssileds
+diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
+index f8d255fd87b8c53511b34b42f4117422218219fe..376835a703f91532300d0dd7c8ef66704acc6e05 100644
+--- a/target/linux/ar71xx/mikrotik/config-default
++++ b/target/linux/ar71xx/mikrotik/config-default
+@@ -16,6 +16,7 @@
+ # CONFIG_ATH79_MACH_AP152 is not set
+ # CONFIG_ATH79_MACH_AP90Q is not set
+ # CONFIG_ATH79_MACH_AP96 is not set
++# CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
+ # CONFIG_ATH79_MACH_ARCHER_C7 is not set
+ # CONFIG_ATH79_MACH_ARDUINO_YUN is not set
+ # CONFIG_ATH79_MACH_AW_NR580 is not set
+diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
+index c1b5e61c3e9e5f02979584f72621f5e54cde2e36..62be218e33cc6366ea89f363983f36523c419650 100644
+--- a/target/linux/ar71xx/nand/config-default
++++ b/target/linux/ar71xx/nand/config-default
+@@ -9,6 +9,7 @@
+ # CONFIG_ATH79_MACH_AP136 is not set
+ # CONFIG_ATH79_MACH_AP147 is not set
+ # CONFIG_ATH79_MACH_AP96 is not set
++# CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
+ # CONFIG_ATH79_MACH_ARCHER_C7 is not set
+ # CONFIG_ATH79_MACH_AW_NR580 is not set
+ # CONFIG_ATH79_MACH_CAP324 is not set

patches/lede/0037-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch

+From: Ludwig Thomeczek <ledesrc@wxorx.net>
+Date: Sat, 13 May 2017 11:40:48 +0200
+Subject: firmware-utils: tplink-safeloader: add TP-Link Archer C25 v1
+
+This adds the necessary firmware layout definitions for the Archer C25.
+It has an addtional partition containing some static data ("extra-para")
+without which no factory flash is possible, therefore put_data() has been
+added.
+
+Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
+
+diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
+index 4e3d2058b286fb7220e5a8308dcdfb25626a1b59..7617566829e159ae9fec00d5de95919a0fb234c6 100644
+--- a/tools/firmware-utils/src/tplink-safeloader.c
++++ b/tools/firmware-utils/src/tplink-safeloader.c
+@@ -293,6 +293,48 @@ static struct device_info boards[] = {
+ 		.last_sysupgrade_partition = "file-system"
+ 	},
+ 
++	/** Firmware layout for the C25v1 */
++	{
++		.id = "ARCHER-C25-V1",
++		.support_list =
++			"SupportList:\n"
++			"{product_name:ArcherC25,product_ver:1.0.0,special_id:00000000}\n"
++			"{product_name:ArcherC25,product_ver:1.0.0,special_id:55530000}\n"
++			"{product_name:ArcherC25,product_ver:1.0.0,special_id:45550000}\n",
++		.support_trail = '\x00',
++		.soft_ver = "soft_ver:1.0.0\n",
++
++		/**
++		    We use a bigger os-image partition than the stock images (and thus
++		    smaller file-system), as our kernel doesn't fit in the stock firmware's
++		    1MB os-image.
++		*/
++		.partitions = {
++			{"factory-boot", 0x00000, 0x20000},
++			{"fs-uboot", 0x20000, 0x10000},
++			{"os-image", 0x30000, 0x180000},	/* Stock: base 0x30000 size 0x100000 */
++			{"file-system", 0x1b0000, 0x620000},	/* Stock: base 0x130000 size 0x6a0000 */
++			{"user-config", 0x7d0000, 0x04000},
++			{"default-mac", 0x7e0000, 0x00100},
++			{"device-id", 0x7e0100, 0x00100},
++			{"extra-para", 0x7e0200, 0x00100},
++			{"pin", 0x7e0300, 0x00100},
++			{"support-list", 0x7e0400, 0x00400},
++			{"soft-version", 0x7e0800, 0x00400},
++			{"product-info", 0x7e0c00, 0x01400},
++			{"partition-table", 0x7e2000, 0x01000},
++			{"profile", 0x7e3000, 0x01000},
++			{"default-config", 0x7e4000, 0x04000},
++			{"merge-config", 0x7ec000, 0x02000},
++			{"qos-db", 0x7ee000, 0x02000},
++			{"radio", 0x7f0000, 0x10000},
++			{NULL, 0, 0}
++		},
++
++		.first_sysupgrade_partition = "os-image",
++		.last_sysupgrade_partition = "file-system",
++	},
++
+ 	/** Firmware layout for the C5 */
+ 	{
+ 		.id = "ARCHER-C5-V2",
+@@ -615,6 +657,15 @@ static struct image_partition_entry read_file(const char *part_name, const char
+ 	return entry;
+ }
+ 
++/** Creates a new image partition from arbitrary data */
++static struct image_partition_entry put_data(const char *part_name, const char *datain, size_t len) {
++
++	struct image_partition_entry entry = alloc_image_partition(part_name, len);
++
++	memcpy(entry.data, datain, len);
++
++	return entry;
++}
+ 
+ /**
+    Copies a list of image partitions into an image buffer and generates the image partition table while doing so
+@@ -796,7 +847,8 @@ static void build_image(const char *output,
+ 		bool add_jffs2_eof,
+ 		bool sysupgrade,
+ 		const struct device_info *info) {
+-	struct image_partition_entry parts[6] = {};
++
++	struct image_partition_entry parts[7] = {};
+ 
+ 	parts[0] = make_partition_table(info->partitions);
+ 	parts[1] = make_soft_version(rev);
+@@ -804,6 +856,11 @@ static void build_image(const char *output,
+ 	parts[3] = read_file("os-image", kernel_image, false);
+ 	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
+ 
++	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0) {
++		const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
++		parts[5] = put_data("extra-para", mdat, 11);
++	}
++
+ 	size_t len;
+ 	void *image;
+ 	if (sysupgrade)

patches/lede/0038-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch

+From: Jan Niehusmann <jan@gondor.com>
+Date: Fri, 19 May 2017 09:42:24 +0200
+Subject: firmware-utils: tplink-safeloader: support strings as soft_version
+
+Some TP-Link routers (C25, C59, C60) contain a version string instead
+of a binary structure in the soft_version partition.
+
+Flashing LEDE from the original firmware's GUI, this version string
+taken from the soft_ver partition of the firmware image is written to
+the router's config partition.
+
+When using tftp recovery to go back to the original Archer C25 firmware,
+a version check compares that version to the version of the firmware to
+be flashed.
+
+Without proper contents in the config partition, reverting to the
+original firmware fails.
+
+Therefore, write the string "soft_ver:1.0.0\n" to that soft_ver
+partition.
+
+Signed-off-by: Jan Niehusmann <jan@gondor.com>
+
+diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
+index 7617566829e159ae9fec00d5de95919a0fb234c6..24684268b1a3fe491c4eb876a5ebefc700f2e56e 100644
+--- a/tools/firmware-utils/src/tplink-safeloader.c
++++ b/tools/firmware-utils/src/tplink-safeloader.c
+@@ -75,6 +75,7 @@ struct device_info {
+ 	const char *vendor;
+ 	const char *support_list;
+ 	char support_trail;
++	const char *soft_ver;
+ 	const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
+ 	const char *first_sysupgrade_partition;
+ 	const char *last_sysupgrade_partition;
+@@ -130,6 +131,7 @@ static struct device_info boards[] = {
+ 			"CPE220(TP-LINK|US|N300-2):1.1\r\n"
+ 			"CPE220(TP-LINK|EU|N300-2):1.1\r\n",
+ 		.support_trail = '\xff',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+@@ -167,6 +169,7 @@ static struct device_info boards[] = {
+ 			"CPE520(TP-LINK|US|N300-5):1.1\r\n"
+ 			"CPE520(TP-LINK|EU|N300-5):1.1\r\n",
+ 		.support_trail = '\xff',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+@@ -198,6 +201,7 @@ static struct device_info boards[] = {
+ 			"WBS210(TP-LINK|US|N300-2):1.20\r\n"
+ 			"WBS210(TP-LINK|EU|N300-2):1.20\r\n",
+ 		.support_trail = '\xff',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+@@ -229,6 +233,7 @@ static struct device_info boards[] = {
+ 			"WBS510(TP-LINK|US|N300-5):1.20\r\n"
+ 			"WBS510(TP-LINK|EU|N300-5):1.20\r\n",
+ 		.support_trail = '\xff',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+@@ -259,6 +264,7 @@ static struct device_info boards[] = {
+ 			"SupportList:\r\n"
+ 			"{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
+ 		.support_trail = '\x00',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"SBL1", 0x00000, 0x20000},
+@@ -345,6 +351,7 @@ static struct device_info boards[] = {
+ 			"product_ver:2.0.0,"
+ 			"special_id:00000000}\r\n",
+ 		.support_trail = '\x00',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x40000},
+@@ -379,6 +386,7 @@ static struct device_info boards[] = {
+ 			"product_ver:1.0.0,"
+ 			"special_id:00000000}\n",
+ 		.support_trail = '\x00',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x40000},
+@@ -411,6 +419,7 @@ static struct device_info boards[] = {
+ 			"SupportList:\r\n"
+ 			"EAP120(TP-LINK|UN|N300-2):1.0\r\n",
+ 		.support_trail = '\xff',
++		.soft_ver = NULL,
+ 
+ 		.partitions = {
+ 			{"fs-uboot", 0x00000, 0x20000},
+@@ -440,6 +449,7 @@ static struct device_info boards[] = {
+ 			"SupportList:\n"
+ 			"{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
+ 		.support_trail = '\x00',
++		.soft_ver = NULL,
+ 
+ 		/**
+ 		    We use a bigger os-image partition than the stock images (and thus
+@@ -483,6 +493,7 @@ static struct device_info boards[] = {
+ 			"{product_name:RE450,product_ver:1.0.0,special_id:4B520000}\r\n"
+ 			"{product_name:RE450,product_ver:1.0.0,special_id:55534100}\r\n",
+ 		.support_trail = '\x00',
++		.soft_ver = NULL,
+ 
+ 		/**
+ 		   The flash partition table for RE450;
+@@ -611,6 +622,23 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
+ 	return entry;
+ }
+ 
++static struct image_partition_entry make_soft_version_from_string(const char *soft_ver) {
++	/** String length _including_ the terminating zero byte */
++	uint32_t ver_len = strlen(soft_ver) + 1;
++	/** Partition contains 64 bit header, the version string, and one additional null byte */
++	size_t partition_len = 2*sizeof(uint32_t) + ver_len + 1;
++	struct image_partition_entry entry = alloc_image_partition("soft-version", partition_len);
++
++	uint32_t *len = (uint32_t *)entry.data;
++	len[0] = htonl(ver_len);
++	len[1] = 0;
++	memcpy(&len[2], soft_ver, ver_len);
++
++	entry.data[partition_len - 1] = 0;
++
++	return entry;
++}
++
+ /** Generates the support-list partition */
+ static struct image_partition_entry make_support_list(const struct device_info *info) {
+ 	size_t len = strlen(info->support_list);
+@@ -851,7 +879,11 @@ static void build_image(const char *output,
+ 	struct image_partition_entry parts[7] = {};
+ 
+ 	parts[0] = make_partition_table(info->partitions);
+-	parts[1] = make_soft_version(rev);
++	if (info->soft_ver)
++		parts[1] = make_soft_version_from_string(info->soft_ver);
++	else
++		parts[1] = make_soft_version(rev);
++
+ 	parts[2] = make_support_list(info);
+ 	parts[3] = read_file("os-image", kernel_image, false);
+ 	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);

patches/lede/0039-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch

+From: Andreas Ziegler <github@andreas-ziegler.de>
+Date: Thu, 3 Aug 2017 03:34:19 +0200
+Subject: add CONFIG_GPIO_74X164 and CONFIG_SPI_GPIO for Archer C25
+
+backport from e39dc8d823c86559eedbbdcee5f5c14b827fed0f
+introduced for Archer C59/C60
+
+Based-on-patch-by: Henryk Heisig <hyniu@o2.pl>
+Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
+
+diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
+index e10401d42ae06506f82f2f5538fbc7df79fd4c65..c82fcf09228be7063967f2517e0942651234afb8 100644
+--- a/target/linux/ar71xx/config-4.4
++++ b/target/linux/ar71xx/config-4.4
+@@ -272,6 +272,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
+ CONFIG_GPIOLIB=y
+ CONFIG_GPIOLIB_IRQCHIP=y
+ CONFIG_GPIO_DEVRES=y
++CONFIG_GPIO_74X164=y
+ # CONFIG_GPIO_LATCH is not set
+ CONFIG_GPIO_NXP_74HC153=y
+ CONFIG_GPIO_PCF857X=y
+@@ -429,6 +430,7 @@ CONFIG_SOC_QCA956X=y
+ CONFIG_SPI=y
+ CONFIG_SPI_ATH79=y
+ CONFIG_SPI_BITBANG=y
++CONFIG_SPI_GPIO=y
+ CONFIG_SPI_MASTER=y
+ # CONFIG_SPI_RB4XX is not set
+ # CONFIG_SPI_VSC7385 is not set

patches/lede/0040-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch

+From: Sven Roederer <devel-sven@geroedel.de>
+Date: Fri, 5 May 2017 22:18:44 +0200
+Subject: ramips: use GPIO_ACTIVE macros in UBNT-ERX.dts
+
+- reorder includes
+- use GPIO_ACTIVE_LOW macro instead of hardcoded "1"
+
+Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
+
+diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
+index 0b2da95b30f0e181e1929502b8ef1aa50a684f69..cf86bbb7e67b1c521c279367ee9e99fee88fae85 100644
+--- a/target/linux/ramips/dts/UBNT-ERX.dts
++++ b/target/linux/ramips/dts/UBNT-ERX.dts
+@@ -1,9 +1,10 @@
+-#include <dt-bindings/input/input.h>
+-
+ /dts-v1/;
+ 
+ #include "mt7621.dtsi"
+ 
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
+ / {
+ 	model = "UBNT-ERX";
+ 
+@@ -24,7 +25,7 @@
+ 
+ 		reset {
+ 			label = "reset";
+-			gpios = <&gpio0 12 1>;
++			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+ 			linux,code = <KEY_RESTART>;
+ 		};
+ 	};

patches/lede/0041-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch

+From: Sven Roederer <devel-sven@geroedel.de>
+Date: Mon, 29 May 2017 11:24:49 +0200
+Subject: ramips: add support for Ubiquiti EdgeRouter X-SFP
+
+This patch adds support for the Ubiquiti EdgeRouter X-SFP and
+improves support for the EdgeRouter X (PoE-passthrough).
+
+Specification:
+- SoC: MediaTek MT7621AT
+- Flash: 256 MiB
+- RAM: 265 MiB
+- Ethernet: 5 x LAN (1000 Mbps)
+- UART: 1 x UART on PCB (3.3V, RX, TX, GND) - 57600 8N1
+- EdgeRouter X:
+  - 1 x PoE-Passtrough (Eth4)
+  - powered by Wallwart or passive PoE
+- EdgeRouter X-SFP:
+  - 5 x PoE-Out (24V, passive)
+  - 1 x SFP (unknown status)
+  - powered by Wallwart (24V)
+
+Doesn't work:
+* SoC has crypto engine but no open driver.
+* SoC has nat acceleration, but no open driver.
+* This router has 2MB spi flash soldered in but MT
+  nand/spi drivers do not support pin sharing,
+  so it is not accessable and disabled. Stock
+  firmware could read it and it was empty.
+
+Installation
+
+via vendor firmware:
+- build an Initrd-image (> 3MiB) and upload the factory-image
+- initrd can have luci-mod-failsafe
+- flash final firmware via LuCI / sysupgrade on rebooted system
+
+via TFTP:
+- stop uboot into tftp-load into option "1"
+- upload factory.bin image
+
+Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
+
+diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
+index 1778dc93297136e3196ad3f74e4b3bea7535cee0..1f5c6429201ba05fc14ff09c6c562d2c114f2a63 100755
+--- a/target/linux/ramips/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/base-files/etc/board.d/02_network
+@@ -146,6 +146,7 @@ ramips_setup_interfaces()
+ 	rb750gr3|\
+ 	rt-n14u|\
+ 	ubnt-erx|\
++	ubnt-erx-sfp|\
+ 	ur-326n4g|\
+ 	wrtnode|\
+ 	wrtnode2p | \
+diff --git a/target/linux/ramips/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/base-files/etc/board.d/03_gpio_switches
+new file mode 100755
+index 0000000000000000000000000000000000000000..859dfb31f51244e69d3dce5fc80b329cb57729f3
+--- /dev/null
++++ b/target/linux/ramips/base-files/etc/board.d/03_gpio_switches
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++. /lib/functions/uci-defaults.sh
++. /lib/ramips.sh
++
++board_config_update
++
++board=$(ramips_board_name)
++
++case "$board" in
++ubnt-erx)
++	ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0"
++	;;
++ubnt-erx-sfp)
++	ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496"
++	ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497"
++	ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498"
++	ucidef_add_gpio_switch "poe_power_port3" "PoE Power Port3" "499"
++	ucidef_add_gpio_switch "poe_power_port4" "PoE Power Port4" "500"
++	;;
++esac
++
++board_config_flush
++
++exit 0
+diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
+index 17ada648931f16d3e85630dd341defb89ba50d6f..b1091f66b2897a19bd01d4a26a1b3647656fa62b 100755
+--- a/target/linux/ramips/base-files/lib/ramips.sh
++++ b/target/linux/ramips/base-files/lib/ramips.sh
+@@ -466,6 +466,9 @@ ramips_board_detect() {
+ 	*"UBNT-ERX")
+ 		name="ubnt-erx"
+ 		;;
++	*"UBNT-ERX-SFP")
++		name="ubnt-erx-sfp"
++		;;
+ 	*"UR-326N4G")
+ 		name="ur-326n4g"
+ 		;;
+diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+index a5cca2080d3b96cef92286b1b15f4f8832d9f8c5..d3efc2dd37ed855a1c0e966e448b67ae73324d5f 100755
+--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
+@@ -234,7 +234,8 @@ platform_check_image() {
+ 		}
+ 		return 0
+ 		;;
+-	ubnt-erx)
++	ubnt-erx|\
++	ubnt-erx-sfp)
+ 		nand_do_platform_check "$board" "$1"
+ 		return $?;
+ 		;;
+@@ -248,7 +249,8 @@ platform_nand_pre_upgrade() {
+ 	local board=$(ramips_board_name)
+ 
+ 	case "$board" in
+-	ubnt-erx)
++	ubnt-erx|\
++	ubnt-erx-sfp)
+ 		platform_upgrade_ubnt_erx "$ARGV"
+ 		;;
+ 	esac
+@@ -258,7 +260,8 @@ platform_do_upgrade() {
+ 	local board=$(ramips_board_name)
+ 
+ 	case "$board" in
+-    	ubnt-erx)
++	ubnt-erx|\
++	ubnt-erx-sfp)
+ 		nand_do_upgrade "$ARGV"
+ 		;;
+ 	*)
+diff --git a/target/linux/ramips/dts/UBNT-ER-e50.dtsi b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
+new file mode 100644
+index 0000000000000000000000000000000000000000..b38c7194942db9f0a713fd8f707b53820d07c78e
+--- /dev/null
++++ b/target/linux/ramips/dts/UBNT-ER-e50.dtsi
+@@ -0,0 +1,106 @@
++#include "mt7621.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	compatible = "ubiquiti,edgerouterx";
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x10000000>;
++	};
++
++	chosen {
++		bootargs = "console=ttyS0,57600";
++	};
++
++	gpio-keys-polled {
++		compatible = "gpio-keys-polled";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		poll-interval = <20>;
++
++		reset {
++			label = "reset";
++			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++	};
++};
++
++&ethernet {
++	mtd-mac-address = <&factory 0x22>;
++};
++
++&nand {
++	status = "okay";
++
++	partition@0 {
++		label = "u-boot";
++		reg = <0x0 0x80000>;
++		read-only;
++	};
++
++	partition@80000 {
++		label = "u-boot-env";
++		reg = <0x80000 0x60000>;
++		read-only;
++	};
++
++	factory: partition@e0000 {
++		label = "factory";
++		reg = <0xe0000 0x60000>;
++	};
++
++	partition@140000 {
++		label = "kernel1";
++		reg = <0x140000 0x300000>;
++	};
++
++	partition@440000 {
++		label = "kernel2";
++		reg = <0x440000 0x300000>;
++	};
++
++	partition@740000 {
++		label = "ubi";
++		reg = <0x740000 0xf7c0000>;
++	};
++};
++
++&pinctrl {
++	state_default: pinctrl0 {
++		gpio {
++			ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
++			ralink,function = "gpio";
++		};
++	};
++};
++
++&spi0 {
++	/* This board has 2Mb spi flash soldered in and visible
++	   from manufacturer's firmware.
++	   But this SoC shares spi and nand pins,
++	   and current driver does't handle this sharing well */
++	status = "disabled";
++
++	m25p80@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "jedec,spi-nor";
++		reg = <1>;
++		spi-max-frequency = <10000000>;
++		m25p,chunked-io = <32>;
++
++		partition@0 {
++			label = "spi";
++			reg = <0x0 0x200000>;
++			read-only;
++		};
++	};
++};
++
++&xhci {
++	status = "disabled";
++};
+diff --git a/target/linux/ramips/dts/UBNT-ERX-SFP.dts b/target/linux/ramips/dts/UBNT-ERX-SFP.dts
+new file mode 100644
+index 0000000000000000000000000000000000000000..ca26d817211e5a5a20a7da926cd2aee726875780
+--- /dev/null
++++ b/target/linux/ramips/dts/UBNT-ERX-SFP.dts
+@@ -0,0 +1,24 @@
++/dts-v1/;
++
++#include "UBNT-ER-e50.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++
++/ {
++	model = "UBNT-ERX-SFP";
++	compatible = "ubiquiti,edgerouterx-sfp";
++
++	i2c-gpio {
++		compatible = "i2c-gpio";
++		gpios = <&gpio0 3 GPIO_ACTIVE_HIGH /* sda */
++		         &gpio0 4 GPIO_ACTIVE_HIGH /* scl */
++		        >;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		pca9555@25 {
++			compatible = "pca9555";
++			reg = <0x25>;
++		};
++	};
++};
+diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
+index cf86bbb7e67b1c521c279367ee9e99fee88fae85..556d1156c352f76a94c6e39bc3b58c88f08815be 100644
+--- a/target/linux/ramips/dts/UBNT-ERX.dts
++++ b/target/linux/ramips/dts/UBNT-ERX.dts
+@@ -1,108 +1,7 @@
+ /dts-v1/;
+ 
+-#include "mt7621.dtsi"
+-
+-#include <dt-bindings/gpio/gpio.h>
+-#include <dt-bindings/input/input.h>
++#include "UBNT-ER-e50.dtsi"
+ 
+ / {
+ 	model = "UBNT-ERX";
+-
+-	memory@0 {
+-		device_type = "memory";
+-		reg = <0x0 0x10000000>;
+-	};
+-
+-	chosen {
+-		bootargs = "console=ttyS0,57600";
+-	};
+-
+-	gpio-keys-polled {
+-		compatible = "gpio-keys-polled";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		poll-interval = <20>;
+-
+-		reset {
+-			label = "reset";
+-			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+-			linux,code = <KEY_RESTART>;
+-		};
+-	};
+-};
+-
+-&ethernet {
+-	mtd-mac-address = <&factory 0x22>;
+-};
+-
+-&nand {
+-	status = "okay";
+-
+-	partition@0 {
+-		label = "u-boot";
+-		reg = <0x0 0x80000>;
+-		read-only;
+-	};
+-
+-	partition@80000 {
+-		label = "u-boot-env";
+-		reg = <0x80000 0x60000>;
+-		read-only;
+-	};
+-
+-	factory: partition@e0000 {
+-		label = "factory";
+-		reg = <0xe0000 0x60000>;
+-	};
+-
+-	partition@140000 {
+-		label = "kernel1";
+-		reg = <0x140000 0x300000>;
+-	};
+-
+-	partition@440000 {
+-		label = "kernel2";
+-		reg = <0x440000 0x300000>;
+-	};
+-
+-	partition@740000 {
+-		label = "ubi";
+-		reg = <0x740000 0xf7c0000>;
+-	};
+-};
+-
+-&pinctrl {
+-	state_default: pinctrl0 {
+-		gpio {
+-			ralink,group = "uart2", "uart3", "i2c", "pcie", "rgmii2", "jtag";
+-			ralink,function = "gpio";
+-		};
+-	};
+-};
+-
+-&spi0 {
+-	/* This board has 2Mb spi flash soldered in and visible
+-	   from manufacturer's firmware.
+-	   But this SoC shares spi and nand pins,
+-	   and current driver does't handle this sharing well */
+-	status = "disabled";
+-
+-	m25p80@0 {
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+-		compatible = "jedec,spi-nor";
+-		reg = <1>;
+-		spi-max-frequency = <10000000>;
+-		m25p,chunked-io = <32>;
+-
+-		partition@0 {
+-			label = "spi";
+-			reg = <0x0 0x200000>;
+-			read-only;
+-		};
+-	};
+-};
+-
+-&xhci {
+-	status = "disabled";
+ };
+diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
+index 15ea9a13b6310b1454b5b3b92cd8ed30ee6255b3..8218bea84410536151a216cd2cc0300369ad977a 100644
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -144,6 +144,19 @@ define Device/ubnt-erx
+ endef
+ TARGET_DEVICES += ubnt-erx
+ 
++define Device/ubnt-erx-sfp
++  DTS := UBNT-ERX-SFP
++  FILESYSTEMS := squashfs
++  KERNEL_SIZE := 3145728
++  KERNEL := $(KERNEL_DTB) | uImage lzma
++  IMAGES := sysupgrade.tar
++  KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
++  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
++  DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP
++  DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2x00-lib -kmod-mac80211 -kmod-cfg80211 -wpad-mini -iwinfo kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio-custom
++endef
++TARGET_DEVICES += ubnt-erx-sfp
++
+ define Device/vr500
+   DTS := VR500
+   IMAGE_SIZE := 66453504

patches/lede/0042-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch

+From: Tim Thorpe <tim@tfthorpe.net>
+Date: Mon, 25 Sep 2017 04:38:49 -0500
+Subject: ar71xx: add support for TP-Link TL-WR1043N v5
+
+TP-Link TL-WR1043N v5 appears to be identical to the TL-WR1043ND v4,
+except that the USB port has been removed and there is no longer a
+removable antenna option.
+
+The software is more in line with the Archer series in that it uses a
+nested bootloader scheme.
+
+Specifications:
+
+ - QCA9563 at 775 MHz
+ - 64 MB RAM
+ - 16 MB flash
+ - 3 (non-detachable) Antennas / 450 Mbit
+ - 1x/4x WAN/LAN Gbps Ethernet (QCA8337)
+ - reset and Wi-Fi buttons
+
+Signed-off-by: Tim Thorpe <tim@tfthorpe.net>
+Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
+
+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 e1efb561b33da4dcfcb82ee953cd888170476dfb..e67b5e38561e841b88e486341950c52e1d454322 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
++++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
+@@ -666,14 +666,20 @@ tl-wr1043nd-v2)
+ 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+ 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+ 	;;
++tl-wr1043n-v5|\
+ tl-wr1043nd-v4)
+-	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+ 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+ 	ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
+ 	ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
+ 	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
+ 	ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
+ 	ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
++
++	case "$board" in
++	tl-wr1043nd-v4)
++		ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
++		;;
++	esac
+ 	;;
+ tl-wr2543n)
+ 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
+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 24ead87850f13346ea4be4f9bfb5582e64a2c4ad..27a0266923743d4856919b9c8772a40e59febe83 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
++++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
+@@ -237,7 +237,8 @@ ar71xx_setup_interfaces()
+ 	mynet-n750|\
+ 	sr3200|\
+ 	wndr3700v4|\
+-	wndr4300)
++	wndr4300|\
++	tl-wr1043n-v5)
+ 		ucidef_add_switch "switch0" \
+ 			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+ 		;;
+@@ -481,6 +482,7 @@ ar71xx_setup_macs()
+ 		lan_mac=$(mtd_get_mac_binary caldata 0)
+ 		wan_mac=$(mtd_get_mac_binary caldata 6)
+ 		;;
++	tl-wr1043n-v5|\
+ 	tl-wr1043nd-v4)
+ 		lan_mac=$(mtd_get_mac_binary product-info 8)
+ 		wan_mac=$(macaddr_add "$lan_mac" 1)
+diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
+index 38cc5d7853c79f2a7800a387310a95abb3b4de1b..61db387c9ecefd7090c25a5f5d75fdbf65a44d65 100644
+--- a/target/linux/ar71xx/base-files/etc/diag.sh
++++ b/target/linux/ar71xx/base-files/etc/diag.sh
+@@ -359,6 +359,7 @@ get_status_led() {
+ 	tl-wdr3320-v2|\
+ 	tl-wdr3500|\
+ 	tl-wr1041n-v2|\
++	tl-wr1043n-v5|\
+ 	tl-wr1043nd|\
+ 	tl-wr1043nd-v2|\
+ 	tl-wr1043nd-v4|\
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index 46711af2b26159ebb105fa97cd8a85bb9c00911a..de6042b202bbd07e64833743933be1cbaf1ed495 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -944,6 +944,9 @@ ar71xx_board_detect() {
+ 	*"TL-WR1043ND v4")
+ 		name="tl-wr1043nd-v4"
+ 		;;
++	*"TL-WR1043N v5")
++		name="tl-wr1043n-v5"
++		;;
+ 	*TL-WR2543N*)
+ 		name="tl-wr2543n"
+ 		;;
+diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+index e65f6e2f7594ba373fbc9a26620859b9005c8532..e748a2559cdb3a0ca6618429b0f613a656e39388 100755
+--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+@@ -261,6 +261,7 @@ platform_check_image() {
+ 	tew-712br|\
+ 	tew-732br|\
+ 	tew-823dru|\
++	tl-wr1043n-v5|\
+ 	unifi-outdoor|\
+ 	unifiac-lite|\
+ 	unifiac-pro|\
+diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
+index c82fcf09228be7063967f2517e0942651234afb8..57b6d2e541d7ef9dea8570ba8de72164d97b9775 100644
+--- a/target/linux/ar71xx/config-4.4
++++ b/target/linux/ar71xx/config-4.4
+@@ -181,6 +181,7 @@ CONFIG_ATH79_MACH_TL_WR1041N_V2=y
+ CONFIG_ATH79_MACH_TL_WR1043ND=y
+ CONFIG_ATH79_MACH_TL_WR1043ND_V2=y
+ CONFIG_ATH79_MACH_TL_WR1043ND_V4=y
++CONFIG_ATH79_MACH_TL_WR1043N_V5=y
+ CONFIG_ATH79_MACH_TL_WR2543N=y
+ CONFIG_ATH79_MACH_TL_WR703N=y
+ CONFIG_ATH79_MACH_TL_WR720N_V3=y
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+index fb2afb965c4641df7cdcaf0920f2d56b3717fa9b..7ad5419f51ec9909d8b59f33178221a7d81ec184 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
++++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+@@ -1564,6 +1564,15 @@ config ATH79_MACH_TL_WR1041N_V2
+ 	select ATH79_DEV_USB
+ 	select ATH79_DEV_WMAC
+ 
++config ATH79_MACH_TL_WR1043N_V5
++	bool "TP-LINK TL-WR1043N v5 support"
++	select SOC_QCA956X
++	select ATH79_DEV_ETH
++	select ATH79_DEV_GPIO_BUTTONS
++	select ATH79_DEV_LEDS_GPIO
++	select ATH79_DEV_M25P80
++	select ATH79_DEV_WMAC
++
+ config ATH79_MACH_TL_WR1043ND
+ 	bool "TP-LINK TL-WR1043ND support"
+ 	select SOC_AR913X
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
+index b1539c5d71a61806b88c50f1a78f6a27d98d7a2d..450819a9e6baa997dab2dfba4c5a19261aae9664 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
+@@ -5,6 +5,7 @@
+  *  Copyright (C) 2016 Matthias Schiffer <mschiffer@universe-factory.net>
+  *  Copyright (C) 2016 Andreas Ziegler <github@andreas-ziegler.de>
+  *  Copyright (C) 2016 Ludwig Thomeczek <ledesrc@wxorx.net>
++ *  Copyright (C) 2017 Tim Thorpe <tim@tfthorpe.net>
+  *
+  *  Derived from: mach-dir-869-a1.c
+  *
+@@ -62,6 +63,8 @@
+ #define TL_WR1043_V4_EEPROM_ADDR		0x1fff0000
+ #define TL_WR1043_V4_WMAC_CALDATA_OFFSET	0x1000
+ 
++#define TL_WR1043N_V5_MAC_LOCATION		0x1ff00008
++
+ static struct gpio_led tl_wr1043nd_v4_leds_gpio[] __initdata = {
+ 	{
+ 		.name		= "tp-link:green:wps",
+@@ -188,3 +191,82 @@ static void __init tl_wr1043nd_v4_setup(void)
+ 
+ MIPS_MACHINE(ATH79_MACH_TL_WR1043ND_V4, "TL-WR1043ND-v4",
+ 	     "TP-LINK TL-WR1043ND v4", tl_wr1043nd_v4_setup);
++
++static struct gpio_led tl_wr1043n_v5_leds_gpio[] __initdata = {
++	{
++		.name		= "tp-link:green:wps",
++		.gpio		= TL_WR1043_V4_GPIO_LED_WPS,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:system",
++		.gpio		= TL_WR1043_V4_GPIO_LED_SYSTEM,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:wlan",
++		.gpio		= TL_WR1043_V4_GPIO_LED_WLAN,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:wan",
++		.gpio		= TL_WR1043_V4_GPIO_LED_WAN,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:lan1",
++		.gpio		= TL_WR1043_V4_GPIO_LED_LAN1,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:lan2",
++		.gpio		= TL_WR1043_V4_GPIO_LED_LAN2,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:lan3",
++		.gpio		= TL_WR1043_V4_GPIO_LED_LAN3,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:green:lan4",
++		.gpio		= TL_WR1043_V4_GPIO_LED_LAN4,
++		.active_low	= 1,
++	},
++};
++
++/* The 1043Nv5 is identical to the 1043NDv4,
++ *  only missing the usb and small firmware layout changes  */
++static void __init tl_wr1043nv5_setup(void)
++{
++	u8 *art = (u8 *) KSEG1ADDR(TL_WR1043_V4_EEPROM_ADDR);
++	u8 *mac = (u8 *) KSEG1ADDR(TL_WR1043N_V5_MAC_LOCATION);
++
++	ath79_register_m25p80(NULL);
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043n_v5_leds_gpio),
++				 tl_wr1043n_v5_leds_gpio);
++	ath79_register_gpio_keys_polled(-1, TL_WR1043_V4_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(tl_wr1043nd_v4_gpio_keys),
++					tl_wr1043nd_v4_gpio_keys);
++
++	platform_device_register(&ath79_mdio0_device);
++
++	mdiobus_register_board_info(tl_wr1043nd_v4_mdio0_info,
++				    ARRAY_SIZE(tl_wr1043nd_v4_mdio0_info));
++
++	ath79_register_wmac(art + TL_WR1043_V4_WMAC_CALDATA_OFFSET, mac);
++
++	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
++
++	/* GMAC0 is connected to an AR8337 switch */
++	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
++	ath79_eth0_data.speed = SPEED_1000;
++	ath79_eth0_data.duplex = DUPLEX_FULL;
++	ath79_eth0_data.phy_mask = BIT(0);
++	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
++	ath79_register_eth(0);
++}
++
++MIPS_MACHINE(ATH79_MACH_TL_WR1043N_V5, "TL-WR1043N-v5", "TP-LINK TL-WR1043N v5",
++	     tl_wr1043nv5_setup);
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+index 8864e0deda57b926e88dceebd26056a2f8099380..9cb4a7f2e1df641232289721b676a9b0149c76e5 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
++++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+@@ -214,6 +214,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WDR6500_V2,		/* TP-LINK TL-WDR6500 v2 */
+ 	ATH79_MACH_TL_WPA8630,			/* TP-Link TL-WPA8630 */
+ 	ATH79_MACH_TL_WR1041N_V2,		/* TP-LINK TL-WR1041N v2 */
++	ATH79_MACH_TL_WR1043N_V5,		/* TP-LINK TL-WR1043N v5 */
+ 	ATH79_MACH_TL_WR1043ND,			/* TP-LINK TL-WR1043ND */
+ 	ATH79_MACH_TL_WR1043ND_V2,		/* TP-LINK TL-WR1043ND v2 */
+ 	ATH79_MACH_TL_WR1043ND_V4,		/* TP-LINK TL-WR1043ND v4 */
+diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
+index 6933654e575a1ef2c92e4c656696a479cba4c594..5be7cbfbd4ab7d73d679d52d2581459250e04302 100644
+--- a/target/linux/ar71xx/image/tp-link.mk
++++ b/target/linux/ar71xx/image/tp-link.mk
+@@ -858,7 +858,22 @@ define Device/tl-wr1043nd-v4
+     IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
+     IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+ endef
+-TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3 tl-wr1043nd-v4
++
++define Device/tl-wr1043n-v5
++  DEVICE_TITLE := TP-LINK TL-WR1043N v5
++  BOARDNAME := TL-WR1043N-v5
++  SUPPORTED_DEVICES := tl-wr1043n-v5
++  DEVICE_PROFILE := TLWR1043
++  MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,15104k(firmware),128k(product-info)ro,640k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(art)ro
++  IMAGE_SIZE := 15104k
++  KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
++  IMAGES := sysupgrade.bin factory.bin
++  IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
++	append-metadata | check-size $$$$(IMAGE_SIZE)
++  IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
++  TPLINK_BOARD_NAME := TLWR1043NV5
++endef
++TARGET_DEVICES += tl-wr1043nd-v1 tl-wr1043nd-v2 tl-wr1043nd-v3 tl-wr1043nd-v4 tl-wr1043n-v5
+ 
+ define Device/tl-wr2543-v1
+     $(Device/tplink-8mlzma)
+diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
+index 376835a703f91532300d0dd7c8ef66704acc6e05..f5af38a726f5ce33391223a4dbeb2fc0a8cac613 100644
+--- a/target/linux/ar71xx/mikrotik/config-default
++++ b/target/linux/ar71xx/mikrotik/config-default
+@@ -143,6 +143,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
+ # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set
+ # CONFIG_ATH79_MACH_TL_WPA8630 is not set
+ # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
++# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set
+ # CONFIG_ATH79_MACH_TL_WR1043ND is not set
+ # CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set
+ # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
+diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
+index 62be218e33cc6366ea89f363983f36523c419650..5c18f5d594d625f91ff10e21ddc5af2b3b4d768f 100644
+--- a/target/linux/ar71xx/nand/config-default
++++ b/target/linux/ar71xx/nand/config-default
+@@ -52,6 +52,7 @@
+ # CONFIG_ATH79_MACH_TL_WDR3500 is not set
+ # CONFIG_ATH79_MACH_TL_WDR4300 is not set
+ # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
++# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set
+ # CONFIG_ATH79_MACH_TL_WR1043ND is not set
+ # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
+ # CONFIG_ATH79_MACH_TL_WR2543N is not set
+diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
+index 24684268b1a3fe491c4eb876a5ebefc700f2e56e..478d5d8e9b43bbe37694732c138048c8fe8d807c 100644
+--- a/tools/firmware-utils/src/tplink-safeloader.c
++++ b/tools/firmware-utils/src/tplink-safeloader.c
+@@ -478,6 +478,42 @@ static struct device_info boards[] = {
+ 		.last_sysupgrade_partition = "file-system"
+ 	},
+ 
++	/** Firmware layout for the TL-WR1043 v5 */
++	{
++		.id     = "TLWR1043NV5",
++		.vendor = "",
++		.support_list =
++			"SupportList:\n"
++			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:45550000}\n"
++			"{product_name:TL-WR1043N,product_ver:5.0.0,special_id:55530000}\n",
++		.support_trail = '\x00',
++		.soft_ver = "soft_ver:1.0.0\n",
++		.partitions = {
++			{"factory-boot", 0x00000, 0x20000},
++			{"fs-uboot", 0x20000, 0x20000},
++			{"os-image", 0x40000, 0x180000},
++			{"file-system", 0x1c0000, 0xd40000},
++			{"default-mac", 0xf00000, 0x00200},
++			{"pin", 0xf00200, 0x00200},
++			{"device-id", 0xf00400, 0x00100},
++			{"product-info", 0xf00500, 0x0fb00},
++			{"soft-version", 0xf10000, 0x01000},
++			{"extra-para", 0xf11000, 0x01000},
++			{"support-list", 0xf12000, 0x0a000},
++			{"profile", 0xf1c000, 0x04000},
++			{"default-config", 0xf20000, 0x10000},
++			{"user-config", 0xf30000, 0x40000},
++			{"qos-db", 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 RE450 */
+ 	{
+ 		.id = "RE450",
+@@ -888,7 +924,9 @@ static void build_image(const char *output,
+ 	parts[3] = read_file("os-image", kernel_image, false);
+ 	parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
+ 
+-	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0) {
++	/* Some devices need the extra-para partition to accept the firmware */
++	if (strcasecmp(info->id, "ARCHER-C25-V1") == 0 ||
++	    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);
+ 	}

patches/lede/0043-ar71xx-QCA956X-add-missing-register.patch

+From: Henryk Heisig <hyniu@o2.pl>
+Date: Fri, 6 Jan 2017 21:21:11 +0100
+Subject: ar71xx: QCA956X: add missing register
+
+Signed-off-by: Henryk Heisig <hyniu@o2.pl>
+
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+index 790c2d3396ffd0a0d00d13403b7f22e32863eef4..a8b19b68b2a46545fdd3ed6bdf14006f8a741185 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+@@ -686,7 +686,6 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
+ 		case ATH79_SOC_AR7241:
+ 		case ATH79_SOC_AR9330:
+ 		case ATH79_SOC_AR9331:
+-		case ATH79_SOC_QCA956X:
+ 		case ATH79_SOC_TP9343:
+ 			pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
+ 			break;
+@@ -698,6 +697,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
+ 		case ATH79_SOC_AR9342:
+ 		case ATH79_SOC_AR9344:
+ 		case ATH79_SOC_QCA9533:
++		case ATH79_SOC_QCA956X:
+ 			switch (pdata->phy_if_mode) {
+ 			case PHY_INTERFACE_MODE_MII:
+ 			case PHY_INTERFACE_MODE_GMII:
+@@ -814,6 +814,27 @@ void __init ath79_setup_qca955x_eth_cfg(u32 mask)
+ 	iounmap(base);
+ }
+ 
++void __init ath79_setup_qca956x_eth_cfg(u32 mask)
++{
++	void __iomem *base;
++	u32 t;
++
++	base = ioremap(QCA956X_GMAC_BASE, QCA956X_GMAC_SIZE);
++
++	t = __raw_readl(base + QCA956X_GMAC_REG_ETH_CFG);
++
++	t &= ~(QCA956X_ETH_CFG_SW_ONLY_MODE |
++	       QCA956X_ETH_CFG_SW_PHY_SWAP);
++
++	t |= mask;
++
++	__raw_writel(t, base + QCA956X_GMAC_REG_ETH_CFG);
++	/* flush write */
++	__raw_readl(base + QCA956X_GMAC_REG_ETH_CFG);
++
++	iounmap(base);
++}
++
+ static int ath79_eth_instance __initdata;
+ void __init ath79_register_eth(unsigned int id)
+ {
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
+index 5a226e40284b6853b59812ffc791e0612c91fa9b..fb9e4f63c66ef9008e423007ecff02c93c321fb8 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
++++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.h
+@@ -49,5 +49,6 @@ void ath79_setup_ar933x_phy4_switch(bool mac, bool mdio);
+ void ath79_setup_ar934x_eth_cfg(u32 mask);
+ void ath79_setup_ar934x_eth_rx_delay(unsigned int rxd, unsigned int rxdv);
+ void ath79_setup_qca955x_eth_cfg(u32 mask);
++void ath79_setup_qca956x_eth_cfg(u32 mask);
+ 
+ #endif /* _ATH79_DEV_ETH_H */
+diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
+index 5fd352c638a75063945adadb64b1043cd81b506c..078fa157f242ce4350185d97a61ef5d1f3f16fc5 100644
+--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
++++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
+@@ -37,11 +37,13 @@ struct ag71xx_platform_data {
+ 	u8		is_ar724x:1;
+ 	u8		has_ar8216:1;
+ 	u8		use_flow_control:1;
++	u8		is_qca956x:1;
+ 
+ 	struct ag71xx_switch_platform_data *switch_data;
+ 
+ 	void		(*ddr_flush)(void);
+ 	void		(*set_speed)(int speed);
++	void		(*update_pll)(u32 pll_10, u32 pll_100, u32 pll_1000);
+ 
+ 	u32		fifo_cfg1;
+ 	u32		fifo_cfg2;
+diff --git a/target/linux/ar71xx/patches-4.4/622-MIPS-ath79-add-more-register-defines-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-4.4/622-MIPS-ath79-add-more-register-defines-for-QCA956x-SoC.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..dff354398cd2ab6556b13be9f7ce45f4d7f311e8
+--- /dev/null
++++ b/target/linux/ar71xx/patches-4.4/622-MIPS-ath79-add-more-register-defines-for-QCA956x-SoC.patch
+@@ -0,0 +1,38 @@
++--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
++@@ -157,6 +157,10 @@
++ #define QCA956X_EHCI0_BASE	0x1b000000
++ #define QCA956X_EHCI1_BASE	0x1b400000
++ #define QCA956X_EHCI_SIZE	0x200
+++#define QCA956X_GMAC_SGMII_BASE	(AR71XX_APB_BASE + 0x00070000)
+++#define QCA956X_GMAC_SGMII_SIZE	0x64
+++#define QCA956X_PLL_BASE	(AR71XX_APB_BASE + 0x00050000)
+++#define QCA956X_PLL_SIZE	0x50
++ #define QCA956X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
++ #define QCA956X_GMAC_SIZE	0x64
++ 
++@@ -404,6 +408,7 @@
++ #define QCA956X_PLL_DDR_CONFIG_REG			0x08
++ #define QCA956X_PLL_DDR_CONFIG1_REG			0x0c
++ #define QCA956X_PLL_CLK_CTRL_REG			0x10
+++#define QCA956X_PLL_ETH_XMII_CONTROL_REG		0x30
++ 
++ #define QCA956X_PLL_CPU_CONFIG_REFDIV_SHIFT		12
++ #define QCA956X_PLL_CPU_CONFIG_REFDIV_MASK		0x1f
++@@ -1186,4 +1191,16 @@
++ #define QCA955X_ETH_CFG_TXE_DELAY_MASK	0x3
++ #define QCA955X_ETH_CFG_TXE_DELAY_SHIFT	20
++ 
+++/*
+++ * QCA956X GMAC Interface
+++ */
+++
+++#define QCA956X_GMAC_REG_ETH_CFG		0x00
+++
+++#define QCA956X_ETH_CFG_SW_ONLY_MODE		BIT(7)
+++#define QCA956X_ETH_CFG_SW_PHY_SWAP		    BIT(8)
+++#define QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP	BIT(9)
+++#define QCA956X_ETH_CFG_SW_APB_ACCESS		BIT(10)
+++#define QCA956X_ETH_CFG_SW_ACC_MSB_FIRST	BIT(13)
+++
++ #endif /* __ASM_MACH_AR71XX_REGS_H */
+diff --git a/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch b/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
+index add2992186ad1d82ce924d2f1ccdf3c36c390a3d..8aa5957a7152af27854f6f7c197120b8029cf9e8 100644
+--- a/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
++++ b/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
+@@ -20,7 +20,7 @@
+  #define AR71XX_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
+  #define AR71XX_UART_SIZE	0x100
+  #define AR71XX_USB_CTRL_BASE	(AR71XX_APB_BASE + 0x00030000)
+-@@ -218,6 +218,9 @@
++@@ -222,6 +222,9 @@
+  #define QCA953X_DDR_REG_FLUSH_PCIE	0xa8
+  #define QCA953X_DDR_REG_FLUSH_WMAC	0xac
+  
+diff --git a/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch b/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch
+index 7db6ad361fa21252118e589195b0bc73222cf4f5..6b331587d157511a40fc1e46630c416a60565a0b 100644
+--- a/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch
++++ b/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch
+@@ -48,7 +48,7 @@ functions on the Arduino Yun.
+  	void __iomem *reg = ath79_gpio_get_function_reg();
+ --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+ +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
+-@@ -850,6 +850,7 @@
++@@ -855,6 +855,7 @@
+  #define AR71XX_GPIO_REG_INT_PENDING	0x20
+  #define AR71XX_GPIO_REG_INT_ENABLE	0x24
+  #define AR71XX_GPIO_REG_FUNC		0x28
+@@ -56,7 +56,7 @@ functions on the Arduino Yun.
+  
+  #define AR934X_GPIO_REG_OUT_FUNC0	0x2c
+  #define AR934X_GPIO_REG_OUT_FUNC1	0x30
+-@@ -974,6 +975,8 @@
++@@ -979,6 +980,8 @@
+  #define AR724X_GPIO_FUNC_UART_EN		BIT(1)
+  #define AR724X_GPIO_FUNC_JTAG_DISABLE		BIT(0)
+  

patches/lede/0044-ag71xx-Fix-rx-ring-buffer-stall-on-small-packets-flood-on-qca956x-and-qca953x.patch

+From: Vittorio Gambaletta <openwrt@vittgam.net>
+Date: Sat, 25 Mar 2017 18:08:02 +0100
+Subject: ag71xx: Fix rx ring buffer stall on small packets flood on qca956x and qca953x.
+
+Backported from Code Aurora QSDK
+
+Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
+
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+index a8b19b68b2a46545fdd3ed6bdf14006f8a741185..427de6a50d0fcbc9dae11f8e6921194c0a5b09ed 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+@@ -996,6 +996,9 @@ void __init ath79_register_eth(unsigned int id)
+ 			pdata->reset_bit = AR934X_RESET_GE0_MAC |
+ 					   AR934X_RESET_GE0_MDIO;
+ 			pdata->set_speed = ar934x_set_speed_ge0;
++
++			if (ath79_soc == ATH79_SOC_QCA9533)
++				pdata->disable_inline_checksum_engine = 1;
+ 		} else {
+ 			pdata->reset_bit = AR934X_RESET_GE1_MAC |
+ 					   AR934X_RESET_GE1_MDIO;
+@@ -1097,6 +1100,8 @@ void __init ath79_register_eth(unsigned int id)
+ 				pdata->set_speed = qca956x_set_speed_sgmii;
+ 			else
+ 				pdata->set_speed = ar934x_set_speed_ge0;
++
++			pdata->disable_inline_checksum_engine = 1;
+ 		} else {
+ 			pdata->reset_bit = QCA955X_RESET_GE1_MAC |
+ 					   QCA955X_RESET_GE1_MDIO;
+diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
+index 078fa157f242ce4350185d97a61ef5d1f3f16fc5..5fdc59c7b78b84670daefa9fd831b154ded84ddc 100644
+--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
++++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
+@@ -37,7 +37,7 @@ struct ag71xx_platform_data {
+ 	u8		is_ar724x:1;
+ 	u8		has_ar8216:1;
+ 	u8		use_flow_control:1;
+-	u8		is_qca956x:1;
++	u8		disable_inline_checksum_engine:1;
+ 
+ 	struct ag71xx_switch_platform_data *switch_data;
+ 
+diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+index 566e9513d8b7c6ef101902ae7d281dcc1c233893..72dd654a691355c881b15d796fad0d640e05fc15 100644
+--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
++++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+@@ -629,6 +629,22 @@ __ag71xx_link_adjust(struct ag71xx *ag, bool update)
+ 	ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
+ 	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
+ 	ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
++
++	if (pdata->disable_inline_checksum_engine) {
++		/*
++		 * The rx ring buffer can stall on small packets on QCA953x and
++		 * QCA956x. Disabling the inline checksum engine fixes the stall.
++		 * The wr, rr functions cannot be used since this hidden register
++		 * is outside of the normal ag71xx register block.
++		 */
++		void __iomem *dam = ioremap_nocache(0xb90001bc, 0x4);
++		if (dam) {
++			__raw_writel(__raw_readl(dam) & ~BIT(27), dam);
++			(void)__raw_readl(dam);
++			iounmap(dam);
++		}
++	}
++
+ 	ag71xx_hw_start(ag);
+ 
+ 	netif_carrier_on(ag->dev);

scripts/common.inc.sh

@@ -18,6 +18,10 @@ alias() {
 	:
 }
 
+manifest_alias() {
+	:
+}
+
 packages() {
 	:
 }

scripts/feeds.sh

-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -14,6 +14,7 @@ FEEDS="$GLUON_SITE_FEEDS $GLUON_FEEDS"
 	done
 ) > lede/feeds.conf
 
+rm -rf lede/tmp
 rm -rf lede/feeds
 rm -rf lede/package/feeds
 

scripts/generate_manifest.sh

@@ -9,6 +9,7 @@ default_sysupgrade_ext='.bin'
 
 output=
 aliases=
+manifest_aliases=
 
 sysupgrade_ext=
 
@@ -33,6 +34,10 @@ generate() {
 		for alias in $aliases; do
 			generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-sysupgrade${sysupgrade_ext}"
 		done
+
+		for alias in $manifest_aliases; do
+			generate_line "$alias" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}"
+		done
 	fi
 }
 
@@ -44,6 +49,7 @@ device() {
 
 	output="$1"
 	aliases=
+	manifest_aliases=
 
 	sysupgrade_ext="$default_sysupgrade_ext"
 }
@@ -53,6 +59,7 @@ sysupgrade_image() {
 
 	output="$1"
 	aliases=
+	manifest_aliases=
 
 	if [ "$3" ]; then
 		sysupgrade_ext="$3"
@@ -65,6 +72,10 @@ alias() {
 	aliases="$aliases $1"
 }
 
+manifest_alias() {
+	manifest_aliases="$manifest_aliases $1"
+}
+
 sysupgrade() {
 	if [ "$2" ]; then
 		sysupgrade_ext="$2"

targets/ar71xx-generic

 ATH10K_PACKAGES=
+ATH10K_PACKAGES_QCA9887=
 
 if [ "$GLUON_ATH10K_MESH" = '11s' ]; then
 	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
 fi
 if [ "$GLUON_ATH10K_MESH" = 'ibss' ]; then
 	ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca988x ath10k-firmware-qca988x-ct'
+	ATH10K_PACKAGES_QCA9887='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca9887 ath10k-firmware-qca9887-ct'
 fi
 
 
@@ -60,6 +62,8 @@ device gl-inet-6416a-v1 gl-inet-6416A-v1
 
 device gl-ar150 gl-ar150
 factory
+device gl-ar300m gl-ar300m
+factory
 
 
 # Linksys by Cisco
@@ -164,6 +168,7 @@ device tp-link-tl-wr1043n-nd-v1 tl-wr1043nd-v1
 device tp-link-tl-wr1043n-nd-v2 tl-wr1043nd-v2
 device tp-link-tl-wr1043n-nd-v3 tl-wr1043nd-v3
 device tp-link-tl-wr1043n-nd-v4 tl-wr1043nd-v4
+device tp-link-tl-wr1043n-nd-v5 tl-wr1043n-v5
 
 device tp-link-tl-wdr3500-v1 tl-wdr3500-v1
 device tp-link-tl-wdr3600-v1 tl-wdr3600-v1
@@ -179,6 +184,11 @@ device tp-link-archer-c7-v2 archer-c7-v2
 packages $ATH10K_PACKAGES
 factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
 
+if [ "$BROKEN" ]; then
+device tp-link-archer-c25-v1 archer-c25-v1 # instability with 5GHz mesh in some environments
+packages $ATH10K_PACKAGES_QCA9887
+fi
+
 device tp-link-re450 re450
 packages $ATH10K_PACKAGES
 fi

targets/generic

@@ -6,6 +6,8 @@ config 'CONFIG_BUSYBOX_CUSTOM=y'
 config 'CONFIG_BUSYBOX_CONFIG_SHA256SUM=y'
 config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
 
+config '# CONFIG_KMOD_BATMAN_ADV_MCAST is not set'
+
 config 'CONFIG_PACKAGE_ATH_DEBUG=y'
 
 config 'CONFIG_TARGET_MULTI_PROFILE=y'

targets/ramips-mt7621

-# D-Link
+# BROKEN: No AP+IBSS support, 11s has high packet loss
+if [ "$BROKEN" ]; then
+
+## D-Link
 
 device d-link-dir-860l-b1 dir-860l-b1
 
-# Ubiquiti
+
+## ZBT
+
+device zbt-wg3526 zbt-wg3526
+factory
+
+fi
+
+
+# Devices without WLAN
+
+## Ubiquiti
 
 device ubnt-erx ubnt-erx
 packages '-hostapd-mini'
 factory
 sysupgrade '.tar'
+
+device ubnt-erx-sfp ubnt-erx-sfp
+packages '-hostapd-mini'
+factory
+sysupgrade '.tar'

targets/ramips-rt305x

@@ -5,3 +5,5 @@ factory
 
 device vocore-16M vocore-16M
 factory
+
+device a5-v11 a5-v11

targets/targets.mk

@@ -4,6 +4,7 @@ $(eval $(call GluonTarget,ar71xx,nand))
 $(eval $(call GluonTarget,brcm2708,bcm2708))
 $(eval $(call GluonTarget,brcm2708,bcm2709))
 $(eval $(call GluonTarget,mpc85xx,generic))
+$(eval $(call GluonTarget,ramips,mt7621))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))
 $(eval $(call GluonTarget,x86,64))
@@ -12,7 +13,6 @@ ifneq ($(BROKEN),)
 $(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
 $(eval $(call GluonTarget,ipq806x)) # BROKEN: Untested
 $(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support
-$(eval $(call GluonTarget,ramips,mt7621)) # BROKEN: No AP+IBSS support, 11s has high packet loss
 $(eval $(call GluonTarget,ramips,mt7628)) # BROKEN: No AP+IBSS support
 $(eval $(call GluonTarget,ramips,rt305x)) # BROKEN: No AP+IBSS support
 $(eval $(call GluonTarget,sunxi)) # BROKEN: Untested