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

Commit 00ee929f authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'regulator-v4.14' into regulator-next 

regulator: Updates for v4.14

This is an extremely quiet release for the regulator subsystem, it's all
fairly minor fixes and cleanups plus a few new drivers and ddevice ID
additions:

 - Support for MediaTek MT6380, Ricoh RC5T619 and ST Voltage Reference
   Buffers.

# gpg: Signature made Mon 04 Sep 2017 17:51:28 BST
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [unknown]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [unknown]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [unknown]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [unknown]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [unknown]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813  A1C5 C3F4 36CA 30F5 D8EB
#      Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2  9FEA 24D6 8B72 5D54 87D0
parents ddc239a4 f039685b

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

+1 −1
Original line number Diff line number Diff line 
Mediatek MT6311 Regulator Driver

Mediatek MT6311 Regulator



Required properties:

- compatible: "mediatek,mt6311-regulator"

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

+1 −1
Original line number Diff line number Diff line 
Mediatek MT6323 Regulator Driver

Mediatek MT6323 Regulator



All voltage regulators are defined as subnodes of the regulators node. A list

of regulators provided by this controller are defined as subnodes of the

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

0 → 100644
+89 −0
Original line number Diff line number Diff line 
MediaTek MT6380 Regulator



All voltage regulators provided by the MT6380 PMIC are described as the

subnodes of the MT6380 regulators node. Each regulator is named according

to its regulator type, buck-<name> and ldo-<name>. The definition for each

of these nodes is defined using the standard binding for regulators at

Documentation/devicetree/bindings/regulator/regulator.txt.



The valid names for regulators are:

BUCK:

  buck-core1, buck-vcore, buck-vrf

LDO:

  ldo-vm ,ldo-va , ldo-vphy, ldo-vddr, ldo-vt



Example:



	regulators {

		compatible = "mediatek,mt6380-regulator";



		mt6380_vcpu_reg: buck-vcore1 {

			regulator-name = "vcore1";

			regulator-min-microvolt = < 600000>;

			regulator-max-microvolt = <1393750>;

			regulator-ramp-delay = <6250>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_vcore_reg: buck-vcore {

			regulator-name = "vcore";

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <1393750>;

			regulator-ramp-delay = <6250>;

		};



		mt6380_vrf_reg: buck-vrf {

			regulator-name = "vrf";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1575000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_vm_reg: ldo-vm {

			regulator-name = "vm";

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1400000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_va_reg: ldo-va {

			regulator-name = "va";

			regulator-min-microvolt = <2200000>;

			regulator-max-microvolt = <3300000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_vphy_reg: ldo-vphy {

			regulator-name = "vphy";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_vddr_reg: ldo-vddr {

			regulator-name = "vddr";

			regulator-min-microvolt = <1240000>;

			regulator-max-microvolt = <1840000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		mt6380_vt_reg: ldo-vt {

			regulator-name = "vt";

			regulator-min-microvolt = <2200000>;

			regulator-max-microvolt = <3300000>;

			regulator-ramp-delay = <0>;

			regulator-always-on;

			regulator-boot-on;

		};

	};

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

+1 −1
Original line number Diff line number Diff line 
Mediatek MT6397 Regulator Driver

Mediatek MT6397 Regulator



Required properties:

- compatible: "mediatek,mt6397-regulator"

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ Continuous Voltage With Enable GPIO Example: 
		 * Inverted PWM logic, and the duty cycle range is limited

		 * to 30%-70%.

		 */

		pwm-dutycycle-range <700 300>; /* */

		pwm-dutycycle-range = <700 300>; /* */

	};



Voltage Table Example: