diff --git a/bindings/cnss/cnss-wlan.txt b/bindings/cnss/cnss-wlan.txt index f9ab0e0b90a4..73828aaebeb9 100644 --- a/bindings/cnss/cnss-wlan.txt +++ b/bindings/cnss/cnss-wlan.txt @@ -12,6 +12,7 @@ provides the reserved RAM dump memory location and size. Required properties: - compatible: "qcom,cnss" for QCA6174 device + "qcom,cnss_sdio" for TF device "qcom,cnss-qca6290" for QCA6290 device "qcom,cnss-qca6390" for QCA6390 device "qcom,cnss-qca6490" for QCA6490 device diff --git a/qcom/sdxnightjar-cnss.dtsi b/qcom/sdxnightjar-cnss.dtsi new file mode 100644 index 000000000000..5d4c7bd08918 --- /dev/null +++ b/qcom/sdxnightjar-cnss.dtsi @@ -0,0 +1,41 @@ + +&soc { + cnss_pcie: qcom,cnss { + compatible = "qcom,cnss"; + wlan-en-gpio = <&tlmm_pinmux 95 0>; + vdd-wlan-supply = <&rome_vreg>; + vdd-wlan-xtal-supply = <&pmd9650_l5>; + vdd-wlan-io-supply = <&pmd9650_l6>; + vdd-wlan-xtal-aon-supply = <&pmd9650_l4>; + qcom,notify-modem-status; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x200000>; + + qcom,msm-bus,name = "msm-cnss"; + qcom,msm-bus,num-cases = <4>; + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-KBps = + <45 512 0 0>, <1 512 0 0>, + /* Upto 200 Mbps */ + <45 512 41421 655360>, <1 512 41421 655360>, + /* Upto 400 Mbps */ + <45 512 98572 655360>, <1 512 98572 1600000>, + /* Upto 800 Mbps */ + <45 512 207108 1146880>, <1 512 207108 3124992>; + }; + + cnss_sdio: qcom,cnss_sdio { + compatible = "qcom,cnss_sdio"; + subsys-name = "AR6320_SDIO"; + vdd-wlan-xtal-supply = <&pmd9650_l5>; + vdd-wlan-io-supply = <&pmd9650_l6>; + qcom,wlan-ramdump-dynamic = <0x200000>; + pinctrl-names = "active", "sleep"; + pinctrl-0 = <&cnss_sdio_active>; + pinctrl-1 = <&cnss_sdio_sleep>; + qcom,is-antenna-shared; + }; +}; diff --git a/qcom/sdxnightjar-pinctrl.dtsi b/qcom/sdxnightjar-pinctrl.dtsi index ac2ca4510732..6f34c29c1b38 100644 --- a/qcom/sdxnightjar-pinctrl.dtsi +++ b/qcom/sdxnightjar-pinctrl.dtsi @@ -1400,4 +1400,15 @@ qcom,pull-up-strength = ; /* Pull up 1.5 uA */ power-source = <1>; /* 1.8 V */ }; + + gpio@c500 { /* GPIO 6 - Rome 3.3V control */ + status = "ok"; + qcom,mode = <1>; /* Digital output*/ + qcom,output-type = <0>; /* CMOS logic */ + qcom,invert = <1>; /* Output high */ + qcom,vin-sel = <0>; /* VPH_PWR */ + qcom,src-sel = <0>; /* Constant */ + qcom,out-strength = <1>; /* High drive strength */ + qcom,master-en = <1>; /* Enable GPIO */ + }; }; diff --git a/qcom/sdxnightjar-regulator.dtsi b/qcom/sdxnightjar-regulator.dtsi index 3de4186dbb5b..d381a0a2996a 100644 --- a/qcom/sdxnightjar-regulator.dtsi +++ b/qcom/sdxnightjar-regulator.dtsi @@ -263,7 +263,7 @@ regulator-name = "rome_vreg"; startup-delay-us = <4000>; enable-active-high; - gpio = <&pmd9650_gpios 6 0>; + gpios = <&pmd9650_gpios 6 0>; }; /* SD card 2.95 V supply */ diff --git a/qcom/sdxnightjar.dtsi b/qcom/sdxnightjar.dtsi index 65b5885279f7..00ea3f6a2f57 100644 --- a/qcom/sdxnightjar.dtsi +++ b/qcom/sdxnightjar.dtsi @@ -1022,6 +1022,7 @@ #include "sdxnightjar-pinctrl.dtsi" #include "sdxnightjar-ion.dtsi" #include "sdxnightjar-blsp.dtsi" +#include "sdxnightjar-cnss.dtsi" #include "sdxnightjar-pcie.dtsi" &i2c_3 {