Merge "ARM: dts: msm: Use wlan carveout region for sdm660/sdm630"

diff --combined arch/arm/boot/dts/qcom/sdm630.dtsi
index 8ca0b94,7448b13..cff3aa8
--- 1/arch/arm/boot/dts/qcom/sdm630.dtsi
--- 2/arch/arm/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630.dtsi
@@@ -1304,18 -1304,9 +1304,18 @@@
                compatible = "qcom,clk-cpu-osm-sdm630";
                reg = <0x179c0000 0x4000>, <0x17916000 0x1000>,
                        <0x17816000 0x1000>, <0x179d1000 0x1000>,
 -                      <0x00784130 0x8>;
 +                      <0x00784130 0x8>, <0x17914800 0x800>,
 +                      <0x17814800 0x800>;
                reg-names = "osm", "pwrcl_pll", "perfcl_pll",
 -                      "apcs_common", "perfcl_efuse";
 +                      "apcs_common", "perfcl_efuse",
 +                      "pwrcl_acd", "perfcl_acd";
 +
 +              qcom,acdtd-val = <0x0000a111 0x0000a111>;
 +              qcom,acdcr-val = <0x002c5ffd 0x002c5ffd>;
 +              qcom,acdsscr-val = <0x00000901 0x00000901>;
 +              qcom,acdextint0-val = <0x2cf9ae8 0x2cf9ae8>;
 +              qcom,acdextint1-val = <0x2cf9afe 0x2cf9afe>;
 +              qcom,acdautoxfer-val = <0x00000015 0x00000015>;
  
                vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;
                vdd-perfcl-supply = <&apc1_perfcl_vreg>;
@@@ -1689,6 -1680,7 +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;
        };