Commit 6b80562d authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'regulator-fix-v4.10-rc6' into regulator-linus 

regulator: Fixes for v4.10

Three changes here, two run of the mill driver specific fixes and a
change from Mark Rutland which reverts some new device specific ACPI
binding code which was added during the merge window as there are
concerns about this sending the wrong signal about usage of regulators
in ACPI systems.

# gpg: Signature made Fri 03 Feb 2017 11:48:10 GMT
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: key 0D9EACE2CD7BEEBC: no public key for trusted key - skipped
# gpg: key 0D9EACE2CD7BEEBC marked as ultimately trusted
# gpg: key CCB0A420AF88CD16: no public key for trusted key - skipped
# gpg: key CCB0A420AF88CD16 marked as ultimately trusted
# gpg: key 162614E316005C11: no public key for trusted key - skipped
# gpg: key 162614E316005C11 marked as ultimately trusted
# gpg: key A730C53A5621E907: no public key for trusted key - skipped
# gpg: key A730C53A5621E907 marked as ultimately trusted
# gpg: key 276568D75C6153AD: no public key for trusted key - skipped
# gpg: key 276568D75C6153AD marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [ultimate]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [ultimate]
parents 69973b83 206c4720

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
@@ -8748,6 +8748,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE