Commit 4fb0357c authored by Arthur Demchenkov's avatar Arthur Demchenkov Committed by Sebastian Reichel
Browse files

power: supply: cpcap-battery: Add charge_full property 



Add charge_full property and let user update it. This is needed for
capacity reporting in the following patches.

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 comments]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent bb8b9a98

drivers/power/supply/cpcap-battery.c

+17 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct cpcap_battery_ddata { 
	struct cpcap_battery_state_data state[CPCAP_BATTERY_STATE_NR];

	u32 cc_lsb;		/* μAms per LSB */

	atomic_t active;

	int charge_full;

	int status;

	u16 vendor;

	unsigned int is_full:1;
@@ -486,6 +487,7 @@ static enum power_supply_property cpcap_battery_props[] = { 
	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,

	POWER_SUPPLY_PROP_CURRENT_AVG,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_CHARGE_FULL,

	POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,

	POWER_SUPPLY_PROP_CHARGE_COUNTER,

	POWER_SUPPLY_PROP_POWER_NOW,
@@ -594,6 +596,11 @@ static int cpcap_battery_get_property(struct power_supply *psy, 
		else

			val->intval = POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL:

		if (!ddata->charge_full)

			return -ENODATA;

		val->intval = ddata->charge_full;

		break;

	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:

		val->intval = ddata->config.info.charge_full_design;

		break;
@@ -661,6 +668,15 @@ static int cpcap_battery_set_property(struct power_supply *psy, 
		ddata->config.bat.constant_charge_voltage_max_uv = val->intval;



		return cpcap_battery_update_charger(ddata, val->intval);

	case POWER_SUPPLY_PROP_CHARGE_FULL:

		if (val->intval < 0)

			return -EINVAL;

		if (val->intval > ddata->config.info.charge_full_design)

			return -EINVAL;



		ddata->charge_full = val->intval;



		return 0;

	default:

		return -EINVAL;

	}
@@ -673,6 +689,7 @@ static int cpcap_battery_property_is_writeable(struct power_supply *psy, 
{

	switch (psp) {

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:

	case POWER_SUPPLY_PROP_CHARGE_FULL:

		return 1;

	default:

		return 0;