diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:37 -0400 |
| commit | 4c35c8676fb224d0cb328ab83237286f8e2df224 (patch) | |
| tree | f1b1dfb4444cb17b1fd79d9d5e646e4663d3364c /drivers/regulator/tps65217-regulator.c | |
| parent | a6117615a21323140e67d394a3301fd319468f1c (diff) | |
| parent | 8828bae464b129abed95b748263f1ab53bdc5755 (diff) | |
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
Diffstat (limited to 'drivers/regulator/tps65217-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65217-regulator.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index 8860379fd6be..9ea1bf26bd13 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c | |||
| @@ -52,25 +52,17 @@ static const unsigned int LDO1_VSEL_table[] = { | |||
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | static const struct regulator_linear_range tps65217_uv1_ranges[] = { | 54 | static const struct regulator_linear_range tps65217_uv1_ranges[] = { |
| 55 | { .min_uV = 900000, .max_uV = 1500000, .min_sel = 0, .max_sel = 24, | 55 | REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000), |
| 56 | .uV_step = 25000 }, | 56 | REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000), |
| 57 | { .min_uV = 1550000, .max_uV = 1800000, .min_sel = 25, .max_sel = 30, | 57 | REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000), |
| 58 | .uV_step = 50000 }, | 58 | REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000), |
| 59 | { .min_uV = 1850000, .max_uV = 2900000, .min_sel = 31, .max_sel = 52, | 59 | REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0), |
| 60 | .uV_step = 50000 }, | ||
| 61 | { .min_uV = 3000000, .max_uV = 3200000, .min_sel = 53, .max_sel = 55, | ||
| 62 | .uV_step = 100000 }, | ||
| 63 | { .min_uV = 3300000, .max_uV = 3300000, .min_sel = 56, .max_sel = 62, | ||
| 64 | .uV_step = 0 }, | ||
| 65 | }; | 60 | }; |
| 66 | 61 | ||
| 67 | static const struct regulator_linear_range tps65217_uv2_ranges[] = { | 62 | static const struct regulator_linear_range tps65217_uv2_ranges[] = { |
| 68 | { .min_uV = 1500000, .max_uV = 1900000, .min_sel = 0, .max_sel = 8, | 63 | REGULATOR_LINEAR_RANGE(1500000, 0, 8, 50000), |
| 69 | .uV_step = 50000 }, | 64 | REGULATOR_LINEAR_RANGE(2000000, 9, 13, 100000), |
| 70 | { .min_uV = 2000000, .max_uV = 2400000, .min_sel = 9, .max_sel = 13, | 65 | REGULATOR_LINEAR_RANGE(2450000, 14, 31, 50000), |
| 71 | .uV_step = 100000 }, | ||
| 72 | { .min_uV = 2450000, .max_uV = 3300000, .min_sel = 14, .max_sel = 31, | ||
| 73 | .uV_step = 50000 }, | ||
| 74 | }; | 66 | }; |
| 75 | 67 | ||
| 76 | static int tps65217_pmic_enable(struct regulator_dev *dev) | 68 | static int tps65217_pmic_enable(struct regulator_dev *dev) |