Unverified Commit 6dfae59d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/for-next' into tmp

parents 1ba0b52e 24bd2afd

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/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";

    };

...

drivers/regulator/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -635,6 +635,13 @@ config REGULATOR_MP8859 
	  Say M here if you want to include support for the regulator as a

	  module. The module will be named "mp8859".



config REGULATOR_MP886X

	tristate "MPS MP8869 regulator driver"

	depends on I2C && (OF || COMPILE_TEST)

	select REGMAP_I2C

	help

	  This driver supports the MP8869 voltage regulator.



config REGULATOR_MPQ7920

	tristate "Monolithic MPQ7920 PMIC"

	depends on I2C && OF

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o 
obj-$(CONFIG_REGULATOR_MCP16502) += mcp16502.o

obj-$(CONFIG_REGULATOR_MP5416) += mp5416.o

obj-$(CONFIG_REGULATOR_MP8859) += mp8859.o

obj-$(CONFIG_REGULATOR_MP886X) += mp886x.o

obj-$(CONFIG_REGULATOR_MPQ7920) += mpq7920.o

obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o

obj-$(CONFIG_REGULATOR_MT6323)	+= mt6323-regulator.o