Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 849e1517 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/pfuze100',... 

Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona' and 'regulator/topic/as3722' into regulator-linus
parents 7cd94843 f2694383 2243cb41 baafdc1d a8659ba4 06e57b6c 71979aa3 fb04f1b0

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

0 → 100644
+60 −0
Original line number Diff line number Diff line 
ACT8865 regulator

-------------------



Required properties:

- compatible: "active-semi,act8865"

- reg: I2C slave address



Any standard regulator properties can be used to configure the single regulator.



The valid names for regulators are:

	DCDC_REG1, DCDC_REG2, DCDC_REG3, LDO_REG1, LDO_REG2, LDO_REG3, LDO_REG4.



Example:

--------



		i2c1: i2c@f0018000 {

			pmic: act8865@5b {

				compatible = "active-semi,act8865";

				reg = <0x5b>;

				status = "disabled";



				regulators {

					vcc_1v8_reg: DCDC_REG1 {

						regulator-name = "VCC_1V8";

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

						regulator-always-on;

					};



					vcc_1v2_reg: DCDC_REG2 {

						regulator-name = "VCC_1V2";

						regulator-min-microvolt = <1100000>;

						regulator-max-microvolt = <1300000>;

						regulator-suspend-mem-microvolt = <1150000>;

						regulator-suspend-standby-microvolt = <1150000>;

						regulator-always-on;

					};



					vcc_3v3_reg: DCDC_REG3 {

						regulator-name = "VCC_3V3";

						regulator-min-microvolt = <3300000>;

						regulator-max-microvolt = <3300000>;

						regulator-always-on;

					};



					vddana_reg: LDO_REG1 {

						regulator-name = "VDDANA";

						regulator-min-microvolt = <3300000>;

						regulator-max-microvolt = <3300000>;

						regulator-always-on;

					};



					vddfuse_reg: LDO_REG2 {

						regulator-name = "FUSE_2V5";

						regulator-min-microvolt = <2500000>;

						regulator-max-microvolt = <2500000>;

					};

				};

			};

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ as per the datasheet of s5m8767. 


	- LDOn

		  - valid values for n are 1 to 28

		  - Example: LDO0, LD01, LDO28

		  - Example: LDO1, LD02, LDO28

	- BUCKn

		  - valid values for n are 1 to 9.

		  - Example: BUCK1, BUCK2, BUCK9

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Device tree binding vendor prefix registry. Keep list in alphabetical order. 
This isn't an exhaustive list, but you should add new prefixes to it before

using them to avoid name-space collisions.



active-semi	Active-Semi International Inc

ad	Avionic Design GmbH

adi	Analog Devices, Inc.

aeroflexgaisler	Aeroflex Gaisler AB

drivers/regulator/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,14 @@ config REGULATOR_88PM8607 
	help

	  This driver supports 88PM8607 voltage regulator chips.



config REGULATOR_ACT8865

	tristate "Active-semi act8865 voltage regulator"

	depends on I2C

	select REGMAP_I2C

	help

	  This driver controls a active-semi act8865 voltage output

	  regulator via I2C bus.



config REGULATOR_AD5398

	tristate "Analog Devices AD5398/AD5821 regulators"

	depends on I2C

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o 
obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o

obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o

obj-$(CONFIG_REGULATOR_AB8500)	+= ab8500-ext.o ab8500.o

obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o

obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o

obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o

obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o