diff options
| author | Mark Brown | 2019-03-04 00:49:46 +0100 |
|---|---|---|
| committer | Mark Brown | 2019-03-04 00:49:46 +0100 |
| commit | 1aad9f2f79e0e09f3ecdf6787df6021ab3941ce9 (patch) | |
| tree | 6d98b9475d43d035f597c4139fdd7587b46fae8e /drivers/regulator/wm831x-dcdc.c | |
| parent | regulator: max77650: Convert to use regulator_set/get_current_limit_regmap (diff) | |
| parent | regulator: wm831x-dcdc: Fix list of wm831x_dcdc_ilim from mA to uA (diff) | |
| download | kernel-qcow2-linux-1aad9f2f79e0e09f3ecdf6787df6021ab3941ce9.tar.gz kernel-qcow2-linux-1aad9f2f79e0e09f3ecdf6787df6021ab3941ce9.tar.xz kernel-qcow2-linux-1aad9f2f79e0e09f3ecdf6787df6021ab3941ce9.zip | |
Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-5.1
Diffstat (limited to 'drivers/regulator/wm831x-dcdc.c')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 4a573eea284a..828f262d6be0 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c @@ -304,8 +304,8 @@ static int wm831x_buckv_get_voltage_sel(struct regulator_dev *rdev) } /* Current limit options */ -static u16 wm831x_dcdc_ilim[] = { - 125, 250, 375, 500, 625, 750, 875, 1000 +static const unsigned int wm831x_dcdc_ilim[] = { + 125000, 250000, 375000, 500000, 625000, 750000, 875000, 1000000 }; static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev, |