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

Commit 60c32f3e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-linus

parents 0f5da28f f3ef11b4

drivers/regulator/wm831x-ldo.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data) 
 */



static const struct regulator_linear_range wm831x_gp_ldo_ranges[] = {

	{ .min_uV =  900000, .max_uV = 1650000, .min_sel =  0, .max_sel = 14,

	{ .min_uV =  900000, .max_uV = 1600000, .min_sel =  0, .max_sel = 14,

	  .uV_step =  50000 },

	{ .min_uV = 1700000, .max_uV = 3300000, .min_sel = 15, .max_sel = 31,

	  .uV_step = 100000 },
@@ -332,7 +332,7 @@ static struct platform_driver wm831x_gp_ldo_driver = { 
 */



static const struct regulator_linear_range wm831x_aldo_ranges[] = {

	{ .min_uV = 1000000, .max_uV = 1650000, .min_sel =  0, .max_sel = 12,

	{ .min_uV = 1000000, .max_uV = 1600000, .min_sel =  0, .max_sel = 12,

	  .uV_step =  50000 },

	{ .min_uV = 1700000, .max_uV = 3500000, .min_sel = 13, .max_sel = 31,

	  .uV_step = 100000 },