2 files changed, 37 insertions, 2 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 51cf2bb37438..eb112d961515 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2328,7 +2328,37 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
                 goto scrub;
 
         /* set supply regulator if it exists */
+        if (init_data->supply_regulator && init_data->supply_regulator_dev) {
+                dev_err(dev,
+                        "Supply regulator specified by both name and dev\n");
+                goto scrub;
+        }
+
+        if (init_data->supply_regulator) {
+                struct regulator_dev *r;
+                int found = 0;
+
+                list_for_each_entry(r, &regulator_list, list) {
+                        if (strcmp(rdev_get_name(r),
+                                   init_data->supply_regulator) == 0) {
+                                found = 1;
+                                break;
+                        }
+                }
+
+                if (!found) {
+                        dev_err(dev, "Failed to find supply %s\n",
+                                init_data->supply_regulator);
+                        goto scrub;
+                }
+
+                ret = set_supply(rdev, r);
+                if (ret < 0)
+                        goto scrub;
+        }
+
         if (init_data->supply_regulator_dev) {
+                dev_warn(dev, "Uses supply_regulator_dev instead of regulator_supply\n");
                 ret = set_supply(rdev,
                         dev_get_drvdata(init_data->supply_regulator_dev));
                 if (ret < 0)
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 234a8476cba8..e2980287245e 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -157,7 +157,11 @@ struct regulator_consumer_supply {
  *
  * Initialisation constraints, our supply and consumers supplies.
  *
- * @supply_regulator_dev: Parent regulator (if any).
+ * @supply_regulator: Parent regulator.  Specified using the regulator name
+ *                    as it appears in the name field in sysfs, which can
+ *                    be explicitly set using the constraints field 'name'.
+ * @supply_regulator_dev: Parent regulator (if any) - DEPRECATED in favour
+ *                        of supply_regulator.
  *
  * @constraints: Constraints.  These must be specified for the regulator to
  *               be usable.
@@ -168,7 +172,8 @@ struct regulator_consumer_supply {
  * @driver_data: Data passed to regulator_init.
  */
 struct regulator_init_data {
-        struct device *supply_regulator_dev; /* or NULL for LINE */
+        const char *supply_regulator;        /* or NULL for system supply */
+        struct device *supply_regulator_dev; /* or NULL for system supply */
 
         struct regulation_constraints constraints;