Commit 334a8208 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/constraints' into regulator-linus

parents 67cc6885 75bc9641
...@@ -119,6 +119,11 @@ static const char *rdev_get_name(struct regulator_dev *rdev) ...@@ -119,6 +119,11 @@ static const char *rdev_get_name(struct regulator_dev *rdev)
return ""; return "";
} }
static bool have_full_constraints(void)
{
return has_full_constraints || of_have_populated_dt();
}
/** /**
* of_get_regulator - get a regulator device node based on supply name * of_get_regulator - get a regulator device node based on supply name
* @dev: Device pointer for the consumer (of regulator) device * @dev: Device pointer for the consumer (of regulator) device
...@@ -1340,7 +1345,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, ...@@ -1340,7 +1345,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
* Assume that a regulator is physically present and enabled * Assume that a regulator is physically present and enabled
* even if it isn't hooked up and just provide a dummy. * even if it isn't hooked up and just provide a dummy.
*/ */
if (has_full_constraints && allow_dummy) { if (have_full_constraints() && allow_dummy) {
pr_warn("%s supply %s not found, using dummy regulator\n", pr_warn("%s supply %s not found, using dummy regulator\n",
devname, id); devname, id);
...@@ -3627,7 +3632,7 @@ int regulator_suspend_finish(void) ...@@ -3627,7 +3632,7 @@ int regulator_suspend_finish(void)
if (error) if (error)
ret = error; ret = error;
} else { } else {
if (!has_full_constraints) if (!have_full_constraints())
goto unlock; goto unlock;
if (!ops->disable) if (!ops->disable)
goto unlock; goto unlock;
...@@ -3825,7 +3830,7 @@ static int __init regulator_init_complete(void) ...@@ -3825,7 +3830,7 @@ static int __init regulator_init_complete(void)
if (!enabled) if (!enabled)
goto unlock; goto unlock;
if (has_full_constraints) { if (have_full_constraints()) {
/* We log since this may kill the system if it /* We log since this may kill the system if it
* goes wrong. */ * goes wrong. */
rdev_info(rdev, "disabling\n"); rdev_info(rdev, "disabling\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment