diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:37 +0100 |
commit | 4c35c8676fb224d0cb328ab83237286f8e2df224 (patch) | |
tree | f1b1dfb4444cb17b1fd79d9d5e646e4663d3364c /drivers/regulator/wm8350-regulator.c | |
parent | a6117615a21323140e67d394a3301fd319468f1c (diff) | |
parent | 8828bae464b129abed95b748263f1ab53bdc5755 (diff) | |
download | op-kernel-dev-4c35c8676fb224d0cb328ab83237286f8e2df224.zip op-kernel-dev-4c35c8676fb224d0cb328ab83237286f8e2df224.tar.gz |
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
Diffstat (limited to 'drivers/regulator/wm8350-regulator.c')
-rw-r--r-- | drivers/regulator/wm8350-regulator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 017e869..de7b9c7 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c @@ -543,10 +543,8 @@ static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev, } static const struct regulator_linear_range wm8350_ldo_ranges[] = { - { .min_uV = 900000, .max_uV = 1650000, .min_sel = 0, .max_sel = 15, - .uV_step = 50000 }, - { .min_uV = 1800000, .max_uV = 3300000, .min_sel = 16, .max_sel = 31, - .uV_step = 100000 }, + REGULATOR_LINEAR_RANGE(900000, 0, 15, 50000), + REGULATOR_LINEAR_RANGE(1800000, 16, 31, 100000), }; static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV) |