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

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

Merge tag 'regulator-v4.13' 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, a series of fairly small fixes
  plus one new feature and a few new drivers:

   - Support for regulators with different settling times for rising and
     falling voltage changes.

   - New drivers for Allwinner AXP803, HiSilicon HI6421V530 and TI
     LP87565"

* tag 'regulator-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (21 commits)
  regulator: core: Fix size limit of supply_map
  regulator: core: Fix voltage change propagations to supply regulators
  regulator: lp87565: Fix the initial voltage range
  regulator: tps65910: wire up sleep control configuration
  regulator: hi6421v530: Describe consumed platform device
  regulator: tps65910: check TPS65910_NUM_REGS at build time
  regulator: core: Prioritise consumer mappings over regulator name
  regulator: lp87565: Fix the GPL header
  regulator: hi6421: Describe consumed platform device
  regulator: hi6421v530: add driver for hi6421v530 voltage regulator
  regulator: da9061: BUCK and LDO regulator driver
  regulator: bd9571mwv: Statize local symbols
  regulator: tps65917: Add support for SMPS12
  regulator: lp87565: Add support for lp87565 PMIC regulators
  regulator: axp20x-regulator: add support for AXP803
  regulator: lp8755: fix spelling mistake "acceess" -> "access"
  regulator: Allow for asymmetric settling times
  regulator: DT: Add properties for asymmetric settling times
  regulator: palmas: Drop unnecessary static
  MAINTAINERS: Update MAX77802 PMIC entry
  ...
parents 36b80422 8d67f64f

Documentation/devicetree/bindings/mfd/tps65910.txt

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ Optional properties: 
  There should be 9 entries here, one for each gpio.

- ti,system-power-controller: Telling whether or not this pmic is controlling

  the system power.

- ti,sleep-enable: Enable SLEEP state.

- ti,sleep-keep-therm: Keep thermal monitoring on in sleep state.

- ti,sleep-keep-ck32k: Keep the 32KHz clock output on in sleep state.

- ti,sleep-keep-hsclk: Keep high speed internal clock on in sleep state.



Regulator Optional properties:

- ti,regulator-ext-sleep-control: enable external sleep

Documentation/devicetree/bindings/regulator/regulator.txt

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ Optional properties: 
- regulator-settling-time-us: Settling time, in microseconds, for voltage

  change if regulator have the constant time for any level voltage change.

  This is useful when regulator have exponential voltage change.

- regulator-settling-time-up-us: Settling time, in microseconds, for voltage

  increase if the regulator needs a constant time to settle after voltage

  increases of any level. This is useful for regulators with exponential

  voltage changes.

- regulator-settling-time-down-us: Settling time, in microseconds, for voltage

  decrease if the regulator needs a constant time to settle after voltage

  decreases of any level. This is useful for regulators with exponential

  voltage changes.

- regulator-soft-start: Enable soft start so that voltage ramps slowly

- regulator-state-mem sub-root node for Suspend-to-RAM mode

  : suspend to memory, the device goes to sleep, but all data stored in memory,

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -8076,11 +8076,11 @@ S: Supported 
F:	drivers/power/supply/max14577_charger.c

F:	drivers/power/supply/max77693_charger.c



MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS

M:	Javier Martinez Canillas <javier@osg.samsung.com>

MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER

M:	Javier Martinez Canillas <javier@dowhile0.org>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	drivers/*/*max77802*.c

F:	drivers/regulator/max77802-regulator.c

F:	Documentation/devicetree/bindings/*/*max77802.txt

