Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier...

diff --cc drivers/regulator/core.c
index e23fd00ec5e23254603b0d0817df963259c980c0,03088f9c3d4f8e3a92063393f768c0543cc70f2d,b899947d839d87b03608d1f9bf4b4208cf57aa01,b899947d839d87b03608d1f9bf4b4208cf57aa01,f2452148c8dafa7d74618f1c5693fddbe4823f6d,b899947d839d87b03608d1f9bf4b4208cf57aa01..443eaab933fcfe680d5e402f72bbe7c55c3ae391
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
--- 6/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -3714,10 -3650,41 -3650,41 -3650,41 -3659,41 -3650,41 +3714,10 @@@@@@@ regulator_register(const struct regulat
                goto scrub;
      
        if (init_data && init_data->supply_regulator)
 -----          supply = init_data->supply_regulator;
 +++++          rdev->supply_name = init_data->supply_regulator;
        else if (regulator_desc->supply_name)
 -----          supply = regulator_desc->supply_name;
 -----
 -----  if (supply) {
 -----          struct regulator_dev *r;
  ----
  ----          r = regulator_dev_lookup(dev, supply, &ret);
  ----
  ----          if (ret == -ENODEV) {
  ----                  /*
  ----                   * No supply was specified for this regulator and
  ----                   * there will never be one.
  ----                   */
  ----                  ret = 0;
  ----                  goto add_dev;
  ----          } else if (!r) {
  ----                  dev_err(dev, "Failed to find supply %s\n", supply);
  ----                  ret = -EPROBE_DEFER;
  -- -                  goto scrub;
  -- -          }
  -- -
  -- -          ret = set_supply(rdev, r);
  -- -          if (ret < 0)
  ----                  goto scrub;
  -- -
  -- -          /* Enable supply if rail is enabled */
  -- -          if (_regulator_is_enabled(rdev)) {
  -- -                  ret = regulator_enable(rdev->supply);
  -- -                  if (ret < 0)
  -- -                          goto scrub;
  ----          }
  -- -  }
 +++++          rdev->supply_name = regulator_desc->supply_name;
      
 -              r = regulator_dev_lookup(dev, supply, &ret);
 -    
 -              if (ret == -ENODEV) {
 -                      /*
 -                       * No supply was specified for this regulator and
 -                       * there will never be one.
 -                       */
 -                      ret = 0;
 -                      goto add_dev;
 -              } else if (!r) {
 -                      dev_err(dev, "Failed to find supply %s\n", supply);
 -                      ret = -EPROBE_DEFER;
 -                      goto scrub;
 -              }
 -    
 -  -           ret = set_supply(rdev, r);
 -  -           if (ret < 0)
 -  -                   goto scrub;
 -  - 
 -  -           /* Enable supply if rail is enabled */
 -  -           if (_regulator_is_enabled(rdev)) {
 -  -                   ret = regulator_enable(rdev->supply);
 -  -                   if (ret < 0)
 -  -                           goto scrub;
 -  -           }
 -  -   }
 -  - 
 -----add_dev:
        /* add consumers devices */
        if (init_data) {
                for (i = 0; i < init_data->num_consumer_supplies; i++) {

diff --cc include/linux/regulator/consumer.h
Simple merge