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

diff --combined drivers/regulator/core.c
index 3fe1313,6a75794..d85f313
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -119,6 -119,11 +119,11 @@@ static const char *rdev_get_name(struc
                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
   * @dev: Device pointer for the consumer (of regulator) device
@@@ -1340,7 -1345,7 +1345,7 @@@ static struct regulator *_regulator_get
         * Assume that a regulator is physically present and enabled
         * 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",
                        devname, id);
  
@@@ -2184,9 -2189,6 +2189,9 @@@ int regulator_list_voltage(struct regul
        struct regulator_ops    *ops = rdev->desc->ops;
        int                     ret;
  
 +      if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
 +              return rdev->desc->fixed_uV;
 +
        if (!ops->list_voltage || selector >= rdev->desc->n_voltages)
                return -EINVAL;
  
@@@ -3627,7 -3629,7 +3632,7 @@@ int regulator_suspend_finish(void
                        if (error)
                                ret = error;
                } else {
-                       if (!has_full_constraints)
+                       if (!have_full_constraints())
                                goto unlock;
                        if (!ops->disable)
                                goto unlock;
@@@ -3825,7 -3827,7 +3830,7 @@@ static int __init regulator_init_comple
                if (!enabled)
                        goto unlock;
  
-               if (has_full_constraints) {
+               if (have_full_constraints()) {
                        /* We log since this may kill the system if it
                         * goes wrong. */
                        rdev_info(rdev, "disabling\n");