diff options
| author | james_chao <james_chao@asus.com> | 2017-05-23 14:30:16 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-05-23 13:55:32 +0000 |
| commit | 2487f169228e4f0ad873b4f6fee11d764a7680e6 (patch) | |
| tree | a738cb2a08b777b77720969a7c4f3085b466c4f0 | |
| parent | bcc12ca8fb72d9fb4ce7e658e25585da9ccabc65 (diff) | |
| download | chrome-ec-2487f169228e4f0ad873b4f6fee11d764a7680e6.tar.gz | |
Revert "bd9995*: maintain VBAT voltage as battery maximum"
This reverts commit 496334078844d2e5156c8b77ba7b58401a0151e5.
Reason for revert:
BUG=b:38445296
BRANCH=gru
TEST=check the charger not lost randomly when aging s5
Change-Id: Ic9a4036764bdc8c9136a398a71c3f0155d68e191
Reviewed-on: https://chromium-review.googlesource.com/511905
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: BoChao Jhan <james_chao@asus.com>
Tested-by: BoChao Jhan <james_chao@asus.com>
| -rw-r--r-- | board/bob/board.h | 1 | ||||
| -rw-r--r-- | board/kevin/board.h | 1 | ||||
| -rw-r--r-- | board/scarlet/board.h | 1 | ||||
| -rw-r--r-- | driver/charger/bd99955.c | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/board/bob/board.h b/board/bob/board.h index 7ba8578ea9..d756c7040a 100644 --- a/board/bob/board.h +++ b/board/bob/board.h @@ -69,6 +69,7 @@ #define CONFIG_CHARGER_BD99955 #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHARGER_INPUT_CURRENT 512 +#define CONFIG_CHARGER_MAINTAIN_VBAT #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2 diff --git a/board/kevin/board.h b/board/kevin/board.h index 66ef9d86c2..a2101d53bf 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -70,6 +70,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BD99955 #define CONFIG_CHARGER_INPUT_CURRENT 512 +#define CONFIG_CHARGER_MAINTAIN_VBAT #define CONFIG_CHARGER_DISCHARGE_ON_AC #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2 diff --git a/board/scarlet/board.h b/board/scarlet/board.h index c4a1978fdc..3e3c21f892 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -70,6 +70,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BD99955 #define CONFIG_CHARGER_INPUT_CURRENT 512 +#define CONFIG_CHARGER_MAINTAIN_VBAT #define CONFIG_CHARGER_V2 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 2 #define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 2 diff --git a/driver/charger/bd99955.c b/driver/charger/bd99955.c index 626cce813a..95209b6de8 100644 --- a/driver/charger/bd99955.c +++ b/driver/charger/bd99955.c @@ -693,8 +693,7 @@ int charger_set_voltage(int voltage) * Regulate the system voltage to battery max if the battery * is not present or the battery is discharging on AC. */ - if (voltage == 0 || - bd99955_is_discharging_on_ac() || + if (bd99955_is_discharging_on_ac() || battery_is_present() != BP_YES || battery_is_cut_off() || voltage > bi->voltage_max) |