diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-11-26 21:24:33 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:07:40 -0500 |
commit | 33234e791de2ac3ea915158e042907748191cabd (patch) | |
tree | d1e0da62abf0a744526457e434b23456e8ea4be5 /drivers/regulator | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) |
regulator: core: Allow specific minimal selector for starting linear mapping
Some drivers (at least 3 drivers) have such variant of linear mapping that
the first few selectors are invalid and the reset are linear mapping.
Let's support this case in core.
This patch adds linear_min_sel in struct regulator_desc,
so we can allow specific minimal selector for starting linear mapping.
Then extends regulator_[map|list]_voltage_linear() to support this feature.
Note that for selectors less than min_linear_index, we need count them to
n_voltages so regulator_list_voltage() won't fail while checking the boundary
for selector before calling list_voltage callback.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e872c8be080..02a249b024b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -1897,6 +1897,10 @@ int regulator_list_voltage_linear(struct regulator_dev *rdev, | |||
1897 | { | 1897 | { |
1898 | if (selector >= rdev->desc->n_voltages) | 1898 | if (selector >= rdev->desc->n_voltages) |
1899 | return -EINVAL; | 1899 | return -EINVAL; |
1900 | if (selector < rdev->desc->linear_min_sel) | ||
1901 | return 0; | ||
1902 | |||
1903 | selector -= rdev->desc->linear_min_sel; | ||
1900 | 1904 | ||
1901 | return rdev->desc->min_uV + (rdev->desc->uV_step * selector); | 1905 | return rdev->desc->min_uV + (rdev->desc->uV_step * selector); |
1902 | } | 1906 | } |
@@ -2120,6 +2124,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev, | |||
2120 | if (ret < 0) | 2124 | if (ret < 0) |
2121 | return ret; | 2125 | return ret; |
2122 | 2126 | ||
2127 | ret += rdev->desc->linear_min_sel; | ||
2128 | |||
2123 | /* Map back into a voltage to verify we're still in bounds */ | 2129 | /* Map back into a voltage to verify we're still in bounds */ |
2124 | voltage = rdev->desc->ops->list_voltage(rdev, ret); | 2130 | voltage = rdev->desc->ops->list_voltage(rdev, ret); |
2125 | if (voltage < min_uV || voltage > max_uV) | 2131 | if (voltage < min_uV || voltage > max_uV) |