summary refs log tree commit diff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorPascal Paillet <p.paillet@st.com>2019-11-13 11:27:37 +0100
committerMark Brown <broonie@kernel.org>2019-11-15 12:05:27 +0000
commit089b3f61ecfc43ca4ea26d595e1d31ead6de3f7b (patch)
tree4e8e82926a2adc6b4f9c0a0729e1b34c1ce13daa /drivers/regulator
parent458ea3ad033fc86e291712ce50cbe60c3428cf30 (diff)
downloadlinux-089b3f61ecfc43ca4ea26d595e1d31ead6de3f7b.tar.gz
regulator: core: Let boot-on regulators be powered off
Boot-on regulators are always kept on because their use_count value
is now incremented at boot time and never cleaned.

Only increment count value for alway-on regulators.
regulator_late_cleanup() is now able to power off boot-on regulators
when unused.

Fixes: 05f224ca6693 ("regulator: core: Clean enabling always-on regulators + their supplies")
Signed-off-by: Pascal Paillet <p.paillet@st.com>
Link: https://lore.kernel.org/r/20191113102737.27831-1-p.paillet@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a5b2a9b02108..5e6c629806e4 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1403,7 +1403,9 @@ static int set_machine_constraints(struct regulator_dev *rdev,
 			rdev_err(rdev, "failed to enable\n");
 			return ret;
 		}
-		rdev->use_count++;
+
+		if (rdev->constraints->always_on)
+			rdev->use_count++;
 	}
 
 	print_constraints(rdev);