arm64: dts: qcom: msm8998: Add wifi node

Add the wifi node and required reserved memory to enable the wlan
hardware.  Enable the wifi node in both the mtp and clamshell platforms
after adding the relevant regulators for each platform.

Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Link: https://lore.kernel.org/r/20191107043313.4055-3-jeffrey.l.hugo@gmail.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
index 6138b58db6d2ccf3d67b337bc01427ea29ecf8e2..0f84fa0894a4f41a28f56df6c8ea2d06129564ad 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi
@@ -292,3 +292,12 @@ &usb3phy {
        vdda-phy-supply = <&vreg_l1a_0p875>;
        vdda-pll-supply = <&vreg_l2a_1p2>;
 };
+
+&wifi {
+       status = "okay";
+
+       vdd-0.8-cx-mx-supply = <&vreg_l5a_0p8>;
+       vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
+       vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
+       vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
index 5f101a20a20a23a1364a9ecc05cb8b5f6cd5d8bc..1220756fb5b3134386b66174655310a57f7c892d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
@@ -364,3 +364,12 @@ &usb3phy {
        vdda-phy-supply = <&vreg_l1a_0p875>;
        vdda-pll-supply = <&vreg_l2a_1p2>;
 };
+
+&wifi {
+       status = "okay";
+
+       vdd-0.8-cx-mx-supply = <&vreg_l5a_0p8>;
+       vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
+       vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
+       vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index d5263e4f64ce8ef163020d0a9b1c9932b557104b..e624f0323d23c2f1ababfb79fa7f89aec874f824 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -43,6 +43,11 @@ memory@86200000 {
                        no-map;
                };
 
+               wlan_msa_mem: memory@95700000 {
+                       reg = <0x0 0x95700000 0x0 0x100000>;
+                       no-map;
+               };
+
                rmtfs {
                        compatible = "qcom,rmtfs-mem";
 
@@ -1889,6 +1894,32 @@ intc: interrupt-controller@17a00000 {
                        redistributor-stride = <0x0 0x20000>;
                        interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
                };
+
+               wifi: wifi@18800000 {
+                       compatible = "qcom,wcn3990-wifi";
+                       status = "disabled";
+                       reg = <0x18800000 0x800000>;
+                       reg-names = "membase";
+                       memory-region = <&wlan_msa_mem>;
+                       clocks = <&rpmcc RPM_SMD_RF_CLK2_PIN>;
+                       clock-names = "cxo_ref_clk_pin";
+                       interrupts =
+                               <GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
+                               <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
+                       iommus = <&anoc2_smmu 0x1900>,
+                                <&anoc2_smmu 0x1901>;
+                       qcom,snoc-host-cap-8bit-quirk;
+               };
        };
 };