diff options
| author | Sibi Sankar <sibis@codeaurora.org> | 2020-07-16 22:17:46 +0300 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-07-17 02:40:02 +0300 |
| commit | 4dc8ff06efa193a7644f7bf5cad37c2b6c53f93b (patch) | |
| tree | 88a6e677cf3ed99eda3e550f54d131323ecfc275 /arch/arm64/boot | |
| parent | 079f81acf10fcdadf2ddb4bf9755509b8bdc3504 (diff) | |
| download | linux-4dc8ff06efa193a7644f7bf5cad37c2b6c53f93b.tar.xz | |
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>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 860fc4658b8b..26cc4913d3dd 100644 --- 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 126e2fce26c1..a91d3f074625 100644 --- 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"; }; }; |