summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:43 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:43 +0100
commit8ca5e1fa9e7c5294e7cb09def81d8408a92faa2e (patch)
treeb50ea9ff9a9a3108723fbec3c0872b24289c4934 /drivers/regulator
parenta2c05e91b991179d43e358d5eb9390f57a59a75f (diff)
parentb27032ca3ec19edc7a1e3ed76e0988645505507b (diff)
downloadblackbird-op-linux-8ca5e1fa9e7c5294e7cb09def81d8408a92faa2e.tar.gz
blackbird-op-linux-8ca5e1fa9e7c5294e7cb09def81d8408a92faa2e.zip
Merge remote-tracking branch 'regulator/topic/max8973' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max8973-regulator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 9a8ea9163005..adb1414e5e37 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -274,15 +274,15 @@ static int max8973_init_dcdc(struct max8973_chip *max,
if (pdata->reg_init_data &&
pdata->reg_init_data->constraints.ramp_delay) {
if (pdata->reg_init_data->constraints.ramp_delay < 25000)
- control1 = MAX8973_RAMP_12mV_PER_US;
+ control1 |= MAX8973_RAMP_12mV_PER_US;
else if (pdata->reg_init_data->constraints.ramp_delay < 50000)
- control1 = MAX8973_RAMP_25mV_PER_US;
+ control1 |= MAX8973_RAMP_25mV_PER_US;
else if (pdata->reg_init_data->constraints.ramp_delay < 200000)
- control1 = MAX8973_RAMP_50mV_PER_US;
+ control1 |= MAX8973_RAMP_50mV_PER_US;
else
- control1 = MAX8973_RAMP_200mV_PER_US;
+ control1 |= MAX8973_RAMP_200mV_PER_US;
} else {
- control1 = MAX8973_RAMP_12mV_PER_US;
+ control1 |= MAX8973_RAMP_12mV_PER_US;
max->desc.ramp_delay = 12500;
}
OpenPOWER on IntegriCloud