power: supply: core: Add one field to present the battery internal resistance

Add one field for 'struct power_supply_battery_info' to present the battery
factory internal resistance.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index e85361878450c52f70c280af1fcce5ba738d60ae..307e0995ca3cce1444267471538bbd0e89f9dc97 100644 (file)
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -579,6 +579,7 @@ int power_supply_get_battery_info(struct power_supply *psy,
        info->charge_term_current_ua         = -EINVAL;
        info->constant_charge_current_max_ua = -EINVAL;
        info->constant_charge_voltage_max_uv = -EINVAL;
+       info->factory_internal_resistance_uohm  = -EINVAL;
 
        if (!psy->of_node) {
                dev_warn(&psy->dev, "%s currently only supports devicetree\n",
@@ -616,6 +617,8 @@ int power_supply_get_battery_info(struct power_supply *psy,
                             &info->constant_charge_current_max_ua);
        of_property_read_u32(battery_np, "constant_charge_voltage_max_microvolt",
                             &info->constant_charge_voltage_max_uv);
+       of_property_read_u32(battery_np, "factory-internal-resistance-micro-ohms",
+                            &info->factory_internal_resistance_uohm);
 
        return 0;
 }

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index f80769175c56dc9f07a234e950394b30cc891230..d089566828bed9992a83af87cb90f88b33efdbd8 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -326,6 +326,7 @@ struct power_supply_battery_info {
        int charge_term_current_ua;         /* microAmps */
        int constant_charge_current_max_ua; /* microAmps */
        int constant_charge_voltage_max_uv; /* microVolts */
+       int factory_internal_resistance_uohm;   /* microOhms */
 };
 
 extern struct atomic_notifier_head power_supply_notifier;