Unverified Commit a21da94f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-5.5' into regulator-next

parents c642e870 c15d5a64

Documentation/devicetree/bindings/mfd/da9062.txt

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ Sub-nodes: 
  details of individual regulator device can be found in:

  Documentation/devicetree/bindings/regulator/regulator.txt



  regulator-initial-mode may be specified for buck regulators using mode values

  from include/dt-bindings/regulator/dlg,da9063-regulator.h.



- rtc : This node defines settings required for the Real-Time Clock associated

  with the DA9062. There are currently no entries in this binding, however

  compatible = "dlg,da9062-rtc" should be added if a node is created.
@@ -96,6 +99,7 @@ Example: 
				regulator-max-microvolt = <1570000>;

				regulator-min-microamp = <500000>;

				regulator-max-microamp = <2000000>;

				regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>;

				regulator-boot-on;

			};

			DA9062_LDO1: ldo1 {

Documentation/devicetree/bindings/regulator/fixed-regulator.yaml

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ properties: 
    description: startup time in microseconds

    $ref: /schemas/types.yaml#/definitions/uint32



  off-on-delay-us:

    description: off delay time in microseconds

    $ref: /schemas/types.yaml#/definitions/uint32



  enable-active-high:

    description:

      Polarity of GPIO is Active high. If this property is missing,

Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ Supported regulator node names: 
	PM8150L:	smps1 - smps8, ldo1 - ldo11, bob, flash, rgb

	PM8998:		smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2

	PMI8998:	bob

	PM6150:         smps1 - smps5, ldo1 - ldo19

	PM6150L:        smps1 - smps8, ldo1 - ldo11, bob



========================

First Level Nodes - PMIC
@@ -43,6 +45,8 @@ First Level Nodes - PMIC 
		    "qcom,pm8150l-rpmh-regulators"

		    "qcom,pm8998-rpmh-regulators"

		    "qcom,pmi8998-rpmh-regulators"

		    "qcom,pm6150-rpmh-regulators"

		    "qcom,pm6150l-rpmh-regulators"



- qcom,pmic-id

	Usage:      required

Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt

+21 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Regulator nodes are identified by their compatible: 
		    "qcom,rpm-pm8841-regulators"

		    "qcom,rpm-pm8916-regulators"

		    "qcom,rpm-pm8941-regulators"

		    "qcom,rpm-pm8950-regulators"

		    "qcom,rpm-pm8994-regulators"

		    "qcom,rpm-pm8998-regulators"

		    "qcom,rpm-pma8084-regulators"
@@ -54,6 +55,26 @@ Regulator nodes are identified by their compatible: 
	Definition: reference to regulator supplying the input pin, as

		    described in the data sheet



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:

- vdd_s4-supply:

- vdd_s4-supply:

- vdd_s5-supply:

- vdd_s6-supply:

- vdd_l1_l19-supply:

- vdd_l2_l23-supply:

- vdd_l3-supply:

- vdd_l4_l5_l6_l7_l16-supply:

- vdd_l8_l11_l12_l17_l22-supply:

- vdd_l9_l10_l13_l14_l15_l18-supply:

- vdd_l20-supply:

- vdd_l21-supply:

	Usage: optional (pm8950 only)

	Value type: <phandle>

	Definition: reference to regulator supplying the input pin, as

		    described in the data sheet



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:

Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt

+25 −0
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ Qualcomm SPMI Regulators 
	Usage: required

	Value type: <string>

	Definition: must be one of:

			"qcom,pm8004-regulators"

			"qcom,pm8005-regulators"

			"qcom,pm8841-regulators"

			"qcom,pm8916-regulators"

			"qcom,pm8941-regulators"

			"qcom,pm8950-regulators"

			"qcom,pm8994-regulators"

			"qcom,pmi8994-regulators"

			"qcom,pms405-regulators"
@@ -72,6 +74,26 @@ Qualcomm SPMI Regulators 
	Definition: Reference to regulator supplying the input pin, as

		    described in the data sheet.



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:

- vdd_s4-supply:

- vdd_s4-supply:

- vdd_s5-supply:

- vdd_s6-supply:

- vdd_l1_l19-supply:

- vdd_l2_l23-supply:

- vdd_l3-supply:

- vdd_l4_l5_l6_l7_l16-supply:

- vdd_l8_l11_l12_l17_l22-supply:

- vdd_l9_l10_l13_l14_l15_l18-supply:

- vdd_l20-supply:

- vdd_l21-supply:

	Usage: optional (pm8950 only)

	Value type: <phandle>

	Definition: reference to regulator supplying the input pin, as

		    described in the data sheet



- vdd_s1-supply:

- vdd_s2-supply:

- vdd_s3-supply:
@@ -139,6 +161,9 @@ The regulator node houses sub-nodes for each regulator within the device. Each 
sub-node is identified using the node's name, with valid values listed for each

of the PMICs below.



pm8005:

	s2, s5



pm8005:

	s1, s2, s3, s4