F:	include/dt-bindings/*/*max77802.h

drivers/mfd/tps65910.c

+15 −7
Original line number Diff line number Diff line
@@ -328,11 +328,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, 
		goto err_sleep_init;

	}



	/* Return if there is no sleep keepon data. */

	if (!pmic_pdata->slp_keepon)

		return 0;



	if (pmic_pdata->slp_keepon->therm_keepon) {

	if (pmic_pdata->slp_keepon.therm_keepon) {

		ret = tps65910_reg_set_bits(tps65910,

				TPS65910_SLEEP_KEEP_RES_ON,

				SLEEP_KEEP_RES_ON_THERM_KEEPON_MASK);
@@ -342,7 +338,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, 
		}

	}



	if (pmic_pdata->slp_keepon->clkout32k_keepon) {

	if (pmic_pdata->slp_keepon.clkout32k_keepon) {

		ret = tps65910_reg_set_bits(tps65910,

				TPS65910_SLEEP_KEEP_RES_ON,

				SLEEP_KEEP_RES_ON_CLKOUT32K_KEEPON_MASK);
@@ -352,7 +348,7 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, 
		}

	}



	if (pmic_pdata->slp_keepon->i2chs_keepon) {

	if (pmic_pdata->slp_keepon.i2chs_keepon) {

		ret = tps65910_reg_set_bits(tps65910,

				TPS65910_SLEEP_KEEP_RES_ON,

				SLEEP_KEEP_RES_ON_I2CHS_KEEPON_MASK);
@@ -415,6 +411,18 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client, 
	prop = of_property_read_bool(np, "ti,en-ck32k-xtal");

	board_info->en_ck32k_xtal = prop;



	prop = of_property_read_bool(np, "ti,sleep-enable");

	board_info->en_dev_slp = prop;



	prop = of_property_read_bool(np, "ti,sleep-keep-therm");

	board_info->slp_keepon.therm_keepon = prop;



	prop = of_property_read_bool(np, "ti,sleep-keep-ck32k");

	board_info->slp_keepon.clkout32k_keepon = prop;



	prop = of_property_read_bool(np, "ti,sleep-keep-hsclk");

	board_info->slp_keepon.i2chs_keepon = prop;



	board_info->irq = client->irq;

	board_info->irq_base = -1;

	board_info->pm_off = of_property_read_bool(np,

drivers/regulator/Kconfig

+20 −2
Original line number Diff line number Diff line
@@ -214,11 +214,11 @@ config REGULATOR_DA9055 
	  will be called da9055-regulator.



config REGULATOR_DA9062

	tristate "Dialog Semiconductor DA9062 regulators"

	tristate "Dialog Semiconductor DA9061/62 regulators"

	depends on MFD_DA9062

	help

	  Say y here to support the BUCKs and LDOs regulators found on

	  DA9062 PMICs.

	  DA9061 and DA9062 PMICs.



	  This driver can also be built as a module. If so, the module

	  will be called da9062-regulator.
@@ -296,6 +296,16 @@ config REGULATOR_HI6421 
	  21 general purpose LDOs, 3 dedicated LDOs, and 5 BUCKs. All

	  of them come with support to either ECO (idle) or sleep mode.



config REGULATOR_HI6421V530

	tristate "HiSilicon Hi6421v530 PMIC voltage regulator support"

	depends on MFD_HI6421_PMIC && OF

	help

	  This driver provides support for the voltage regulators on

	  HiSilicon Hi6421v530 PMU / Codec IC.

	  Hi6421v530 is a multi-function device which, on regulator part,

	  provides 5 general purpose LDOs, and all of them come with support

	  to either ECO (idle) or sleep mode.



config REGULATOR_HI655X

	tristate "Hisilicon HI655X PMIC regulators support"

	depends on ARCH_HISI || COMPILE_TEST
@@ -365,6 +375,14 @@ config REGULATOR_LP8755 
	  chip contains six step-down DC/DC converters which can support

	  9 mode multiphase configuration.



config REGULATOR_LP87565

	tristate "TI LP87565 Power regulators"

	depends on MFD_TI_LP87565 && OF

	help

	  This driver supports LP87565 voltage regulator chips. LP87565

	  provides four step-down converters. It supports software based

	  voltage control for different voltage domains



config REGULATOR_LP8788

	tristate "TI LP8788 Power Regulators"

	depends on MFD_LP8788