From: Matti Vaittinen Date: Wed, 22 Aug 2018 09:53:27 +0000 (+0300) Subject: regulator: regmap helpers - support overlapping linear ranges X-Git-Tag: v4.20-rc1~184^2~1^2~21 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e7d80b6b848b4b5f83d3fbee9fd042d036ede9c6;p=linux.git regulator: regmap helpers - support overlapping linear ranges Don't give up voltage mapping if first range with suitable min/max uV does not provide the wanted voltage. Signed-off-by: Matti Vaittinen Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index 2ae7c3ac5940..ef09021dc46e 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -321,17 +321,18 @@ int regulator_map_voltage_linear_range(struct regulator_dev *rdev, ret += range->min_sel; - break; + /* + * Map back into a voltage to verify we're still in bounds. + * If we are not, then continue checking rest of the ranges. + */ + voltage = rdev->desc->ops->list_voltage(rdev, ret); + if (voltage >= min_uV && voltage <= max_uV) + break; } if (i == rdev->desc->n_linear_ranges) return -EINVAL; - /* 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) - return -EINVAL; - return ret; } EXPORT_SYMBOL_GPL(regulator_map_voltage_linear_range);