Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main"factory-brya-14909.124.B-main

This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
>
> Relevant changes:
>
> git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
> BUG=b:247100970 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
Bug: b:247100970 b:254328661
Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247
Auto-Submit: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Commit-Queue: YH Lin <yueherngl@chromium.org>

1 files changed, 0 insertions, 370 deletions

diff --git a/zephyr/program/skyrim/gpio.dtsi b/zephyr/program/skyrim/gpio.dtsi
deleted file mode 100644
index 2b79bad222..0000000000
--- a/zephyr/program/skyrim/gpio.dtsi
+++ /dev/null
@@ -1,370 +0,0 @@
-/* Copyright 2021 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/ {
-	aliases {
-		gpio-wp = &gpio_wp;
-		gpio-cbi-wp = &gpio_cbi_wp;
-		gpio-kbd-kso2 = &gpio_ec_kso_02_inv;
-	};
-
-	/* GPIOs shared by all boards */
-	named-gpios {
-		compatible = "named-gpios";
-
-		ccd_mode_odl {
-			gpios = <&gpioc 6 GPIO_ODR_HIGH>;
-		};
-		ec_gsc_packet_mode {
-			gpios = <&gpiob 1 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_PACKET_MODE_EN";
-		};
-		gpio_mech_pwr_btn_odl: mech_pwr_btn_odl {
-			gpios = <&gpiod 2 GPIO_INPUT>;
-			enum-name = "GPIO_POWER_BUTTON_L";
-		};
-		gpio_slp_s3_l: slp_s3_l {
-			gpios = <&gpio6 1 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S3_L";
-			alias = "GPIO_PCH_SLP_S0_L";
-		};
-		gpio_slp_s5_l: slp_s5_l {
-			gpios = <&gpio7 2 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S5_L";
-		};
-		gpio_pg_pwr_s5: pg_pwr_s5 {
-			gpios = <&gpioc 0 GPIO_INPUT>;
-			enum-name = "GPIO_S5_PGOOD";
-		};
-		gpio_s0_pgood: pg_pcore_s0_r_od {
-			gpios = <&gpiob 6 GPIO_INPUT>;
-			enum-name = "GPIO_S0_PGOOD";
-		};
-		gpio_acok_od: acok_od {
-			gpios = <&gpio0 0 GPIO_INPUT>;
-			enum-name = "GPIO_AC_PRESENT";
-		};
-		gpio_en_pwr_s5: en_pwr_s5 {
-			gpios = <&gpiob 7 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PWR_A";
-		};
-		gpio_en_pwr_s0_r: en_pwr_s0_r {
-			gpios = <&gpiof 1 GPIO_OUTPUT_LOW>;
-		};
-		gpio_en_pwr_pcore_s0_r: en_pwr_pcore_s0_r {
-			gpios = <&gpioe 1 GPIO_OUTPUT_LOW>;
-		};
-		ec_sys_rst_l {
-			gpios = <&gpio7 6 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_SYS_RESET_L";
-		};
-		gpio_ec_soc_rsmrst_l: ec_soc_rsmrst_l {
-			gpios = <&gpioc 5 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_PCH_RSMRST_L";
-		};
-		gpio_ec_pch_wake_odl: ec_soc_wake_l {
-			gpios = <&gpio0 3 GPIO_OUTPUT_HIGH>;
-		};
-		prochot_odl {
-			gpios = <&gpiod 5 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_CPU_PROCHOT";
-		};
-		soc_alert_ec_l {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-		};
-		gpio_usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl {
-			gpios = <&gpioe 0 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
-		};
-		gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl {
-			gpios = <&gpioc 7 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
-		};
-		gpio_usb_c0_ppc_int_odl: usb_c0_ppc_int_odl {
-			gpios = <&gpio7 5 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
-		};
-		gpio_usb_c1_ppc_int_odl: usb_c1_ppc_int_odl {
-			gpios = <&gpiod 4 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
-		};
-		gpio_usb_c0_bc12_int_odl: usb_c0_bc12_int_odl {
-			gpios = <&gpioa 4 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_USB_C0_BC12_INT_ODL";
-		};
-		gpio_usb_c1_bc12_int_odl: usb_c1_bc12_int_odl {
-			gpios = <&gpio9 6 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_USB_C1_BC12_INT_ODL";
-		};
-		gpio_usb_c0_tcpc_rst_l: usb_c0_tcpc_rst_l {
-			gpios = <&gpio3 4 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_USB_C0_TCPC_RST_L";
-		};
-		gpio_usb_c1_tcpc_rst_l: usb_c1_tcpc_rst_l {
-			gpios = <&gpio3 7 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_USB_C1_TCPC_RST_L";
-		};
-		usb_c0_hpd {
-			gpios = <&gpiof 5 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_USB_C0_DP_HPD";
-		};
-		usb_c1_hpd {
-			gpios = <&gpiof 4 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_USB_C1_DP_HPD";
-		};
-		gpio_lid_open: lid_open {
-			gpios = <&gpio0 2 GPIO_INPUT>;
-			enum-name = "GPIO_LID_OPEN";
-		};
-		gpio_ec_batt_pres_odl: ec_batt_pres_odl {
-			gpios = <&gpio9 4 GPIO_INPUT>;
-			enum-name = "GPIO_BATT_PRES_ODL";
-		};
-		gpio_ec_disable_disp_bl: ec_disable_disp_bl {
-			gpios = <&gpioa 6 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_ENABLE_BACKLIGHT_L";
-		};
-		gpio_usb_fault_odl: usb_fault_odl {
-			gpios = <&gpio5 0 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
-		};
-		gpio_en_pwr_s3: en_pwr_s3 {
-			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
-		};
-		gpio_pg_groupc_s0_od: pg_groupc_s0_od {
-			gpios = <&gpiof 0 GPIO_INPUT>;
-		};
-		gpio_ec_i2c_usbc_pd_int: ec_i2c_usbc_pd_int {
-			gpios = <&gpioa 3 GPIO_INPUT>;
-		};
-		gpio_soc_thermtrip_odl: soc_thermtrip_odl {
-			gpios = <&gpio9 5 GPIO_INPUT>;
-		};
-		gpio_hub_rst: hub_rst {
-			gpios = <&gpio6 6 GPIO_OUTPUT_HIGH>;
-		};
-		ec_soc_int_l {
-			gpios = <&gpioa 1 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_EC_INT_L";
-		};
-		gpio_ec_soc_pwr_good: ec_soc_pwr_good {
-			gpios = <&gpiod 3 GPIO_OUTPUT_LOW>;
-		};
-		gpio_pcore_ocp_r_l: pcore_ocp_r_l {
-			gpios = <&gpioa 5 GPIO_INPUT>;
-		};
-		gpio_usb_hub_fault_q_odl: usb_hub_fault_q_odl {
-			gpios = <&gpioe 5 GPIO_INPUT_PULL_UP>;
-		};
-		gpio_pg_lpddr5_s3_od: pg_lpddr5_s3_od {
-			gpios = <&gpio7 3 GPIO_INPUT>;
-		};
-		3axis_int_l {
-			gpios = <&gpioa 2 GPIO_INPUT_PULL_UP>;
-		};
-		gpio_ec_soc_pwr_btn_l: ec_soc_pwr_btn_l {
-			gpios = <&gpioa 7 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_PCH_PWRBTN_L";
-		};
-		gpio_volup_btn_odl: volup_btn_odl {
-			gpios = <&gpio6 7 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_VOLUME_UP_L";
-		};
-		gpio_voldn_btn_odl: voldn_btn_odl {
-			gpios = <&gpio7 0 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_VOLUME_DOWN_L";
-		};
-		ec_sc_rst {
-			gpios = <&gpiob 0 GPIO_OUTPUT_LOW>;
-		};
-		gpio_cbi_wp: ec_cbi_wp {
-			gpios = <&gpio8 1 GPIO_OUTPUT_LOW>;
-		};
-		gpio_wp: ec_wp_l {
-			gpios = <&gpiod 7 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
-		};
-		gpio_pg_lpddr5_s0_od: pg_lpddr5_s0_od {
-			gpios = <&gpio6 0 GPIO_INPUT>;
-		};
-		ec_espi_rst_l {
-			gpios = <&gpio5 4 GPIO_PULL_DOWN>;
-		};
-		gpio_accel_gyro_int_l: accel_gyro_int_l {
-			gpios = <&gpioa 0 GPIO_INPUT>;
-		};
-		/* unimplemented GPIOs */
-		entering-rw {
-			enum-name = "GPIO_ENTERING_RW";
-		};
-		pch-sys-prwok {
-			enum-name = "GPIO_PCH_SYS_PWROK";
-		};
-		ec_i2c_usb_a0_c0_scl {
-			gpios = <&gpiob 5 GPIO_INPUT>;
-		};
-		ec_i2c_usb_a0_c0_sda {
-			gpios = <&gpiob 4 GPIO_INPUT>;
-		};
-		ec_i2c_usb_a1_c1_scl {
-			gpios = <&gpio9 0 GPIO_INPUT>;
-		};
-		ec_i2c_usb_a1_c1_sda {
-			gpios = <&gpio8 7 GPIO_INPUT>;
-		};
-		ec_i2c_batt_scl {
-			gpios = <&gpio9 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec_i2c_batt_sda {
-			gpios = <&gpio9 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec_i2c_usbc_mux_scl {
-			gpios = <&gpiod 1 GPIO_INPUT>;
-		};
-		ec_i2c_usbc_mux_sda {
-			gpios = <&gpiod 0 GPIO_INPUT>;
-		};
-		ec_i2c_power_scl {
-			gpios = <&gpiof 3 GPIO_INPUT>;
-		};
-		ec_i2c_power_sda {
-			gpios = <&gpiof 2 GPIO_INPUT>;
-		};
-		ec_i2c_cbi_scl {
-			gpios = <&gpio3 3 GPIO_INPUT>;
-		};
-		ec_i2c_cbi_sda {
-			gpios = <&gpio3 6 GPIO_INPUT>;
-		};
-		ec_i2c_sensor_scl {
-			gpios = <&gpioe 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec_i2c_sensor_sda {
-			gpios = <&gpioe 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec_i2c_soc_sic {
-			gpios = <&gpiob 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		ec_i2c_soc_sid {
-			gpios = <&gpiob 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-		};
-		en_kb_bl {
-			gpios = <&gpio9 7 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_EN_KEYBOARD_BACKLIGHT";
-		};
-		gpio_ec_kso_02_inv: ec_kso_02_inv {
-			gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>;
-		};
-		tablet_mode_l {
-			gpios = <&gpioc 1 GPIO_INPUT>;
-			enum-name = "GPIO_TABLET_MODE_L";
-		};
-		ec_gpio56 {
-			gpios = <&gpio5 6 GPIO_INPUT_PULL_UP>;
-		};
-		ec_flprg2 {
-			gpios = <&gpio8 6 GPIO_INPUT_PULL_UP>;
-		};
-
-		usb_c0_tcpc_fastsw_ctl_en {
-			gpios = <&ioex_c0_port0 4 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C0_TCPC_FASTSW_CTL_EN";
-		};
-		usb_c0_ppc_en_l {
-			gpios = <&ioex_c0_port1 0 GPIO_OUTPUT_LOW>;
-		};
-		ioex_usb_c0_ilim_3a_en: usb_c0_ppc_ilim_3a_en {
-			gpios = <&ioex_c0_port1 1 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C0_PPC_ILIM_3A_EN";
-		};
-		ioex_usb_c0_sbu_fault_odl: usb_c0_sbu_fault_odl {
-			gpios = <&ioex_c0_port1 2 GPIO_INPUT>;
-		};
-		ioex_en_pp5000_usb_a0_vbus: en_pp5000_usb_a0_vbus {
-			gpios = <&ioex_c0_port1 5 GPIO_OUTPUT_LOW>;
-		};
-		ioex_usb_a0_fault_odl: usb_a0_fault_odl {
-			gpios = <&ioex_c0_port1 6 GPIO_INPUT>;
-		};
-		ioex_usb_c0_sbu_flip: usb_c0_sbu_flip {
-			gpios = <&ioex_c0_port1 7 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C0_SBU_FLIP";
-		};
-
-		usb_a1_retimer_en {
-			gpios = <&ioex_c1_port0 0 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_A1_RETIMER_EN";
-		};
-		usb_a1_retimer_rst {
-			gpios = <&ioex_c1_port0 1 GPIO_OUTPUT_LOW>;
-		};
-		usb_c1_in_hpd {
-			gpios = <&ioex_c1_port0 3 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C1_HPD_IN_DB";
-		};
-		usb_c1_tcpc_fastsw_ctl_en {
-			gpios = <&ioex_c1_port0 4 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C1_TCPC_FASTSW_CTL_EN";
-		};
-		usb_c1_ppc_en_l {
-			gpios = <&ioex_c1_port1 0 GPIO_OUTPUT_LOW>;
-		};
-		usb_c1_ppc_ilim_3a_en {
-			gpios = <&ioex_c1_port1 1 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C1_PPC_ILIM_3A_EN";
-		};
-		ioex_usb_c1_sbu_fault_odl: usb_c1_sbu_fault_odl {
-			gpios = <&ioex_c1_port1 2 GPIO_INPUT>;
-			enum-name = "IOEX_USB_C1_FAULT_ODL";
-		};
-		ioex_en_pp5000_usb_a1_vbus: en_pp5000_usb_a1_vbus {
-			gpios = <&ioex_c1_port1 5 GPIO_OUTPUT_LOW>;
-		};
-		ioex_usb_a1_fault_db_odl: usb_a1_fault_db_odl {
-			gpios = <&ioex_c1_port1 6 GPIO_INPUT>;
-		};
-		ioex_usb_c1_sbu_flip: usb_c1_sbu_flip {
-			gpios = <&ioex_c1_port1 7 GPIO_OUTPUT_LOW>;
-			enum-name = "IOEX_USB_C1_SBU_FLIP";
-		};
-	};
-
-	usba-port-enable-list {
-		compatible = "cros-ec,usba-port-enable-pins";
-		enable-pins = <&ioex_en_pp5000_usb_a0_vbus
-			       &ioex_en_pp5000_usb_a1_vbus>;
-	};
-};
-
-/* PSL input pads*/
-&psl_in1_gpd2 {
-	/* MECH_PWR_BTN_ODL */
-	psl-in-mode = "edge";
-	psl-in-pol = "low-falling";
-};
-
-&psl_in2_gp00 {
-	/* ACOK_OD */
-	psl-in-mode = "edge";
-	psl-in-pol = "high-rising";
-};
-
-&psl_in4_gp02 {
-	/* LID_OPEN */
-	psl-in-mode = "edge";
-	psl-in-pol = "high-rising";
-};
-
-/* Power domain device controlled by PSL (Power Switch Logic) IO pads */
-&power_ctrl_psl {
-	status = "okay";
-	pinctrl-names = "sleep";
-	pinctrl-0 = <&psl_in1_gpd2 &psl_in2_gp00 &psl_in4_gp02>;
-};
-
-/* host interface */
-&espi0 {
-	status = "okay";
-	pinctrl-0 = <&espi_lpc_gp46_47_51_52_53_54_55_57>;
-	pinctrl-names = "default";
-};