Add device tree support for mc13892 regulator driver

Documentation/devicetree/bindings/mfd/mc13xxx.txt line 15

Quoted 4 lines · Shawn Guo

Documentation/devicetree/bindings/mfd/mc13xxx.txt new file +4 -0

+Sub-nodes:
+- regulators : Contain the regulator nodes.  The bindings details of individual
+  regulator node can be found in:
+  Documentation/devicetree/bindings/regulator/regulator.txt

How does the driver figure out which regulators map onto which subnodes?

Quoted 6 lines · Mark Brown

Quoted 4 lines · Shawn Guo

Documentation/devicetree/bindings/mfd/mc13xxx.txt new file +4 -0

+Sub-nodes:
+- regulators : Contain the regulator nodes.  The bindings details of individual
+  regulator node can be found in:
+  Documentation/devicetree/bindings/regulator/regulator.txt

Quoted 1 line

How does the driver figure out which regulators map onto which subnodes?

There should only be one sub-node named 'regulators', otherwise, DTC will report ERROR (duplicate_node_names).

Quoted 7 lines · Shawn Guo

Quoted 6 lines · Mark Brown

Quoted 4 lines · Shawn Guo

Documentation/devicetree/bindings/mfd/mc13xxx.txt new file +4 -0

+Sub-nodes:
+- regulators : Contain the regulator nodes.  The bindings details of individual
+  regulator node can be found in:
+  Documentation/devicetree/bindings/regulator/regulator.txt

Quoted 4 lines

Quoted 1 line

How does the driver figure out which regulators map onto which subnodes?

There should only be one sub-node named 'regulators', otherwise, DTC will report ERROR (duplicate_node_names).

That doesn't answer the question - I've still no idea how the binding is supposed to map the nodes contained within regulators onto the physical regulators.

(quoted diff) +14 -0

+struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(
+     struct platform_device *pdev, struct mc13xxx_regulator *regulators,
+     int num_regulators)
+{
+     struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
+     struct mc13xxx_regulator_init_data *data, *p;
+     struct device_node *parent, *child;
+     int i;
+
+     of_node_get(pdev->dev.parent->of_node);
+     parent = of_find_node_by_name(pdev->dev.parent->of_node, "regulators");
+     if (!parent)
+             return NULL;
+

(quoted diff) +12 -0

+                             p->id = i;
+                             p->init_data = of_get_regulator_init_data(
+                                                     &pdev->dev, child);
+                             p->node = child;
+                             p++;
+                             break;
+                     }
+             }
+     }
+
+     return data;
+}

Quoted 3 lines · Mark Brown

That doesn't answer the question - I've still no idea how the binding is supposed to map the nodes contained within regulators onto the physical regulators.

And here it is. It finds the regulator node by looking for the regulator name.

It adds device tree probe support for mc13xxx mfd driver.

Signed-off-by Shawn Guo <[email protected]>

Cc Samuel Ortiz <[email protected]>

---
Changes since v2:

* Add some note on how driver matches regulator device and the node in binding document

Since it's a small change, I only resend this patch (as v3) instead of the whole series. Hope it's fine.

Regards,
Shawn

 Documentation/devicetree/bindings/mfd/mc13xxx.txt |   53 ++++++++++
 drivers/mfd/mc13xxx-core.c                        |  106 +++++++++++++++------
 2 files changed, 128 insertions(+), 31 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/mc13xxx.txt

It adds device tree probe support for mc13xxx mfd driver.

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 <[email protected]>

Cc Mark Brown <[email protected]>

Cc Liam Girdwood <[email protected]>

---

?drivers/regulator/fixed.c ? ? ? ? ? ? ?| ? ?2 +-
?drivers/regulator/of_regulator.c ? ? ? | ? ?7 ++++---
?include/linux/regulator/of_regulator.h | ? ?6 ++++--

?3 files changed, 9 insertions(+), 6 deletions(-)

drivers/regulator/fixed.c +1 -1

index 72abbf5..a44a017 100644
@@ -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;
 

drivers/regulator/of_regulator.c +0 -0

index acd7045..6caf641 100644
@@ -66,18 +66,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 *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);

include/linux/regulator/of_regulator.h +0 -0

index d83a98d..769704f 100644
@@ -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;
?}

--
1.7.4.1

_______________________________________________
devicetree-discuss mailing list
devicetree-discuss at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss

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().

It adds device tree probe support for mc13892-regulator driver.

Signed-off-by Shawn Guo <[email protected]>

Cc Mark Brown <[email protected]>

Cc Liam Girdwood <[email protected]>

---
 drivers/regulator/mc13892-regulator.c      |   43 +++++++++++++++-----
 drivers/regulator/mc13xxx-regulator-core.c |   57 ++++++++++++++++++++++++++++
 drivers/regulator/mc13xxx.h                |   20 ++++++++++
 include/linux/mfd/mc13xxx.h                |    1 +
 4 files changed, 110 insertions(+), 11 deletions(-)

Ping?

It adds device tree probe support for mc13892-regulator driver.

Signed-off-by Shawn Guo <[email protected]>

Cc Mark Brown <[email protected]>

Cc Liam Girdwood <[email protected]>