forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: core: Change the unit of ramp_delay from mV/uS to uV/uS

Browse source 
This change makes it possible to set ramp_delay with 0.xxx mV/uS without
truncation issue.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-06-18 14:03:16 +08:00 • committed by Mark Brown
parent 398715ab94
commit ea38d13fd1
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/regulator/regulator.txt
View file

@ -10,7 +10,7 @@ Optional properties:
- regulator-always-on: boolean, regulator should never be disabled - regulator-always-on: boolean, regulator should never be disabled
- regulator-boot-on: bootloader/firmware enabled regulator - regulator-boot-on: bootloader/firmware enabled regulator
- <name>-supply: phandle to the parent supply/regulator node - <name>-supply: phandle to the parent supply/regulator node
- regulator-ramp-delay: ramp delay for regulator(in mV/uS) - regulator-ramp-delay: ramp delay for regulator(in uV/uS)
Example: Example:

4
drivers/regulator/core.c
View file

@ -2319,11 +2319,11 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
if (rdev->desc->uV_step) { if (rdev->desc->uV_step) {
return DIV_ROUND_UP(rdev->desc->uV_step * return DIV_ROUND_UP(rdev->desc->uV_step *
abs(new_selector - old_selector), abs(new_selector - old_selector),
ramp_delay * 1000); ramp_delay);
} else if (rdev->desc->volt_table) { } else if (rdev->desc->volt_table) {
return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] - return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] -
rdev->desc->volt_table[old_selector]), rdev->desc->volt_table[old_selector]),
ramp_delay * 1000); ramp_delay);
} else { } else {
rdev_warn(rdev, "Unsupported voltage mapping settings\n"); rdev_warn(rdev, "Unsupported voltage mapping settings\n");
} }

2
include/linux/regulator/driver.h
View file

@ -173,7 +173,7 @@ enum regulator_type {
* *
* @min_uV: Voltage given by the lowest selector (if linear mapping) * @min_uV: Voltage given by the lowest selector (if linear mapping)
* @uV_step: Voltage increase with each selector (if linear mapping) * @uV_step: Voltage increase with each selector (if linear mapping)
* @ramp_delay: Time to settle down after voltage change (unit: mV/us) * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
* @volt_table: Voltage mapping table (if table based mapping) * @volt_table: Voltage mapping table (if table based mapping)
* *
* @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_

2
include/linux/regulator/machine.h
View file

@ -92,7 +92,7 @@ struct regulator_state {
* mode. * mode.
* @initial_state: Suspend state to set by default. * @initial_state: Suspend state to set by default.
* @initial_mode: Mode to set at startup. * @initial_mode: Mode to set at startup.
* @ramp_delay: Time to settle down after voltage change (unit: mV/us) * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
*/ */
struct regulation_constraints { struct regulation_constraints {