Merge "dt-bindings: pinctrl: qcom-pmic-gpio: add binding for PM7325B"

bindings/pinctrl/qcom,pmic-gpio.txt

@@ -41,6 +41,7 @@ PMIC's from Qualcomm.
 		    "qcom,pm8450-gpio"
 		    "qcom,pmx65-gpio"
 		    "qcom,pm7325-gpio"
+		    "qcom,pm7325b-gpio"
 		    "qcom,pm6450-gpio"
 		    "qcom,pm8550-gpio"
 		    "qcom,pmxr2230-gpio"
@@ -142,6 +143,8 @@ to specify in a pin configuration subnode:
 		    gpio1-gpio12 for pm6150l
 		    gpio1-gpio4 for pm8450
 		    gpio1-gpio16 for pmx65
+		    gpio1-gpio10 for pm7325
+		    gpio1-gpio8 for pm7325b
 
 - function:
 	Usage: required

bindings/regulator/qpnp-lcdb-regulator.txt

@@ -24,17 +24,13 @@ First Level Node - LCDB module
 			"qcom,lcdb-pm660"
 			"qcom,lcdb-pmi632"
 			"qcom,lcdb-pm6150l"
+			"qcom,lcdb-pm7325b"
 
 - reg
 	Usage:      required
 	Value type: <prop-encoded-array>
 	Definition:  Base address of the LCDB SPMI peripheral.
 
-- qcom,pmic-revid
-	Usage:      required
-	Value type: <phandle>
-	Definition:  Phandle to the PMIC's revid node
-
 - qcom,voltage-step-ramp
 	Usage:      optional
 	Value type: <bool>
@@ -43,12 +39,56 @@ First Level Node - LCDB module
 		     to be enabled only on platforms where voltage needs to
 		     be ramped up with multiple steps.
 
+- qcom,ncp-symmetry
+	Usage:      optional
+	Value type: <bool>
+	Definition:  Enabling this will make NCP voltage follow LDO voltage
+		     directly.
+
 - qcom,pwrdn-delay-ms
 	Usage:      optional
 	Value type: <u32>
 	Definition:  Required to control the LDO power down delay.
 		     Possible values are 0, 1, 4, 8.
 
+- qcom,pwrup-delay-ms
+	Usage:      optional
+	Value type: <u32>
+	Definition:  Required to control the LDO power up delay.
+		     Possible values are 0, 1, 4, 8.
+
+- qcom,pwrup-config
+	Usage:      optional
+	Value type: <u32>
+	Definition:  Controls the order of powering up BOOST, LDO AND NCP
+		     blocks. Applicable for PM7325B. Possible values are: 0, 1, 2, 3, 4.
+		     0 - Boost, LDO, NCP
+		     1 - Boost, LDO
+		     2 - Boost, NCP
+		     3 - Boost only
+		     4 - Boost, NCP, LDO
+
+- qcom,high-p2-blank-time-ns
+	Usage:      optional
+	Value type: <u32>
+	Definition:  Controls the higher clamp threshold for p2 minimum on time.
+		     Applicable for PM7325B. Possible values are 40, 69, 99, 129, 159,
+		     189, 220, 250.
+
+- qcom,low-p2-blank-time-ns
+	Usage:      optional
+	Value type: <u32>
+	Definition:  Controls the lower clamp threshold for p2 minimum on time.
+		     Applicable for PM7325B. Possible values are 40, 69, 99, 129, 159,
+		     189, 220, 250.
+
+- qcom,mpc-current-thr-ma
+	Usage:      optional
+	Value type: <u32>
+	Definition:  Controls the mpc threshold for inductor current after start up
+		     is done. Applicable for PM7325B. Possible values are 160, 200, 240,
+		     280, 320, 360, 400, 440.
+
 Touch-to-wake (TTW) properties:
 
 TTW supports 2 modes of operation - HW and SW. In the HW mode the enable/disable
@@ -141,8 +181,9 @@ Properties below are specific to LDO bias only.
 - qcom,ldo-ilim-ma
 	Usage:      optional
 	Value type:  <u32>
-	Definition:  Current limit (in mA) of the LDO bias.
-		     Possible values are 110, 160, 210, 260, 310, 360, 410, 460.
+	Definition:  Current limit (in mA) of the LDO bias. For PM7325B, possible
+		     values are 35, 175, 280, 420, 455, 595, 700, 840. For other PMICs,
+		     possible values are 110, 160, 210, 260, 310, 360, 410, 460.
 
 - qcom,ldo-soft-start-us
 	Usage:      optional
@@ -150,7 +191,6 @@ Properties below are specific to LDO bias only.
 	Definition:  Soft-start time (in uS) of the LDO bias.
 		     Possible values are 0, 500, 1000, 2000.
 
-
 NCP subnode properties:
 
 Properties below are specific to NCP bias only.
@@ -180,8 +220,9 @@ Properties below are specific to NCP bias only.
 - qcom,ncp-ilim-ma
 	Usage:      optional
 	Value type:  <u32>
-	Definition:  Current limit (in mA) of the NCP bias.
-		     Possible values are 260, 460, 640, 810.
+	Definition:  Current limit (in mA) of the NCP bias. For PM7325B, possible
+		     values are 700, 80, 900, 1000. For other PMICs, possible values
+		     are 260, 460, 640, 810.
 
 - qcom,ncp-soft-start-us
 	Usage:      optional
@@ -221,11 +262,19 @@ Properties below are specific to BOOST subnode only.
 	Definition: Current threshold (in mA) at which pulse-skip is entered.
 		    Possible values are 50, 60, 70, 80.
 
+- qcom,bst-ps-threshold-mv
+	Usage:      optional
+	Value type:  <u32>
+	Definition: Current threshold (in mv) at which pulse-skip is entered.
+		    Applicable for PM7325B. Possible values are 360, 384, 408, 432,
+		    456, 480, 504, 528.
+
 - qcom,bst-ilim-ma
 	Usage:      optional
 	Value type:  <u32>
-	Definition:  Current limit (in mA) of the BOOST rail.
-		     Possible values are 200 to 1600mA in 200mA steps.
+	Definition:  Current limit (in mA) of the BOOST rail. For PM7325B, possible
+		     possible values are 1130 to 2250mA in 160mA steps. For other PMICs,
+		     possible values are 200 to 1600mA in 200mA steps.
 
 - qcom,bst-headroom-mv
 	Usage:      optional