|
25 | 25 | REG_MANUFACTURER_DATA,
|
26 | 26 | REG_TEMPERATURE,
|
27 | 27 | REG_VOLTAGE,
|
28 |
| - REG_CURRENT, |
| 28 | + REG_CURRENT_NOW, |
| 29 | + REG_CURRENT_AVG, |
29 | 30 | REG_MAX_ERR,
|
30 | 31 | REG_CAPACITY,
|
31 | 32 | REG_TIME_TO_EMPTY,
|
@@ -92,8 +93,10 @@ static const struct chip_data {
|
92 | 93 | SBS_DATA(POWER_SUPPLY_PROP_TEMP, 0x08, 0, 65535),
|
93 | 94 | [REG_VOLTAGE] =
|
94 | 95 | SBS_DATA(POWER_SUPPLY_PROP_VOLTAGE_NOW, 0x09, 0, 20000),
|
95 |
| - [REG_CURRENT] = |
| 96 | + [REG_CURRENT_NOW] = |
96 | 97 | SBS_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768, 32767),
|
| 98 | + [REG_CURRENT_AVG] = |
| 99 | + SBS_DATA(POWER_SUPPLY_PROP_CURRENT_AVG, 0x0B, -32768, 32767), |
97 | 100 | [REG_MAX_ERR] =
|
98 | 101 | SBS_DATA(POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN, 0x0c, 0, 100),
|
99 | 102 | [REG_CAPACITY] =
|
@@ -142,6 +145,7 @@ static enum power_supply_property sbs_properties[] = {
|
142 | 145 | POWER_SUPPLY_PROP_CYCLE_COUNT,
|
143 | 146 | POWER_SUPPLY_PROP_VOLTAGE_NOW,
|
144 | 147 | POWER_SUPPLY_PROP_CURRENT_NOW,
|
| 148 | + POWER_SUPPLY_PROP_CURRENT_AVG, |
145 | 149 | POWER_SUPPLY_PROP_CAPACITY,
|
146 | 150 | POWER_SUPPLY_PROP_CAPACITY_ERROR_MARGIN,
|
147 | 151 | POWER_SUPPLY_PROP_TEMP,
|
@@ -324,7 +328,7 @@ static int sbs_status_correct(struct i2c_client *client, int *intval)
|
324 | 328 | {
|
325 | 329 | int ret;
|
326 | 330 |
|
327 |
| - ret = sbs_read_word_data(client, sbs_data[REG_CURRENT].addr); |
| 331 | + ret = sbs_read_word_data(client, sbs_data[REG_CURRENT_NOW].addr); |
328 | 332 | if (ret < 0)
|
329 | 333 | return ret;
|
330 | 334 |
|
@@ -521,6 +525,7 @@ static void sbs_unit_adjustment(struct i2c_client *client,
|
521 | 525 | case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
|
522 | 526 | case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
|
523 | 527 | case POWER_SUPPLY_PROP_CURRENT_NOW:
|
| 528 | + case POWER_SUPPLY_PROP_CURRENT_AVG: |
524 | 529 | case POWER_SUPPLY_PROP_CHARGE_NOW:
|
525 | 530 | case POWER_SUPPLY_PROP_CHARGE_FULL:
|
526 | 531 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
|
@@ -699,6 +704,7 @@ static int sbs_get_property(struct power_supply *psy,
|
699 | 704 | case POWER_SUPPLY_PROP_CYCLE_COUNT:
|
700 | 705 | case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
701 | 706 | case POWER_SUPPLY_PROP_CURRENT_NOW:
|
| 707 | + case POWER_SUPPLY_PROP_CURRENT_AVG: |
702 | 708 | case POWER_SUPPLY_PROP_TEMP:
|
703 | 709 | case POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG:
|
704 | 710 | case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
|
|
0 commit comments