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

Commit 73e705bf authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Mark Brown
Browse files

regulator: core: Add set_voltage_time op 



The new op is analogous to set_voltage_time_sel. It can be used by
regulators which don't have a table of discrete voltages. The function
returns the time for the regulator output voltage to stabilize after
being set to a new value, in microseconds. If the op is not set a
default implementation is used to calculate the delay.

This change also removes the ramp_delay calculation in the PWM
regulator, since the driver now uses the core code for the calculation
of the delay.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d89564ef

drivers/regulator/core.c

+59 −27
Original line number Diff line number Diff line
@@ -2743,6 +2743,24 @@ static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev, 
	return ret;

}



static int _regulator_set_voltage_time(struct regulator_dev *rdev,

				       int old_uV, int new_uV)

{

	unsigned int ramp_delay = 0;



	if (rdev->constraints->ramp_delay)

		ramp_delay = rdev->constraints->ramp_delay;

	else if (rdev->desc->ramp_delay)

		ramp_delay = rdev->desc->ramp_delay;



	if (ramp_delay == 0) {

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

		return 0;

	}



	return DIV_ROUND_UP(abs(new_uV - old_uV), ramp_delay);

}



static int _regulator_do_set_voltage(struct regulator_dev *rdev,

				     int min_uV, int max_uV)

{
@@ -2752,6 +2770,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, 
	unsigned int selector;

	int old_selector = -1;

	const struct regulator_ops *ops = rdev->desc->ops;

	int old_uV = _regulator_get_voltage(rdev);



	trace_regulator_set_voltage(rdev_get_name(rdev), min_uV, max_uV);
@@ -2803,13 +2822,28 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, 
	if (ret)

		goto out;



	/* Call set_voltage_time_sel if successfully obtained old_selector */

	if (!old_selector >= 0 && old_selector != selector) {

		delay = ops->set_voltage_time_sel(rdev,

						old_selector, selector);

	if (ops->set_voltage_time_sel) {

		/*

		 * Call set_voltage_time_sel if successfully obtained

		 * old_selector

		 */

		if (old_selector >= 0 && old_selector != selector)

			delay = ops->set_voltage_time_sel(rdev, old_selector,

							  selector);

	} else {

		if (old_uV != best_val) {

			if (ops->set_voltage_time)

				delay = ops->set_voltage_time(rdev, old_uV,

							      best_val);

			else

				delay = _regulator_set_voltage_time(rdev,

								    old_uV,

								    best_val);

		}

	}



	if (delay < 0) {

			rdev_warn(rdev, "set_voltage_time_sel() failed: %d\n",

				  delay);

		rdev_warn(rdev, "failed to get delay: %d\n", delay);

		delay = 0;

	}
@@ -2820,7 +2854,6 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, 
	} else if (delay) {

		udelay(delay);

	}

	}



	if (best_val >= 0) {

		unsigned long data = best_val;
@@ -3000,9 +3033,13 @@ int regulator_set_voltage_time(struct regulator *regulator, 
	int voltage;

	int i;



	if (ops->set_voltage_time)

		return ops->set_voltage_time(rdev, old_uV, new_uV);

	else if (!ops->set_voltage_time_sel)

		return _regulator_set_voltage_time(rdev, old_uV, new_uV);



	/* Currently requires operations to do this */

	if (!ops->list_voltage || !ops->set_voltage_time_sel

	    || !rdev->desc->n_voltages)

	if (!ops->list_voltage || !rdev->desc->n_voltages)

		return -EINVAL;



	for (i = 0; i < rdev->desc->n_voltages; i++) {
@@ -3041,17 +3078,8 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev, 
				   unsigned int old_selector,

				   unsigned int new_selector)

{

	unsigned int ramp_delay = 0;

	int old_volt, new_volt;



	if (rdev->constraints->ramp_delay)

		ramp_delay = rdev->constraints->ramp_delay;

	else if (rdev->desc->ramp_delay)

		ramp_delay = rdev->desc->ramp_delay;



	if (ramp_delay == 0)

		return 0;



	/* sanity check */

	if (!rdev->desc->ops->list_voltage)

		return -EINVAL;
@@ -3059,7 +3087,11 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev, 
	old_volt = rdev->desc->ops->list_voltage(rdev, old_selector);

	new_volt = rdev->desc->ops->list_voltage(rdev, new_selector);



	return DIV_ROUND_UP(abs(new_volt - old_volt), ramp_delay);

	if (rdev->desc->ops->set_voltage_time)

		return rdev->desc->ops->set_voltage_time(rdev, old_volt,

							 new_volt);

	else

		return _regulator_set_voltage_time(rdev, old_volt, new_volt);

}

EXPORT_SYMBOL_GPL(regulator_set_voltage_time_sel);

drivers/regulator/pwm-regulator.c

+0 −10
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/delay.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/err.h>
@@ -194,12 +193,10 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev, 
	unsigned int min_uV_duty = drvdata->continuous.min_uV_dutycycle;

	unsigned int max_uV_duty = drvdata->continuous.max_uV_dutycycle;

	unsigned int duty_unit = drvdata->continuous.dutycycle_unit;

	unsigned int ramp_delay = rdev->constraints->ramp_delay;

	int min_uV = rdev->constraints->min_uV;

	int max_uV = rdev->constraints->max_uV;

	int diff_uV = max_uV - min_uV;

	struct pwm_state pstate;

	int old_uV = pwm_regulator_get_voltage(rdev);

	unsigned int diff_duty;

	unsigned int dutycycle;

	int ret;
@@ -233,13 +230,6 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev, 
		return ret;

	}



	if ((ramp_delay == 0) || !pwm_regulator_is_enabled(rdev))

		return 0;



	/* Ramp delay is in uV/uS. Adjust to uS and delay */

	ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);

	usleep_range(ramp_delay, ramp_delay + DIV_ROUND_UP(ramp_delay, 10));



	return 0;

}

include/linux/regulator/driver.h

+8 −2
Original line number Diff line number Diff line
@@ -113,10 +113,14 @@ struct regulator_linear_range { 
 *               stabilise after being enabled, in microseconds.

 * @set_ramp_delay: Set the ramp delay for the regulator. The driver should

 *		select ramp delay equal to or less than(closest) ramp_delay.

 * @set_voltage_time: Time taken for the regulator voltage output voltage

 *               to stabilise after being set to a new value, in microseconds.

 *               The function receives the from and to voltage as input, it

 *               should return the worst case.

 * @set_voltage_time_sel: Time taken for the regulator voltage output voltage

 *               to stabilise after being set to a new value, in microseconds.

 *               The function provides the from and to voltage selector, the

 *               function should return the worst case.

 *               The function receives the from and to voltage selector as

 *               input, it should return the worst case.

 * @set_soft_start: Enable soft start for the regulator.

 *

 * @set_suspend_voltage: Set the voltage for the regulator when the system
@@ -168,6 +172,8 @@ struct regulator_ops { 
	/* Time taken to enable or set voltage on the regulator */

	int (*enable_time) (struct regulator_dev *);

	int (*set_ramp_delay) (struct regulator_dev *, int ramp_delay);

	int (*set_voltage_time) (struct regulator_dev *, int old_uV,

				 int new_uV);

	int (*set_voltage_time_sel) (struct regulator_dev *,

				     unsigned int old_selector,

				     unsigned int new_selector);