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, 190 deletions

diff --git a/zephyr/program/nissa/pujjo/cbi.dtsi b/zephyr/program/nissa/pujjo/cbi.dtsi
deleted file mode 100644
index 02057140a5..0000000000
--- a/zephyr/program/nissa/pujjo/cbi.dtsi
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/ {
-	/* Pujjo-specific fw_config fields. */
-	nissa-fw-config {
-		/*
-		 * FW_CONFIG field to enable KB back light or not.
-		 */
-		kb-bl {
-			enum-name = "FW_KB_BL";
-			start = <3>;
-			size = <1>;
-
-			no-kb-bl {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_KB_BL_NOT_PRESENT";
-				value = <0>;
-			};
-			kb-bl-present {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_KB_BL_PRESENT";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * FW_CONFIG field for KB PWB present or not.
-		 */
-		kb-pwb {
-			enum-name = "FW_KB_PWB";
-			start = <4>;
-			size = <1>;
-
-			no-kb-pwb {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_KB_PWB_NOT_PRESENT";
-				value = <0>;
-			};
-			kb-pwb-present {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_KB_PWB_PRESENT";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * FW_CONFIG field for tablet present or not.
-		 */
-		tablet {
-			enum-name = "FW_TABLET";
-			start = <5>;
-			size = <1>;
-
-			no-tablet {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_TABLET_NOT_PRESENT";
-				value = <0>;
-			};
-			tablet-present {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_TABLET_PRESENT";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * FW_CONFIG field for LTE board present or not.
-		 *
-		 *	start = <6>;
-		 *	size = <1>;
-		 */
-
-		/*
-		 * FW_CONFIG field for SD card present or not.
-		 *
-		 *	start = <7>;
-		 *	size = <1>;
-		 */
-
-		/*
-		 * FW_CONFIG field for pen present or not.
-		 */
-		pen {
-			enum-name = "FW_PEN";
-			start = <8>;
-			size = <1>;
-
-			no-pen {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_PEN_NOT_PRESENT";
-				value = <0>;
-			};
-			pen-present {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "FW_PEN_PRESENT";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * FW_CONFIG field for WF camera present or not.
-		 *
-		 *	start = <9>;
-		 *	size = <1>;
-		 */
-
-		/*
-		 * FW_CONFIG field for multiple thermal table.
-		 */
-		therm-table {
-			enum-name = "THERM_TABLE";
-			start = <10>;
-			size = <2>;
-
-			therm-table-1 {
-				compatible = "cros-ec,cbi-fw-config-value";
-				enum-name = "THERM_TABLE_1";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * FW_CONFIG field for multiple audio module.
-		 *
-		 *	start = <12>;
-		 *	size = <3>;
-		 */
-
-		/*
-		 * FW_CONFIG field for EXT_VR.
-		 *
-		 *	start = <15>;
-		 *	size = <1>;
-		 */
-
-		/*
-		 * FW_CONFIG field for multiple wi-fi SAR.
-		 *
-		 *	start = <16>;
-		 *	size = <2>;
-		 */
-	};
-
-	/* Pujjo-specific ssfc fields. */
-	cbi-ssfc {
-		compatible = "cros-ec,cbi-ssfc";
-		/*
-		 * SSFC field to identify BASE motion sensor.
-		 */
-		base-sensor {
-			enum-name = "BASE_SENSOR";
-			size = <2>;
-
-			base_sensor_0: bmi323 {
-				compatible = "cros-ec,cbi-ssfc-value";
-				status = "okay";
-				value = <0>;
-				default;
-			};
-			base_sensor_1: lsm6dsm {
-				compatible = "cros-ec,cbi-ssfc-value";
-				status = "okay";
-				value = <1>;
-			};
-		};
-
-		/*
-		 * SSFC field to identify LID motion sensor.
-		 */
-		lid-sensor {
-			enum-name = "LID_SENSOR";
-			size = <2>;
-
-			lid_sensor_0: bma422 {
-				compatible = "cros-ec,cbi-ssfc-value";
-				status = "okay";
-				value = <0>;
-				default;
-			};
-			lid_sensor_1: lis2dw12 {
-				compatible = "cros-ec,cbi-ssfc-value";
-				status = "okay";
-				value = <1>;
-			};
-		};
-	};
-};