diff options
| author | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-17 09:04:35 +0000 |
|---|---|---|
| committer | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-17 09:04:35 +0000 |
| commit | ccc57fa0cbd41dedd0fdfda607b4effb643b928a (patch) | |
| tree | 064cdedad65202b1692e7bf9ad5f556afcb13795 /include/config.h | |
| parent | 246a64a7a7afa655fa977b157d6b4e3bbf8854b6 (diff) | |
| parent | 7f55c15872425d95df9d6e55fb9fab4a9a33937e (diff) | |
| download | chrome-ec-firmware-nissa-15217.B-main.tar.gz | |
Merge remote-tracking branch cros/main into firmware-nissa-15217.B-mainfirmware-nissa-15217.B-main
Generated by: util/update_release_branch.py -r --zephyr --board nissa firmware-
nissa-15217.B-main
Relevant changes:
git log --oneline 246a64a7a7..7f55c15872 -- zephyr/program/nissa
util/getversion.sh
7f55c15872 uldren: Modify battery parameter
b98a347e1b gothrax: Initial Zephyr EC image
638a938c27 yavilla: Add convertible related functions
926f0b68e1 Craask: define LED behavior at STATE_DISCHARGE_S0_BAT_LOW
BRANCH=None
BUG=b:274750316 b:279614675 b:273791621 b:282116750
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I0a1340ab45ce827aff3180468668cfcba92c6fe5
Signed-off-by: Shou-Chieh Hsu <shouchieh@google.com>
Diffstat (limited to 'include/config.h')
| -rw-r--r-- | include/config.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index a3a2edb1ed..dfc684f278 100644 --- a/include/config.h +++ b/include/config.h @@ -665,6 +665,12 @@ #undef CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV /* + * Check the specific battery status to judge whether the battery is + * initialized and stable when the battery wakes up from ship mode. + */ +#undef CONFIG_BATTERY_STBL_STAT + +/* * Some batteries don't update full capacity timely or don't update it at all. * On such systems, compensation is required to guarantee remaining_capacity * will be equal to full_capacity eventually. This used to be done in ACPI. @@ -6411,6 +6417,33 @@ #define CONFIG_BATTERY_V1 #endif +/* + * Check the specific battery status to judge whether the battery is + * initialized and stable when the battery wakes up from ship mode. + * Use two MASKs to provide logical AND and logical OR options for different + * status. For example: + * + * Logical OR -- just check one of TCA/TDA mask: + * #define CONFIG_BATT_ALARM_MASK1 \ + * (STATUS_TERMINATE_CHARGE_ALARM | STATUS_TERMINATE_DISCHARGE_ALARM) + * #define CONFIG_BATT_ALARM_MASK2 0xFFFF + * + * Logical AND -- check both TCA/TDA mask: + * #define CONFIG_BATT_ALARM_MASK1 STATUS_TERMINATE_CHARGE_ALARM + * #define CONFIG_BATT_ALARM_MASK2 STATUS_TERMINATE_DISCHARGE_ALARM + * + * The default configuration is logical OR. + */ +#ifdef CONFIG_BATTERY_STBL_STAT +#ifndef CONFIG_BATT_ALARM_MASK1 +#define CONFIG_BATT_ALARM_MASK1 \ + (STATUS_TERMINATE_CHARGE_ALARM | STATUS_TERMINATE_DISCHARGE_ALARM) +#endif +#ifndef CONFIG_BATT_ALARM_MASK2 +#define CONFIG_BATT_ALARM_MASK2 0xFFFF +#endif +#endif + /*****************************************************************************/ /* Define derived USB PD Discharge common path */ #if defined(CONFIG_USB_PD_DISCHARGE_GPIO) || \ |