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, 12 insertions, 88 deletions

diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts
index 282ea97bb4..c8742ebbcf 100644
--- a/zephyr/projects/trogdor/lazor/gpio.dts
+++ b/zephyr/projects/trogdor/lazor/gpio.dts
@@ -10,363 +10,287 @@
 		usb_c0_pd_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PD_INT_ODL";
-			label = "USB_C0_PD_INT_ODL";
 		};
 		usb_c1_pd_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_PD_INT_ODL";
-			label = "USB_C1_PD_INT_ODL";
 		};
 		usb_c0_swctl_int_odl {
 			gpios = <&gpio0 3 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_SWCTL_INT_ODL";
-			label = "USB_C0_SWCTL_INT_ODL";
 		};
 		usb_c1_swctl_int_odl {
 			gpios = <&gpio4 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_SWCTL_INT_ODL";
-			label = "USB_C1_SWCTL_INT_ODL";
 		};
 		usb_c0_bc12_int_l {
-			gpios = <&gpio6 1 (GPIO_INPUT | GPIO_PULL_UP)>;
+			gpios = <&gpio6 1 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_USB_C0_BC12_INT_L";
-			label = "USB_C0_BC12_INT_L";
 		};
 		usb_c1_bc12_int_l {
-			gpios = <&gpio8 2 (GPIO_INPUT | GPIO_PULL_UP)>;
+			gpios = <&gpio8 2 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
 		};
 		usb_a0_oc_odl {
-			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_PULL_UP)>;
+			gpios = <&gpiod 1 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_USB_A0_OC_ODL";
-			label = "USB_A0_OC_ODL";
 		};
 		gpio_acok_od: acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioe 3 GPIO_INPUT>;
 			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
 		};
 		gpio_ec_pwr_btn_odl: ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "EC_PWR_BTN_ODL";
 		};
 		ec_voldn_btn_odl {
-			gpios = <&gpio7 0 (GPIO_INPUT | GPIO_PULL_UP)>;
+			gpios = <&gpio7 0 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
 		};
 		ec_volup_btn_odl {
-			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_UP)>;
+			gpios = <&gpiof 2 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
 		};
 		ec_wp_odl {
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 		gpio_lid_open_ec: lid_open_ec {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN_EC";
 		};
 		ap_rst_l {
 			gpios = <&gpioc 1 GPIO_INPUT>;
 			enum-name = "GPIO_AP_RST_L";
-			label = "AP_RST_L";
 		};
 		ps_hold {
-			gpios = <&gpioa 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
+			gpios = <&gpioa 4 GPIO_INPUT_PULL_DOWN>;
 			enum-name = "GPIO_PS_HOLD";
-			label = "PS_HOLD";
 		};
 		ap_suspend {
 			gpios = <&gpio5 7 GPIO_INPUT>;
 			enum-name = "GPIO_AP_SUSPEND";
-			label = "AP_SUSPEND";
 		};
 		deprecated_ap_rst_req {
-			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
+			gpios = <&gpioc 2 GPIO_INPUT_PULL_DOWN>;
 			enum-name = "GPIO_DEPRECATED_AP_RST_REQ";
-			label = "DEPRECATED_AP_RST_REQ";
 		};
 		power_good {
-			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
+			gpios = <&gpio5 4 GPIO_INPUT_PULL_DOWN>;
 			enum-name = "GPIO_POWER_GOOD";
-			label = "POWER_GOOD";
 		};
 		warm_reset_l {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_WARM_RESET_L";
-			label = "WARM_RESET_L";
 		};
 		ap_ec_spi_cs_l {
-			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CS_L";
+			gpios = <&gpio5 3 GPIO_INPUT_PULL_DOWN>;
 		};
 		tablet_mode_l {
 			gpios = <&gpioc 6 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		gpio_accel_gyro_int_l: accel_gyro_int_l {
 			gpios = <&gpioa 0 GPIO_INPUT>;
 			enum-name = "GPIO_ACCEL_GYRO_INT_L";
-			label = "ACCEL_GYRO_INT_L";
 		};
 		da9313_gpio0 {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_DA9313_GPIO0";
-			label = "DA9313_GPIO0";
 		};
 		switchcap_pg_int_l {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_SWITCHCAP_PG_INT_L";
-			label = "SWITCHCAP_PG_INT_L";
 		};
 		gpio_ec_rst_odl: ec_rst_odl {
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_RST_ODL";
-			label = "EC_RST_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpioe 1 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		pm845_resin_l {
 			gpios = <&gpio3 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_RESIN_L";
-			label = "PM845_RESIN_L";
 		};
 		pmic_kpd_pwr_odl {
 			gpios = <&gpiod 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_KPD_PWR_ODL";
-			label = "PMIC_KPD_PWR_ODL";
 		};
 		ec_int_l {
 			gpios = <&gpioa 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
 		};
 		qsip_on {
 			gpios = <&gpio5 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_QSIP_ON";
-			label = "QSIP_ON";
 		};
 		hibernate_l {
 			gpios = <&gpio5 2 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_HIBERNATE_L";
-			label = "HIBERNATE_L";
 		};
 		switchcap_on {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON";
-			label = "SWITCHCAP_ON";
 		};
 		switchcap_on_l {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON_L";
-			label = "SWITCHCAP_ON_L";
 		};
 		vbob_en {
 			gpios = <&gpiod 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_VBOB_EN";
-			label = "VBOB_EN";
 		};
 		en_pp3300_a {
 			gpios = <&gpioa 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
 		};
 		en_pp5000_a {
 			gpios = <&gpio6 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_A";
 		};
 		ec_bl_disable_l {
 			gpios = <&gpiob 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_BL_DISABLE_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpio5 6 GPIO_INPUT>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		trackpad_int_gate {
 			gpios = <&gpio7 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_TRACKPAD_INT_GATE";
-			label = "TRACKPAD_INT_GATE";
 		};
 		usb_c0_pd_rst_l {
 			gpios = <&gpiof 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_USB_C0_PD_RST_L";
-			label = "USB_C0_PD_RST_L";
 		};
 		usb_c1_pd_rst_l {
 			gpios = <&gpioe 4 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_USB_C1_PD_RST_L";
-			label = "USB_C1_PD_RST_L";
 		};
 		dp_mux_oe_l {
 			gpios = <&gpio9 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_DP_MUX_OE_L";
-			label = "DP_MUX_OE_L";
 		};
 		dp_mux_sel {
 			gpios = <&gpio4 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_MUX_SEL";
-			label = "DP_MUX_SEL";
 		};
 		dp_hot_plug_det {
 			gpios = <&gpio9 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_HOT_PLUG_DET";
-			label = "DP_HOT_PLUG_DET";
 		};
 		en_usb_a_5v {
 			gpios = <&gpio8 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_USB_A_5V";
-			label = "EN_USB_A_5V";
 		};
 		usb_a_cdp_ilim_en {
 			gpios = <&gpio7 5 GPIO_OUT_HIGH>;
-			label = "USB_A_CDP_ILIM_EN";
 		};
 		ec_chg_led_y_c1 {
 			gpios = <&gpioc 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
 		};
 		ec_chg_led_b_c1 {
 			gpios = <&gpioc 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_B_C1";
-			label = "EC_CHG_LED_B_C1";
 		};
 		ap_ec_spi_mosi {
-			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MOSI";
+			gpios = <&gpio4 6 GPIO_INPUT_PULL_DOWN>;
 		};
 		ap_ec_spi_miso {
-			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MISO";
+			gpios = <&gpio4 7 GPIO_INPUT_PULL_DOWN>;
 		};
 		ap_ec_spi_clk {
-			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CLK";
+			gpios = <&gpio5 5 GPIO_INPUT_PULL_DOWN>;
 		};
 		kb_bl_pwm {
 			gpios = <&gpio8 0 GPIO_INPUT>;
-			label = "KB_BL_PWM";
 		};
 		edp_bkltctl {
 			gpios = <&gpiob 7 GPIO_INPUT>;
-			label = "EDP_BKLTCTL";
 		};
 		ppvar_boostin_sense {
 			gpios = <&gpio4 4 GPIO_INPUT>;
-			label = "PPVAR_BOOSTIN_SENSE";
 		};
 		charger_iadp {
 			gpios = <&gpio4 3 GPIO_INPUT>;
-			label = "CHARGER_IADP";
 		};
 		charger_pmon {
 			gpios = <&gpio4 2 GPIO_INPUT>;
-			label = "CHARGER_PMON";
 		};
 		ec_i2c_power_scl {
 			gpios = <&gpiob 5 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SCL";
 		};
 		ec_i2c_power_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SDA";
 		};
 		ec_i2c_usb_c0_pd_scl {
 			gpios = <&gpio9 0 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SCL";
 		};
 		ec_i2c_usb_c0_pd_sda {
 			gpios = <&gpio8 7 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SDA";
 		};
 		ec_i2c_usb_c1_pd_scl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SCL";
 		};
 		ec_i2c_usb_c1_pd_sda {
 			gpios = <&gpio9 1 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SDA";
 		};
 		ec_i2c_eeprom_scl {
 			gpios = <&gpio3 3 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SCL";
 		};
 		ec_i2c_eeprom_sda {
 			gpios = <&gpio3 6 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SDA";
 		};
 		ec_i2c_sensor_scl {
 			gpios = <&gpiob 3 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C_SENSOR_SCL";
-			label = "EC_I2C_SENSOR_SCL";
 		};
 		ec_i2c_sensor_sda {
 			gpios = <&gpiob 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C_SENSOR_SDA";
-			label = "EC_I2C_SENSOR_SDA";
 		};
 		gpio_brd_id0: brd_id0 {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BRD_ID0";
 		};
 		gpio_brd_id1: brd_id1 {
 			gpios = <&gpio9 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BRD_ID1";
 		};
 		gpio_brd_id2: brd_id2 {
 			gpios = <&gpio6 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BRD_ID2";
 		};
 		gpio_sku_id0: sku_id0 {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID0";
-			label = "SKU_ID0";
 		};
 		gpio_sku_id1: sku_id1 {
 			gpios = <&gpio4 1 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID1";
-			label = "SKU_ID1";
 		};
 		gpio_sku_id2: sku_id2 {
 			gpios = <&gpiod 4 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID2";
-			label = "SKU_ID2";
 		};
 		arm_x86 {
 			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "ARM_X86";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
 	};