summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/88pg86x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-06-01 13:01:44 +0100
committerMark Brown <broonie@kernel.org>2020-06-01 13:01:44 +0100
commit5fb565b69dabd5a256fc116702331b54a4621dc9 (patch)
tree55c3cd9ba11101f9c2e3b6789d0b4d87f91e0732 /drivers/regulator/88pg86x.c
parentcc58045486d0f938662b01025c855fd4aea89ea6 (diff)
parent0b0c0bd818ef76a20f58c3cb1ac96a3056ccb681 (diff)
downloadlinux-5fb565b69dabd5a256fc116702331b54a4621dc9.tar.bz2
Merge remote-tracking branch 'regulator/for-5.8' into regulator-linus
Diffstat (limited to 'drivers/regulator/88pg86x.c')
-rw-r--r--drivers/regulator/88pg86x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/88pg86x.c b/drivers/regulator/88pg86x.c
index d5ef55c81185..71cfa2c5de5e 100644
--- a/drivers/regulator/88pg86x.c
+++ b/drivers/regulator/88pg86x.c
@@ -11,13 +11,13 @@ static const struct regulator_ops pg86x_ops = {
.list_voltage = regulator_list_voltage_linear_range,
};
-static const struct regulator_linear_range pg86x_buck1_ranges[] = {
+static const struct linear_range pg86x_buck1_ranges[] = {
REGULATOR_LINEAR_RANGE( 0, 0, 10, 0),
REGULATOR_LINEAR_RANGE(1000000, 11, 34, 25000),
REGULATOR_LINEAR_RANGE(1600000, 35, 47, 50000),
};
-static const struct regulator_linear_range pg86x_buck2_ranges[] = {
+static const struct linear_range pg86x_buck2_ranges[] = {
REGULATOR_LINEAR_RANGE( 0, 0, 15, 0),
REGULATOR_LINEAR_RANGE(1000000, 16, 39, 25000),
REGULATOR_LINEAR_RANGE(1600000, 40, 52, 50000),