arm64: dts: qcom: sc7180: Move the fixed-perm property to SoC dtsi

All the platforms using SC7180 SoC are expected to have the wlan firmware
memory statically mapped by the Trusted Firmware. Hence move back the
qcom,msa-fixed-perm property to the SoC dtsi.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Fixes: 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node")
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/20200716191746.23196-1-sibis@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 860fc4658b8b1b0b2627d96a7b2b4e6f2b90b831..26cc4913d3ddc82ed8c70804bb3de9137989dbfe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -392,7 +392,6 @@
 
 &wifi {
        status = "okay";
-       qcom,msa-fixed-perm;
        vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>;
        vdd-1.8-xo-supply = <&vreg_l1c_1p8>;
        vdd-1.3-rfa-supply = <&vreg_l2c_1p3>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 126e2fce26c1a4438cc12269b49d44b751b878e7..a91d3f074625ef9ff0c83993db4026cbfa6583ca 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -3233,6 +3233,7 @@
                                <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
                                <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
                        memory-region = <&wlan_mem>;
+                       qcom,msa-fixed-perm;
                        status = "disabled";
                };
        };