Merge remote-tracking branch 'regulator/topic/min' into regulator-next

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 35c149bb2ad3..cd1b201c91e2 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1924,6 +1924,10 @@ int regulator_list_voltage_linear(struct regulator_dev *rdev,
 {
         if (selector >= rdev->desc->n_voltages)
                 return -EINVAL;
+        if (selector < rdev->desc->linear_min_sel)
+                return 0;
+
+        selector -= rdev->desc->linear_min_sel;
 
         return rdev->desc->min_uV + (rdev->desc->uV_step * selector);
 }
@@ -2152,6 +2156,8 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
         if (ret < 0)
                 return ret;
 
+        ret += rdev->desc->linear_min_sel;
+
         /* Map back into a voltage to verify we're still in bounds */
         voltage = rdev->desc->ops->list_voltage(rdev, ret);
         if (voltage < min_uV || voltage > max_uV)