Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mark Brown 2013-04-28 02:13:43 +01:00
commit 8ca5e1fa9e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/regulator/max8973-regulator.c
View file

@ -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;
}