aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-06-06 22:05:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-07 19:29:11 -0400
commit5a6881e8e134ea636bbc8423049e84638dbb7106 (patch)
tree57813294f666d3b659d097df22dfef190f2766b9
parent93b07e7bcd50bb73d3d60043438fa68bd5a0988b (diff)
regulator: core: Handle fixed voltage in map_voltage_linear
Fixed voltage is a kind of linear mapping where n_voltages is 1. This change allows [list|map]_voltage_linear to be used for fixed voltage. For fixed voltage, n_voltages is 1 and the only valid selector is 0. Thus we actually don't care the uV_step setting. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8521e0d6b3bc..5c6aedaa934d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2070,6 +2070,14 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
2070{ 2070{
2071 int ret, voltage; 2071 int ret, voltage;
2072 2072
2073 /* Allow uV_step to be 0 for fixed voltage */
2074 if (rdev->desc->n_voltages == 1 && rdev->desc->uV_step == 0) {
2075 if (min_uV <= rdev->desc->min_uV && rdev->desc->min_uV <= max_uV)
2076 return 0;
2077 else
2078 return -EINVAL;
2079 }
2080
2073 if (!rdev->desc->uV_step) { 2081 if (!rdev->desc->uV_step) {
2074 BUG_ON(!rdev->desc->uV_step); 2082 BUG_ON(!rdev->desc->uV_step);
2075 return -EINVAL; 2083 return -EINVAL;