Merge remote-tracking branch cros/main into firmware-keeby-14119.B-mainfirmware-keeby-14119.B-main

Relevant changes:

git log --oneline c5bd23a4b..b44d10f8f -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh

42d03a001 config: change temp_sensor_power from config to gpio
e296efb28 usb_common: Fix CONFIG_USB_PD_DISCHARGE_TCPC typo
c346481f4 atomic: cast to unsigned when shifting
9b972a0f2 driver/tcpm/it83xx, it8xxx2: ITE inactive port return from HOOK
a499d8fd4 driver/tcpm/it83xx, it8xxx2: set sleep mask for mixed TCPC case
ed62e2583 TCPMv2: don't set the sleep mask for TCPC embedded in EC
c962696e8 motion_sensor: Remove |int_signal| field
86b216794 ocpc: modify pre-charge target condition
6f8336eb4 dedede: Set MKBP event wake mask to 0
02d034df0 dedede: add stylus fw_config
4f7cd7509 atomic: use atomic_t where it is possible
e3ffa0519 mkbp: change the type fifo_entries to atomic_t
bb4c47af0 usb: use atomic_t where possible
c6e513ee2 power/icelake: Add SLP_S5 as a watched power signal
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
23a975d12 i2c: Use declared initializers for i2c_ports: boards a-l
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI

BRANCH=None
BUG=b:202796060 b:207805856 b:167983049 b:208318528 b:181983966
BUG=b:207328258 b:195416058 b:205285137 b:199919093 b:207055975
BUG=b:129159505 b:204947672 b:141363146 b:207082842 b:205675485
TEST=`make -j buildall`

Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I980351977e11088a130e478df0701be4715f049b

1 files changed, 8 insertions, 9 deletions

diff --git a/util/config_allowed.txt b/util/config_allowed.txt
index ba0d54fd5a..e7e751116c 100644
--- a/util/config_allowed.txt
+++ b/util/config_allowed.txt
@@ -488,22 +488,20 @@ CONFIG_HOSTCMD_ALIGNED
 CONFIG_HOSTCMD_AP_SET_SKUID
 CONFIG_HOSTCMD_BATTERY_V2
 CONFIG_HOSTCMD_BUTTON
-CONFIG_HOSTCMD_ESPI
 CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP
 CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ
 CONFIG_HOSTCMD_ESPI_EC_MODE
 CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST
 CONFIG_HOSTCMD_ESPI_VW_SLP_S3
 CONFIG_HOSTCMD_ESPI_VW_SLP_S4
+CONFIG_HOSTCMD_ESPI_VW_SLP_S5
 CONFIG_HOSTCMD_EVENTS
 CONFIG_HOSTCMD_FLASHPD
 CONFIG_HOSTCMD_FLASH_SPI_INFO
-CONFIG_HOSTCMD_HECI
 CONFIG_HOSTCMD_I2C_ADDR_FLAGS
 CONFIG_HOSTCMD_I2C_SLAVE_ADDR
 CONFIG_HOSTCMD_I2C_CONTROL
 CONFIG_HOSTCMD_LOCATE_CHIP
-CONFIG_HOSTCMD_LPC
 CONFIG_HOSTCMD_PD
 CONFIG_HOSTCMD_PD_CHG_CTRL
 CONFIG_HOSTCMD_PD_PANIC
@@ -512,7 +510,6 @@ CONFIG_HOSTCMD_RATE_LIMITING_PERIOD
 CONFIG_HOSTCMD_RATE_LIMITING_RECESS
 CONFIG_HOSTCMD_RWHASHPD
 CONFIG_HOSTCMD_SECTION_SORTED
-CONFIG_HOSTCMD_SHI
 CONFIG_HOSTCMD_SKUID
 CONFIG_HOSTCMD_X86
 CONFIG_HOST_COMMAND_STATUS
@@ -520,6 +517,10 @@ CONFIG_HOST_ESPI_VW_POWER_SIGNAL
 CONFIG_HOST_EVENT64
 CONFIG_HOST_EVENT64_REPORT_MASK
 CONFIG_HOST_EVENT_REPORT_MASK
+CONFIG_HOST_INTERFACE_ESPI
+CONFIG_HOST_INTERFACE_HECI
+CONFIG_HOST_INTERFACE_LPC
+CONFIG_HOST_INTERFACE_SHI
 CONFIG_HWTIMER_64BIT
 CONFIG_HW_CRC
 CONFIG_HW_SPECIFIC_UDELAY
@@ -611,6 +612,7 @@ CONFIG_LED_DRIVER_DS2413
 CONFIG_LED_DRIVER_LM3509
 CONFIG_LED_DRIVER_LM3630A
 CONFIG_LED_DRIVER_LP5562
+CONFIG_LED_DRIVER_MP3385
 CONFIG_LED_DRIVER_OZ554
 CONFIG_LED_POLICY_STD
 CONFIG_LED_POWER_ACTIVE_LOW
@@ -655,7 +657,6 @@ CONFIG_MAG_LSM6DSM_BMM150
 CONFIG_MAG_LSM6DSM_LIS2MDL
 CONFIG_MALLOC
 CONFIG_MAPPED_STORAGE_BASE
-CONFIG_MATH_UTIL
 CONFIG_MAX695X_SEVEN_SEGMENT_DISPLAY
 CONFIG_MCDP28X0
 CONFIG_MCHP_48MHZ_OUT
@@ -894,7 +895,8 @@ CONFIG_TEMP_SENSOR_G753
 CONFIG_TEMP_SENSOR_G781
 CONFIG_TEMP_SENSOR_G782
 CONFIG_TEMP_SENSOR_OTI502
-CONFIG_TEMP_SENSOR_POWER_GPIO
+CONFIG_TEMP_SENSOR_PCT2075
+CONFIG_TEMP_SENSOR_POWER
 CONFIG_TEMP_SENSOR_SB_TSI
 CONFIG_TEMP_SENSOR_TMP006
 CONFIG_TEMP_SENSOR_TMP112
@@ -1052,9 +1054,6 @@ CONFIG_USB_PD_TCPMV2
 CONFIG_USB_PD_TCPM_ANX3429
 CONFIG_USB_PD_TCPM_ANX740X
 CONFIG_USB_PD_TCPM_ANX741X
-CONFIG_USB_PD_TCPM_ANX7447
-CONFIG_USB_PD_TCPM_ANX7447_AUX_PU_PD
-CONFIG_USB_PD_TCPM_ANX7447_OCM_ERASE_COMMAND
 CONFIG_USB_PD_TCPM_ANX74XX
 CONFIG_USB_PD_TCPM_ANX7688
 CONFIG_USB_PD_TCPM_CCGXXF