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

Commit 925f14dc authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next

parents 8ee00511 43f1f216

drivers/regulator/wm831x-dcdc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ static int wm831x_buckv_map_voltage(struct regulator_dev *rdev, 
	if (min_uV < 600000)

	if (min_uV < 600000)

		vsel = 0;

		vsel = 0;

	else if (min_uV <= 1800000)

	else if (min_uV <= 1800000)

		vsel = ((min_uV - 600000) / 12500) + 8;

		vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8;

	else

	else

		return -EINVAL;

		return -EINVAL;
@@ -993,4 +993,5 @@ MODULE_DESCRIPTION("WM831x DC-DC convertor driver"); 
MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:wm831x-buckv");

MODULE_ALIAS("platform:wm831x-buckv");

MODULE_ALIAS("platform:wm831x-buckp");

MODULE_ALIAS("platform:wm831x-buckp");

MODULE_ALIAS("platform:wm831x-boostp");

MODULE_ALIAS("platform:wm831x-epe");
 
MODULE_ALIAS("platform:wm831x-epe");