diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-05-25 18:10:36 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-01 22:36:11 +0000 |
commit | 02b2f0fae0e9ea5c0b38e5c580e57d1d16486a17 (patch) | |
tree | 6e1a6869fdd0577457fd8b435c079f8de59f8f42 | |
parent | baef8699dcc089643fddc56f31fb4b4b9aab7e4d (diff) | |
download | chrome-ec-02b2f0fae0e9ea5c0b38e5c580e57d1d16486a17.tar.gz |
Remove CONFIG_BATTERY_DEAD_UNTIL_VALUE
BUG=none
BRANCH=none
TEST=buildall
Change-Id: Iebf0817c1b605d74348c9b20c01df74bd69468d2
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2929338
-rw-r--r-- | common/charge_state_v2.c | 4 | ||||
-rw-r--r-- | driver/battery/smart.c | 4 | ||||
-rw-r--r-- | include/config.h | 7 | ||||
-rw-r--r-- | util/config_allowed.txt | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index d700531874..c3e5d8eae5 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1959,11 +1959,7 @@ void charger_task(void *u) */ if (curr.requested_voltage == 0 && curr.requested_current == 0 && -#ifdef CONFIG_BATTERY_DEAD_UNTIL_VALUE - curr.batt.state_of_charge < CONFIG_BATTERY_DEAD_UNTIL_VALUE) { -#else curr.batt.state_of_charge == 0) { -#endif /* Battery is dead, give precharge current */ curr.requested_voltage = batt_info->voltage_max; diff --git a/driver/battery/smart.c b/driver/battery/smart.c index fd7dbcafb9..7915328ff2 100644 --- a/driver/battery/smart.c +++ b/driver/battery/smart.c @@ -444,11 +444,7 @@ void battery_get_params(struct batt_params *batt) batt_new.state_of_charge < BATTERY_LEVEL_FULL) || (batt_new.desired_voltage == 0 && batt_new.desired_current == 0 && -#ifdef CONFIG_BATTERY_DEAD_UNTIL_VALUE - batt_new.state_of_charge < CONFIG_BATTERY_DEAD_UNTIL_VALUE))) -#else batt_new.state_of_charge == 0))) -#endif #else batt_new.desired_voltage && batt_new.desired_current && diff --git a/include/config.h b/include/config.h index 5a1e3336a4..7582dbc8e6 100644 --- a/include/config.h +++ b/include/config.h @@ -617,13 +617,6 @@ #undef CONFIG_BATTERY_V2 /* - * Some fuel gauges in battery take some time to return valid battery params - * when wake form dead battery. - * It need to do precharge to take valid battery params. - */ -#undef CONFIG_BATTERY_DEAD_UNTIL_VALUE - -/* * Number of batteries, only matters when CONFIG_BATTERY_V2 is used. */ #undef CONFIG_BATTERY_COUNT diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 0c276f0067..ff11156db3 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -91,7 +91,6 @@ CONFIG_BATTERY_COUNT CONFIG_BATTERY_CRITICAL_SHUTDOWN_CUT_OFF CONFIG_BATTERY_CRITICAL_SHUTDOWN_TIMEOUT CONFIG_BATTERY_CUTOFF_DELAY_US -CONFIG_BATTERY_DEAD_UNTIL_VALUE CONFIG_BATTERY_LEVEL_NEAR_FULL CONFIG_BATTERY_MAX17055 CONFIG_BATTERY_MAX17055_ALERT |