patches: refresh and refactor eap 225 support patch

freifunkh · Apr 27, 2023 · dc468ba · dc468ba
1 parent 22f23a5
commit dc468ba
Showing 1 changed file with 21 additions and 55 deletions.
diff --git a/...-support-for-TP-Link-EAP-225-Outdoo.patch → ...port-for-TP-Link-EAP-225-Outdoor-v3.patch b/...-support-for-TP-Link-EAP-225-Outdoo.patch → ...port-for-TP-Link-EAP-225-Outdoor-v3.patch
@@ -1,28 +1,18 @@
-From 34524d5a22a26a85873deca16376f0c04151d862 Mon Sep 17 00:00:00 2001
 From: Sebastian Schaper <openwrt@sebastianschaper.net>
 Date: Thu, 9 Mar 2023 20:26:35 +0100
-Subject: [PATCH] ath79-generic: add support for TP-Link EAP-225 Outdoor v3
+Subject: ath79-generic: add support for TP-Link EAP-225 Outdoor v3
 
 ath79-generic: don't build factory for TP-Link EAP-225 Outdoor v3
 
 needs newer version of tplink-safeloader
 
 ath79-generic: fix 5g wifi for EAP225-Outdoor v3 backport
----
- docs/user/supported_devices.rst               |   1 +
- .../luasrc/usr/lib/lua/gluon/platform.lua     |   1 +
- ...upport-for-TP-Link-EAP225-Outdoor-v3.patch | 163 ++++++++++++++++++
- ...-wifi-for-eap225-outdoor-v3-backport.patch |  24 +++
- targets/ath79-generic                         |   5 +
- 5 files changed, 194 insertions(+)
- create mode 100644 patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
- create mode 100644 patches/openwrt/0012-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
 
 diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
-index d4727ada..f99192be 100644
+index 3a136427ce72889e584ba99919d73da9624a431a..77f91711f595cb80849d5c7967457ae8b49a28f3 100644
 --- a/docs/user/supported_devices.rst
 +++ b/docs/user/supported_devices.rst
-@@ -111,6 +111,7 @@ ath79-generic
+@@ -115,6 +115,7 @@ ath79-generic
    - CPE510 (v1.0, v1.1, v2.0, v3.0)
    - CPE710 (v1.0)
    - EAP225-Outdoor (v1)
@@ -31,30 +21,26 @@ index d4727ada..f99192be 100644
    - TL-WDR3500 (v1)
    - TL-WDR3600 (v1)
 diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
-index 3301319e..a36bd468 100644
+index 6debe8c5dd3e6ea7c4da7f76fe163f8a2cc0400f..6f5c217448f224a14ba065b97a0148a70aad6888 100644
 --- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
 +++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
-@@ -36,6 +36,7 @@ function M.is_outdoor_device()
+@@ -37,6 +37,7 @@ function M.is_outdoor_device()
  		'tplink,cpe510-v3',
  		'tplink,cpe710-v1',
  		'tplink,eap225-outdoor-v1',
 +		'tplink,eap225-outdoor-v3',
  		'tplink,wbs210-v1',
  		'tplink,wbs210-v2',
  		'tplink,wbs510-v1',
-diff --git a/patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch b/patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
+diff --git a/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch b/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
 new file mode 100644
-index 00000000..1c23cf1b
+index 0000000000000000000000000000000000000000..20b8377f985fc03217a073ab6e0d2e86181b2ade
 --- /dev/null
-+++ b/patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
-@@ -0,0 +1,163 @@
-+From dd8d70db641786382aa40aa3992fd0abffdd1a68 Mon Sep 17 00:00:00 2001
++++ b/patches/openwrt/0014-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
+@@ -0,0 +1,150 @@
 +From: Paul Maruhn <paulmaruhn@posteo.de>
 +Date: Tue, 22 Mar 2022 21:06:42 +0100
-+Subject: [PATCH] ath79: support for TP-Link EAP225-Outdoor v3
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
++Subject: ath79: support for TP-Link EAP225-Outdoor v3
 +
 +This model is almost identical to the EAP225-Outdoor v1.
 +Major difference is the RTL8211FS PHY Chipset.
@@ -102,16 +88,10 @@ index 00000000..1c23cf1b
 +Tested-by: Tido Klaassen <tido_ff@4gh.eu>
 +Signed-off-by: Nick Hainke <vincent@systemli.org>
 +(cherry picked from commit 7e4de89e631aaf56be5375662b7d5ed0f27e26f6)
