Commit eb76d840 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/max77686',... 

Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max8973', 'regulator/topic/maxim', 'regulator/topic/palmas' and 'regulator/topic/pv88080' into regulator-next
parents ce59dedf a9597305 d2d5437b 724fef53 6c7d614f 99cf3af5

Documentation/devicetree/bindings/regulator/max8973-regulator.txt

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ Optional properties: 


Enhanced transient response (ETR) will affect the configuration of CKADV.



-junction-warn-millicelsius: u32, junction warning temperature threshold

		in millicelsius. If die temperature crosses this level then

		device generates the warning interrupts.



Please note that thermal functionality is only supported on MAX77621. The

supported threshold warning temperature for MAX77621 are 120 degC and 140 degC.



Example:



	max8973@1b {

Documentation/devicetree/bindings/regulator/pv88080.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
* Powerventure Semiconductor PV88080 Voltage Regulator



Required properties:

- compatible: "pvs,pv88080".

- reg: I2C slave address, usually 0x49.

- interrupts: the interrupt outputs of the controller

- regulators: A node that houses a sub-node for each regulator within the

  device. Each sub-node is identified using the node's name, with valid

  values listed below. The content of each sub-node is defined by the

  standard binding for regulators; see regulator.txt.

  BUCK1, BUCK2, and BUCK3.



Optional properties:

- Any optional property defined in regulator.txt



Example



	pmic: pv88080@49 {

		compatible = "pvs,pv88080";

		reg = <0x49>;

		interrupt-parent = <&gpio>;

		interrupts = <24 24>;



		regulators {

			BUCK1 {

				regulator-name = "buck1";

				regulator-min-microvolt = < 600000>;

				regulator-max-microvolt = <1393750>;

				regulator-min-microamp 	= < 220000>;

				regulator-max-microamp 	= <7040000>;

			};



			BUCK2 {

				regulator-name = "buck2";

				regulator-min-microvolt = < 600000>;

				regulator-max-microvolt = <1393750>;

				regulator-min-microamp 	= <1496000>;

				regulator-max-microamp 	= <4189000>;

			};



			BUCK3 {

				regulator-name = "buck3";

				regulator-min-microvolt = <1400000>;

				regulator-max-microvolt = <2193750>;

				regulator-min-microamp 	= <1496000>;

				regulator-max-microamp 	= <4189000>;

			};

		};

	};

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7020,9 +7020,9 @@ M: Chanwoo Choi <cw00.choi@samsung.com> 
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	drivers/*/max14577.c

F:	drivers/*/max14577*.c

F:	drivers/*/max77686*.c

F:	drivers/*/max77693.c

F:	drivers/*/max77693*.c

F:	drivers/extcon/extcon-max14577.c

F:	drivers/extcon/extcon-max77693.c

F:	drivers/rtc/rtc-max77686.c

drivers/regulator/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ config REGULATOR_MAX8952 
config REGULATOR_MAX8973

	tristate "Maxim MAX8973 voltage regulator "

	depends on I2C

	depends on THERMAL && THERMAL_OF

	select REGMAP_I2C

	help

	  The MAXIM MAX8973 high-efficiency. three phase, DC-DC step-down
@@ -557,6 +558,13 @@ config REGULATOR_PV88060 
	  Say y here to support the voltage regulators and convertors

	  PV88060



config REGULATOR_PV88080

	tristate "Powerventure Semiconductor PV88080 regulator"

	depends on I2C

	select REGMAP_I2C

	help

	  Say y here to support the buck convertors on PV88080



config REGULATOR_PV88090

	tristate "Powerventure Semiconductor PV88090 regulator"

	depends on I2C

drivers/regulator/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o 
obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o

obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o

obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o

obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o

obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o

obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o

obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o

obj-$(CONFIG_REGULATOR_MAX8649)	+= max8649.o
@@ -56,10 +56,10 @@ obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o 
obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o

obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o

obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o

obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o

obj-$(CONFIG_REGULATOR_MAX8997) += max8997-regulator.o

obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o

obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o

obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o

obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o

obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o

obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o

obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
@@ -72,6 +72,7 @@ obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o 
obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o

obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o

obj-$(CONFIG_REGULATOR_PV88060) += pv88060-regulator.o

obj-$(CONFIG_REGULATOR_PV88080) += pv88080-regulator.o

obj-$(CONFIG_REGULATOR_PV88090) += pv88090-regulator.o

obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o

obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o