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

Commit 52787e91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator updates from Mark Brown:
 "This is quite a quiet release in terms of volume of patches but it
  includes a couple of really nice core changes - the work Sascha has
  done in particular is something I've wanted to get done for a long
  time but just never got round to myself.

  Highlights include:

   - Support from Sascha Hauer for setting the voltage of parent
     supplies based on requests from their children.  This is used both
     to allow set_voltage() to work through a dumb switch and to improve
     the efficiency of systems where DCDCs are used to supply LDOs by
     minimising the voltage drop over the LDOs.

   - Removal of regulator_list by Tomeu Vizoso, meaning we're not
     duplicating the device list maintained by the driver core.

   - Support for Wolfson/Cirrus WM8998 and WM1818"

* tag 'regulator-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (29 commits)
  regulator: Use regulator_lock_supply() for get_voltage() too
  regulator: arizona: Add regulator specific device tree binding document
  regulator: stw481x: compile on COMPILE_TEST
  regulator: qcom-smd: Correct set_load() unit
  regulator: core: Propagate voltage changes to supply regulators
  regulator: core: Factor out regulator_map_voltage
  regulator: i.MX anatop: Allow supply regulator
  regulator: introduce min_dropout_uV
  regulator: core: create unlocked version of regulator_set_voltage
  regulator: arizona-ldo1: Fix handling of GPIO 0
  regulator: da9053: Update regulator for DA9053 BC silicon support
  regulator: max77802: Separate sections for nodes and properties
  regulator: max77802: Add input supply properties to DT binding doc
  regulator: axp20x: set supply names for AXP22X DC1SW/DC5LDO internally
  regulator: axp20x: Drop AXP221 DC1SW and DC5LDO regulator supplies from bindings
  mfd: tps6105x: Use i2c regmap to access registers
  regulator: act8865: add DT binding for property "active-semi,vsel-high"
  regulator: act8865: support output voltage by VSET2[] bits
  regulator: arizona: add support for WM8998 and WM1814
  regulator: core: create unlocked version of regulator_list_voltage
  ...
parents f66477a0 62e544b9

Documentation/devicetree/bindings/mfd/axp20x.txt

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ DCDC2 : DC-DC buck : vin2-supply 
DCDC3		: DC-DC	buck	: vin3-supply

DCDC4		: DC-DC	buck	: vin4-supply

DCDC5		: DC-DC	buck	: vin5-supply

DC1SW		: On/Off Switch	: dcdc1-supply		: DCDC1 secondary output

DC5LDO		: LDO		: dcdc5-supply		: input from DCDC5

DC1SW		: On/Off Switch	:			: DCDC1 secondary output

DC5LDO		: LDO		:			: input from DCDC5

ALDO1		: LDO		: aldoin-supply		: shared supply

ALDO2		: LDO		: aldoin-supply		: shared supply

ALDO3		: LDO		: aldoin-supply		: shared supply

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 
Optional properties:

- system-power-controller: Telling whether or not this pmic is controlling

  the system power. See Documentation/devicetree/bindings/power/power-controller.txt .

- active-semi,vsel-high: Indicates the VSEL pin is high.

  If this property is missing, assume the VSEL pin is low(0).



Optional input supply properties:

- for act8600:
@@ -49,6 +51,7 @@ Example: 
			pmic: act8865@5b {

				compatible = "active-semi,act8865";

				reg = <0x5b>;

				active-semi,vsel-high;

				status = "disabled";



				regulators {

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Optional properties: 
- anatop-delay-reg-offset: Anatop MFD step time register offset

- anatop-delay-bit-shift: Bit shift for the step time register

- anatop-delay-bit-width: Number of bits used in the step time register

- vin-supply: The supply for this regulator



Any property defined as part of the core regulator

binding, defined in regulator.txt, can also be used.

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Cirrus Logic Arizona class audio SoCs



These devices are audio SoCs with extensive digital capabilities and a range

of analogue I/O.



This document lists regulator specific bindings, see the primary binding

document:

  ../mfd/arizona.txt



Optional properties:

  - wlf,ldoena : GPIO specifier for the GPIO controlling LDOENA



Optional subnodes:

  - ldo1 : Initial data for the LDO1 regulator, as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt

  - micvdd : Initial data for the MICVDD regulator, as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt

Documentation/devicetree/bindings/regulator/max77802.txt

+24 −1
Original line number Diff line number Diff line
@@ -8,7 +8,28 @@ regulators that can be controlled over I2C. 


Following properties should be present in main device node of the MFD chip.



Optional node:

Optional properties:

- inb1-supply:  The input supply for BUCK1

- inb2-supply:  The input supply for BUCK2

- inb3-supply:  The input supply for BUCK3

- inb4-supply:  The input supply for BUCK4

- inb5-supply:  The input supply for BUCK5

- inb6-supply:  The input supply for BUCK6

- inb7-supply:  The input supply for BUCK7

- inb8-supply:  The input supply for BUCK8

- inb9-supply:  The input supply for BUCK9

- inb10-supply: The input supply for BUCK10

- inl1-supply:  The input supply for LDO8 and LDO15

- inl2-supply:  The input supply for LDO17, LDO27, LDO30 and LDO35

- inl3-supply:  The input supply for LDO3, LDO5, LDO6 and LDO7

- inl4-supply:  The input supply for LDO10, LDO11, LDO13 and LDO14

- inl5-supply:  The input supply for LDO9 and LDO19

- inl6-supply:  The input supply for LDO4, LDO21, LDO24 and LDO33

- inl7-supply:  The input supply for LDO18, LDO20, LDO28 and LDO29

- inl9-supply:  The input supply for LDO12, LDO23, LDO25, LDO26, LDO32 and LDO34

- inl10-supply: The input supply for LDO1 and LDO2



Optional nodes:

- regulators : The regulators of max77802 have to be instantiated

  under subnode named "regulators" using the following format.
@@ -58,6 +79,8 @@ Example: 
		#address-cells = <1>;

		#size-cells = <0>;



		inb1-supply = <&parent_reg>;



		regulators {

			ldo1_reg: LDO1 {

				regulator-name = "vdd_1v0";