raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

regulator: core: fix false positive in regulator_late_cleanup()

Browse Source 
[ Upstream commit 4e2a354e37 ]

The check done by regulator_late_cleanup() to detect whether a regulator
is on was inconsistent with the check done by _regulator_is_enabled().
While _regulator_is_enabled() takes the enable GPIO into account,
regulator_late_cleanup() was not doing that.

This resulted in a false positive, e.g. when a GPIO-controlled fixed
regulator was used, which was not enabled at boot time, e.g.

reg_disp_1v2: reg_disp_1v2 {
	compatible = "regulator-fixed";
	regulator-name = "display_1v2";
	regulator-min-microvolt = <1200000>;
	regulator-max-microvolt = <1200000>;
	gpio = <&tlmm 148 0>;
	enable-active-high;
};

Such regulator doesn't have an is_enabled() operation. Nevertheless
it's state can be determined based on the enable GPIO. The check in
regulator_late_cleanup() wrongly assumed that the regulator is on and
tried to disable it.

Signed-off-by: Oliver Barta <oliver.barta@aptiv.com>
Link: https://lore.kernel.org/r/20220208084645.8686-1-oliver.barta@aptiv.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Oliver Barta
2022-02-08 09:46:45 +01:00
committed by Greg Kroah-Hartman
parent 467d664e5f
commit 6e7015d982
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/regulator/core.c
View File

@@ -5862,9 +5862,8 @@ core_initcall(regulator_init);
static int regulator_late_cleanup(struct device *dev, void *data) static int regulator_late_cleanup(struct device *dev, void *data)
{ {
struct regulator_dev *rdev = dev_to_rdev(dev); struct regulator_dev *rdev = dev_to_rdev(dev);
const struct regulator_ops *ops = rdev->desc->ops;
struct regulation_constraints *c = rdev->constraints; struct regulation_constraints *c = rdev->constraints;
int enabled, ret; int ret;
if (c && c->always_on) if (c && c->always_on)
return 0; return 0;
@@ -5877,14 +5876,8 @@ static int regulator_late_cleanup(struct device *dev, void *data)
if (rdev->use_count) if (rdev->use_count)
goto unlock; goto unlock;
/* If we can't read the status assume it's always on. */ /* If reading the status failed, assume that it's off. */
if (ops->is_enabled) if (_regulator_is_enabled(rdev) <= 0)
enabled = ops->is_enabled(rdev);
else
enabled = 1;
/* But if reading the status failed, assume that it's off. */
if (enabled <= 0)
goto unlock; goto unlock;
if (have_full_constraints()) { if (have_full_constraints()) {