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

Commit fe9e3138 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regulator updates from Mark Brown:
 "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"

* tag 'regulator-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (24 commits)
  regulator: Add support for stm32-vrefbuf
  regulator: Add STM32 Voltage Reference Buffer
  regulator: pv88090: Exception handling for out of bounds
  regulator: da9063: Return an error code on probe failure
  regulator: rn5t618: add RC5T619 PMIC support
  regulator: ltc3589: constify i2c_device_id
  regulator: fan53555: fix I2C device ids
  regulator: add fixes with MT6397 dt-bindings shouldn't reference driver
  regulator: add fixes with MT6323 dt-bindings shouldn't reference driver
  regulator: add fixes with MT6311 dt-bindings shouldn't reference driver
  regulator: Add document for MediaTek MT6380 regulator
  regulator: mt6380: Add support for MT6380
  regulator: pwm-regulator: Remove unneeded gpiod NULL check
  regulator: core: fix a possible race in disable_work handling
  regulator: fan53555: Use of_device_get_match_data() to simplify probe
  regulator: of: regulator_of_get_init_data() missing of_node_get()
  regulator: pwm-regulator: fix example syntax
  regulator: Convert to using %pOF instead of full_name
  regulator: cpcap: Add OF mode mapping
  regulator: cpcap: Fix standby mode
  ...
parents b88f5577 00ee929f

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: