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

This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.

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

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..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:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>

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

1 files changed, 0 insertions, 101 deletions

diff --git a/zephyr/test/drivers/default/src/chipset.c b/zephyr/test/drivers/default/src/chipset.c
deleted file mode 100644
index 89ba761c23..0000000000
--- a/zephyr/test/drivers/default/src/chipset.c
+++ /dev/null
@@ -1,101 +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.
- */
-
-#include "chipset.h"
-#include "console.h"
-#include "test/drivers/test_state.h"
-
-#include <stdint.h>
-
-#include <zephyr/fff.h>
-#include <zephyr/shell/shell.h>
-#include <zephyr/ztest.h>
-
-#include <ap_power/ap_power.h>
-#include <ap_power/ap_power_events.h>
-
-ZTEST(chipset, test_get_ap_reset_stats__bad_pointers)
-{
-	zassert_equal(EC_ERROR_INVAL, get_ap_reset_stats(NULL, 0, NULL));
-}
-
-ZTEST(chipset, test_get_ap_reset_stats__happy_path)
-{
-	struct ap_reset_log_entry reset_log_entries[4];
-	uint32_t actual_reset_count, reset_count;
-
-	memset(reset_log_entries, 0, sizeof(reset_log_entries));
-
-	/* Report two AP resets */
-	report_ap_reset(CHIPSET_RESET_AP_WATCHDOG);
-	report_ap_reset(CHIPSET_RESET_HANG_REBOOT);
-
-	zassert_equal(EC_SUCCESS,
-		      get_ap_reset_stats(reset_log_entries,
-					 ARRAY_SIZE(reset_log_entries),
-					 &reset_count));
-
-	/* Check the reset causes. The reset entry log is not a FIFO, so we get
-	 * the last two empty slots followed by the two we triggered above.
-	 */
-	zassert_equal(0, reset_log_entries[0].reset_cause);
-	zassert_equal(0, reset_log_entries[1].reset_cause);
-	zassert_equal(CHIPSET_RESET_AP_WATCHDOG,
-		      reset_log_entries[2].reset_cause);
-	zassert_equal(CHIPSET_RESET_HANG_REBOOT,
-		      reset_log_entries[3].reset_cause);
-
-	/* Check reset count */
-	actual_reset_count = test_chipset_get_ap_resets_since_ec_boot();
-	zassert_equal(actual_reset_count, reset_count,
-		      "Found %d resets, expected %d", reset_count,
-		      actual_reset_count);
-}
-
-ZTEST(chipset, test_console_cmd_apreset)
-{
-	struct ap_reset_log_entry reset_log_entries[4];
-	uint32_t reset_count;
-
-	zassert_ok(shell_execute_cmd(get_ec_shell(), "apreset"));
-
-	/* Make sure an AP reset happened. The expected reset log entry is at
-	 * index 3 because we read out 3 empty slots first.
-	 */
-	zassert_ok(get_ap_reset_stats(reset_log_entries,
-				      ARRAY_SIZE(reset_log_entries),
-				      &reset_count));
-
-	zassert_equal(CHIPSET_RESET_CONSOLE_CMD,
-		      reset_log_entries[3].reset_cause);
-}
-
-ZTEST(chipset, test_console_cmd_apshutdown)
-{
-	struct ap_reset_log_entry reset_log_entries[4];
-	uint32_t reset_count;
-
-	zassert_ok(shell_execute_cmd(get_ec_shell(), "apshutdown"));
-
-	/* Make sure an AP reset happened. The expected reset log entry is at
-	 * index 3 because we read out 3 empty slots first.
-	 */
-	zassert_ok(get_ap_reset_stats(reset_log_entries,
-				      ARRAY_SIZE(reset_log_entries),
-				      &reset_count));
-
-	zassert_equal(CHIPSET_SHUTDOWN_CONSOLE_CMD,
-		      reset_log_entries[3].reset_cause);
-}
-
-static void reset(void *arg)
-{
-	ARG_UNUSED(arg);
-
-	test_chipset_corrupt_reset_log_checksum();
-	init_reset_log();
-}
-
-ZTEST_SUITE(chipset, drivers_predicate_post_main, NULL, reset, reset, NULL);