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

diff --git a/zephyr/projects/corsola/gpio_kingler.dts b/zephyr/projects/corsola/gpio_kingler.dts
new file mode 100644
index 0000000000..4ea7b30710
--- /dev/null
+++ b/zephyr/projects/corsola/gpio_kingler.dts
@@ -0,0 +1,242 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/ {
+	named-gpios {
+		compatible = "named-gpios";
+
+		base_imu_int_l {
+			gpios = <&gpio5 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_BASE_IMU_INT_L";
+		};
+		spi_ap_clk_ec {
+			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		spi_ap_cs_ec_l {
+			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_SHI_CS_L";
+		};
+		spi_ap_do_ec_di {
+			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		spi_ap_di_ec_do {
+			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		ap_ec_warm_rst_req: ap_ec_warm_rst_req {
+			gpios = <&gpio5 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8 |
+				 GPIO_ACTIVE_HIGH)>;
+			enum-name = "GPIO_AP_EC_WARM_RST_REQ";
+		};
+		ap_ec_wdtrst_l: ap_ec_wdtrst_l {
+			gpios = <&gpio5 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8 |
+				 GPIO_ACTIVE_LOW)>;
+			enum-name = "GPIO_AP_EC_WDTRST_L";
+		};
+		ap_in_sleep_l: ap_in_sleep_l {
+			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8 |
+				 GPIO_ACTIVE_LOW)>;
+			enum-name = "GPIO_AP_IN_SLEEP_L";
+		};
+		en_ulp {
+			gpios = <&gpioc 6 GPIO_OUT_LOW>;
+			enum-name = "GPIO_EN_ULP";
+		};
+		en_ec_id_odl {
+			gpios = <&gpio7 6 GPIO_ODR_LOW>;
+			enum-name = "GPIO_EN_EC_ID_ODL";
+		};
+		sys_rst_odl {
+			gpios = <&gpioc 5 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_SYS_RST_ODL";
+		};
+		ec_i2c_sensor_scl {
+			gpios = <&gpiob 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		ec_i2c_sensor_sda {
+			gpios = <&gpiob 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		ec_i2c_usb_c0_scl {
+			gpios = <&gpio9 0 GPIO_INPUT>;
+		};
+		ec_i2c_usb_c0_sda {
+			gpios = <&gpio8 7 GPIO_INPUT>;
+		};
+		ec_i2c_usb_c1_scl {
+			gpios = <&gpio9 2 GPIO_INPUT>;
+		};
+		ec_i2c_usb_c1_sda {
+			gpios = <&gpio9 1 GPIO_INPUT>;
+		};
+		ec_i2c_pwr_cbi_scl {
+			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		ec_i2c_pwr_cbi_sda {
+			gpios = <&gpiod 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+		};
+		ec_i2c_batt_scl {
+			gpios = <&gpio3 3 GPIO_INPUT>;
+		};
+		ec_i2c_batt_sda {
+			gpios = <&gpio3 6 GPIO_INPUT>;
+		};
+		ec_pen_chg_dis_odl {
+			gpios = <&gpioe 4 GPIO_INPUT>;
+			enum-name = "GPIO_EC_PEN_CHG_DIS_ODL";
+		};
+		gpio_ec_wp_l: ec_wp_odl {
+			#gpio-cells = <0>;
+			gpios = <&gpioe 3 (GPIO_OPEN_DRAIN)>;
+			enum-name = "GPIO_WP_L";
+		};
+		lid_accel_int_l {
+			gpios = <&gpiob 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_LID_ACCEL_INT_L";
+		};
+		tablet_mode_l {
+			gpios = <&gpiob 2 GPIO_INPUT>;
+			enum-name = "GPIO_TABLET_MODE_L";
+		};
+		ec_ap_int_odl {
+			gpios = <&gpioc 1 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_EC_INT_L";
+		};
+		ec_kso_02_inv {
+			gpios = <&gpio1 7 GPIO_OUT_LOW>;
+			enum-name = "GPIO_KBD_KSO2";
+		};
+		usb_c0_bc12_int_odl {
+			gpios = <&gpio8 3 GPIO_INPUT>;
+		};
+		ec_entering_rw {
+			gpios = <&gpio0 3 GPIO_OUT_LOW>;
+			enum-name = "GPIO_ENTERING_RW";
+		};
+		charger_prochot_odl {
+			gpios = <&gpiob 1 GPIO_INPUT>;
+			enum-name = "GPIO_CHARGER_PROCHOT_ODL";
+		};
+		ec_rst_odl {
+			gpios = <&gpio7 7 GPIO_INPUT>;
+			enum-name = "GPIO_EC_RST_ODL";
+		};
+		lid_open {
+			gpios = <&gpiod 2 GPIO_INPUT>;
+			enum-name = "GPIO_LID_OPEN";
+		};
+		acok_od {
+			gpios = <&gpio0 0 GPIO_INPUT>;
+			enum-name = "GPIO_AC_PRESENT";
+		};
+		gsc_ec_pwr_btn_odl {
+			gpios = <&gpio0 1 GPIO_INPUT>;
+			enum-name = "GPIO_POWER_BUTTON_L";
+		};
+		en_5v_usm {
+			gpios = <&gpio0 2 GPIO_OUT_LOW>;
+			enum-name = "GPIO_EN_5V_USM";
+		};
+		packet_mode_en {
+			gpios = <&gpio0 2 GPIO_OUT_LOW>;
+			enum-name = "GPIO_PACKET_MODE_EN";
+		};
+		x_ec_gpio2 {
+			gpios = <&gpiod 4 GPIO_INPUT>;
+			enum-name = "GPIO_X_EC_GPIO2";
+		};
+		ap_sysrst_odl_r: ap_sysrst_odl_r {
+			gpios = <&gpioa 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8 |
+				 GPIO_ACTIVE_LOW)>;
+			enum-name = "GPIO_AP_EC_SYSRST_ODL";
+		};
+		ap_xhci_init_done {
+			gpios = <&gpioa 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_AP_XHCI_INIT_DONE";
+		};
+		usb_c0_ppc_int_odl {
+			gpios = <&gpio6 7 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
+		};
+		pg_pp5000_z2_od {
+			gpios = <&gpio7 0 GPIO_INPUT>;
+			enum-name = "GPIO_PG_PP5000_Z2_OD";
+		};
+		ec_x_gpio1 {
+			gpios = <&gpio6 2 GPIO_OUT_LOW>;
+			enum-name = "GPIO_EC_X_GPIO1";
+		};
+		dp_aux_path_sel {
+			gpios = <&gpio6 3 GPIO_OUT_LOW>;
+			enum-name = "GPIO_DP_AUX_PATH_SEL";
+		};
+		ec_bl_en_od {
+			gpios = <&gpio4 0 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_EC_BL_EN_OD";
+		};
+		ec_x_gpio3 {
+			gpios = <&gpiod 3 GPIO_OUT_LOW>;
+			enum-name = "GPIO_EC_X_GPIO3";
+		};
+		usb_c0_tcpc_int_odl {
+			gpios = <&gpio7 3 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
+		};
+		usb_c0_tcpc_rst {
+			gpios = <&gpioc 0 GPIO_OUT_LOW>;
+			enum-name = "GPIO_USB_C0_TCPC_RST";
+		};
+		en_pp5000_usb_a0_vbus_x {
+			gpios = <&gpio6 0 GPIO_OUT_LOW>;
+			enum-name = "GPIO_EN_PP5000_USB_A0_VBUS";
+		};
+		hdmi_prsnt_odl {
+			gpios = <&gpio3 7 GPIO_INPUT>;
+			enum-name = "GPIO_HDMI_PRSNT_ODL";
+		};
+		en_pp5000_z2 {
+			gpios = <&gpio3 4 GPIO_OUT_HIGH>;
+			enum-name = "GPIO_EN_PP5000_Z2";
+		};
+		usb_c1_tcpc_int_odl {
+			gpios = <&gpioe 1 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
+		};
+		ec_batt_pres_odl {
+			gpios = <&gpioe 0 GPIO_INPUT>;
+			enum-name = "GPIO_BATT_PRES_ODL";
+		};
+		usb_a0_fault_odl {
+			gpios = <&gpioc 7 GPIO_INPUT>;
+			enum-name = "GPIO_USB_A0_FAULT_ODL";
+		};
+		ec_ap_dp_hpd_odl {
+			gpios = <&gpio6 1 GPIO_ODR_HIGH>;
+			enum-name = "GPIO_EC_AP_DP_HPD_ODL";
+		};
+		ec_pmic_en_odl {
+			gpios = <&gpio7 4 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
+			enum-name = "GPIO_EC_PMIC_EN_ODL";
+		};
+		ec_volup_btn_odl {
+			gpios = <&gpiod 5 GPIO_INPUT>;
+			enum-name = "GPIO_VOLUME_UP_L";
+		};
+		ec_voldn_btn_odl {
+			gpios = <&gpioe 2 GPIO_INPUT>;
+			enum-name = "GPIO_VOLUME_DOWN_L";
+		};
+		ccd_mode_odl {
+			gpios = <&gpioe 5 GPIO_INPUT>;
+			enum-name = "GPIO_CCD_MODE_ODL";
+		};
+	};
+
+	def-lvol-io-list {
+		compatible = "nuvoton,npcx-lvolctrl-def";
+		lvol-io-pads = <
+			&lvol_ioe3 /*  GPIOE3 GPIO_EC_WP_L */
+			&lvol_io40 /*  GPIO40 GPIO_EC_BL_EN_OD */
+		>;
+	};
+};