Merge "wcnss: Update the wcnss wlan module power up sequence"

1 files changed, 20 insertions, 4 deletions

diff --git a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
index 061c1d16ad24..46cbc5206be4 100644
--- a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
+++ b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
@@ -12,7 +12,7 @@ Required properties:
              "riva_ccu_base", "pronto_a2xb_base", "pronto_ccpu_base",
              "pronto_saw2_base", "wlan_tx_phy_aborts","wlan_brdg_err_source",
              "wlan_tx_status", "alarms_txctl", "alarms_tactl",
-             "pronto_mcu_base".
+             "pronto_mcu_base", "pronto_qfuse".
 - interupts: Pronto to Apps interrupts for tx done and rx pending.
 - qcom,pronto-vddmx-supply: regulator to supply pronto pll.
 - qcom,pronto-vddcx-supply: voltage corner regulator to supply WLAN/BT/FM
@@ -29,7 +29,7 @@ Required properties:
 - qcom,wcnss-vadc: VADC handle for battery voltage notification APIs.
 - pinctrl-<n> : Pinctrl states as described in bindings/pinctrl/pinctrl-bindings.txt
 - pinctrl-names : Names corresponding to the numbered pinctrl states
-- clocks: from common clock binding: handle to xo and rf_clk clocks.
+- clocks: from common clock binding: handle to xo, rf_clk and wcnss snoc clocks.
 - clock-names: Names of all the clocks that are accessed by the subsystem
 - qcom,vdd-voltage-level: This property represents (nominal, min, max) voltage
 for iris and pronto regulators in milli-volts.
@@ -39,11 +39,16 @@ iris and pronto regulators in micro-amps.
 Optional properties:
 - qcom,has-autodetect-xo: boolean flag to determine whether Iris XO auto detect
 should be performed during boot up.
+- qcom,snoc-wcnss-clock-freq: indicates the wcnss snoc clock frequency in Hz.
+If wcnss_snoc clock is specified in the list of clocks, this property needs
+to be set to make it functional.
 - qcom,wlan-rx-buff-count: WLAN RX buffer count is a configurable value,
 using a smaller count for this buffer will reduce the memory usage.
 - qcom,is-pronto-v3: boolean flag to determine the pronto hardware version
 in use. subsequently correct workqueue will be used by DXE engine to push frames
 in TX data path.
+- qcom,is-dual-band-disable: boolean flag to determine the WLAN dual band
+                             capability.
 - qcom,is-pronto-vadc: boolean flag to determine Battery voltage feature
 support for pronto hardware.
 - qcom,wcnss-pm : <Core rail LDO#, PA rail LDO#, XO settling time,
@@ -59,6 +64,10 @@ support for pronto hardware.
 to use for VBATT feature.
 - qcom,has-a2xb-split-reg: boolean flag to determine A2xb split timeout limit
 register is available or not.
+- qcom,wcn-external-gpio-support: boolean flag to determine 3.3v gpio support
+for pronto hardware for a target.
+- qcom,wcn-external-gpio: The wcnss wlan module 3.3v external GPIO for
+the pronto hardware.
 
 Example:
 
@@ -80,6 +89,8 @@ Example:
 
         gpios = <&msmgpio 36 0>, <&msmgpio 37 0>, <&msmgpio 38 0>,
                 <&msmgpio 39 0>, <&msmgpio 40 0>;
+        qcom,wcn-external-gpio = <&msmgpio 64 0>;
+        qcom,wcn-external-gpio-support;
         qcom,has-48mhz-xo;
         qcom,is-pronto-vt;
         qcom,wlan-rx-buff-count = <512>;
@@ -94,7 +105,12 @@ Example:
         clocks = <&clock_rpm clk_xo_wlan_clk>,
                    <&clock_rpm clk_rf_clk2>,
                    <&clock_debug clk_gcc_debug_mux>,
-                   <&clock_gcc clk_wcnss_m_clk>;
-        clock-names = "xo", "rf_clk", "measure", "wcnss_debug";
+                   <&clock_gcc clk_wcnss_m_clk>,
+		   <&clock_gcc clk_snoc_wcnss_a_clk>;
+
+        clock-names = "xo", "rf_clk", "measure", "wcnss_debug",
+			"snoc_wcnss";
+
+	qcom,snoc-wcnss-clock-freq = <200000000>;
 	qcom,wcnss-pm = <11 21 1200 1 1 6>;
     };