Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents a2c05e91 b27032ca

drivers/regulator/max8973-regulator.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

	}