Commit 6ea01266 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Sebastian Reichel
Browse files

power: supply: sbs-battery: add support for time_to_empty_now attribute 



As defined by the Smart Battery Data Specification.

An _AVG suffix is added to the enum values REG_TIME_TO_EMPTY and
REG_TIME_TO_FULL to make the distinction clear.

Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent e11544d0

drivers/power/supply/sbs-battery.c

+10 −4
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ enum { 
	REG_CURRENT_AVG,

	REG_MAX_ERR,

	REG_CAPACITY,

	REG_TIME_TO_EMPTY,

	REG_TIME_TO_FULL,

	REG_TIME_TO_EMPTY_NOW,

	REG_TIME_TO_EMPTY_AVG,

	REG_TIME_TO_FULL_AVG,

	REG_STATUS,

	REG_CAPACITY_LEVEL,

	REG_CYCLE_COUNT,
@@ -119,9 +120,11 @@ static const struct chip_data { 
		SBS_DATA(POWER_SUPPLY_PROP_ENERGY_FULL, 0x10, 0, 65535),

	[REG_FULL_CHARGE_CAPACITY_CHARGE] =

		SBS_DATA(POWER_SUPPLY_PROP_CHARGE_FULL, 0x10, 0, 65535),

	[REG_TIME_TO_EMPTY] =

	[REG_TIME_TO_EMPTY_NOW] =

		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, 0x11, 0, 65535),

	[REG_TIME_TO_EMPTY_AVG] =

		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, 0x12, 0, 65535),

	[REG_TIME_TO_FULL] =

	[REG_TIME_TO_FULL_AVG] =

		SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0, 65535),

	[REG_CHARGE_CURRENT] =

		SBS_DATA(POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, 0x14, 0, 65535),
@@ -165,6 +168,7 @@ static const enum power_supply_property sbs_properties[] = { 
	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,

	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,

	POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,
@@ -748,6 +752,7 @@ static void sbs_unit_adjustment(struct i2c_client *client, 
		val->intval -= TEMP_KELVIN_TO_CELSIUS;

		break;



	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:

	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:

		/* sbs provides time to empty and time to full in minutes.
@@ -966,6 +971,7 @@ static int sbs_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CURRENT_NOW:

	case POWER_SUPPLY_PROP_CURRENT_AVG:

	case POWER_SUPPLY_PROP_TEMP:

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:

	case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:

	case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:

	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: