diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:36 +0100 |
| commit | 706664c290d69f890a9e3acfc6a8196098459826 (patch) | |
| tree | a8b8e7bc7f9172a412363b1ceb9ea1a78587e077 /include/linux/regulator | |
| parent | b735e47f6e94f07911dcdf92837ebfd0ec1cf7c0 (diff) | |
| parent | 609d5f6ddc18d05801646c869fcf4d0537b9110b (diff) | |
| download | linux-706664c290d69f890a9e3acfc6a8196098459826.tar.gz linux-706664c290d69f890a9e3acfc6a8196098459826.tar.bz2 linux-706664c290d69f890a9e3acfc6a8196098459826.zip | |
Merge remote-tracking branch 'regulator/topic/fixed' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 779b877e0fa1..c8b492c6b6a8 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -209,6 +209,7 @@ enum regulator_type { * @min_uV: Voltage given by the lowest selector (if linear mapping) * @uV_step: Voltage increase with each selector (if linear mapping) * @linear_min_sel: Minimal selector for starting linear mapping + * @fixed_uV: Fixed voltage of rails. * @ramp_delay: Time to settle down after voltage change (unit: uV/us) * @volt_table: Voltage mapping table (if table based mapping) * @@ -241,6 +242,7 @@ struct regulator_desc { unsigned int min_uV; unsigned int uV_step; unsigned int linear_min_sel; + int fixed_uV; unsigned int ramp_delay; const struct regulator_linear_range *linear_ranges; |