commit e953583456005823d7c20fefe5212f0f60a93fb6
author Mark Brown <broonie@linaro.org> Sun Jun 01 19:15:16 2014 +0100
committer Mark Brown <broonie@linaro.org> Sun Jun 01 19:16:11 2014 +0100
tree f8849caebda4409c190f565e5ca24f9898eba03f
parent c9eaa447e77efe77b7fa4c953bd62de8297fd6c5

regulator: Don't disable unused regulators we don't have permission for

In the spirit of conservatism that governs our general approach to
permissions it is better if we don't touch regulators we weren't explicitly
given permissions to control. This avoids the need to explicitly specify
unknown regulators in DT as always on, if a regulator is not otherwise
involved in software control it can be omitted from the DT.

Regulators explicitly given constraints in DT still need to have an always
on constraint specified as before.

Signed-off-by: Mark Brown <broonie@linaro.org>

drivers/regulator/core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9a09f3c..e3cb9b6 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3819,8 +3819,9 @@
 	mutex_lock(&regulator_list_mutex);
 
 	/* If we have a full configuration then disable any regulators
-	 * which are not in use or always_on.  This will become the
-	 * default behaviour in the future.
+	 * we have permission to change the status for and which are
+	 * not in use or always_on.  This is effectively the default
+	 * for DT and ACPI as they have full constraints.
 	 */
 	list_for_each_entry(rdev, &regulator_list, list) {
 		ops = rdev->desc->ops;
@@ -3829,6 +3830,9 @@
 		if (c && c->always_on)
 			continue;
 
+		if (c && !(c->valid_ops_mask & REGULATOR_CHANGE_STATUS))
+			continue;
+
 		mutex_lock(&rdev->mutex);
 
 		if (rdev->use_count)