diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2018-09-03 16:49:37 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-09-03 16:10:40 +0100 |
| commit | 3edd79cf5a44b12dbb13bc320f5788aed6562b36 (patch) | |
| tree | 113e6648b42a65f5eab03fdf69227f4ca27707f3 /drivers/regulator/of_regulator.c | |
| parent | regulator: da9063: fix DT probing with constraints (diff) | |
| download | linux-dev-3edd79cf5a44b12dbb13bc320f5788aed6562b36.tar.xz linux-dev-3edd79cf5a44b12dbb13bc320f5788aed6562b36.zip | |
regulator: Fix 'do-nothing' value for regulators without suspend state
Some regulators don't have all states defined and in such cases regulator
core should not assume anything. However in current implementation
of of_get_regulation_constraints() DO_NOTHING_IN_SUSPEND enable value was
set only for regulators which had suspend node defined, otherwise the
default 0 value was used, what means DISABLE_IN_SUSPEND. This lead to
broken system suspend/resume on boards, which had simple regulator
constraints definition (without suspend state nodes).
To avoid further mismatches between the default and uninitialized values
of the suspend enabled/disabled states, change the values of the them,
so default '0' means DO_NOTHING_IN_SUSPEND.
Fixes: 72069f9957a1: regulator: leave one item to record whether regulator is enabled
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/regulator/of_regulator.c')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 638f17d4c848..210fc20f7de7 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -213,8 +213,6 @@ static void of_get_regulation_constraints(struct device_node *np, else if (of_property_read_bool(suspend_np, "regulator-off-in-suspend")) suspend_state->enabled = DISABLE_IN_SUSPEND; - else - suspend_state->enabled = DO_NOTHING_IN_SUSPEND; if (!of_property_read_u32(np, "regulator-suspend-min-microvolt", &pval)) |