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, 119 deletions

diff --git a/zephyr/test/drivers/src/lis2dw12.c b/zephyr/test/drivers/src/lis2dw12.c
deleted file mode 100644
index 287430e65b..0000000000
--- a/zephyr/test/drivers/src/lis2dw12.c
+++ /dev/null
@@ -1,119 +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 <ztest.h>
-#include <drivers/emul.h>
-#include "driver/accel_lis2dw12.h"
-#include "emul/emul_common_i2c.h"
-#include "emul/emul_lis2dw12.h"
-
-#define LIS2DW12_NODELABEL DT_NODELABEL(ms_lis2dw12_accel)
-#define LIS2DW12_SENSOR_ID SENSOR_ID(LIS2DW12_NODELABEL)
-#define EMUL_LABEL DT_LABEL(DT_NODELABEL(lis2dw12_emul))
-
-#include <stdio.h>
-static void lis2dw12_setup(void)
-{
-	lis2dw12_emul_reset(emul_get_binding(EMUL_LABEL));
-}
-
-static void test_lis2dw12_init__fail_read_who_am_i(void)
-{
-	const struct emul *emul = emul_get_binding(EMUL_LABEL);
-	struct motion_sensor_t *ms = &motion_sensors[LIS2DW12_SENSOR_ID];
-	int rv;
-
-	i2c_common_emul_set_read_fail_reg(lis2dw12_emul_to_i2c_emul(emul),
-					  LIS2DW12_WHO_AM_I_REG);
-	rv = ms->drv->init(ms);
-	zassert_equal(EC_ERROR_INVAL, rv, NULL);
-}
-
-static void test_lis2dw12_init__fail_who_am_i(void)
-{
-	const struct emul *emul = emul_get_binding(EMUL_LABEL);
-	struct motion_sensor_t *ms = &motion_sensors[LIS2DW12_SENSOR_ID];
-	int rv;
-
-	lis2dw12_emul_set_who_am_i(emul, ~LIS2DW12_WHO_AM_I);
-
-	rv = ms->drv->init(ms);
-	zassert_equal(EC_ERROR_ACCESS_DENIED, rv,
-		      "init returned %d but was expecting %d", rv,
-		      EC_ERROR_ACCESS_DENIED);
-}
-
-static void test_lis2dw12_init__fail_write_soft_reset(void)
-{
-	const struct emul *emul = emul_get_binding(EMUL_LABEL);
-	struct motion_sensor_t *ms = &motion_sensors[LIS2DW12_SENSOR_ID];
-	int rv;
-
-	i2c_common_emul_set_write_fail_reg(lis2dw12_emul_to_i2c_emul(emul),
-					   LIS2DW12_SOFT_RESET_ADDR);
-	rv = ms->drv->init(ms);
-	zassert_equal(EC_ERROR_INVAL, rv, NULL);
-}
-
-static void test_lis2dw12_init__timeout_read_soft_reset(void)
-{
-	const struct emul *emul = emul_get_binding(EMUL_LABEL);
-	struct motion_sensor_t *ms = &motion_sensors[LIS2DW12_SENSOR_ID];
-	int rv;
-
-	i2c_common_emul_set_read_fail_reg(lis2dw12_emul_to_i2c_emul(emul),
-					  LIS2DW12_SOFT_RESET_ADDR);
-	rv = ms->drv->init(ms);
-	zassert_equal(EC_ERROR_TIMEOUT, rv, "init returned %d but expected %d",
-		      rv, EC_ERROR_TIMEOUT);
-}
-
-static int lis2dw12_test_mock_write_fail_set_bdu(struct i2c_emul *emul, int reg,
-						uint8_t val, int bytes,
-						void *data)
-{
-	if (reg == LIS2DW12_BDU_ADDR && bytes == 1 &&
-	    (val & LIS2DW12_BDU_MASK) != 0) {
-		return -EIO;
-	}
-	return 1;
-}
-
-static void test_lis2dw12_init__fail_set_bdu(void)
-{
-	const struct emul *emul = emul_get_binding(EMUL_LABEL);
-	struct motion_sensor_t *ms = &motion_sensors[LIS2DW12_SENSOR_ID];
-	int rv;
-
-	i2c_common_emul_set_write_func(lis2dw12_emul_to_i2c_emul(emul),
-				      lis2dw12_test_mock_write_fail_set_bdu,
-				      NULL);
-	rv = ms->drv->init(ms);
-	zassert_equal(EC_ERROR_INVAL, rv, "init returned %d but expected %d",
-		      rv, EC_ERROR_INVAL);
-	zassert_true(lis2dw12_emul_get_soft_reset_count(emul) > 0,
-		      "expected at least one soft reset");
-}
-
-void test_suite_lis2dw12(void)
-{
-	ztest_test_suite(lis2dw12,
-			 ztest_unit_test_setup_teardown(
-				 test_lis2dw12_init__fail_read_who_am_i,
-				 lis2dw12_setup, unit_test_noop),
-			 ztest_unit_test_setup_teardown(
-				 test_lis2dw12_init__fail_who_am_i,
-				 lis2dw12_setup, unit_test_noop),
-			 ztest_unit_test_setup_teardown(
-				 test_lis2dw12_init__fail_write_soft_reset,
-				 lis2dw12_setup, unit_test_noop),
-			 ztest_unit_test_setup_teardown(
-				 test_lis2dw12_init__timeout_read_soft_reset,
-				 lis2dw12_setup, unit_test_noop),
-			 ztest_unit_test_setup_teardown(
-				 test_lis2dw12_init__fail_set_bdu,
-				 lis2dw12_setup, unit_test_noop));
-	ztest_run_test_suite(lis2dw12);
-}