diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-12-10 23:05:21 +0100 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-01-12 20:29:20 +0300 |
| commit | 22fadd766b2a222b273df9f2264b72e4b3bbe921 (patch) | |
| tree | 17ba072ba44590265cabb3ec6b6ea0852a2448e2 /drivers | |
| parent | 20fd9830ccc685adce65ba89ffc3ca5426a2b064 (diff) | |
| download | linux-stable-22fadd766b2a222b273df9f2264b72e4b3bbe921.tar.gz linux-stable-22fadd766b2a222b273df9f2264b72e4b3bbe921.tar.bz2 linux-stable-22fadd766b2a222b273df9f2264b72e4b3bbe921.zip | |
olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW
{CURRENT,VOLTAGE}_AVG are actually {CURRENT,VOLTAGE}_NOW (the EC code
directly passes through the value from the gas gauge instead of the
internally used average). We retain {CURRENT,VOLTAGE}_AVG as an alias
for compatibility reasons, it will be removed later.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
[ pgf@laptop.org: added VOLTAGE_NOW, aliased to VOLTAGE_AVG ]
Signed-off-by: Paul Fox <pgf@laptop.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/olpc_battery.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index 0f7a7b11bda3..64e40ff5c44a 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c @@ -333,6 +333,7 @@ static int olpc_bat_get_property(struct power_supply *psy, return ret; break; case POWER_SUPPLY_PROP_VOLTAGE_AVG: + case POWER_SUPPLY_PROP_VOLTAGE_NOW: ret = olpc_ec_cmd(EC_BAT_VOLTAGE, NULL, 0, (void *)&ec_word, 2); if (ret) return ret; @@ -340,6 +341,7 @@ static int olpc_bat_get_property(struct power_supply *psy, val->intval = (s16)be16_to_cpu(ec_word) * 9760L / 32; break; case POWER_SUPPLY_PROP_CURRENT_AVG: + case POWER_SUPPLY_PROP_CURRENT_NOW: ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2); if (ret) return ret; @@ -414,7 +416,9 @@ static enum power_supply_property olpc_xo1_bat_props[] = { POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_VOLTAGE_AVG, + POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CAPACITY, POWER_SUPPLY_PROP_CAPACITY_LEVEL, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, |