ipq40xx: update E2600AC c1/c2 board

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: 张 鹏 <sd20@qxwlan.com>
(cherry picked from commit bdc786e82c13547b01bd8f699d00598a974c14f6)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 9842725be29458c581b551f5f2e7460cc29b6818..ee5d89bb3537ae2064f6c06b8ec9083f2383cc25 100644 (file)
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -54,7 +54,8 @@ ALLWIFIBOARDS:= \
        p2w_r619ac \
        plasmacloud_pa1200 \
        plasmacloud_pa2200 \
-       qxwlan_e2600ac \
+       qxwlan_e2600ac-c1 \
+       qxwlan_e2600ac-c2 \
        teltonika_rutx \
        zte_mf286d
 
@@ -146,7 +147,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 (file)
index 0000000..9eafff1
Binary files /dev/null and b/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c1.qca4019 differ

diff --git a/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c2.qca4019 b/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c2.qca4019
new file mode 100644 (file)
index 0000000..256f3e5
Binary files /dev/null and b/package/firmware/ipq-wifi/board-qxwlan_e2600ac-c2.qca4019 differ

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts
index a50ee4a84ef1c85522c5086a6dbeffed3ea81e00..f9205c28fa4f9d9f1e5ea03af72b26ff8b1342e7 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac-c1.dts
@@ -89,3 +89,16 @@
        };
 };
 
+&wifi0 {
+       status = "okay";
+       nvmem-cell-names = "pre-calibration";
+       nvmem-cells = <&precal_art_1000>;
+       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 ce54ce9f9bfefd0f9d02434f3ef513b2a8c03f0f..1f88322a4f1e8c84949964569d4453a7bf84bcec 100644 (file)
--- 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 45681b19bb0199a9d2707fc7730cd63bf116a82d..5bfb758e50dc5242f4f565ddcbf7f1b1995aa037 100644 (file)
--- 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 94b00f833a5c5c0dfc9f16353db0c5859def047e..d5ec18feac2924372b11e571e6ad503a7c5d9346 100644 (file)
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -928,7 +928,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
@@ -943,7 +943,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