commit ba2a50e1abe6a8a57b1fc40f26e60b5535fcc910
author Kyle Yan <kyan@quicinc.com> Wed Jan 18 04:00:04 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 18 04:00:04 2017 -0800
tree 14d727ce59b477f2d04ef91383f6ef4f7288cf4f
parent 7c7b105781c1b2a74b2033f94cf69973c744f25b
parent 54d725c602beedb9700b8300eaa5908e9a933235

Merge "defconfig: msm: Turn on the HMP scheduler for existing targets" into msm-4.8

drivers/regulator/core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8994db2..183fa22 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4443,6 +4443,8 @@
 
 	dev_set_drvdata(&rdev->dev, rdev);
 	rdev_init_debugfs(rdev);
+	rdev->proxy_consumer = regulator_proxy_consumer_register(dev,
+							config->of_node);
 
 	/* try to resolve regulators supply since a new one was registered */
 	class_for_each_device(&regulator_class, NULL, NULL,
@@ -4482,6 +4484,7 @@
 			regulator_disable(rdev->supply);
 		regulator_put(rdev->supply);
 	}
+	regulator_proxy_consumer_unregister(rdev->proxy_consumer);
 	rdev_deinit_debugfs(rdev);
 	mutex_lock(&regulator_list_mutex);
 	flush_work(&rdev->disable_work.work);

include/linux/regulator/driver.h

diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index e59f776..ee79113 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -18,6 +18,7 @@
 #include <linux/device.h>
 #include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
+#include <linux/regulator/proxy-consumer.h>
 
 struct regmap;
 struct regulator_dev;
@@ -433,6 +434,7 @@
 
 	/* time when this regulator was disabled last time */
 	unsigned long last_off_jiffy;
+	struct proxy_consumer *proxy_consumer;
 	struct regulator *debug_consumer;
 };