diff options
| author | Linus Torvalds | 2020-01-06 12:04:31 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-01-06 12:04:31 -0800 |
| commit | 5acefdc27b739e68294259c1a89c39d250246554 (patch) | |
| tree | b14c9a25a57dd1f5d2f56ec905757f54b698ce33 /drivers/regulator/bd70528-regulator.c | |
| parent | b967793c96dde15cbcb07fb98238535682cc27f8 (diff) | |
| parent | 6f1ff76154b8b36033efcbf6453a71a3d28f52cd (diff) | |
Merge tag 'regulator-fix-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Three small fixes here, two the result of Axel Lin's amazing work
tracking down inconsistencies in drivers"
* tag 'regulator-fix-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: bd70528: Remove .set_ramp_delay for bd70528_ldo_ops
regulator: axp20x: Fix axp20x_set_ramp_delay
regulator: axp20x: Fix AXP22x ELDO2 regulator enable bitmask
Diffstat (limited to 'drivers/regulator/bd70528-regulator.c')
| -rw-r--r-- | drivers/regulator/bd70528-regulator.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/bd70528-regulator.c b/drivers/regulator/bd70528-regulator.c index ec764022621f..5bf8a2dc5fe7 100644 --- a/drivers/regulator/bd70528-regulator.c +++ b/drivers/regulator/bd70528-regulator.c @@ -101,7 +101,6 @@ static const struct regulator_ops bd70528_ldo_ops = { .set_voltage_sel = regulator_set_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .set_voltage_time_sel = regulator_set_voltage_time_sel, - .set_ramp_delay = bd70528_set_ramp_delay, }; static const struct regulator_ops bd70528_led_ops = { |