Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 0365df8

Browse files
jneannebroonie
authored andcommitted
regulator: tps65219: use generic set_bypass()
Due to wrong interpretation of the specification, custom implementation was used instead of standard regmap helper. LINK: https://lore.kernel.org/all/c2014039-f1e8-6976-33d6-52e2dd4e7b66@baylibre.com/ Fixes: c12ac5f ("regulator: drivers: Add TI TPS65219 PMIC regulators support") Regulator does NOT require to be off to be switched to bypass mode. Signed-off-by: Jerome Neanne <jneanne@baylibre.com> Link: https://lore.kernel.org/r/20230203140119.13029-1-jneanne@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e314e15 commit 0365df8

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

drivers/regulator/tps65219-regulator.c

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,6 @@ static unsigned int tps65219_get_mode(struct regulator_dev *dev)
173173
return REGULATOR_MODE_NORMAL;
174174
}
175175

176-
/*
177-
* generic regulator_set_bypass_regmap does not fully match requirements
178-
* TPS65219 Requires explicitly that regulator is disabled before switch
179-
*/
180-
static int tps65219_set_bypass(struct regulator_dev *dev, bool enable)
181-
{
182-
struct tps65219 *tps = rdev_get_drvdata(dev);
183-
unsigned int rid = rdev_get_id(dev);
184-
185-
if (dev->desc->ops->is_enabled(dev)) {
186-
dev_err(tps->dev,
187-
"%s LDO%d enabled, must be shut down to set bypass ",
188-
__func__, rid);
189-
return -EBUSY;
190-
}
191-
return regulator_set_bypass_regmap(dev, enable);
192-
}
193-
194176
/* Operations permitted on BUCK1/2/3 */
195177
static const struct regulator_ops tps65219_bucks_ops = {
196178
.is_enabled = regulator_is_enabled_regmap,
@@ -217,7 +199,7 @@ static const struct regulator_ops tps65219_ldos_1_2_ops = {
217199
.set_voltage_sel = regulator_set_voltage_sel_regmap,
218200
.list_voltage = regulator_list_voltage_linear_range,
219201
.map_voltage = regulator_map_voltage_linear_range,
220-
.set_bypass = tps65219_set_bypass,
202+
.set_bypass = regulator_set_bypass_regmap,
221203
.get_bypass = regulator_get_bypass_regmap,
222204
};
223205

0 commit comments

Comments
 (0)