Commit 8d67f64f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/settle',... 

Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next
parents 9b08f765 3ffad468 a9bc67de be035303

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,

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/core.c

+6 −0
Original line number Diff line number Diff line
@@ -2767,6 +2767,12 @@ static int _regulator_set_voltage_time(struct regulator_dev *rdev, 
		ramp_delay = rdev->desc->ramp_delay;

	else if (rdev->constraints->settling_time)

		return rdev->constraints->settling_time;

	else if (rdev->constraints->settling_time_up &&

		 (new_uV > old_uV))

		return rdev->constraints->settling_time_up;

	else if (rdev->constraints->settling_time_down &&

		 (new_uV < old_uV))

		return rdev->constraints->settling_time_down;



	if (ramp_delay == 0) {

		rdev_dbg(rdev, "ramp_delay not set\n");

drivers/regulator/of_regulator.c

+19 −0
Original line number Diff line number Diff line
@@ -90,6 +90,25 @@ static void of_get_regulation_constraints(struct device_node *np, 
	if (!ret)

		constraints->settling_time = pval;



	ret = of_property_read_u32(np, "regulator-settling-time-up-us", &pval);

	if (!ret)

		constraints->settling_time_up = pval;

	if (constraints->settling_time_up && constraints->settling_time) {

		pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-up-us'\n",

			np->name);

		constraints->settling_time_up = 0;

	}



	ret = of_property_read_u32(np, "regulator-settling-time-down-us",

				   &pval);

	if (!ret)

		constraints->settling_time_down = pval;

	if (constraints->settling_time_down && constraints->settling_time) {

		pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-down-us'\n",

			np->name);

		constraints->settling_time_down = 0;

	}



	ret = of_property_read_u32(np, "regulator-enable-ramp-delay", &pval);

	if (!ret)

		constraints->enable_time = pval;