Commit 0f596487 authored by Arthur Demchenkov's avatar Arthur Demchenkov Committed by Sebastian Reichel
Browse files

power: supply: cpcap-battery: Add charge_now property 



Add charge_now property for capacity reporting.

Cc: Arthur Demchenkov <spinal.by@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarArthur Demchenkov <spinal.by@gmail.com>
[tony@atomide.com: updated to apply for naming changes]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 1e64926c

drivers/power/supply/cpcap-battery.c

+11 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static enum power_supply_property cpcap_battery_props[] = { 
	POWER_SUPPLY_PROP_CURRENT_AVG,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_CHARGE_NOW,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_CHARGE_COUNTER,

	POWER_SUPPLY_PROP_POWER_NOW,
@@ -661,6 +662,16 @@ static int cpcap_battery_get_property(struct power_supply *psy, 
		else

			val->intval = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN;

		break;

	case POWER_SUPPLY_PROP_CHARGE_NOW:

		empty = cpcap_battery_get_empty(ddata);

		if (!empty->voltage)

			return -ENODATA;

		val->intval = empty->counter_uah - latest->counter_uah;

		if (val->intval < 0)

			val->intval = 0;

		else if (ddata->charge_full && ddata->charge_full < val->intval)

			val->intval = ddata->charge_full;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL:

		if (!ddata->charge_full)

			return -ENODATA;