From: Mark Brown <broonie@kernel.org>
Date: Fri, 10 Apr 2015 18:16:03 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bea3672833dac06e37651e755d24ffdb0c471907;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/qcom' and 'regulator/topic/stw481x' into regulator-next
---

bea3672833dac06e37651e755d24ffdb0c471907
diff --cc drivers/regulator/core.c
index e23fd00ec5e2,03088f9c3d4f,b899947d839d,b899947d839d,f2452148c8da,b899947d839d..443eaab933fc
--- a/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++) {