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/console_cmd/charger.c b/zephyr/test/drivers/default/src/console_cmd/charger.c
index 9adda29a8d..420ef67fe4 100644
--- a/zephyr/test/drivers/default/src/console_cmd/charger.c
+++ b/zephyr/test/drivers/default/src/console_cmd/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/shell/shell.h>
-#include <zephyr/ztest.h>
-
 #include "console.h"
 #include "dptf.h"
 #include "ec_commands.h"
 #include "test/drivers/test_state.h"
 #include "test/drivers/utils.h"
 
+#include <zephyr/shell/shell.h>
+#include <zephyr/ztest.h>
+
 /* Tests which need no fixture */
 ZTEST_USER(console_cmd_charger, test_default_dump)
 {
@@ -81,7 +81,7 @@ ZTEST_USER(console_cmd_charger, test_good_input_current)
 
 	zassert_ok(shell_execute_cmd(get_ec_shell(), "charger input 1000"),
 		   "Failed to set input current");
-	zassume_ok(charger_get_input_current_limit(0, &input_current),
+	zassert_ok(charger_get_input_current_limit(0, &input_current),
 		   "Failed to get input current");
 	zassert_equal(input_current, 1000,
 		      "Input current not set in charger: %d", input_current);
@@ -117,7 +117,7 @@ static void *console_cmd_charger_setup(void)
 	static struct console_cmd_charger_fixture fixture;
 
 	/* Assume we have one charger at index 0 */
-	zassume_true(board_get_charger_chip_count() > 0,
+	zassert_true(board_get_charger_chip_count() > 0,
 		     "Insufficient chargers found");
 
 	/* Get references for the emulators */
@@ -158,7 +158,7 @@ ZTEST_USER_F(console_cmd_charger, test_good_current)
 	/* Give the charger task time to pick up the manual current */
 	k_sleep(K_SECONDS(1));
 
-	zassume_ok(charger_get_current(0, &current), "Failed to get current");
+	zassert_ok(charger_get_current(0, &current), "Failed to get current");
 	zassert_equal(current, 1000, "Current not set in charger: %d", current);
 }
 
@@ -176,7 +176,7 @@ ZTEST_USER_F(console_cmd_charger, test_good_voltage)
 	/* Give the charger task time to pick up the manual voltage */
 	k_sleep(K_SECONDS(1));
 
-	zassume_ok(charger_get_voltage(0, &voltage), "Failed to get voltage");
+	zassert_ok(charger_get_voltage(0, &voltage), "Failed to get voltage");
 	zassert_equal(voltage, 3000, "Voltage not set in charger: %d", voltage);
 }