Make regulator_sync_voltage() to re-balance voltage state of a coupled regulators instead of changing the voltage directly. Tested-by: Peter Geis <pgwipeout@xxxxxxxxx> # Ouya T30 Tested-by: Dmitry Osipenko <digetx@xxxxxxxxx> # A500 T20 and Nexus7 T30 Tested-by: Nicolas Chauvet <kwizart@xxxxxxxxx> # PAZ00 T20 Tested-by: Matt Merhar <mattmerhar@xxxxxxxxxxxxxx> # Ouya T30 Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx> --- Changelog: v4: - Now not using goto in the code, like it was suggested by Mark Brown in a review comment to v3. v3: - This patch is factored out from [1] to ease merging of the patches that will use the regulator_sync_voltage(). The goal is to get this change merged into 5.12, it will remove dependency for the Tegra Core power domain driver which will target 5.13. [1] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=221130 drivers/regulator/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 3ae5ccd9277d..8e197b785a31 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4148,7 +4148,11 @@ int regulator_sync_voltage(struct regulator *regulator) if (ret < 0) goto out; - ret = _regulator_do_set_voltage(rdev, min_uV, max_uV); + /* balance only, if regulator is coupled */ + if (rdev->coupling_desc.n_coupled > 1) + ret = regulator_balance_voltage(rdev, PM_SUSPEND_ON); + else + ret = _regulator_do_set_voltage(rdev, min_uV, max_uV); out: regulator_unlock(rdev); -- 2.29.2