diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 10:11:37 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 10:11:37 (GMT) |
| commit | 4c35c8676fb224d0cb328ab83237286f8e2df224 (patch) | |
| tree | f1b1dfb4444cb17b1fd79d9d5e646e4663d3364c /drivers/regulator/da903x.c | |
| parent | a6117615a21323140e67d394a3301fd319468f1c (diff) | |
| parent | 8828bae464b129abed95b748263f1ab53bdc5755 (diff) | |
| download | linux-4c35c8676fb224d0cb328ab83237286f8e2df224.tar.xz | |
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
Diffstat (limited to 'drivers/regulator/da903x.c')
| -rw-r--r-- | drivers/regulator/da903x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c index c61d96e..b431ae3 100644 --- a/drivers/regulator/da903x.c +++ b/drivers/regulator/da903x.c @@ -253,10 +253,8 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev, } 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 }, + REGULATOR_LINEAR_RANGE(1700000, 0, 7, 50000), + REGULATOR_LINEAR_RANGE(2700000, 8, 15, 50000), }; static struct regulator_ops da903x_regulator_ldo_ops = { |