Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9a861cce10596ae1f10cffefe1ad4519a253475

Authored by Shawn Guo
Committed by Mark Brown
1 parent ab62aa931e
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 9 additions and 6 deletions Side-by-side Diff

drivers/regulator/fixed.c
Diff comments   View file @ d9a861c
... ... @@ -64,7 +64,7 @@
64 64 if (!config)
65 65 return NULL;
66 66  
67   - config->init_data = of_get_regulator_init_data(dev);
  67 + config->init_data = of_get_regulator_init_data(dev, dev->of_node);
68 68 if (!config->init_data)
69 69 return NULL;
70 70  
drivers/regulator/of_regulator.c
Diff comments   View file @ d9a861c
... ... @@ -69,18 +69,19 @@
69 69 * tree node, returns a pointer to the populated struture or NULL if memory
70 70 * alloc fails.
71 71 */
72   -struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
  72 +struct regulator_init_data *of_get_regulator_init_data(struct device *dev,
  73 + struct device_node *node)
73 74 {
74 75 struct regulator_init_data *init_data;
75 76  
76   - if (!dev->of_node)
  77 + if (!node)
77 78 return NULL;
78 79  
79 80 init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
80 81 if (!init_data)
81 82 return NULL; /* Out of memory? */
82 83  
83   - of_get_regulation_constraints(dev->of_node, &init_data);
  84 + of_get_regulation_constraints(node, &init_data);
84 85 return init_data;
85 86 }
86 87 EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
include/linux/regulator/of_regulator.h
Diff comments   View file @ d9a861c
... ... @@ -8,10 +8,12 @@
8 8  
9 9 #if defined(CONFIG_OF)
10 10 extern 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 13 #else
13 14 static 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 18 return NULL;
17 19 }