diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-14 04:01:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-14 04:01:11 -0700 |
| commit | bd63fad4d186a8fddd191b1bdb262b938d01d6fe (patch) | |
| tree | f311cb4845f6647dd546ffc2a694b60e2deb7a00 | |
| parent | 5c64544466596a6b1cb0714ff117ee92907115df (diff) | |
| parent | d8e33bd35188cda259cb9127ec73e07ae938c676 (diff) | |
Merge "ARM: dts: msm: Use wlan carveout region for sdm660/sdm630"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm630.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660.dtsi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi index 8ca0b94403cb..cff3aa809488 100644 --- a/arch/arm/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm/boot/dts/qcom/sdm630.dtsi @@ -1689,6 +1689,7 @@ qcom,vdd-1.3-rfa-config = <1200000 1370000>; qcom,vdd-3.3-ch0-config = <3200000 3400000>; qcom,wlan-msa-memory = <0x100000>; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; qcom,smmu-s1-bypass; }; diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi index 8158825264c2..f14c9a32c2f9 100644 --- a/arch/arm/boot/dts/qcom/sdm660.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660.dtsi @@ -1940,6 +1940,7 @@ qcom,vdd-1.3-rfa-config = <1200000 1370000>; qcom,vdd-3.3-ch0-config = <3200000 3400000>; qcom,wlan-msa-memory = <0x100000>; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; qcom,smmu-s1-bypass; }; |