mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
power: supply: sbs-battery: add POWER_SUPPLY_PROP_CURRENT_AVG support
Expose averaged current information, which is part of the SBS standard and should be supported by all batteries. Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
parent
79bcd5a4a6
commit
8ce6ee43bd
1 changed files with 9 additions and 3 deletions
|
@ -25,7 +25,8 @@ enum {
|
||||||
REG_MANUFACTURER_DATA,
|
REG_MANUFACTURER_DATA,
|
||||||
REG_TEMPERATURE,
|
REG_TEMPERATURE,
|
||||||
REG_VOLTAGE,
|
REG_VOLTAGE,
|
||||||
REG_CURRENT,
|
REG_CURRENT_NOW,
|
||||||
|
REG_CURRENT_AVG,
|
||||||
REG_MAX_ERR,
|
REG_MAX_ERR,
|
||||||
REG_CAPACITY,
|
REG_CAPACITY,
|
||||||
REG_TIME_TO_EMPTY,
|
REG_TIME_TO_EMPTY,
|
||||||
|
@ -92,8 +93,10 @@ static const struct chip_data {
|
||||||
SBS_DATA(POWER_SUPPLY_PROP_TEMP, 0x08, 0, 65535),
|
SBS_DATA(POWER_SUPPLY_PROP_TEMP, 0x08, 0, 65535),
|
||||||
[REG_VOLTAGE] =
|
[REG_VOLTAGE] =
|
||||||
SBS_DATA(POWER_SUPPLY_PROP_VOLTAGE_NOW, 0x09, 0, 20000),
|
SBS_DATA(POWER_SUPPLY_PROP_VOLTAGE_NOW, 0x09, 0, 20000),
|
||||||
[REG_CURRENT] =
|
[REG_CURRENT_NOW] =
|
||||||
SBS_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768, 32767),
|
SBS_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768, 32767),
|
||||||
|
[REG_CURRENT_AVG] =
|
||||||
|
SBS_DATA(POWER_SUPPLY_PROP_CURRENT_AVG, 0x0B, -32768, 32767),
|
||||||
[REG_MAX_ERR] =
|
[REG_MAX_ERR] =
|
||||||
SBS_DATA(POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN, 0x0c, 0, 100),
|
SBS_DATA(POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN, 0x0c, 0, 100),
|
||||||
[REG_CAPACITY] =
|
[REG_CAPACITY] =
|
||||||
|
@ -142,6 +145,7 @@ static enum power_supply_property sbs_properties[] = {
|
||||||
POWER_SUPPLY_PROP_CYCLE_COUNT,
|
POWER_SUPPLY_PROP_CYCLE_COUNT,
|
||||||
POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
||||||
POWER_SUPPLY_PROP_CURRENT_NOW,
|
POWER_SUPPLY_PROP_CURRENT_NOW,
|
||||||
|
POWER_SUPPLY_PROP_CURRENT_AVG,
|
||||||
POWER_SUPPLY_PROP_CAPACITY,
|
POWER_SUPPLY_PROP_CAPACITY,
|
||||||
POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN,
|
POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN,
|
||||||
POWER_SUPPLY_PROP_TEMP,
|
POWER_SUPPLY_PROP_TEMP,
|
||||||
|
@ -324,7 +328,7 @@ static int sbs_status_correct(struct i2c_client *client, int *intval)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = sbs_read_word_data(client, sbs_data[REG_CURRENT].addr);
|
ret = sbs_read_word_data(client, sbs_data[REG_CURRENT_NOW].addr);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -521,6 +525,7 @@ static void sbs_unit_adjustment(struct i2c_client *client,
|
||||||
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
|
case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
|
||||||
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
|
case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
|
||||||
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
||||||
|
case POWER_SUPPLY_PROP_CURRENT_AVG:
|
||||||
case POWER_SUPPLY_PROP_CHARGE_NOW:
|
case POWER_SUPPLY_PROP_CHARGE_NOW:
|
||||||
case POWER_SUPPLY_PROP_CHARGE_FULL:
|
case POWER_SUPPLY_PROP_CHARGE_FULL:
|
||||||
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
|
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
|
||||||
|
@ -699,6 +704,7 @@ static int sbs_get_property(struct power_supply *psy,
|
||||||
case POWER_SUPPLY_PROP_CYCLE_COUNT:
|
case POWER_SUPPLY_PROP_CYCLE_COUNT:
|
||||||
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
||||||
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
||||||
|
case POWER_SUPPLY_PROP_CURRENT_AVG:
|
||||||
case POWER_SUPPLY_PROP_TEMP:
|
case POWER_SUPPLY_PROP_TEMP:
|
||||||
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
|
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
|
||||||
case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
|
case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
|
||||||
|
|
Loading…
Reference in a new issue