Skip to content

L
linux
Commit 8ca5e1fa authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'regulator/topic/max8973' into v3.9-rc8

parents a2c05e91 b27032ca
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
drivers/regulator/max8973-regulator.c
View file @ 8ca5e1fa
...@@ -274,15 +274,15 @@ static int max8973_init_dcdc(struct max8973_chip *max, ...@@ -274,15 +274,15 @@ static int max8973_init_dcdc(struct max8973_chip *max,
if (pdata->reg_init_data && if (pdata->reg_init_data &&
pdata->reg_init_data->constraints.ramp_delay) { pdata->reg_init_data->constraints.ramp_delay) {
if (pdata->reg_init_data->constraints.ramp_delay < 25000) 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) 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) else if (pdata->reg_init_data->constraints.ramp_delay < 200000)
control1 = MAX8973_RAMP_50mV_PER_US; control1 |= MAX8973_RAMP_50mV_PER_US;
else else
control1 = MAX8973_RAMP_200mV_PER_US; control1 |= MAX8973_RAMP_200mV_PER_US;
} else { } else {
control1 = MAX8973_RAMP_12mV_PER_US; control1 |= MAX8973_RAMP_12mV_PER_US;
max->desc.ramp_delay = 12500; max->desc.ramp_delay = 12500;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7