power_supply: ensure that the TRICKLE bit is checked in olpc_battery
PATCH 4/5 power_supply: ensure that the TRICKLE bit is checked in olpc_battery
There are times when the battery is present but trickle charging, and the EC sets only the TRICKLE bit.. So we must check for the bit when we're checking the charging/present status.
Signed-off-by Andres Salomon <[email protected]>
--- drivers/power/olpc_battery.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/power/olpc_battery.c +5 -3
@@ -35,6 +35,7 @@#define BAT_STAT_AC 0x10#define BAT_STAT_CHARGING 0x20#define BAT_STAT_DISCHARGING 0x40 +#define BAT_STAT_TRICKLE 0x80#define BAT_ERR_INFOFAIL 0x02#define BAT_ERR_OVERVOLTAGE 0x04
@@ -89,7 +90,7 @@ static char bat_serial[17]; /* Ick */static int olpc_bat_get_status (union power_supply_propval *val,uint8_t ec_byte) {if (olpc_platform_info.ecver >0x44 ) { -if (ec_byte &BAT_STAT_CHARGING ) +if (ec_byte & (BAT_STAT_CHARGING |BAT_STAT_TRICKLE )) val->intval =POWER_SUPPLY_STATUS_CHARGING ;else if (ec_byte &BAT_STAT_DISCHARGING ) val->intval =POWER_SUPPLY_STATUS_DISCHARGING ;
@@ -219,7 +220,8 @@ static int olpc_bat_get_property(struct power_supply *psy,It doesn't matter though -- the EC will return the last-known information, and it's as if we just ran that _little_ bit faster and managed to read it out before the battery went away. */ -if (!(ec_byte &BAT_STAT_PRESENT ) && psp !=POWER_SUPPLY_PROP_PRESENT ) +if (!(ec_byte & (BAT_STAT_PRESENT |BAT_STAT_TRICKLE )) && + psp !=POWER_SUPPLY_PROP_PRESENT )return -ENODEV ;switch (psp) {
@@ -229,7 +231,7 @@ static int olpc_bat_get_property(struct power_supply *psy,return ret;break ;case POWER_SUPPLY_PROP_PRESENT : - val->intval = !!(ec_byte &BAT_STAT_PRESENT ); + val->intval = !!(ec_byte & (BAT_STAT_PRESENT |BAT_STAT_TRICKLE ));break ;case POWER_SUPPLY_PROP_HEALTH :
Signature · 1 line
1.5.6.5
Anton Vorontsov
AppliedQuoted 7 lines · Andres Salomon
There are times when the battery is present but trickle charging, and the EC sets only the TRICKLE bit.. So we must check for the bit when we're checking the charging/present status.
Signed-off-by Andres Salomon <[email protected]>---
Applied to battery-2.6.31.git, plus some cosmetic changes were made, so please ensure that the patches are still fine.
Thanks.
Quoted 47 lines
drivers/power/olpc_battery.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)drivers/power/olpc_battery.c +5
-3@@ -35,6 +35,7 @@#define BAT_STAT_AC 0x10#define BAT_STAT_CHARGING 0x20#define BAT_STAT_DISCHARGING 0x40 +#define BAT_STAT_TRICKLE 0x80#define BAT_ERR_INFOFAIL 0x02#define BAT_ERR_OVERVOLTAGE 0x04@@ -89,7 +90,7 @@ static char bat_serial[17]; /* Ick */static int olpc_bat_get_status (union power_supply_propval *val,uint8_t ec_byte) {if (olpc_platform_info.ecver >0x44 ) { -if (ec_byte &BAT_STAT_CHARGING ) +if (ec_byte & (BAT_STAT_CHARGING |BAT_STAT_TRICKLE )) val->intval =POWER_SUPPLY_STATUS_CHARGING ;else if (ec_byte &BAT_STAT_DISCHARGING ) val->intval =POWER_SUPPLY_STATUS_DISCHARGING ;@@ -219,7 +220,8 @@ static int olpc_bat_get_property(struct power_supply *psy,It doesn't matter though -- the EC will return the last-known information, and it's as if we just ran that _little_ bit faster and managed to read it out before the battery went away. */ -if (!(ec_byte &BAT_STAT_PRESENT ) && psp !=POWER_SUPPLY_PROP_PRESENT ) +if (!(ec_byte & (BAT_STAT_PRESENT |BAT_STAT_TRICKLE )) && + psp !=POWER_SUPPLY_PROP_PRESENT )return -ENODEV ;switch (psp) {@@ -229,7 +231,7 @@ static int olpc_bat_get_property(struct power_supply *psy,return ret;break ;case POWER_SUPPLY_PROP_PRESENT : - val->intval = !!(ec_byte &BAT_STAT_PRESENT ); + val->intval = !!(ec_byte & (BAT_STAT_PRESENT |BAT_STAT_TRICKLE ));break ;case POWER_SUPPLY_PROP_HEALTH :Signature · 1 line
1.5.6.5
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2