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

Commit 15333539 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator updates from Mark Brown:
 "A respin of the merges in the previous pull request with one extra
  fix.

  A quiet release for the regulator API, quite a large number of small
  improvements all over but other than the addition of new drivers for
  the AS3722 and MAX14577 there is nothing of substantial non-local
  impact"

* tag 'regulator-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (47 commits)
  regulator: pfuze100-regulator: Improve dev_info() message
  regulator: pfuze100-regulator: Fix some checkpatch complaints
  regulator: twl: Fix checkpatch issue
  regulator: core: Fix checkpatch issue
  regulator: anatop-regulator: Remove unneeded memset()
  regulator: s5m8767: Update LDO index in s5m8767-regulator.txt
  regulator: as3722: set enable time for SD0/1/6
  regulator: as3722: detect SD0 low-voltage mode
  regulator: tps62360: Fix up a pointer-integer size mismatch warning
  regulator: anatop-regulator: Remove unneeded kstrdup()
  regulator: act8865: Fix build error when !OF
  regulator: act8865: register all regulators regardless of how many are used
  regulator: wm831x-dcdc: Remove unneeded 'err' label
  regulator: anatop-regulator: Add MODULE_ALIAS()
  regulator: act8865: fix incorrect devm_kzalloc for act8865
  regulator: act8865: Remove set_suspend_[en|dis]able implementation
  regulator: act8865: Remove unneeded regulator_unregister() calls
  regulator: s2mps11: Clean up redundant code
  regulator: tps65910: Simplify setting enable_mask for regulators
  regulator: act8865: add device tree binding doc
  ...
parents bb1b6490 07b19808

Documentation/devicetree/bindings/mfd/tps65910.txt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Required properties: 


  The valid regulator-compatible values are:

  tps65910: vrtc, vio, vdd1, vdd2, vdd3, vdig1, vdig2, vpll, vdac, vaux1,

            vaux2, vaux33, vmmc

            vaux2, vaux33, vmmc, vbb

  tps65911: vrtc, vio, vdd1, vdd3, vddctrl, ldo1, ldo2, ldo3, ldo4, ldo5,

            ldo6, ldo7, ldo8
@@ -38,7 +38,7 @@ Required properties: 
	vcc4-supply: VAUX1 and VAUX2 input.

	vcc5-supply: VPLL and VDAC input.

	vcc6-supply: VDIG1 and VDIG2 input.

	vcc7-supply: VRTC input.

	vcc7-supply: VRTC and VBB input.

	vccio-supply: VIO input.

  tps65911:

	vcc1-supply: VDD1 input.

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/mfd/pcf50633-core.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int pcf50633_probe(struct i2c_client *client, 
	for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {

		struct platform_device *pdev;



		pdev = platform_device_alloc("pcf50633-regltr", i);

		pdev = platform_device_alloc("pcf50633-regulator", i);

		if (!pdev) {

			dev_err(pcf->dev, "Cannot create regulator %d\n", i);

			continue;