commit bf1fc23c80e61695e8e899354d17549a4946a9d0
author Mark Brown <broonie@kernel.org> Fri Jul 17 12:42:48 2015 +0100
committer Mark Brown <broonie@kernel.org> Fri Jul 17 12:42:48 2015 +0100
tree d2f4a544d3b96f7e576a7622e3cd75cc2bcfa51d
parent fa26e4d2b3cf1c84f20fbc003501bb028f682d92
parent 322dfa6402ec08da1ca182ac0061a1cf2c5c3101

Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
	drivers/regulator/88pm800.c

drivers/regulator/88pm800.c

diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index 26c277f..a62a896 100644
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@ -133,7 +133,7 @@
 		.owner			= THIS_MODULE,			\
 		.n_voltages		= ARRAY_SIZE(ldo_volt_table),	\
 		.vsel_reg		= PM800_##vreg##_VOUT,		\
-		.vsel_mask		= 0x1f,				\
+		.vsel_mask		= 0xf,				\
 		.enable_reg		= PM800_##ereg,			\
 		.enable_mask		= 1 << (ebit),			\
 		.volt_table		= ldo_volt_table,		\