-+---
-+ .../dts/qca9563_tplink_eap225-outdoor-v3.dts  | 59 +++++++++++++++++++
-+ .../generic/base-files/etc/board.d/02_network |  1 +
-+ target/linux/ath79/image/generic-tp-link.mk   | 11 ++++
-+ 3 files changed, 71 insertions(+)
-+ create mode 100644 target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
 +
 +diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
 +new file mode 100644
-+index 0000000000..e5914c9a55
++index 0000000000000000000000000000000000000000..e5914c9a55069e5baa5c7b989f3405c762e4d29d
 +--- /dev/null
 ++++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
 +@@ -0,0 +1,59 @@
@@ -175,7 +155,7 @@ index 00000000..1c23cf1b
 ++	};
 ++};
 +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 8f9516b8c6..b17ef03afc 100644
++index 54f7e4592f5c09a396dfb1b1ec83e908e39b8a49..f1804cd113afb7c2d4ef22fc429dab74914eddb8 100644
 +--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 ++++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +@@ -78,6 +78,7 @@ ath79_setup_interfaces()
@@ -187,7 +167,7 @@ index 00000000..1c23cf1b
 + 	tplink,eap225-v3|\
 + 	tplink,eap245-v1|\
 +diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
-+index fed572c884..3d3a457113 100644
++index 3a9f2a5821d3e3729f5a0ac842b93da638baacf0..2876a454e4472294dbfc7dde43882cd88449cb6a 100644
 +--- a/target/linux/ath79/image/generic-tp-link.mk
 ++++ b/target/linux/ath79/image/generic-tp-link.mk
 +@@ -401,6 +401,17 @@ define Device/tplink_eap225-outdoor-v1
@@ -208,26 +188,18 @@ index 00000000..1c23cf1b
 + define Device/tplink_eap225-v1
 +   $(Device/tplink-eap2x5)
 +   SOC := qca9563
-+-- 
-+2.34.1
-+
-diff --git a/patches/openwrt/0012-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch b/patches/openwrt/0012-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
+diff --git a/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch b/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
 new file mode 100644
-index 00000000..35885138
+index 0000000000000000000000000000000000000000..f6493919ff60263a559456b03f97191b47f92420
 --- /dev/null
-+++ b/patches/openwrt/0012-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
-@@ -0,0 +1,24 @@
-+From 075c962dffda3e0a8500aeb8c181acd28841610b Mon Sep 17 00:00:00 2001
++++ b/patches/openwrt/0015-ath79-fix-5g-wifi-for-eap225-outdoor-v3-backport.patch
+@@ -0,0 +1,16 @@
 +From: Sebastian Schaper <openwrt@sebastianschaper.net>
 +Date: Thu, 9 Mar 2023 23:24:33 +0100
-+Subject: [PATCH] ath79: fix 5g wifi for eap225-outdoor v3 backport
-+
-+---
-+ .../generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 1 +
-+ 1 file changed, 1 insertion(+)
++Subject: ath79: fix 5g wifi for eap225-outdoor v3 backport
 +
 +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 712bba76ed..5bc4f0a43f 100644
++index 712bba76edc86b849bcb9214a9373ec067d66246..5bc4f0a43f0b221b5794e1b1fb95d22027125725 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
 +@@ -257,6 +257,7 @@ case "$FIRMWARE" in
@@ -238,14 +210,11 @@ index 00000000..35885138
 + 	tplink,eap225-v3|\
 + 	tplink,eap225-wall-v2)
 + 		caldata_extract "art" 0x5000 0x2f20
-+-- 
-+2.34.1
-+
 diff --git a/targets/ath79-generic b/targets/ath79-generic
-index 9af60e02..9da7a7bf 100644
+index 6e5cd23ecb3290b0765602ba439b3346192ff9c8..0fe7102c5abaaef5c065b056b2f29f1adbd8af64 100644
 --- a/targets/ath79-generic
 +++ b/targets/ath79-generic
-@@ -468,6 +468,11 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
+@@ -474,6 +474,11 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
  	packages = ATH10K_PACKAGES_QCA9888,
  })
 
@@ -257,6 +226,3 @@ index 9af60e02..9da7a7bf 100644
  device('tp-link-re355-v1', 'tplink_re355-v1', {
  	manifest_aliases = {
  		'tp-link-re355', -- upgrade from OpenWrt 19.07
--- 
-2.34.1
-