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

Commit 58f253d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regulator updates from Mark Brown:
 "A quiet release for the regulator API, conference season must've been
  slowing everyone down:

   - a new interface allowing drivers to provide an interface for
     reading a more detailed description of error conditions which
     allows devices using these regulators to build

   - ACPI support for the fixed voltage regulator.

   - cleanups for the TI TWL drivers to reduce code duplication"

* tag 'regulator-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (24 commits)
  regulator: tps65086: Fix 25mV ranges for BUCK regulators 1, 2, and 6
  regulator: Fix regulator_get_error_flags() signature mismatch
  regulator: core: add newline in debug message
  regulator: tps65086: Fix 25mV ranges for BUCK regulators
  regulator: core: Correct type of mode in regulator_mode_constrain
  regulator: max77620: add documentation for MPOK property
  regulator: max77620: add support to configure MPOK
  regulator: twl6030: Remove unused fields from struct twlreg_info
  regulator: twl: Remove unused fields from struct twlreg_info
  regulator: twl: split twl6030 logic into its own file
  regulator: twl: kill unused functions
  regulator: twl: make driver DT only
  regulator: twl-regulator: rework fixed regulator definition
  regulator: max77620: remove unused variable
  regulator: pwm: Add missing quotes to DT example
  regulator: stw481x-vmmc: fix ages old enable error
  regulator: gpio: properly check return value of of_get_named_gpio
  regulator: lp873x: Add support for populating input supply
  regulator: axp20x: Fix axp809 ldo_io registration error on cold boot
  regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap
  ...
parents 96955c96 d00b7461

Documentation/devicetree/bindings/mfd/lp873x.txt

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ Required properties: 
  - #gpio-cells:	Should be two.  The first cell is the pin number and

			the second cell is used to specify flags.

			See ../gpio/gpio.txt for more information.

  - xxx-in-supply:	Phandle to parent supply node of each regulator

			populated under regulators node. xxx can be

			buck0, buck1, ldo0 or ldo1.

  - regulators:	List of child nodes that specify the regulator

			initialization data.

Example:
@@ -17,6 +20,11 @@ pmic: lp8733@60 { 
	gpio-controller;

	#gpio-cells = <2>;



	buck0-in-supply = <&vsys_3v3>;

	buck1-in-supply = <&vsys_3v3>;

	ldo0-in-supply = <&vsys_3v3>;

	ldo1-in-supply = <&vsys_3v3>;



	regulators {

		lp8733_buck0: buck0 {

			regulator-name = "lp8733-buck0";

Documentation/devicetree/bindings/mfd/max77620.txt

+12 −0
Original line number Diff line number Diff line
@@ -106,6 +106,18 @@ Here supported time periods by device in microseconds are as follows: 
MAX77620 supports 40, 80, 160, 320, 640, 1280, 2560 and 5120 microseconds.

MAX20024 supports 20, 40, 80, 160, 320, 640, 1280 and 2540 microseconds.



-maxim,power-ok-control: configure map power ok bit

			1: Enables POK(Power OK) to control nRST_IO and GPIO1

			POK function.

			0: Disables POK control.

			if property missing, do not configure MPOK bit.

			If POK mapping is enabled for GPIO1/nRST_IO then,

			GPIO1/nRST_IO pins are HIGH only if all rails

			that have POK control enabled are HIGH.

			If any of the rails goes down(which are enabled for POK

			control) then, GPIO1/nRST_IO goes LOW.

			this property is valid for max20024 only.



For DT binding details of different sub modules like GPIO, pincontrol,

regulator, power, please refer respective device-tree binding document

under their respective sub-system directories.

Documentation/devicetree/bindings/mfd/tps65086.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Required properties: 
                            defined below.



Optional regulator properties:

 - ti,regulator-step-size-25mv	: This is applicable for buck[1,2,6], set this

 - ti,regulator-step-size-25mv	: This is applicable for buck[1-6], set this

				    if the regulator is factory set with a 25mv

				    step voltage mapping.

 - ti,regulator-decay		: This is applicable for buck[1-6], set this if

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

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ Any property defined as part of the core regulator binding can also be used. 


Continuous Voltage With Enable GPIO Example:

	pwm_regulator {

		compatible = "pwm-regulator;

		compatible = "pwm-regulator";

		pwms = <&pwm1 0 8448 0>;

		enable-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;

		regulator-min-microvolt = <1016000>;
@@ -76,7 +76,7 @@ Continuous Voltage With Enable GPIO Example: 


Voltage Table Example:

	pwm_regulator {

		compatible = "pwm-regulator;

		compatible = "pwm-regulator";

		pwms = <&pwm1 0 8448 0>;

		regulator-min-microvolt = <1016000>;

		regulator-max-microvolt = <1114000>;

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8761,6 +8761,7 @@ F: drivers/regulator/tps65217-regulator.c 
F:	drivers/regulator/tps65218-regulator.c

F:	drivers/regulator/tps65910-regulator.c

F:	drivers/regulator/twl-regulator.c

F:	drivers/regulator/twl6030-regulator.c

F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT