]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regulator: core: Let boot-on regulators be powered off
authorPascal Paillet <p.paillet@st.com>
Wed, 13 Nov 2019 10:27:37 +0000 (11:27 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:45:32 +0000 (16:45 +0100)
[ Upstream commit 089b3f61ecfc43ca4ea26d595e1d31ead6de3f7b ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/regulator/core.c

index 51ce280c1ce1360d1bf9a503cfb88b8e88a66fe2..87bc06b386a04503eeaf009ae7280e095985cf74 100644 (file)
@@ -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);