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

Commit 22a712b9 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents eea8e85e 1864b670

drivers/regulator/tps62360-regulator.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -278,7 +278,7 @@ static int tps62360_init_dcdc(struct tps62360_chip *tps, 
			__func__, REG_RAMPCTRL, ret);

			__func__, REG_RAMPCTRL, ret);

		return ret;

		return ret;

	}

	}

	ramp_ctrl = (ramp_ctrl >> 4) & 0x7;

	ramp_ctrl = (ramp_ctrl >> 5) & 0x7;





	/* ramp mV/us = 32/(2^ramp_ctrl) */

	/* ramp mV/us = 32/(2^ramp_ctrl) */

	tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl));

	tps->desc.ramp_delay = DIV_ROUND_UP(32000, BIT(ramp_ctrl));