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/act8865-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/act8865-regulator.c')
| -rw-r--r-- | drivers/regulator/act8865-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index 0fa97f934df4..19b9742c9ecc 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -220,13 +220,13 @@ static const struct regmap_config act8865_regmap_config = { .val_bits = 8, }; -static const struct regulator_linear_range act8865_voltage_ranges[] = { +static const struct linear_range act8865_voltage_ranges[] = { REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000), REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000), REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000), }; -static const struct regulator_linear_range act8600_sudcdc_voltage_ranges[] = { +static const struct linear_range act8600_sudcdc_voltage_ranges[] = { REGULATOR_LINEAR_RANGE(3000000, 0, 63, 0), REGULATOR_LINEAR_RANGE(3000000, 64, 159, 100000), REGULATOR_LINEAR_RANGE(12600000, 160, 191, 200000), |