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

Commit 550bf893 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: da903x: Convert da9034 ldo12 to use linear ranges 



The voltage table of da9034 LDO12 is:
1700000, 1750000, 1800000, 1850000, 1900000, 1950000, 2000000, 2050000
2700000, 2750000, 2800000, 2850000, 2900000, 2950000, 3000000, 3050000

The voltage table is composed of two linear ranges:
for selector 0 ... 7:
        volt = 1700000 + 50000 * selector
for selector: 8 ... 15:
        volt = 2700000 + 50000 * (selector - 8)

This patch converts da9034 LDO12 to use newly introduced helpers for multiple
linear ranges.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6c918d22

drivers/regulator/da903x.c

+10 −35
Original line number Diff line number Diff line
@@ -252,39 +252,12 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev, 
	return ret;

}



static int da9034_map_ldo12_voltage(struct regulator_dev *rdev,

				    int min_uV, int max_uV)

{

	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);

	int sel;



	if (check_range(info, min_uV, max_uV)) {

		pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);

		return -EINVAL;

	}



	sel = DIV_ROUND_UP(min_uV - info->desc.min_uV, info->desc.uV_step);

	sel = (sel >= 20) ? sel - 12 : ((sel > 7) ? 8 : sel);



	return sel;

}



static int da9034_list_ldo12_voltage(struct regulator_dev *rdev,

				     unsigned selector)

{

	struct da903x_regulator_info *info = rdev_get_drvdata(rdev);

	int volt;



	if (selector >= 8)

		volt = 2700000 + rdev->desc->uV_step * (selector - 8);

	else

		volt = rdev->desc->min_uV + rdev->desc->uV_step * selector;



	if (volt > info->max_uV)

		return -EINVAL;



	return volt;

}

static const struct regulator_linear_range da9034_ldo12_ranges[] = {

	{ .min_uV = 1700000, .max_uV = 2050000, .min_sel =  0, .max_sel = 7,

	  .uV_step =  50000 },

	{ .min_uV = 2700000, .max_uV = 3050000, .min_sel =  8, .max_sel = 15,

	  .uV_step =  50000 },

};



static struct regulator_ops da903x_regulator_ldo_ops = {

	.set_voltage_sel = da903x_set_voltage_sel,
@@ -332,8 +305,8 @@ static struct regulator_ops da9034_regulator_dvc_ops = { 
static struct regulator_ops da9034_regulator_ldo12_ops = {

	.set_voltage_sel = da903x_set_voltage_sel,

	.get_voltage_sel = da903x_get_voltage_sel,

	.list_voltage	= da9034_list_ldo12_voltage,

	.map_voltage	= da9034_map_ldo12_voltage,

	.list_voltage	= regulator_list_voltage_linear_range,

	.map_voltage	= regulator_map_voltage_linear_range,

	.enable		= da903x_enable,

	.disable	= da903x_disable,

	.is_enabled	= da903x_is_enabled,
@@ -476,6 +449,8 @@ static int da903x_regulator_probe(struct platform_device *pdev) 
	if (ri->desc.id == DA9034_ID_LDO12) {

		ri->desc.ops = &da9034_regulator_ldo12_ops;

		ri->desc.n_voltages = 16;

		ri->desc.linear_ranges = da9034_ldo12_ranges;

		ri->desc.n_linear_ranges = ARRAY_SIZE(da9034_ldo12_ranges);

	}



	if (ri->desc.id == DA9030_ID_LDO14)