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

Commit 398715ab authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: core: Support table based mapping in regulator_set_voltage_time_sel 



For table based mapping, we can calculate voltage difference by below equation:
abs(rdev->desc->volt_table[new_selector] - rdev->desc->volt_table[old_selector])

Thus we can make regulator_set_voltage_time_sel work for table based mapping.

regulator_set_voltage_time_sel() only supports linear or table based mapping.
In case it is misused, also warn if neither linear nor table based mapping
is used with regulator_set_voltage_time_sel().

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 086ccd43

drivers/regulator/core.c

+25 −12
Original line number Diff line number Diff line
@@ -2296,25 +2296,38 @@ EXPORT_SYMBOL_GPL(regulator_set_voltage_time); 
 * Provided with the starting and target voltage selectors, this function

 * returns time in microseconds required to rise or fall to this new voltage

 *

 * Drivers providing uV_step in their regulator_desc and ramp_delay in

 * regulation_constraints can use this as their set_voltage_time_sel()

 * operation.

 * Drivers providing uV_step or volt_table in their regulator_desc and

 * ramp_delay in regulation_constraints can use this as their

 * set_voltage_time_sel() operation.

 */

int regulator_set_voltage_time_sel(struct regulator_dev *rdev,

				   unsigned int old_selector,

				   unsigned int new_selector)

{

	if (rdev->desc->uV_step) {

	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;

	}



	if (rdev->desc->uV_step) {

		return DIV_ROUND_UP(rdev->desc->uV_step *

				    abs(new_selector - old_selector),

				rdev->constraints->ramp_delay * 1000);

		if (rdev->desc->ramp_delay)

			return DIV_ROUND_UP(rdev->desc->uV_step *

				abs(new_selector - old_selector),

				rdev->desc->ramp_delay * 1000);

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

				    ramp_delay * 1000);

	} else if (rdev->desc->volt_table) {

		return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] -

					rdev->desc->volt_table[old_selector]),

				    ramp_delay * 1000);

	} else {

		rdev_warn(rdev, "Unsupported voltage mapping settings\n");

	}



	return 0;

}