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, 4 insertions, 54 deletions

diff --git a/zephyr/test/kingler/src/db_detect_hdmi.c b/zephyr/test/kingler/src/db_detect_hdmi.c
index 04a65269ad..35cf92ae5e 100644
--- a/zephyr/test/kingler/src/db_detect_hdmi.c
+++ b/zephyr/test/kingler/src/db_detect_hdmi.c
@@ -3,43 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include "baseboard_usbc_config.h"
-#include "ec_commands.h"
-#include "gpio_signal.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "variant_db_detection.h"
 #include "zephyr/kernel.h"
-
 #include <zephyr/drivers/gpio/gpio_emul.h>
-#include <zephyr/fff.h>
 #include <zephyr/ztest.h>
 
-FAKE_VALUE_FUNC(int, corsola_is_dp_muxable, int);
-FAKE_VOID_FUNC(svdm_set_hpd_gpio, int, int);
-
-#define FFF_FAKES_LIST(FAKE)        \
-	FAKE(corsola_is_dp_muxable) \
-	FAKE(svdm_set_hpd_gpio)
-
-static void db_hdmi_rule_before(const struct ztest_unit_test *test, void *data)
-{
-	ARG_UNUSED(test);
-	ARG_UNUSED(data);
-	FFF_FAKES_LIST(RESET_FAKE);
-	FFF_RESET_HISTORY();
-}
-ZTEST_RULE(db_hdmi_rule, db_hdmi_rule_before, NULL);
-
-uint8_t board_get_usb_pd_port_count(void)
-{
-	return 2;
-}
-
-enum tcpc_cc_polarity pd_get_polarity(int port)
-{
-	return 0;
-}
+#include "gpio_signal.h"
+#include "hooks.h"
+#include "variant_db_detection.h"
 
 static void *db_detection_setup(void)
 {
@@ -103,31 +73,11 @@ ZTEST(db_detection, test_db_detect_hdmi)
 		      gpio_emul_output_get(ps185_pwrdn_gpio, ps185_pwrdn_pin),
 		      NULL);
 
-	/* Verify x_ec_interrupt is enabled, and plug */
+	/* Verify x_ec_interrupt is enabled */
 	interrupt_count = 0;
 	zassert_ok(gpio_emul_input_set(int_x_ec_gpio, int_x_ec_pin, 1), NULL);
 	k_sleep(K_MSEC(100));
 
-	corsola_is_dp_muxable_fake.return_val = 1;
-
 	zassert_equal(interrupt_count, 1, "interrupt_count=%d",
 		      interrupt_count);
-
-	zassert_false(usb_mux_get(USBC_PORT_C1) & USB_PD_MUX_DP_ENABLED, NULL);
-
-	/* invoke hdmi interrupt, the argument doesn't care, just pass 0 */
-	hdmi_hpd_interrupt(0);
-
-	k_sleep(K_MSEC(500));
-
-	zassert_equal(svdm_set_hpd_gpio_fake.call_count, 1);
-	zassert_true(usb_mux_get(USBC_PORT_C1) & USB_PD_MUX_DP_ENABLED, NULL);
-
-	/* unplug */
-	zassert_ok(gpio_emul_input_set(int_x_ec_gpio, int_x_ec_pin, 0), NULL);
-
-	hdmi_hpd_interrupt(0);
-	k_sleep(K_MSEC(500));
-
-	zassert_false(usb_mux_get(USBC_PORT_C1) & USB_PD_MUX_DP_ENABLED, NULL);
 }