aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-01 04:21:06 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 14:10:17 -0500
commitd9a861cce10596ae1f10cffefe1ad4519a253475 (patch)
treefac8fb1171d8422a2e4686edbed59a6bf91d764d /include/linux/regulator
parentab62aa931ed3512bc67857a03636756b96c78eae (diff)
regulator: pass device_node to of_get_regulator_init_data()
It's not always true that the device_node of regulator can be found at dev->of_node at the time when of_get_regulator_init_data() is being called, because in some cases the regulator nodes in device tree do not have 'struct device' behind them until regulator_dev gets created for it by core function regulator_register(). The patch adds device_node as a new parameter to of_get_regulator_init_data(), so that caller can pass in the node of regulator directly. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/of_regulator.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index d83a98d3e3f..769704f296e 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -8,10 +8,12 @@
8 8
9#if defined(CONFIG_OF) 9#if defined(CONFIG_OF)
10extern struct regulator_init_data 10extern struct regulator_init_data
11 *of_get_regulator_init_data(struct device *dev); 11 *of_get_regulator_init_data(struct device *dev,
12 struct device_node *node);
12#else 13#else
13static inline struct regulator_init_data 14static inline struct regulator_init_data
14 *of_get_regulator_init_data(struct device *dev) 15 *of_get_regulator_init_data(struct device *dev,
16 struct device_node *node)
15{ 17{
16 return NULL; 18 return NULL;
17} 19}