From 8529d7471a7c41b63c35d31537457f90be8fcf69 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 5 Jan 2022 12:41:12 +0100 Subject: [PATCH] ipq40xx: fix wifi mac assignment on on hfcl-ion4 Signed-off-by: John Crispin --- patches/0042-ipq40xx-add-HFCL-ION4-support.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/patches/0042-ipq40xx-add-HFCL-ION4-support.patch b/patches/0042-ipq40xx-add-HFCL-ION4-support.patch index 91ce2057e..d47486f5e 100644 --- a/patches/0042-ipq40xx-add-HFCL-ION4-support.patch +++ b/patches/0042-ipq40xx-add-HFCL-ION4-support.patch @@ -1,7 +1,7 @@ -From f68588775d1123cc2a5231ade30de46b3fc82027 Mon Sep 17 00:00:00 2001 +From 2bfcd7d31d0860c28e6c35688302e48eb2b3e2ae Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 26 Aug 2021 17:34:47 +0200 -Subject: [PATCH 01/13] ipq40xx: add HFCL ION4 support +Subject: [PATCH 01/14] ipq40xx: add HFCL ION4 support Signed-off-by: John Crispin --- @@ -9,12 +9,12 @@ Signed-off-by: John Crispin package/firmware/ipq-wifi/Makefile | 4 +- .../ipq40xx/base-files/etc/board.d/01_leds | 4 + .../ipq40xx/base-files/etc/board.d/02_network | 1 + - .../etc/hotplug.d/firmware/11-ath10k-caldata | 6 + + .../etc/hotplug.d/firmware/11-ath10k-caldata | 8 + .../base-files/lib/upgrade/platform.sh | 1 + .../arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts | 236 ++++++++++++++++++ target/linux/ipq40xx/image/generic.mk | 18 ++ .../ipq40xx/patches-5.4/999-hfcl_ion.patch | 12 + - 9 files changed, 285 insertions(+), 1 deletion(-) + 9 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts create mode 100644 target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch @@ -82,25 +82,27 @@ index 5a2a3a47f7..e4b009bf93 100755 ucidef_set_interface_wan "eth0" ;; diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -index 64bb4efaf8..97dd1b4039 100644 +index 64bb4efaf8..211e7cfda1 100644 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -167,6 +167,9 @@ case "$FIRMWARE" in +@@ -167,6 +167,10 @@ case "$FIRMWARE" in tp-link,ec420-g1) caldata_extract "0:ART" 0x1000 0x2f20 ;; + hfcl,ion4) + caldata_extract "0:ART" 4096 12064 ++ ath10k_patch_mac $(mtd_get_mac_ascii 0:ART WLAN0_BASEMAC) + ;; esac ;; "ath10k/pre-cal-ahb-a800000.wifi.bin") -@@ -283,6 +286,9 @@ case "$FIRMWARE" in +@@ -283,6 +287,10 @@ case "$FIRMWARE" in caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) ;; + hfcl,ion4) + caldata_extract "0:ART" 20480 12064 ++ ath10k_patch_mac $(mtd_get_mac_ascii 0:ART WLAN1_BASEMAC) + ;; esac ;;