]> Pileus Git - ~andy/linux/commitdiff
power_supply: Add power_supply_get_by_phandle
authorSebastian Reichel <sre@debian.org>
Sun, 24 Nov 2013 16:49:29 +0000 (17:49 +0100)
committerAnton Vorontsov <anton@enomsg.org>
Tue, 24 Dec 2013 02:21:11 +0000 (18:21 -0800)
Add method to get power supply by device tree phandle.

Signed-off-by: Sebastian Reichel <sre@debian.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
drivers/power/power_supply_core.c
include/linux/power_supply.h

index 6aac23cc65663ada046958869dc6d5b8b32e9648..26606641fe44d5b250caaa8eccd972701c290737 100644 (file)
@@ -341,6 +341,32 @@ struct power_supply *power_supply_get_by_name(const char *name)
 }
 EXPORT_SYMBOL_GPL(power_supply_get_by_name);
 
+#ifdef CONFIG_OF
+static int power_supply_match_device_node(struct device *dev, const void *data)
+{
+       return dev->parent && dev->parent->of_node == data;
+}
+
+struct power_supply *power_supply_get_by_phandle(struct device_node *np,
+                                                       const char *property)
+{
+       struct device_node *power_supply_np;
+       struct device *dev;
+
+       power_supply_np = of_parse_phandle(np, property, 0);
+       if (!power_supply_np)
+               return ERR_PTR(-ENODEV);
+
+       dev = class_find_device(power_supply_class, NULL, power_supply_np,
+                                               power_supply_match_device_node);
+
+       of_node_put(power_supply_np);
+
+       return dev ? dev_get_drvdata(dev) : NULL;
+}
+EXPORT_SYMBOL_GPL(power_supply_get_by_phandle);
+#endif /* CONFIG_OF */
+
 int power_supply_powers(struct power_supply *psy, struct device *dev)
 {
        return sysfs_create_link(&psy->dev->kobj, &dev->kobj, "powers");
index 3e28fe188d171a11f224fcdc36975a031c7146b2..c9dc4e09854cb87f728ad797d940ac4c8b1b4b14 100644 (file)
@@ -244,6 +244,14 @@ extern struct atomic_notifier_head power_supply_notifier;
 extern int power_supply_reg_notifier(struct notifier_block *nb);
 extern void power_supply_unreg_notifier(struct notifier_block *nb);
 extern struct power_supply *power_supply_get_by_name(const char *name);
+#ifdef CONFIG_OF
+extern struct power_supply *power_supply_get_by_phandle(struct device_node *np,
+                                                       const char *property);
+#else /* !CONFIG_OF */
+static inline struct power_supply *
+power_supply_get_by_phandle(struct device_node *np, const char *property)
+{ return NULL; }
+#endif /* CONFIG_OF */
 extern void power_supply_changed(struct power_supply *psy);
 extern int power_supply_am_i_supplied(struct power_supply *psy);
 extern int power_supply_set_battery_charged(struct power_supply *psy);