diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:38 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:38 -0400 |
commit | 88c260a180817093682af8bd311ca141ba3952c9 (patch) | |
tree | 37654842800eea4b3cc17bc05f4f40670ec3b6c3 | |
parent | 08f09c63e1b0d01ba59b43d4b7e1454c72ae72f5 (diff) | |
parent | 6e044c3fa87e310f24ec8062d7d6954180761fea (diff) |
Merge remote-tracking branch 'regulator/topic/mc13783' into regulator-next
-rw-r--r-- | drivers/regulator/mc13783-regulator.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index f036b26d4cfc..7f4a67edf780 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c | |||
@@ -258,34 +258,34 @@ static struct mc13xxx_regulator mc13783_regulators[] = { | |||
258 | 258 | ||
259 | MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val), | 259 | MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val), |
260 | MC13783_FIXED_DEFINE(REG, VIOHI, REGULATORMODE0, mc13783_viohi_val), | 260 | MC13783_FIXED_DEFINE(REG, VIOHI, REGULATORMODE0, mc13783_viohi_val), |
261 | MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0, \ | 261 | MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0, |
262 | mc13783_violo_val), | 262 | mc13783_violo_val), |
263 | MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0, \ | 263 | MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0, |
264 | mc13783_vdig_val), | 264 | mc13783_vdig_val), |
265 | MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0, \ | 265 | MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0, |
266 | mc13783_vgen_val), | 266 | mc13783_vgen_val), |
267 | MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0, \ | 267 | MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0, |
268 | mc13783_vrfdig_val), | 268 | mc13783_vrfdig_val), |
269 | MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0, \ | 269 | MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0, |
270 | mc13783_vrfref_val), | 270 | mc13783_vrfref_val), |
271 | MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0, \ | 271 | MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0, |
272 | mc13783_vrfcp_val), | 272 | mc13783_vrfcp_val), |
273 | MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0, \ | 273 | MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0, |
274 | mc13783_vsim_val), | 274 | mc13783_vsim_val), |
275 | MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0, \ | 275 | MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0, |
276 | mc13783_vesim_val), | 276 | mc13783_vesim_val), |
277 | MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0, \ | 277 | MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0, |
278 | mc13783_vcam_val), | 278 | mc13783_vcam_val), |
279 | MC13783_FIXED_DEFINE(REG, VRFBG, REGULATORMODE1, mc13783_vrfbg_val), | 279 | MC13783_FIXED_DEFINE(REG, VRFBG, REGULATORMODE1, mc13783_vrfbg_val), |
280 | MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1, \ | 280 | MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1, |
281 | mc13783_vvib_val), | 281 | mc13783_vvib_val), |
282 | MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1, \ | 282 | MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1, |
283 | mc13783_vrf_val), | 283 | mc13783_vrf_val), |
284 | MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1, \ | 284 | MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1, |
285 | mc13783_vrf_val), | 285 | mc13783_vrf_val), |
286 | MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1, \ | 286 | MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1, |
287 | mc13783_vmmc_val), | 287 | mc13783_vmmc_val), |
288 | MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1, \ | 288 | MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1, |
289 | mc13783_vmmc_val), | 289 | mc13783_vmmc_val), |
290 | MC13783_GPO_DEFINE(REG, GPO1, POWERMISC, mc13783_gpo_val), | 290 | MC13783_GPO_DEFINE(REG, GPO1, POWERMISC, mc13783_gpo_val), |
291 | MC13783_GPO_DEFINE(REG, GPO2, POWERMISC, mc13783_gpo_val), | 291 | MC13783_GPO_DEFINE(REG, GPO2, POWERMISC, mc13783_gpo_val), |