diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 12:11:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 12:11:37 +0200 |
| commit | 4c35c8676fb224d0cb328ab83237286f8e2df224 (patch) | |
| tree | f1b1dfb4444cb17b1fd79d9d5e646e4663d3364c /drivers/regulator/tps65912-regulator.c | |
| parent | Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next (diff) | |
| parent | regulator: Add REGULATOR_LINEAR_RANGE macro (diff) | |
| download | linux-4c35c8676fb224d0cb328ab83237286f8e2df224.tar.xz linux-4c35c8676fb224d0cb328ab83237286f8e2df224.zip | |
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
Diffstat (limited to 'drivers/regulator/tps65912-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65912-regulator.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c index 1ed4d049abfe..9cafaa0f9455 100644 --- a/drivers/regulator/tps65912-regulator.c +++ b/drivers/regulator/tps65912-regulator.c @@ -119,12 +119,9 @@ struct tps65912_reg { }; static const struct regulator_linear_range tps65912_ldo_ranges[] = { - { .min_uV = 800000, .max_uV = 1600000, .min_sel = 0, .max_sel = 32, - .uV_step = 25000 }, - { .min_uV = 1650000, .max_uV = 3000000, .min_sel = 33, .max_sel = 60, - .uV_step = 50000 }, - { .min_uV = 3100000, .max_uV = 3300000, .min_sel = 61, .max_sel = 63, - .uV_step = 100000 }, + REGULATOR_LINEAR_RANGE(800000, 0, 32, 25000), + REGULATOR_LINEAR_RANGE(1650000, 33, 60, 50000), + REGULATOR_LINEAR_RANGE(3100000, 61, 63, 100000), }; static int tps65912_get_range(struct tps65912_reg *pmic, int id) |