ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 84 deletions

diff --git a/zephyr/test/drivers/src/ppc.c b/zephyr/test/drivers/src/ppc.c
deleted file mode 100644
index dced25c227..0000000000
--- a/zephyr/test/drivers/src/ppc.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <zephyr.h>
-#include <ztest.h>
-#include <ztest_assert.h>
-
-#include "emul/emul_syv682x.h"
-
-#include "stubs.h"
-#include "syv682x.h"
-#include "timer.h"
-#include "usbc_ppc.h"
-
-#define SYV682X_ORD DT_DEP_ORD(DT_NODELABEL(syv682x_emul))
-
-static const int syv682x_port = 1;
-
-static void test_ppc_syv682x_vbus_enable(void)
-{
-	struct i2c_emul *emul = syv682x_emul_get(SYV682X_ORD);
-	uint8_t reg;
-
-	zassert_ok(syv682x_emul_get_reg(emul, SYV682X_CONTROL_1_REG, &reg),
-			"Reading CONTROL_1 failed");
-	zassert_equal(reg & SYV682X_CONTROL_1_PWR_ENB,
-			SYV682X_CONTROL_1_PWR_ENB, "VBUS sourcing disabled");
-	zassert_false(ppc_is_sourcing_vbus(syv682x_port),
-			"PPC sourcing VBUS at beginning of test");
-
-	zassert_ok(ppc_vbus_source_enable(syv682x_port, true),
-			"VBUS enable failed");
-	zassert_ok(syv682x_emul_get_reg(emul, SYV682X_CONTROL_1_REG, &reg),
-			"Reading CONTROL_1 failed");
-	zassert_equal(reg & SYV682X_CONTROL_1_PWR_ENB, 0,
-			"VBUS sourcing disabled");
-	zassert_true(ppc_is_sourcing_vbus(syv682x_port),
-			"PPC is not sourcing VBUS after VBUS enabled");
-}
-
-static void test_ppc_syv682x_interrupt(void)
-{
-	struct i2c_emul *emul = syv682x_emul_get(SYV682X_ORD);
-
-	syv682x_emul_set_status(emul, SYV682X_STATUS_OC_5V);
-	syv682x_interrupt(syv682x_port);
-
-	/* An OC event less than 100 ms should not cause VBUS to turn off. */
-	msleep(50);
-	syv682x_interrupt(syv682x_port);
-	zassert_true(ppc_is_sourcing_vbus(syv682x_port),
-			"PPC is not sourcing VBUS after 50 ms OC");
-	/* But one greater than 100 ms should. */
-	msleep(60);
-	syv682x_interrupt(syv682x_port);
-	zassert_false(ppc_is_sourcing_vbus(syv682x_port),
-			"PPC is sourcing VBUS after 100 ms OC");
-
-	syv682x_emul_set_status(emul, 0x0);
-	/*
-	 * TODO(b/190519131): Organize the tests to be more hermetic and avoid
-	 * the following issue: The driver triggers overcurrent protection. If
-	 * overcurrent protection is triggered 3 times, the TC won't turn the
-	 * port back on without a detach. This could frustrate efforts to test
-	 * the TC.
-	 */
-}
-
-static void test_ppc_syv682x(void)
-{
-	zassert_ok(ppc_init(syv682x_port), "PPC init failed");
-
-	test_ppc_syv682x_vbus_enable();
-	test_ppc_syv682x_interrupt();
-}
-
-void test_suite_ppc(void)
-{
-	ztest_test_suite(ppc,
-			 ztest_user_unit_test(test_ppc_syv682x));
-	ztest_run_test_suite(ppc);
-}