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

regulator: core: Allow fixed enable_time to be set in the regulator_desc

Browse source 
Many regulators have a fixed specification for their enable time. Allow
this to be set in the regulator_desc as a number to save them having to
implement an explicit operation.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-06-27 14:23:10 +01:00
parent 5260cd2bc9
commit 79511ed322
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/regulator/core.c
View file

@ -1189,7 +1189,7 @@ overflow_err:
static int _regulator_get_enable_time(struct regulator_dev *rdev) static int _regulator_get_enable_time(struct regulator_dev *rdev)
{ {
if (!rdev->desc->ops->enable_time) if (!rdev->desc->ops->enable_time)
return 0; return rdev->desc->enable_time;
return rdev->desc->ops->enable_time(rdev); return rdev->desc->ops->enable_time(rdev);
} }

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

@ -180,6 +180,8 @@ enum regulator_type {
* @vsel_mask: Mask for register bitfield used for selector * @vsel_mask: Mask for register bitfield used for selector
* @enable_reg: Register for control when using regmap enable/disable ops * @enable_reg: Register for control when using regmap enable/disable ops
* @enable_mask: Mask for control when using regmap enable/disable ops * @enable_mask: Mask for control when using regmap enable/disable ops
*
* @enable_time: Time taken for initial enable of regulator (in uS).
*/ */
struct regulator_desc { struct regulator_desc {
const char *name; const char *name;
@ -201,6 +203,8 @@ struct regulator_desc {
unsigned int vsel_mask; unsigned int vsel_mask;
unsigned int enable_reg; unsigned int enable_reg;
unsigned int enable_mask; unsigned int enable_mask;
unsigned int enable_time;
}; };
/** /**