Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main

Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main

Relevant changes:

git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh

e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell

BRANCH=None
BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
BUG=b:247100970 b:254328661
TEST=`emerge-brya chromeos-ec`

Force-Relevant-Builds: all
Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
Signed-off-by: YH Lin <yueherngl@google.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/zephyr/Kconfig.charger b/zephyr/Kconfig.charger
index f408797d17..c2c6eeb3f4 100644
--- a/zephyr/Kconfig.charger
+++ b/zephyr/Kconfig.charger
@@ -63,6 +63,21 @@ config PLATFORM_EC_CHARGE_MANAGER
 	  source is available on the hardware, so cannot be built without
 	  PLATFORM_EC_USBC.
 
+config PLATFORM_EC_CHARGE_STATE_DEBUG
+	bool "Debug information about the charge state"
+	depends on PLATFORM_EC_CHARGE_MANAGER
+	help
+	  Enables debug information regarding the current charge state. Enabling
+	  this config will allow the EC_CMD_CHARGE_STATE host command to use the
+	  CHARGE_STATE_CMD_GET_PARAM command to query the current charge state.
+
+config PLATFORM_EC_CMD_PWR_AVG
+	bool "Enable the console command to print power average"
+	depends on PLATFORM_EC_CHARGE_MANAGER
+	help
+	  Enables the console command which prints out the current (past 1
+	  minute) power average.
+
 config PLATFORM_EC_CHARGESPLASH
 	bool "Charging splashscreen support"
 	help
@@ -171,6 +186,8 @@ config PLATFORM_EC_CHARGER_RAA489000
 
 config PLATFORM_EC_CHARGER_RT9490
 	bool "Use the RT9490 charger"
+	default y
+	depends on DT_HAS_RICHTEK_RT9490_ENABLED || DT_HAS_ZEPHYR_RT9490_EMUL_ENABLED
 	depends on PLATFORM_EC_I2C
 	select PLATFORM_EC_CHARGER_OTG_SUPPORTED
 	help
@@ -187,6 +204,12 @@ config PLATFORM_EC_CHARGER_SM5803
 	  Enables the driver for the SM5803.
 	  The SM5803 is the Silicon Mitus SM5803 Buck-Boost Charger.
 
+	  This charger is known to be very inefficient when operating in buck-boost
+	  mode (when input voltage is close to output voltage), such that permanent
+	  damage may be done to the charger. Users should exercise caution around
+	  choice of supported configurations: see b:260271871, b:258754576, and
+	  b:230712704 for more information.
+
 
 if PLATFORM_EC_OCPC
 
@@ -199,6 +222,13 @@ config PLATFORM_EC_OCPC_DEF_RBATT_MOHMS
 	  This should be at a minimum the Rds(on) resistance of the BFET plus
 	  the series sense resistor.
 
+config PLATFORM_EC_OCPC_DEF_DRIVELIMIT_MILLIVOLTS
+	int "Drive Limit for the OCPC PID control loop"
+	default 10
+	help
+	  Sets how agressively the OCPC PID control loop can adjust VSYS to drive
+	  the battery with the correct current.
+
 endif  # PLATFORM_EC_OCPC
 
 config PLATFORM_EC_CHARGER_DISCHARGE_ON_AC