Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e7d80b6b authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Mark Brown
Browse files

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: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 61b2e674

drivers/regulator/helpers.c

+7 −6
Original line number Diff line number Diff line
@@ -321,17 +321,18 @@ int regulator_map_voltage_linear_range(struct regulator_dev *rdev, 


		ret += range->min_sel;



		/*

		 * 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);