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, 8 insertions, 35 deletions

diff --git a/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c b/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
index 2865d7efc3..149f25dfdd 100644
--- a/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
+++ b/zephyr/test/drivers/keyboard_scan/src/keyboard_backlight.c
@@ -3,24 +3,17 @@
  * found in the LICENSE file.
  */
 
-#include "console.h"
-#include "host_command.h"
-#include "keyboard_backlight.h"
-#include "pwm_mock.h"
-#include "test/drivers/test_state.h"
-
 #include <stdint.h>
 #include <string.h>
-
-#include <zephyr/drivers/pwm.h>
+#include <zephyr/ztest.h>
 #include <zephyr/kernel.h>
 #include <zephyr/shell/shell_dummy.h>
-#include <zephyr/ztest.h>
 #include <zephyr/ztest_assert.h>
 
-#define KBLIGHT_PWM_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(cros_ec_kblight_pwm)
-
-extern const struct kblight_drv kblight_pwm;
+#include "console.h"
+#include "host_command.h"
+#include "keyboard_backlight.h"
+#include "test/drivers/test_state.h"
 
 /**
  * @brief Send host command to set the backlight percentage
@@ -63,7 +56,7 @@ ZTEST(keyboard_backlight, host_command_get_backlight__normal)
 	uint8_t expected_percentage = 50;
 	int ret;
 
-	zassert_ok(set_backlight_percent_helper(expected_percentage), NULL);
+	zassume_ok(set_backlight_percent_helper(expected_percentage), NULL);
 
 	/* Brief delay to allow a deferred function to enable the backlight */
 	k_sleep(K_MSEC(50));
@@ -85,7 +78,7 @@ ZTEST(keyboard_backlight, console_command__noargs)
 	const char *outbuffer;
 	size_t buffer_size;
 
-	zassert_ok(set_backlight_percent_helper(70), NULL);
+	zassume_ok(set_backlight_percent_helper(70), NULL);
 	k_sleep(K_MSEC(50));
 
 	/* With no args, print current state */
@@ -109,7 +102,7 @@ ZTEST(keyboard_backlight, console_command__set_on)
 
 ZTEST(keyboard_backlight, console_command__set_off)
 {
-	zassert_ok(set_backlight_percent_helper(40), NULL);
+	zassume_ok(set_backlight_percent_helper(40), NULL);
 	k_sleep(K_MSEC(50));
 
 	/* Turn back off */
@@ -128,26 +121,6 @@ ZTEST(keyboard_backlight, console_command__bad_params)
 		      shell_execute_cmd(get_ec_shell(), "kblight 101"), NULL);
 }
 
-ZTEST(keyboard_backlight, set_backlight__device_not_ready)
-{
-	const struct pwm_dt_spec kblight_pwm_dt =
-		PWM_DT_SPEC_GET(KBLIGHT_PWM_NODE);
-	const struct device *pwm_dev = kblight_pwm_dt.dev;
-	int initial_duty;
-	int initialized_saved;
-
-	initial_duty = pwm_mock_get_duty(pwm_dev, kblight_pwm_dt.channel);
-
-	initialized_saved = pwm_dev->state->initialized;
-	pwm_dev->state->initialized = 0;
-
-	zassert_ok(kblight_pwm.set(initial_duty + 10), NULL);
-	zassert_equal(initial_duty,
-		      pwm_mock_get_duty(pwm_dev, kblight_pwm_dt.channel), NULL);
-
-	pwm_dev->state->initialized = initialized_saved;
-}
-
 static void reset(void *data)
 {
 	ARG_UNUSED(data);