Unverified Commit 24bd2afd authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-5.7' into regulator-next

parents bae4cb90 86332c34

Documentation/devicetree/bindings/mfd/qcom-rpm.txt

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

		    "qcom,rpm-pm8921-regulators"

		    "qcom,rpm-pm8018-regulators"

		    "qcom,rpm-smb208-regulators"



- vdd_l0_l1_lvs-supply:

- vdd_l2_l11_l12-supply:
@@ -171,6 +172,9 @@ pm8018: 
	s1, s2, s3, s4, s5, , l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,

	l12, l14, lvs1



smb208:

	s1a, s1b, s2a, s2b



The content of each sub-node is defined by the standard binding for regulators -

see regulator.txt - with additional custom properties described below:

Documentation/devicetree/bindings/regulator/mp886x.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Monolithic Power Systems MP8867/MP8869 voltage regulator



Required properties:

- compatible: Must be one of the following.

	"mps,mp8867"

	"mps,mp8869"

- reg: I2C slave address.

- enable-gpios: enable gpios.

- mps,fb-voltage-divider: An array of two integers containing the resistor

  values R1 and R2 of the feedback voltage divider in kilo ohms.



Any property defined as part of the core regulator binding, defined in

./regulator.txt, can also be used.



Example:



	vcpu: regulator@62 {

		compatible = "mps,mp8869";

		regulator-name = "vcpu";

		regulator-min-microvolt = <700000>;

		regulator-max-microvolt = <850000>;

		regulator-always-on;

		regulator-boot-on;

		enable-gpios = <&porta 1 GPIO_ACTIVE_LOW>;

		mps,fb-voltage-divider = <80 240>;

		reg = <0x62>;

	};

Documentation/devicetree/bindings/regulator/mps,mp5416.yaml

0 → 100644
+78 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/regulator/mps,mp5416.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Monolithic Power System MP5416 PMIC



maintainers:

  - Saravanan Sekar <sravanhome@gmail.com>



properties:

  $nodename:

    pattern: "^pmic@[0-9a-f]{1,2}$"

  compatible:

    enum:

      - mps,mp5416



  reg:

    maxItems: 1



  regulators:

    type: object

    description: |

      list of regulators provided by this controller, must be named

      after their hardware counterparts BUCK[1-4] and LDO[1-4]



    patternProperties:

      "^buck[1-4]$":

        allOf:

          - $ref: "regulator.yaml#"

        type: object



      "^ldo[1-4]$":

        allOf:

          - $ref: "regulator.yaml#"

        type: object



    additionalProperties: false

  additionalProperties: false



required:

  - compatible

  - reg

  - regulators



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        pmic@69 {

          compatible = "mps,mp5416";

          reg = <0x69>;



          regulators {



            buck1 {

             regulator-name = "buck1";

             regulator-min-microvolt = <600000>;

             regulator-max-microvolt = <2187500>;

             regulator-min-microamp  = <3800000>;

             regulator-max-microamp  = <6800000>;

             regulator-boot-on;

            };



            ldo2 {

             regulator-name = "ldo2";

             regulator-min-microvolt = <800000>;

             regulator-max-microvolt = <3975000>;

            };

         };

       };

     };

...

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

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

		    "qcom,rpm-pm8998-regulators"

		    "qcom,rpm-pma8084-regulators"

		    "qcom,rpm-pmi8994-regulators"

		    "qcom,rpm-pmi8998-regulators"

		    "qcom,rpm-pms405-regulators"
@@ -143,6 +144,15 @@ 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_bst_byp-supply:

	Usage: optional (pmi8994 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:
@@ -259,6 +269,9 @@ pma8084: 
	l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,

	l21, l22, l23, l24, l25, l26, l27, lvs1, lvs2, lvs3, lvs4, 5vs1



pmi8994:

	s1, s2, s3, boost-bypass



pmi8998:

	bob

Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/regulator/vqmmc-ipq4019-regulator.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm IPQ4019 VQMMC SD LDO regulator



maintainers:

  - Robert Marko <robert.marko@sartura.hr>



description: |

  Qualcomm IPQ4019 SoC-s feature a built a build SD/EMMC controller,

  in order to support both 1.8 and 3V I/O voltage levels an LDO

  controller is also embedded.



allOf:

  - $ref: "regulator.yaml#"



properties:

  compatible:

    const: qcom,vqmmc-ipq4019-regulator



  reg:

    maxItems: 1



required:

  - compatible

  - reg



examples:

  - |

    regulator@1948000 {

      compatible = "qcom,vqmmc-ipq4019-regulator";

      reg = <0x01948000 0x4>;

      regulator-name = "vqmmc";

      regulator-min-microvolt = <1500000>;

      regulator-max-microvolt = <3000000>;

      regulator-always-on;

      status = "disabled";

    };

...