From bdc786e82c13547b01bd8f699d00598a974c14f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=20=E9=B9=8F?= Date: Fri, 25 Mar 2022 17:39:07 +0800 Subject: [PATCH] ipq40xx: update E2600AC c1/c2 board MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Modified the radio frequency hardware part of e2600ac c1/c2, need to cooperate with the modified board.bin file, the device can work normally. Signed-off-by: 张 鹏 --- package/firmware/ipq-wifi/Makefile | 6 ++++-- .../ipq-wifi/board-qxwlan_e2600ac-c1.qca4019 | Bin 0 -> 24324 bytes .../ipq-wifi/board-qxwlan_e2600ac-c2.qca4019 | Bin 0 -> 36476 bytes .../arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts | 13 +++++++++++++ .../arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts | 13 +++++++++++++ .../arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi | 14 -------------- target/linux/ipq40xx/image/generic.mk | 4 ++-- 7 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 package/firmware/ipq-wifi/board-qxwlan_e2600ac-c1.qca4019 create mode 100644 package/firmware/ipq-wifi/board-qxwlan_e2600ac-c2.qca4019 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 5ee9d12919..b3b04c6abf 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -55,7 +55,8 @@ ALLWIFIBOARDS:= \ p2w_r619ac \ plasmacloud_pa1200 \ plasmacloud_pa2200 \ - qxwlan_e2600ac \ + qxwlan_e2600ac-c1 \ + qxwlan_e2600ac-c2 \ teltonika_rutx \ zte_mf286d @@ -148,7 +149,8 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3)) $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC)) $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200)) $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200)) -$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) +$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c1,Qxwlan E2600AC C1)) +$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac-c2,Qxwlan E2600AC C2)) $(eval $(call generate-ipq-wifi-package,teltonika_rutx,Teltonika RUTX)) $(eval $(call generate-ipq-wifi-package,zte_mf286d,ZTE MF286D)) diff --git a/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c1.qca4019 b/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c1.qca4019 new file mode 100644 index 0000000000000000000000000000000000000000..9eafff1aaa8a75c0babc881fd812de45ca8595f3 GIT binary patch literal 24324 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 + qcom,ath10k-calibration-variant = "Qxwlan-E2600AC-C1"; +}; + +&wifi1 { + status = "okay"; + nvmem-cell-names = "pre-calibration"; + nvmem-cells = <&precal_art_5000>; + qcom,ath10k-calibration-variant = "Qxwlan-E2600AC-C1"; +}; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts index ce54ce9f9b..1f88322a4f 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c2.dts @@ -124,3 +124,16 @@ }; }; +&wifi0 { + status = "okay"; + nvmem-cell-names = "pre-calibration"; + nvmem-cells = <&precal_art_1000>; + qcom,ath10k-calibration-variant = "Qxwlan-E2600AC-C2"; +}; + +&wifi1 { + status = "okay"; + nvmem-cell-names = "pre-calibration"; + nvmem-cells = <&precal_art_5000>; + qcom,ath10k-calibration-variant = "Qxwlan-E2600AC-C2"; +}; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi index 45681b19bb..5bfb758e50 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi @@ -254,17 +254,3 @@ &usb2_hs_phy { status = "okay"; }; - -&wifi0 { - status = "okay"; - nvmem-cell-names = "pre-calibration"; - nvmem-cells = <&precal_art_1000>; - qcom,ath10k-calibration-variant = "Qxwlan-E2600AC"; -}; - -&wifi1 { - status = "okay"; - nvmem-cell-names = "pre-calibration"; - nvmem-cells = <&precal_art_5000>; - qcom,ath10k-calibration-variant = "Qxwlan-E2600AC"; -}; diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk index 3354084a70..33c6def373 100644 --- a/target/linux/ipq40xx/image/generic.mk +++ b/target/linux/ipq40xx/image/generic.mk @@ -930,7 +930,7 @@ define Device/qxwlan_e2600ac-c1 KERNEL_SIZE := 4096k IMAGE_SIZE := 31232k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac + DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac-c1 DEFAULT := n endef TARGET_DEVICES += qxwlan_e2600ac-c1 @@ -945,7 +945,7 @@ define Device/qxwlan_e2600ac-c2 KERNEL_INSTALL := 1 BLOCKSIZE := 128k PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac + DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac-c2 endef TARGET_DEVICES += qxwlan_e2600ac-c2 -- 2.30.2