aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-01 17:21:06 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-11 21:45:39 +0800
commit2b062842b3cda2c6e93736578ade2c6cd80bebbc (patch)
treeccd563e24c8b094913f123a0ba52279a66621ed8
parenta12d38906071ebde2628de5623ff99ee18db3895 (diff)
downloadlinux-linaro-2b062842b3cda2c6e93736578ade2c6cd80bebbc.tar.gz
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> Acked-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/fixed.c2
-rw-r--r--drivers/regulator/of_regulator.c7
-rw-r--r--include/linux/regulator/of_regulator.h6
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index ebec5e06dfa..12d08c694ae 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev)
if (!config)
return NULL;
- config->init_data = of_get_regulator_init_data(dev);
+ config->init_data = of_get_regulator_init_data(dev, dev->of_node);
if (!config->init_data)
return NULL;
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index b7b3fc3b09e..f1651eb6964 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -69,18 +69,19 @@ static void of_get_regulation_constraints(struct device_node *np,
* tree node, returns a pointer to the populated struture or NULL if memory
* alloc fails.
*/
-struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
+struct regulator_init_data *of_get_regulator_init_data(struct device *dev,
+ struct device_node *node)
{
struct regulator_init_data *init_data;
- if (!dev->of_node)
+ if (!node)
return NULL;
init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
if (!init_data)
return NULL; /* Out of memory? */
- of_get_regulation_constraints(dev->of_node, &init_data);
+ of_get_regulation_constraints(node, &init_data);
return init_data;
}
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
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 @@
#if defined(CONFIG_OF)
extern struct regulator_init_data
- *of_get_regulator_init_data(struct device *dev);
+ *of_get_regulator_init_data(struct device *dev,
+ struct device_node *node);
#else
static inline struct regulator_init_data
- *of_get_regulator_init_data(struct device *dev)
+ *of_get_regulator_init_data(struct device *dev,
+ struct device_node *node)
{
return NULL;
}