aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps65218-regulator.c
diff options
context:
space:
mode:
authorKeerthy <j-keerthy@ti.com>2014-07-09 06:22:59 -0400
committerMark Brown <broonie@linaro.org>2014-07-10 08:11:36 -0400
commit7753d2d41f658fe42de148732173e35999fd5e39 (patch)
treea79c9d11204550fa62525da6643adc7480ce1b99 /drivers/regulator/tps65218-regulator.c
parent6a5e06d9f4443c6f967ea7352cf30abdd681accf (diff)
regulator: tps65218: Add fixed_uV fields for dcdc5 and dcdc6
Add fixed_uV fields for dcdc5 and dcdc6. Signed-off-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/tps65218-regulator.c')
-rw-r--r--drivers/regulator/tps65218-regulator.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index e610dadcf6d1..f0a40281b9c1 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -30,7 +30,7 @@
30enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 }; 30enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };
31 31
32#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, \ 32#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, \
33 _lr, _nlr, _delay) \ 33 _lr, _nlr, _delay, _fuv) \
34 { \ 34 { \
35 .name = _name, \ 35 .name = _name, \
36 .id = _id, \ 36 .id = _id, \
@@ -46,6 +46,7 @@ enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };
46 .linear_ranges = _lr, \ 46 .linear_ranges = _lr, \
47 .n_linear_ranges = _nlr, \ 47 .n_linear_ranges = _nlr, \
48 .ramp_delay = _delay, \ 48 .ramp_delay = _delay, \
49 .fixed_uV = _fuv \
49 } \ 50 } \
50 51
51#define TPS65218_INFO(_id, _nm, _min, _max) \ 52#define TPS65218_INFO(_id, _nm, _min, _max) \
@@ -186,32 +187,32 @@ static const struct regulator_desc regulators[] = {
186 TPS65218_REG_CONTROL_DCDC1, 187 TPS65218_REG_CONTROL_DCDC1,
187 TPS65218_CONTROL_DCDC1_MASK, 188 TPS65218_CONTROL_DCDC1_MASK,
188 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN, 189 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN,
189 dcdc1_dcdc2_ranges, 2, 4000), 190 dcdc1_dcdc2_ranges, 2, 4000, 0),
190 TPS65218_REGULATOR("DCDC2", TPS65218_DCDC_2, tps65218_dcdc12_ops, 64, 191 TPS65218_REGULATOR("DCDC2", TPS65218_DCDC_2, tps65218_dcdc12_ops, 64,
191 TPS65218_REG_CONTROL_DCDC2, 192 TPS65218_REG_CONTROL_DCDC2,
192 TPS65218_CONTROL_DCDC2_MASK, 193 TPS65218_CONTROL_DCDC2_MASK,
193 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN, 194 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN,
194 dcdc1_dcdc2_ranges, 2, 4000), 195 dcdc1_dcdc2_ranges, 2, 4000, 0),
195 TPS65218_REGULATOR("DCDC3", TPS65218_DCDC_3, tps65218_ldo1_dcdc34_ops, 196 TPS65218_REGULATOR("DCDC3", TPS65218_DCDC_3, tps65218_ldo1_dcdc34_ops,
196 64, TPS65218_REG_CONTROL_DCDC3, 197 64, TPS65218_REG_CONTROL_DCDC3,
197 TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1, 198 TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1,
198 TPS65218_ENABLE1_DC3_EN, ldo1_dcdc3_ranges, 2, 0), 199 TPS65218_ENABLE1_DC3_EN, ldo1_dcdc3_ranges, 2, 0, 0),
199 TPS65218_REGULATOR("DCDC4", TPS65218_DCDC_4, tps65218_ldo1_dcdc34_ops, 200 TPS65218_REGULATOR("DCDC4", TPS65218_DCDC_4, tps65218_ldo1_dcdc34_ops,
200 53, TPS65218_REG_CONTROL_DCDC4, 201 53, TPS65218_REG_CONTROL_DCDC4,
201 TPS65218_CONTROL_DCDC4_MASK, 202 TPS65218_CONTROL_DCDC4_MASK,
202 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN, 203 TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN,
203 dcdc4_ranges, 2, 0), 204 dcdc4_ranges, 2, 0, 0),
204 TPS65218_REGULATOR("DCDC5", TPS65218_DCDC_5, tps65218_dcdc56_pmic_ops, 205 TPS65218_REGULATOR("DCDC5", TPS65218_DCDC_5, tps65218_dcdc56_pmic_ops,
205 1, -1, -1, TPS65218_REG_ENABLE1, 206 1, -1, -1, TPS65218_REG_ENABLE1,
206 TPS65218_ENABLE1_DC5_EN, NULL, 0, 0), 207 TPS65218_ENABLE1_DC5_EN, NULL, 0, 0, 1000000),
207 TPS65218_REGULATOR("DCDC6", TPS65218_DCDC_6, tps65218_dcdc56_pmic_ops, 208 TPS65218_REGULATOR("DCDC6", TPS65218_DCDC_6, tps65218_dcdc56_pmic_ops,
208 1, -1, -1, TPS65218_REG_ENABLE1, 209 1, -1, -1, TPS65218_REG_ENABLE1,
209 TPS65218_ENABLE1_DC6_EN, NULL, 0, 0), 210 TPS65218_ENABLE1_DC6_EN, NULL, 0, 0, 1800000),
210 TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64, 211 TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,
211 TPS65218_REG_CONTROL_LDO1, 212 TPS65218_REG_CONTROL_LDO1,
212 TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2, 213 TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,
213 TPS65218_ENABLE2_LDO1_EN, ldo1_dcdc3_ranges, 214 TPS65218_ENABLE2_LDO1_EN, ldo1_dcdc3_ranges,
214 2, 0), 215 2, 0, 0),
215}; 216};
216 217
217static int tps65218_regulator_probe(struct platform_device *pdev) 218static int tps65218_regulator_probe(struct platform_device *pdev)