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, 18 insertions, 0 deletions

diff --git a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml
index 2bc19d3ec4..a5a0fb3844 100644
--- a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml
+++ b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml
@@ -35,6 +35,7 @@ properties:
       - GPIO_EC_ALS_RGB_INT_L
       - GPIO_EC_AP_DP_HPD_ODL
       - GPIO_EC_BL_EN_OD
+      - GPIO_EC_CBI_WP
       - GPIO_EC_CHG_LED_B_C1
       - GPIO_EC_CHG_LED_W_C0
       - GPIO_EC_CHG_LED_W_C1
@@ -55,16 +56,20 @@ properties:
       - GPIO_EC_I2C7_EEPROM_PWR_SDA_R
       - GPIO_EC_I2C_SENSOR_SCL
       - GPIO_EC_I2C_SENSOR_SDA
+      - GPIO_EC_I2C_USBC_PD_INT
       - GPIO_EC_IMU_INT_L
       - GPIO_EC_INT_L
       - GPIO_EC_PCH_SYS_PWROK
       - GPIO_EC_PCH_WAKE_ODL
       - GPIO_EC_PCORE_INT_ODL
+      - GPIO_EC_PEN_CHG_DIS_ODL
       - GPIO_EC_PMIC_EN_ODL
       - GPIO_EC_PMIC_WATCHDOG_L
       - GPIO_EC_PROCHOT_IN_L
       - GPIO_EC_PWR_BTN_ODL
       - GPIO_EC_RST_ODL
+      - GPIO_EC_SOC_PWR_GOOD
+      - GPIO_EC_SC_RST
       - GPIO_EC_WP_L
       - GPIO_EC_X_GPIO1
       - GPIO_EC_X_GPIO3
@@ -87,12 +92,14 @@ properties:
       - GPIO_EN_PWR_A
       - GPIO_EN_PWR_PCORE_S0_R
       - GPIO_EN_PWR_S0_R
+      - GPIO_EN_PWR_S3
       - GPIO_EN_S5_RAILS
       - GPIO_EN_SLP_Z
       - GPIO_EN_ULP
       - GPIO_EN_USB_A_5V
       - GPIO_HDMI_PRSNT_ODL
       - GPIO_HIBERNATE_L
+      - GPIO_HUB_RST
       - GPIO_I2C_A_SCL
       - GPIO_I2C_A_SDA
       - GPIO_I2C_B_SCL
@@ -122,16 +129,20 @@ properties:
       - GPIO_PCH_SLP_S5_L
       - GPIO_PCH_SLP_SUS_L
       - GPIO_PCH_SYS_PWROK
+      - GPIO_PCORE_OCP_L
       - GPIO_PGOOD_FAN
       - GPIO_PG_EC_ALL_SYS_PWRGD
       - GPIO_PG_EC_DSW_PWROK
       - GPIO_PG_EC_RSMRST_ODL
       - GPIO_PG_GROUPC_S0_OD
       - GPIO_PG_LPDDR4X_S3_OD
+      - GPIO_PG_LPDDR5_S0_OD
+      - GPIO_PG_LPDDR5_S3_OD
       - GPIO_PG_MT6315_GPU_ODL
       - GPIO_PG_MT6315_PROC_ODL
       - GPIO_PG_MT6360_ODL
       - GPIO_PG_PP5000_A_ODL
+      - GPIO_PG_PP5000_Z2_OD
       - GPIO_PMIC_EC_PWRGD
       - GPIO_PMIC_KPD_PWR_ODL
       - GPIO_PMIC_RESIN_L
@@ -142,11 +153,14 @@ properties:
       - GPIO_QSIP_ON
       - GPIO_S0_PGOOD
       - GPIO_S5_PGOOD
+      - GPIO_SC_0_INT_L
       - GPIO_SET_VMC_VOLT_AT_1V8
+      - GPIO_SHI_CS_L
       - GPIO_SKU_ID0
       - GPIO_SKU_ID1
       - GPIO_SKU_ID2
       - GPIO_SLP_SUS_L
+      - GPIO_SOC_THERMTRIP_ODL
       - GPIO_SPI0_CS
       - GPIO_SPI_CLK_GPG6
       - GPIO_SPI_CS_GPG7
@@ -176,6 +190,7 @@ properties:
       - GPIO_USB_C0_PPC_INT_ODL
       - GPIO_USB_C0_SWCTL_INT_ODL
       - GPIO_USB_C0_TCPC_INT_ODL
+      - GPIO_USB_C0_TCPC_RST
       - GPIO_USB_C0_TCPC_RST_L
       - GPIO_USB_C1_BC12_CHARGER_INT_ODL
       - GPIO_USB_C1_BC12_INT_L
@@ -192,6 +207,8 @@ properties:
       - GPIO_USB_C1_SWCTL_INT_ODL
       - GPIO_USB_C1_TCPC_INT_ODL
       - GPIO_USB_C1_TCPC_RST_L
+      - GPIO_USB_HUB_FAULT_ODL
+      - GPIO_USB_FAULT_ODL
       - GPIO_VCCST_PWRGD_OD
       - GPIO_VBOB_EN
       - GPIO_VOLUME_DOWN_L
@@ -199,4 +216,5 @@ properties:
       - GPIO_WARM_RESET_L
       - GPIO_WP
       - GPIO_WP_L
+      - GPIO_X_EC_GPIO1
       - GPIO_X_EC_GPIO2