diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-06 15:52:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-06 15:52:14 +0200 |
| commit | e2a23affe6a6a15111ae56edd7e4f3c9673ef201 (patch) | |
| tree | a69d90bfe04ff687e8ccde00ddac9aea357e33e6 /drivers/regulator/tps65217-regulator.c | |
| parent | Merge branch 'regulator-5.1' into regulator-linus (diff) | |
| parent | regulator: core: simplify return value on suported_voltage (diff) | |
| download | linux-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.tar.xz linux-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.zip | |
Merge branch 'regulator-5.2' into regulator-next
Diffstat (limited to 'drivers/regulator/tps65217-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65217-regulator.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index 546fb5cf2023..67ba78da77ec 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c @@ -58,8 +58,7 @@ static const unsigned int LDO1_VSEL_table[] = { static const struct regulator_linear_range tps65217_uv1_ranges[] = { REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000), - REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000), - REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000), + REGULATOR_LINEAR_RANGE(1550000, 25, 52, 50000), REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000), REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0), }; @@ -150,7 +149,7 @@ static int tps65217_pmic_set_suspend_disable(struct regulator_dev *dev) } /* Operations permitted on DCDCx, LDO2, LDO3 and LDO4 */ -static struct regulator_ops tps65217_pmic_ops = { +static const struct regulator_ops tps65217_pmic_ops = { .is_enabled = regulator_is_enabled_regmap, .enable = tps65217_pmic_enable, .disable = tps65217_pmic_disable, @@ -163,7 +162,7 @@ static struct regulator_ops tps65217_pmic_ops = { }; /* Operations permitted on LDO1 */ -static struct regulator_ops tps65217_pmic_ldo1_ops = { +static const struct regulator_ops tps65217_pmic_ldo1_ops = { .is_enabled = regulator_is_enabled_regmap, .enable = tps65217_pmic_enable, .disable = tps65217_pmic_disable, |