Commit 68cc38ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regulator updates from Mark Brown:
 "Quite a lot of core work this time around, though not 100% successful.

  We gained support for runtime mode changes thanks to David Collins and
  improved support for write only regulators (ones where we can't read
  back the configuration) from Douglas Anderson.

  There's been quite a bit of work from Linus Walleij on converting from
  specfying GPIOs by numbers to descriptors. Sadly the testing turned
  out to be less good than we had hoped and so a lot of this had to be
  reverted.

  We also have the start of updates to use coupled regulators from
  Maciej Purski, unfortunately there are further problems there so the
  last couple of patches have been reverted.

  We also have new drivers for BD71837 and SY8106A devices, SAW
  regulators on Qualcomm SPMI and dropped support for some preproduction
  chips that never made it to market from the AB8500 driver"

* tag 'regulator-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (57 commits)
  regulator: gpio: Revert
  ARM: pxa, regulator: fix building ezx e680
  regulator: Revert coupled regulator support again
  regulator: wm8994: Fix shared GPIOs
  regulator: max77686: Fix shared GPIOs
  regulator: bd71837: BD71837 PMIC regulator driver
  regulator: bd71837: Devicetree bindings for BD71837 regulators
  regulator: gpio: Get enable GPIO using GPIO descriptor
  regulator: fixed: Convert to use GPIO descriptor only
  regulator: s2mps11: Fix boot on Odroid XU3
  dt-bindings: qcom_spmi: Document SAW support
  regulator: qcom_spmi: Add support for SAW
  regulator: tps65090: Pass descriptor instead of GPIO number
  regulator: s5m8767: Pass descriptor instead of GPIO number
  regulator: pfuze100: Delete reference to ena_gpio
  regulator: max8952: Pass descriptor instead of GPIO number
  regulator: lp8788-ldo: Pass descriptor instead of GPIO number
  regulator: lm363x: Pass descriptor instead of GPIO number
  regulator: max8973: Pass descriptor instead of GPIO number
  regulator: mc13xxx-core: Switch to SPDX identifier
  ...
parents 410feb75 13ed4964

Documentation/devicetree/bindings/mfd/axp20x.txt

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Optional properties: 
			  regulator to drive the OTG VBus, rather then

			  as an input pin which signals whether the

			  board is driving OTG VBus or not.

			  (axp221 / axp223 / axp813 only)

			  (axp221 / axp223 / axp803/ axp813 only)



- x-powers,master-mode: Boolean (axp806 only). Set this when the PMIC is

			wired for master mode. The default is slave mode.
@@ -132,6 +132,7 @@ FLDO2 : LDO : fldoin-supply : shared supply 
LDO_IO0		: LDO		: ips-supply		: GPIO 0

LDO_IO1		: LDO		: ips-supply		: GPIO 1

RTC_LDO		: LDO		: ips-supply		: always on

DRIVEVBUS	: Enable output	: drivevbus-supply	: external regulator



AXP806 regulators, type, and corresponding input supply names:

Documentation/devicetree/bindings/mfd/bd9571mwv.txt

+21 −0
Original line number Diff line number Diff line
@@ -25,6 +25,25 @@ Required properties: 
			    Each child node is defined using the standard

			    binding for regulators.



Optional properties:

  - rohm,ddr-backup-power : Value to use for DDR-Backup Power (default 0).

			    This is a bitmask that specifies which DDR power

			    rails need to be kept powered when backup mode is

			    entered, for system suspend:

			      - bit 0: DDR0

			      - bit 1: DDR1

			      - bit 2: DDR0C

			      - bit 3: DDR1C

			    These bits match the KEEPON_DDR* bits in the

			    documentation for the "BKUP Mode Cnt" register.

  - rohm,rstbmode-level: The RSTB signal is configured for level mode, to

			 accommodate a toggle power switch (the RSTBMODE pin is

			 strapped low).

  - rohm,rstbmode-pulse: The RSTB signal is configured for pulse mode, to

			 accommodate a momentary power switch (the RSTBMODE pin

			 is strapped high).

			 The two properties above are mutually exclusive.



