diff options
| -rw-r--r-- | drivers/regulator/max8973-regulator.c | 10 |
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, | |||
| 274 | if (pdata->reg_init_data && | 274 | if (pdata->reg_init_data && |
| 275 | pdata->reg_init_data->constraints.ramp_delay) { | 275 | pdata->reg_init_data->constraints.ramp_delay) { |
| 276 | if (pdata->reg_init_data->constraints.ramp_delay < 25000) | 276 | if (pdata->reg_init_data->constraints.ramp_delay < 25000) |
| 277 | control1 = MAX8973_RAMP_12mV_PER_US; | 277 | control1 |= MAX8973_RAMP_12mV_PER_US; |
| 278 | else if (pdata->reg_init_data->constraints.ramp_delay < 50000) | 278 | else if (pdata->reg_init_data->constraints.ramp_delay < 50000) |
| 279 | control1 = MAX8973_RAMP_25mV_PER_US; | 279 | control1 |= MAX8973_RAMP_25mV_PER_US; |
| 280 | else if (pdata->reg_init_data->constraints.ramp_delay < 200000) | 280 | else if (pdata->reg_init_data->constraints.ramp_delay < 200000) |
| 281 | control1 = MAX8973_RAMP_50mV_PER_US; | 281 | control1 |= MAX8973_RAMP_50mV_PER_US; |
| 282 | else | 282 | else |
| 283 | control1 = MAX8973_RAMP_200mV_PER_US; | 283 | control1 |= MAX8973_RAMP_200mV_PER_US; |
| 284 | } else { | 284 | } else { |
| 285 | control1 = MAX8973_RAMP_12mV_PER_US; | 285 | control1 |= MAX8973_RAMP_12mV_PER_US; |
| 286 | max->desc.ramp_delay = 12500; | 286 | max->desc.ramp_delay = 12500; |
| 287 | } | 287 | } |
| 288 | 288 | ||
