qualcommax: ipq50xx: correct fw memory mode for ipq5018 and qcn6122 wifi

The reason fwmode 2 was used for ipq5018 and qcn6122 wifi was that
coldboot calibration doesn't work and causes the firmware to crach
during wifi bringup. Since coldboot calibration is now disabled in the
driver, all boards can now use their respective firmware memory mode, so
let's the property in all board DTS files accordingly.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19083
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts
index dc38c66e1155a1c75bcec3b909aee16d0caad648..b08d9235c7b52789e2a7c2b63a34b5a05b52989b 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts
@@ -417,7 +417,7 @@
        qcom,rproc = <&q6_wcss_pd1>;
        qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
        qcom,ath11k-calibration-variant = "GL-iNet-GL-B3000";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4c400000>;
 };
 
@@ -428,7 +428,7 @@
        qcom,rproc = <&q6_wcss_pd3>;
        qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
        qcom,ath11k-calibration-variant = "GL-iNet-GL-B3000";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4d100000>;
        qcom,m3-dump-addr = <0x4df00000>;
 };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
index 8505178a8f6f539836b6b47e119c1749dd27bbfd..508ca081b41de88859649b046ba4332780629825 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
@@ -375,7 +375,7 @@
        // IPQ5018
        qcom,rproc = <&q6_wcss_pd1>;
        qcom,ath11k-calibration-variant = "Linksys-MR5500";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4c400000>;
 
        status = "okay";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
index ce1040516490a636e7553f92c676e7371cf29a4e..5eaa84e3e640de0ae60bf91569e9a81a981ccd5e 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
@@ -238,7 +238,7 @@
        // IPQ5018
        qcom,rproc = <&q6_wcss_pd1>;
        qcom,ath11k-calibration-variant = "Linksys-MX2000";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4c400000>;
 
        status = "okay";
@@ -249,7 +249,7 @@
        qcom,rproc = <&q6_wcss_pd2>;
        qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
        qcom,ath11k-calibration-variant = "Linksys-MX2000";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4d100000>;
        qcom,m3-dump-addr = <0x4df00000>;
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
index 036fc63a9ff43c76b9d644d2f236e66d837de126..535f0ec10e4be028a80b92eddcf26188816ff0bb 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
@@ -223,7 +223,7 @@
        // IPQ5018
        qcom,rproc = <&q6_wcss_pd1>;
        qcom,ath11k-calibration-variant = "Linksys-MX5500";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4c400000>;
 
        status = "okay";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
index 84282daa9c99b8636a92feb4fda2309df6ce9ebd..7984f3f57a7e54ba1b121e3e03b0cd438367b44e 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
@@ -233,7 +233,7 @@
        // IPQ5018
        qcom,rproc = <&q6_wcss_pd1>;
        qcom,ath11k-calibration-variant = "Linksys-SPNMX56";
-       qcom,ath11k-fw-memory-mode = <2>;
+       qcom,ath11k-fw-memory-mode = <1>;
        qcom,bdf-addr = <0x4c400000>;
 
        status = "okay";