summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/wm8400-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:37 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:37 +0100
commit4c35c8676fb224d0cb328ab83237286f8e2df224 (patch)
treef1b1dfb4444cb17b1fd79d9d5e646e4663d3364c /drivers/regulator/wm8400-regulator.c
parenta6117615a21323140e67d394a3301fd319468f1c (diff)
parent8828bae464b129abed95b748263f1ab53bdc5755 (diff)
downloadlinux-4c35c8676fb224d0cb328ab83237286f8e2df224.tar.gz
linux-4c35c8676fb224d0cb328ab83237286f8e2df224.tar.bz2
linux-4c35c8676fb224d0cb328ab83237286f8e2df224.zip
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
Diffstat (limited to 'drivers/regulator/wm8400-regulator.c')
-rw-r--r--drivers/regulator/wm8400-regulator.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 870b52f709bc..82d829000851 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -20,10 +20,8 @@
#include <linux/mfd/wm8400-private.h>
static const struct regulator_linear_range wm8400_ldo_ranges[] = {
- { .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 },
+ REGULATOR_LINEAR_RANGE(900000, 0, 14, 50000),
+ REGULATOR_LINEAR_RANGE(1700000, 15, 31, 100000),
};
static struct regulator_ops wm8400_ldo_ops = {