p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Marek Szyprowski 2018-09-03 16:49:37 +02:00 committed by Mark Brown
parent ef394f3fbe
commit 3edd79cf5a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/core.c
View File

@ -3161,7 +3161,7 @@ static inline int regulator_suspend_toggle(struct regulator_dev *rdev,
if (!rstate->changeable) if (!rstate->changeable)
return -EPERM; return -EPERM;
rstate->enabled = en; rstate->enabled = (en) ? ENABLE_IN_SUSPEND : DISABLE_IN_SUSPEND;
return 0; return 0;
} }

2
drivers/regulator/of_regulator.c
View File

@ -213,8 +213,6 @@ static void of_get_regulation_constraints(struct device_node *np,
else if (of_property_read_bool(suspend_np, else if (of_property_read_bool(suspend_np,
"regulator-off-in-suspend")) "regulator-off-in-suspend"))
suspend_state->enabled = DISABLE_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", if (!of_property_read_u32(np, "regulator-suspend-min-microvolt",
&pval)) &pval))

6
include/linux/regulator/machine.h
View File

@ -48,9 +48,9 @@ struct regulator;
* DISABLE_IN_SUSPEND - turn off regulator in suspend states * DISABLE_IN_SUSPEND - turn off regulator in suspend states
* ENABLE_IN_SUSPEND - keep regulator on in suspend states * ENABLE_IN_SUSPEND - keep regulator on in suspend states
*/ */
#define DO_NOTHING_IN_SUSPEND (-1) #define DO_NOTHING_IN_SUSPEND 0
#define DISABLE_IN_SUSPEND 0 #define DISABLE_IN_SUSPEND 1
#define ENABLE_IN_SUSPEND 1 #define ENABLE_IN_SUSPEND 2
/* Regulator active discharge flags */ /* Regulator active discharge flags */
enum regulator_active_discharge { enum regulator_active_discharge {