| Message ID | 20170315192653.26799-5-liam@networkimprov.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Wed, Mar 15, 2017 at 12:26:49PM -0700, Liam Breck wrote: > From: Liam Breck <kernel@networkimprov.net> > > power_supply_get_battery_info() reads battery data from devicetree. > struct power_supply_battery_info provides battery data to drivers. > Drivers may surface battery data in sysfs via corresponding > POWER_SUPPLY_PROP_* fields. > > Signed-off-by: Matt Ranostay <matt@ranostay.consulting> > Signed-off-by: Liam Breck <kernel@networkimprov.net> Acked-By: Sebastian Reichel <sre@kernel.org> -- Sebastian > --- > drivers/power/supply/power_supply_core.c | 40 ++++++++++++++++++++++++++++++++ > include/linux/power_supply.h | 18 ++++++++++++++ > 2 files changed, 58 insertions(+) > > diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c > index a74d8ca..c121931 100644 > --- a/drivers/power/supply/power_supply_core.c > +++ b/drivers/power/supply/power_supply_core.c > @@ -17,6 +17,7 @@ > #include <linux/device.h> > #include <linux/notifier.h> > #include <linux/err.h> > +#include <linux/of.h> > #include <linux/power_supply.h> > #include <linux/thermal.h> > #include "power_supply.h" > @@ -487,6 +488,45 @@ struct power_supply *devm_power_supply_get_by_phandle(struct device *dev, > EXPORT_SYMBOL_GPL(devm_power_supply_get_by_phandle); > #endif /* CONFIG_OF */ > > +int power_supply_get_battery_info(struct power_supply *psy, > + struct power_supply_battery_info *info) > +{ > + struct device_node *battery_np; > + const char *value; > + int err; > + > + info->energy_full_design_uwh = -EINVAL; > + info->charge_full_design_uah = -EINVAL; > + info->voltage_min_design_uv = -EINVAL; > + > + if (!psy->of_node) { > + dev_warn(&psy->dev, "%s currently only supports devicetree\n", > + __func__); > + return -ENXIO; > + } > + > + battery_np = of_parse_phandle(psy->of_node, "monitored-battery", 0); > + if (!battery_np) > + return -ENODEV; > + > + err = of_property_read_string(battery_np, "compatible", &value); > + if (err) > + return err; > + > + if (strcmp("fixed-battery", value)) > + return -ENODEV; > + > + of_property_read_u32(battery_np, "energy-full-design-microwatt-hours", > + &info->energy_full_design_uwh); > + of_property_read_u32(battery_np, "charge-full-design-microamp-hours", > + &info->charge_full_design_uah); > + of_property_read_u32(battery_np, "voltage-min-design-microvolt", > + &info->voltage_min_design_uv); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(power_supply_get_battery_info); > + > int power_supply_get_property(struct power_supply *psy, > enum power_supply_property psp, > union power_supply_propval *val) > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > index 3965503..e84f1d3 100644 > --- a/include/linux/power_supply.h > +++ b/include/linux/power_supply.h > @@ -288,6 +288,21 @@ struct power_supply_info { > int use_for_apm; > }; > > +/* > + * This is the recommended struct to manage static battery parameters, > + * populated by power_supply_get_battery_info(). Most platform drivers should > + * use these for consistency. > + * Its field names must correspond to elements in enum power_supply_property. > + * The default field value is -EINVAL. > + * Power supply class itself doesn't use this. > + */ > + > +struct power_supply_battery_info { > + int energy_full_design_uwh; /* microWatt-hours */ > + int charge_full_design_uah; /* microAmp-hours */ > + int voltage_min_design_uv; /* microVolts */ > +}; > + > 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); > @@ -306,6 +321,9 @@ static inline struct power_supply * > devm_power_supply_get_by_phandle(struct device *dev, const char *property) > { return NULL; } > #endif /* CONFIG_OF */ > + > +extern int power_supply_get_battery_info(struct power_supply *psy, > + struct power_supply_battery_info *info); > 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); > -- > 2.9.3 >
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index a74d8ca..c121931 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -17,6 +17,7 @@ #include <linux/device.h> #include <linux/notifier.h> #include <linux/err.h> +#include <linux/of.h> #include <linux/power_supply.h> #include <linux/thermal.h> #include "power_supply.h" @@ -487,6 +488,45 @@ struct power_supply *devm_power_supply_get_by_phandle(struct device *dev, EXPORT_SYMBOL_GPL(devm_power_supply_get_by_phandle); #endif /* CONFIG_OF */ +int power_supply_get_battery_info(struct power_supply *psy, + struct power_supply_battery_info *info) +{ + struct device_node *battery_np; + const char *value; + int err; + + info->energy_full_design_uwh = -EINVAL; + info->charge_full_design_uah = -EINVAL; + info->voltage_min_design_uv = -EINVAL; + + if (!psy->of_node) { + dev_warn(&psy->dev, "%s currently only supports devicetree\n", + __func__); + return -ENXIO; + } + + battery_np = of_parse_phandle(psy->of_node, "monitored-battery", 0); + if (!battery_np) + return -ENODEV; + + err = of_property_read_string(battery_np, "compatible", &value); + if (err) + return err; + + if (strcmp("fixed-battery", value)) + return -ENODEV; + + of_property_read_u32(battery_np, "energy-full-design-microwatt-hours", + &info->energy_full_design_uwh); + of_property_read_u32(battery_np, "charge-full-design-microamp-hours", + &info->charge_full_design_uah); + of_property_read_u32(battery_np, "voltage-min-design-microvolt", + &info->voltage_min_design_uv); + + return 0; +} +EXPORT_SYMBOL_GPL(power_supply_get_battery_info); + int power_supply_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 3965503..e84f1d3 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -288,6 +288,21 @@ struct power_supply_info { int use_for_apm; }; +/* + * This is the recommended struct to manage static battery parameters, + * populated by power_supply_get_battery_info(). Most platform drivers should + * use these for consistency. + * Its field names must correspond to elements in enum power_supply_property. + * The default field value is -EINVAL. + * Power supply class itself doesn't use this. + */ + +struct power_supply_battery_info { + int energy_full_design_uwh; /* microWatt-hours */ + int charge_full_design_uah; /* microAmp-hours */ + int voltage_min_design_uv; /* microVolts */ +}; + 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); @@ -306,6 +321,9 @@ static inline struct power_supply * devm_power_supply_get_by_phandle(struct device *dev, const char *property) { return NULL; } #endif /* CONFIG_OF */ + +extern int power_supply_get_battery_info(struct power_supply *psy, + struct power_supply_battery_info *info); 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);