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>

1 files changed, 7 insertions, 7 deletions

diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
index 47e26f97d6..36a417d22c 100644
--- a/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
+++ b/zephyr/test/drivers/default/src/integration/usbc/usb_pd_bist_shared.c
@@ -3,8 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/ztest.h>
-
 #include "emul/emul_isl923x.h"
 #include "emul/emul_smart_battery.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
@@ -15,6 +13,8 @@
 #include "usb_pd.h"
 #include "util.h"
 
+#include <zephyr/ztest.h>
+
 struct usb_pd_bist_shared_fixture {
 	struct tcpci_partner_data sink_5v_500ma;
 	struct tcpci_snk_emul_data snk_ext_500ma;
@@ -99,7 +99,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode)
 
 	/* Start up BIST shared test mode */
 	bist_data = BDO(BDO_MODE_SHARED_ENTER, 0);
-	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+	zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
 					       PD_DATA_BIST, &bist_data, 1, 0),
 		   "Failed to send BIST enter message");
 
@@ -116,7 +116,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_mode)
 
 	/* Leave BIST shared test mode */
 	bist_data = BDO(BDO_MODE_SHARED_EXIT, 0);
-	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+	zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
 					       PD_DATA_BIST, &bist_data, 1, 0),
 		   "Failed to send BIST exit message");
 
@@ -152,7 +152,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_no_snk_entry)
 
 	/* Have the source send the BIST Enter Mode */
 	bist_data = BDO(BDO_MODE_SHARED_ENTER, 0);
-	zassume_ok(tcpci_partner_send_data_msg(&fixture->src, PD_DATA_BIST,
+	zassert_ok(tcpci_partner_send_data_msg(&fixture->src, PD_DATA_BIST,
 					       &bist_data, 1, 0),
 		   "Failed to send BIST enter message");
 
@@ -181,7 +181,7 @@ ZTEST_F(usb_pd_bist_shared, verify_bist_shared_exit_no_action)
 	tcpci_snk_emul_clear_last_5v_cap(&fixture->snk_ext_500ma);
 
 	bist_data = BDO(BDO_MODE_SHARED_EXIT, 0);
-	zassume_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
+	zassert_ok(tcpci_partner_send_data_msg(&fixture->sink_5v_500ma,
 					       PD_DATA_BIST, &bist_data, 1, 0),
 		   "Failed to send BIST exit message");
 
@@ -198,7 +198,7 @@ ZTEST_F(usb_pd_bist_shared, verify_control_bist_shared_mode)
 	uint32_t f5v_cap;
 
 	host_cmd_typec_control_bist_share_mode(USBC_PORT_C0, 1);
-	zassume_ok(tcpci_partner_send_control_msg(&fixture->sink_5v_500ma,
+	zassert_ok(tcpci_partner_send_control_msg(&fixture->sink_5v_500ma,
 						  PD_CTRL_GET_SOURCE_CAP, 0),
 		   "Failed to send get src cap");
 	/* wait tSenderResponse (26 ms) */