regulator: core: support of supply name through desc
[linux-2.6.git] / drivers / regulator / of_regulator.c
index 76673c7..679734d 100644 (file)
@@ -10,6 +10,7 @@
  * (at your option) any later version.
  */
 
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/regulator/machine.h>
@@ -33,6 +34,9 @@ static void of_get_regulation_constraints(struct device_node *np,
        /* Voltage change possible? */
        if (constraints->min_uV != constraints->max_uV)
                constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
+       /* Only one voltage?  Then make sure it's set. */
+       if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
+               constraints->apply_uV = true;
 
        uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
        if (uV_offset)
@@ -65,17 +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);