With the addition of the device_nodes to use similar to how
supplied_to works, add a helper function which will parse out the
phandles for the supplied-nodes directly from the node. This
implmentation requires the property name to be "supplied-nodes".
Signed-off-by: Rhyland Klein <rkl...@nvidia.com>
---
drivers/power/power_supply_core.c | 57 +++++++++++++++++++++++++++++++++++++
include/linux/power_supply.h | 6 ++++
2 files changed, 63 insertions(+)
diff --git a/drivers/power/power_supply_core.c
b/drivers/power/power_supply_core.c
index 9e42702..4bc682b 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -84,6 +84,63 @@ void power_supply_changed(struct power_supply *psy)
}
EXPORT_SYMBOL_GPL(power_supply_changed);
+#ifdef CONFIG_OF
+#include <linux/of.h>
+
+static int __power_supply_get_supplied_nodes(struct device *dev,
+ struct device_node *np,
+ struct device_node **supplicants,
+ int *count)
+{
+ int i = 0;
+ int num_nodes = 0;
+ struct device_node *node;
+
+ do {
+ node = of_parse_phandle(np, "power-supply,supplied-nodes", i++);
+ if (node)
+ num_nodes++;
+ } while (node);
+
+ if (!num_nodes) {
+ dev_warn(dev, "No supplicant phandles found.\n");
+ return -EINVAL;
+ }
+
+ *supplicants = devm_kzalloc(dev, sizeof(struct device_node *) *
+ num_nodes, GFP_KERNEL);
+
+ if (!*supplicants) {
+ dev_err(dev, "Failed allocation for memory for supplicants\n");
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < num_nodes; i++)
+ supplicants[i] = of_parse_phandle(np,
+ "power-supply,supplied-nodes", i);
+
+ *count = num_nodes;
+
+ return 0;
+}
+
+int power_supply_get_supplied_nodes(struct device *dev,
+ struct device_node *np,
+ struct device_node **supplicants,
+ int *count)
+{
+ int error;
+
+ if (!np || !supplicants)
+ return -EINVAL;
+
+ error = __power_supply_get_supplied_nodes(dev, np, supplicants, count);
+
+ return error;
+}
+EXPORT_SYMBOL_GPL(power_supply_get_supplied_nodes);
+#endif
+
static int __power_supply_am_i_supplied(struct device *dev, void *data)
{
union power_supply_propval ret = {0,};
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 8c8693b..359335a 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -230,6 +230,12 @@ struct power_supply_info {
extern struct power_supply *power_supply_get_by_name(char *name);
extern void power_supply_changed(struct power_supply *psy);
+#ifdef CONFIG_OF
+extern int power_supply_get_supplied_nodes(struct device *dev,
+ struct device_node *np,
+ struct device_node **supplicants,
+ int *count);
+#endif
extern int power_supply_am_i_supplied(struct power_supply *psy);
extern int power_supply_set_battery_charged(struct power_supply *psy);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
