diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 12:04:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 12:04:33 +0100 |
| commit | 60c32f3ec879d7e75a5b7d1c57ba8acb6583d1bf (patch) | |
| tree | ceb704b73ca59776e046dae96103dfba1c8620f0 /drivers/regulator | |
| parent | 0f5da28f93fb847a0aa64d359d46b99c73cd1d6e (diff) | |
| parent | f3ef11b485db3fa57e635c64a3fd86533f5e42c8 (diff) | |
| download | blackbird-op-linux-60c32f3ec879d7e75a5b7d1c57ba8acb6583d1bf.tar.gz blackbird-op-linux-60c32f3ec879d7e75a5b7d1c57ba8acb6583d1bf.zip | |
Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-linus
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/wm831x-ldo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c index 1432b26ef2e9..2205fbc2c37b 100644 --- a/drivers/regulator/wm831x-ldo.c +++ b/drivers/regulator/wm831x-ldo.c @@ -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 }, |
