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 /zephyr/Kconfig.battery | |
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 'zephyr/Kconfig.battery')
-rw-r--r-- | zephyr/Kconfig.battery | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/zephyr/Kconfig.battery b/zephyr/Kconfig.battery index 01d42567ab..2247e30cff 100644 --- a/zephyr/Kconfig.battery +++ b/zephyr/Kconfig.battery @@ -178,6 +178,49 @@ config PLATFORM_EC_BATTERY_MAX_IMBALANCE_MV system tolerant of larger values of CONFIG_PLATFORM_EC_BATTERY_MAX_IMBALANCE_MV. +config PLATFORM_EC_BATTERY_STBL_STAT + bool "Check whether the battery is initialized and stable" + help + Enables support for checking 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: + STATUS_TERMINATE_CHARGE_ALARM(TCA):0x4000 + STATUS_TERMINATE_DISCHARGE_ALARM(TDA):0x0800 + + Logical OR -- just check one of TCA/TDA mask: + CONFIG_PLATFORM_EC_BATT_ALARM_MASK1=(0x4000 | 0x0800) + CONFIG_PLATFORM_EC_BATT_ALARM_MASK2=0xFFFF + + Logical AND -- check both TCA/TDA mask: + CONFIG_PLATFORM_EC_BATT_ALARM_MASK1=0x4000 + CONFIG_PLATFORM_EC_BATT_ALARM_MASK2=0x0800 + + The default configuration is logical OR. + +if PLATFORM_EC_BATTERY_STBL_STAT + +config PLATFORM_EC_BATT_ALARM_MASK1 + hex "The battery status mask" + default 0x4800 + help + Use two MASKs to provide logical AND and logical OR options for different + status. Default mask 0x4800 means + (STATUS_TERMINATE_CHARGE_ALARM | STATUS_TERMINATE_DISCHARGE_ALARM), + any one of these two masks is set, the battery state can be considered + stable. + +config PLATFORM_EC_BATT_ALARM_MASK2 + hex "The battery status mask" + default 0xFFFF + help + Use two MASKs to provide logical AND and logical OR options for different + status. Default mask 0xFFFF means do not use this mask. + +endif # PLATFORM_EC_BATTERY_STBL_STAT + config PLATFORM_EC_CHARGER_MIN_BAT_PCT_IMBALANCED_POWER_ON int "Minimum battery percentage for power on with an imbalanced pack" depends on PLATFORM_EC_BATTERY_MEASURE_IMBALANCE |