diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-01 13:01:44 +0100 |
| commit | 5fb565b69dabd5a256fc116702331b54a4621dc9 (patch) | |
| tree | 55c3cd9ba11101f9c2e3b6789d0b4d87f91e0732 /drivers/regulator/hi6421-regulator.c | |
| parent | cc58045486d0f938662b01025c855fd4aea89ea6 (diff) | |
| parent | 0b0c0bd818ef76a20f58c3cb1ac96a3056ccb681 (diff) | |
| download | linux-5fb565b69dabd5a256fc116702331b54a4621dc9.tar.bz2 | |
Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus
Diffstat (limited to 'drivers/regulator/hi6421-regulator.c')
| -rw-r--r-- | drivers/regulator/hi6421-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/hi6421-regulator.c b/drivers/regulator/hi6421-regulator.c index 5ac3d7c29725..66219d8dfc1a 100644 --- a/drivers/regulator/hi6421-regulator.c +++ b/drivers/regulator/hi6421-regulator.c @@ -87,7 +87,7 @@ static const unsigned int ldo_8_voltages[] = { }; /* Ranges are sorted in ascending order. */ -static const struct regulator_linear_range ldo_audio_volt_range[] = { +static const struct linear_range ldo_audio_volt_range[] = { REGULATOR_LINEAR_RANGE(2800000, 0, 3, 50000), REGULATOR_LINEAR_RANGE(3000000, 4, 7, 100000), }; @@ -195,7 +195,7 @@ static const struct regulator_ops hi6421_buck345_ops; * _id - LDO id name string * _match - of match name string * n_volt - number of votages available - * volt_ranges - array of regulator_linear_range + * volt_ranges - array of linear_range * vstep - voltage increase in each linear step in uV * vreg - voltage select register * vmask - voltage select mask |