Merge branches 'topic/tps51632', 'topic/tps80031', 'topic/vexpress',... (f86221d2) · Commits · e / devices / android_kernel_xiaomi_markw

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

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		GPIO controlled regulators

		Required properties:
		- compatible : Must be "regulator-gpio".
		- states : Selection of available voltages and GPIO configs.
		if there are no states, then use a fixed regulator

		Optional properties:
		- enable-gpio : GPIO to use to enable/disable the regulator.
		- gpios : GPIO group used to control voltage.
		- startup-delay-us : Startup time in microseconds.
		- enable-active-high : Polarity of GPIO is active high (default is low).

		Any property defined as part of the core regulator binding defined in
		regulator.txt can also be used.

		Example:

		mmciv: gpio-regulator {
		compatible = "regulator-gpio";

		regulator-name = "mmci-gpio-supply";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2600000>;
		regulator-boot-on;

		enable-gpio = <&gpio0 23 0x4>;
		gpios = <&gpio0 24 0x4
		&gpio0 25 0x4>;
		states = <1800000 0x3
		2200000 0x2
		2600000 0x1
		2900000 0x0>;

		startup-delay-us = <100000>;
		enable-active-high;
		};

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

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		Max8925 Voltage regulators

		Required nodes:
		-nodes:
		- SDV1 for SDV SDV1
		- SDV2 for SDV SDV2
		- SDV3 for SDV SDV3
		- LDO1 for LDO LDO1
		- LDO2 for LDO LDO2
		- LDO3 for LDO LDO3
		- LDO4 for LDO LDO4
		- LDO5 for LDO LDO5
		- LDO6 for LDO LDO6
		- LDO7 for LDO LDO7
		- LDO8 for LDO LDO8
		- LDO9 for LDO LDO9
		- LDO10 for LDO LDO10
		- LDO11 for LDO LDO11
		- LDO12 for LDO LDO12
		- LDO13 for LDO LDO13
		- LDO14 for LDO LDO14
		- LDO15 for LDO LDO15
		- LDO16 for LDO LDO16
		- LDO17 for LDO LDO17
		- LDO18 for LDO LDO18
		- LDO19 for LDO LDO19
		- LDO20 for LDO LDO20

		Optional properties:
		- Any optional property defined in bindings/regulator/regulator.txt

		Example:

		SDV1 {
		regulator-min-microvolt = <637500>;
		regulator-max-microvolt = <1425000>;
		regulator-boot-on;
		regulator-always-on;
		};

Documentation/devicetree/bindings/regulator/vexpress.txt

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		Versatile Express voltage regulators
		------------------------------------

		Requires node properties:
		- "compatible" value: "arm,vexpress-volt"
		- "arm,vexpress-sysreg,func" when controlled via vexpress-sysreg
		(see Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
		for more details)

		Required regulator properties:
		- "regulator-name"
		- "regulator-always-on"

		Optional regulator properties:
		- "regulator-min-microvolt"
		- "regulator-max-microvolt"

		See Documentation/devicetree/bindings/regulator/regulator.txt
		for more details about the regulator properties.

		When no "regulator-[min\|max]-microvolt" properties are defined,
		the device is treated as fixed (or rather "read-only") regulator.

		Example:
		volt@0 {
		compatible = "arm,vexpress-volt";
		arm,vexpress-sysreg,func = <2 0>;
		regulator-name = "Cores";
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <1050000>;
		regulator-always-on;
		};

drivers/regulator/Kconfig

+27 −0

Original line number	Diff line number	Diff line
		@@ -335,6 +335,17 @@ config REGULATOR_PALMAS
		on the muxing. This is handled automatically in the driver by
		reading the mux info from OTP.

		config REGULATOR_TPS51632
		tristate "TI TPS51632 Power Regulator"
		depends on I2C
		select REGMAP_I2C
		help
		This driver supports TPS51632 voltage regulator chip.
		The TPS51632 is 3-2-1 Phase D-Cap+ Step Down Driverless Controller
		with Serial VID control and DVFS.
		The voltage output can be configure through I2C interface or PWM
		interface.

		config REGULATOR_TPS6105X
		tristate "TI TPS6105X Power regulators"
		depends on TPS6105X
		@@ -415,6 +426,15 @@ config REGULATOR_TPS65912
		help
		This driver supports TPS65912 voltage regulator chip.

		config REGULATOR_TPS80031
		tristate "TI TPS80031/TPS80032 power regualtor driver"
		depends on MFD_TPS80031
		help
		TPS80031/ TPS80032 Fully Integrated Power Management with Power
		Path and Battery Charger. It has 5 configurable step-down
		converters, 11 general purpose LDOs, VBUS generator and digital
		output to control regulators.

		config REGULATOR_TWL4030
		bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC"
		depends on TWL4030_CORE
		@@ -422,6 +442,13 @@ config REGULATOR_TWL4030
		This driver supports the voltage regulators provided by
		this family of companion chips.

		config REGULATOR_VEXPRESS
		tristate "Versatile Express regulators"
		depends on VEXPRESS_CONFIG
		help
		This driver provides support for voltage regulators available
		on the ARM Ltd's Versatile Express platform.

		config REGULATOR_WM831X
		tristate "Wolfson Microelectronics WM831x PMIC regulators"
		depends on MFD_WM831X

drivers/regulator/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
		obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
		obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
		obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
		obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
		obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
		obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
		obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o
		@@ -56,7 +57,9 @@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o
		obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
		obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
		obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
		obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
		obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
		obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
		obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
		obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
		obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o