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, 30 insertions, 31 deletions

diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts
index 9ec2af0a12..68549c7b68 100644
--- a/zephyr/projects/brya/brya/gpio.dts
+++ b/zephyr/projects/brya/brya/gpio.dts
@@ -10,137 +10,136 @@
 		lid_open: lid_open {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 
-		gsc_ec_pwr_btn_odl: power_btn {
+		gsc_ec_pwr_btn_odl: gsc_ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "GSC_EC_PWR_BTN_ODL";
 		};
 
-		wp_l {
+		gpio_ec_wp_l: ec_wp_odl {
+			#gpio-cells = <0>;
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 
 		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";
 		};
 
-		packet_mode_en {
+		ec_gsc_packet_mode {
 			gpios = <&gpio7 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PACKET_MODE_EN";
-			label = "EC_GSC_PACKET_MODE";
+		};
+		gpio_ec_accel_int_l: ec_accel_int_l {
+			gpios = <&gpio8 1 GPIO_INPUT>;
+			enum-name = "GPIO_EC_ACCEL_INT";
+		};
+		gpio_ec_imu_int_l: gpio_ec_imu_int_l {
+			gpios = <&gpio5 6 GPIO_INPUT>;
+			enum-name = "GPIO_EC_IMU_INT_L";
+		};
+		gpio_ec_als_rgb_int_l: gpio_ec_als_rgb_int_l {
+			gpios = <&gpiod 4 GPIO_INPUT>;
+			enum-name = "GPIO_EC_ALS_RGB_INT_L";
+		};
+		tablet_mode_l {
+			gpios = <&gpio9 5 GPIO_INPUT>;
+			enum-name = "GPIO_TABLET_MODE_L";
 		};
 		acok_od: acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
-		pch_wake_odl {
+		ec_pch_wake_r_odl {
 			gpios = <&gpioc 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "EC_PCH_WAKE_R_ODL";
 		};
-		pch_int_odl {
+		ec_pch_int_odl {
 			gpios = <&gpiob 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_PCH_INT_ODL";
 		};
 		pg_ec_dsw_pwrok {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_DSW_PWROK";
-			label = "PG_EC_DSW_PWROK";
 		};
 		en_s5_rails {
 			gpios = <&gpiob 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_S5_RAILS";
-			label = "EN_S5_RAILS";
 		};
 		sys_rst_odl {
 			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_SYS_RESET_L";
-			label = "SYS_RST_ODL";
 		};
 		pg_ec_rsmrst_odl {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_RSMRST_ODL";
-			label = "PG_EC_RSMRST_ODL";
 		};
 		ec_pch_rsmrst_odl {
 			gpios = <&gpioa 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PCH_RSMRST_L";
-			label = "EC_PCH_RSMRST_ODL";
 		};
 		pg_ec_all_sys_pwrgd {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
-			label = "PG_EC_ALL_SYS_PWRGD";
 		};
 		slp_s0_l {
 			gpios = <&gpiod 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S0_L";
-			label = "SLP_S0_L";
 		};
 		slp_s3_l {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S3_L";
-			label = "SLP_S3_L";
 		};
 		vccst_pwrgd_od {
 			gpios = <&gpioa 4 GPIO_ODR_LOW>;
 			enum-name = "GPIO_VCCST_PWRGD_OD";
-			label = "VCCST_PWRGD_OD";
 		};
 		ec_prochot_odl {
 			gpios = <&gpio6 3 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_CPU_PROCHOT";
-			label = "EC_PROCHOT_ODL";
 		};
 		ec_pch_pwr_btn_odl {
 			gpios = <&gpioc 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PCH_PWRBTN_L";
-			label = "EC_PCH_PWR_BTN_ODL";
 		};
 		slp_sus_l {
 			gpios = <&gpiof 1 GPIO_INPUT>;
 			enum-name = "GPIO_SLP_SUS_L";
-			label = "SLP_SUS_L";
 		};
 		pch_pwrok {
 			gpios = <&gpio7 2 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PCH_PWROK";
-			label = "PCH_PWROK";
 		};
 		ec_pch_sys_pwrok {
 			gpios = <&gpio3 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_PCH_SYS_PWROK";
-			label = "EC_PCH_SYS_PWROK";
 		};
 		imvp9_vrrdy_od {
 			gpios = <&gpio4 3 GPIO_INPUT>;
 			enum-name = "GPIO_IMVP9_VRRDY_OD";
-			label = "IMVP9_VRRDY_OD";
 		};
 		ec_edp_bl_en {
 			gpios = <&gpiod 3 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_EDP_BL_EN";
+		};
+		ec_prochot_in_l {
+			gpios = <&gpiof 0 GPIO_INPUT>;
+			enum-name = "GPIO_EC_PROCHOT_IN_L";
+		};
+		gpio_en_pp5000_fan: en_pp5000_fan {
+			gpios = <&gpio6 1 GPIO_OUT_HIGH>;
+			enum-name = "GPIO_EN_PP5000_FAN";
 		};
 	};