Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

regulator: da903x: Convert da9034 ldo12 to use linear ranges

Browse Source 
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: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2013-07-28 16:37:23 +08:00 committed by Mark Brown
parent 6c918d2209
commit 550bf89366
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/regulator/da903x.c
View File

@ -252,39 +252,12 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev,
return ret; return ret;
} }
static int da9034_map_ldo12_voltage(struct regulator_dev *rdev, static const struct regulator_linear_range da9034_ldo12_ranges[] = {
int min_uV, int max_uV) { .min_uV = 1700000, .max_uV = 2050000, .min_sel = 0, .max_sel = 7,
{ .uV_step = 50000 },
struct da903x_regulator_info *info = rdev_get_drvdata(rdev); { .min_uV = 2700000, .max_uV = 3050000, .min_sel = 8, .max_sel = 15,
int sel; .uV_step = 50000 },
};
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 struct regulator_ops da903x_regulator_ldo_ops = { static struct regulator_ops da903x_regulator_ldo_ops = {
.set_voltage_sel = da903x_set_voltage_sel, .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 = { static struct regulator_ops da9034_regulator_ldo12_ops = {
.set_voltage_sel = da903x_set_voltage_sel, .set_voltage_sel = da903x_set_voltage_sel,
.get_voltage_sel = da903x_get_voltage_sel, .get_voltage_sel = da903x_get_voltage_sel,
.list_voltage = da9034_list_ldo12_voltage, .list_voltage = regulator_list_voltage_linear_range,
.map_voltage = da9034_map_ldo12_voltage, .map_voltage = regulator_map_voltage_linear_range,
.enable = da903x_enable, .enable = da903x_enable,
.disable = da903x_disable, .disable = da903x_disable,
.is_enabled = da903x_is_enabled, .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) { if (ri->desc.id == DA9034_ID_LDO12) {
ri->desc.ops = &da9034_regulator_ldo12_ops; ri->desc.ops = &da9034_regulator_ldo12_ops;
ri->desc.n_voltages = 16; 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) if (ri->desc.id == DA9030_ID_LDO14)