diff options
| author | Vic Yang <victoryang@chromium.org> | 2014-07-23 14:53:39 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-25 03:46:03 +0000 |
| commit | 915224b6d7762e20c05ca76f6c24332149dde225 (patch) | |
| tree | 2e38fd3dbaa2b3ced897a3ed702f8bd4beb5acd8 | |
| parent | 701bbe8764b0682ce3b21f0dd0b9642290282d86 (diff) | |
| download | chrome-ec-stabilize-6092.B.tar.gz | |
ryu: Kick battery out of disconnect state when AC is attachedstabilize-6092.B
Like Samus, the battery can be placed into a disconnect state. This CL
implements the necessary function to determine if it is so and kick it
out of this state when possible.
BUG=chrome-os-partner:30633
TEST=Put a battery in this state. Plug in AC. Verify the battery is
revived.
BRANCH=None
Change-Id: I074a72a2efe3844cbdfb0eda16a25fd8d1755a9b
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/209634
Reviewed-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/ryu/board.h | 1 | ||||
| -rw-r--r-- | driver/battery/bq27541.c | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/board/ryu/board.h b/board/ryu/board.h index 6c38c4863b..74ba9701a6 100644 --- a/board/ryu/board.h +++ b/board/ryu/board.h @@ -35,6 +35,7 @@ #undef CONFIG_BATTERY_RYU /* TODO implement */ #define CONFIG_BATTERY_BQ27541 #define CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD +#define CONFIG_BATTERY_REVIVE_DISCONNECT #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_BQ24773 diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c index 8999ac2324..81d0a0dc42 100644 --- a/driver/battery/bq27541.c +++ b/driver/battery/bq27541.c @@ -7,6 +7,7 @@ #include "battery.h" #include "console.h" +#include "extpower.h" #include "i2c.h" #include "util.h" @@ -39,6 +40,7 @@ #define REG_DEVICE_NAME_LENGTH 0x62 #define MAX_DEVICE_NAME_LENGTH 7 #define REG_DEVICE_NAME 0x63 +#define REG_PROTECTOR 0x6d static int bq27541_read(int offset, int *data) { @@ -220,3 +222,50 @@ void battery_get_params(struct batt_params *batt) batt->desired_current = 99999; } } + +#ifdef CONFIG_BATTERY_REVIVE_DISCONNECT +/* + * Check if battery is in disconnect state, a state entered by pulling + * BATT_DISCONN_N low, and clear that state if we have external power plugged + * and no battery faults are detected. Disconnect state resembles battery + * shutdown mode, but extra steps must be taken to get the battery out of this + * mode. + */ +enum battery_disconnect_state battery_get_disconnect_state(void) +{ + int val, rv; + /* + * Take note if we find that the battery isn't in disconnect state, + * and always return NOT_DISCONNECTED without probing the battery. + * This assumes the battery will not go to disconnect state during + * runtime. + */ + static int not_disconnected; + + if (not_disconnected) + return BATTERY_NOT_DISCONNECTED; + + if (extpower_is_present()) { + /* Check DSG_OFF bit */ + rv = bq27541_read(REG_PROTECTOR, &val); + if (rv) + return BATTERY_DISCONNECT_ERROR; + if (!(val & (1 << 6))) { + not_disconnected = 1; + return BATTERY_NOT_DISCONNECTED; + } + + /* DSG_OFF is set. Verify this is not due to a safety fault */ + if (val & 0x3f) + return BATTERY_DISCONNECT_ERROR; + rv = bq27541_read(REG_FLAGS, &val); + if (rv) + return BATTERY_DISCONNECT_ERROR; + if (val & 0xfc60) + return BATTERY_DISCONNECT_ERROR; + return BATTERY_DISCONNECTED; + } + not_disconnected = 1; + return BATTERY_NOT_DISCONNECTED; +} +#endif /* CONFIG_BATTERY_REVIVE_DISCONNECT */ |