Example:



	pmic: pmic@30 {
@@ -36,6 +55,8 @@ Example: 
		#interrupt-cells = <2>;

		gpio-controller;

		#gpio-cells = <2>;

		rohm,ddr-backup-power = <0xf>;

		rohm,rstbmode-pulse;



		regulators {

			dvfs: dvfs {

Documentation/devicetree/bindings/regulator/pfuze100.txt

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Each regulator is defined using the standard binding for regulators. 


Example 1: PFUZE100



	pmic: pfuze100@8 {

	pfuze100: pmic@8 {

		compatible = "fsl,pfuze100";

		reg = <0x08>;
@@ -122,7 +122,7 @@ Example 1: PFUZE100 


Example 2: PFUZE200



	pmic: pfuze200@8 {

	pfuze200: pmic@8 {

		compatible = "fsl,pfuze200";

		reg = <0x08>;
@@ -216,7 +216,7 @@ Example 2: PFUZE200 


Example 3: PFUZE3000



	pmic: pfuze3000@8 {

	pfuze3000: pmic@8 {

		compatible = "fsl,pfuze3000";

		reg = <0x08>;

Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt

+45 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ Qualcomm SPMI Regulators 
	Definition: Reference to regulator supplying the input pin, as

		    described in the data sheet.



- qcom,saw-reg:

	Usage: optional

	Value type: <phandle>

	Description: Reference to syscon node defining the SAW registers.





The regulator node houses sub-nodes for each regulator within the device. Each

sub-node is identified using the node's name, with valid values listed for each
@@ -201,6 +206,17 @@ see regulator.txt - with additional custom properties described below: 
			2 = 0.55 uA

			3 = 0.75 uA



- qcom,saw-slave:

	Usage: optional

	Value type: <boo>

	Description: SAW controlled gang slave. Will not be configured.



- qcom,saw-leader:

	Usage: optional

	Value type: <boo>

	Description: SAW controlled gang leader. Will be configured as

		     SAW regulator.



Example:



	regulators {
@@ -221,3 +237,32 @@ Example: 


		....

	};



Example 2:



	saw3: syscon@9A10000 {

		compatible = "syscon";

		reg = <0x9A10000 0x1000>;

	};



	...



	spm-regulators {

		compatible = "qcom,pm8994-regulators";

		qcom,saw-reg = <&saw3>;

		s8 {

			qcom,saw-slave;

		};

		s9 {

			qcom,saw-slave;

		};

		s10 {

			qcom,saw-slave;

		};

		pm8994_s11_saw: s11 {

			qcom,saw-leader;

			regulator-always-on;

			regulator-min-microvolt = <900000>;

			regulator-max-microvolt = <1140000>;

		};

	};

Documentation/devicetree/bindings/regulator/regulator.txt

+10 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ Optional properties: 
- regulator-initial-mode: initial operating mode. The set of possible operating

  modes depends on the capabilities of every hardware so each device binding

  documentation explains which values the regulator supports.

- regulator-allowed-modes: list of operating modes that software is allowed to

  configure for the regulator at run-time.  Elements may be specified in any

  order.  The set of possible operating modes depends on the capabilities of

  every hardware so each device binding document explains which values the

  regulator supports.

- regulator-system-load: Load in uA present on regulator that is not captured by

  any consumer request.

- regulator-pull-down: Enable pull down resistor when the regulator is disabled.
@@ -68,6 +73,11 @@ Optional properties: 
	0: Disable active discharge.

	1: Enable active discharge.

	Absence of this property will leave configuration to default.

- regulator-coupled-with: Regulators with which the regulator

  is coupled. The linkage is 2-way - all coupled regulators should be linked

  with each other. A regulator should not be coupled with its supplier.

- regulator-coupled-max-spread: Max spread between voltages of coupled regulators

  in microvolts.



Deprecated properties:

- regulator-compatible: If a regulator chip contains multiple

CRA Git | Maintained and supported by SUSTech CRA and CCSE