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

diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c
deleted file mode 100644
index 6fa8b31cc9..0000000000
--- a/zephyr/emul/emul_lis2dw12.c
+++ /dev/null
@@ -1,161 +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.
- */
-
-#define DT_DRV_COMPAT cros_lis2dw12_emul
-
-#include <device.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <emul.h>
-#include <errno.h>
-#include <sys/__assert.h>
-
-#include "driver/accel_lis2dw12.h"
-#include "emul/emul_common_i2c.h"
-#include "emul/emul_lis2dw12.h"
-#include "i2c.h"
-
-#include <logging/log.h>
-LOG_MODULE_REGISTER(lis2dw12_emul, CONFIG_LIS2DW12_EMUL_LOG_LEVEL);
-
-#define LIS2DW12_DATA_FROM_I2C_EMUL(_emul)                                   \
-	CONTAINER_OF(CONTAINER_OF(_emul, struct i2c_common_emul_data, emul), \
-		     struct lis2dw12_emul_data, common)
-
-struct lis2dw12_emul_data {
-	/** Common I2C data */
-	struct i2c_common_emul_data common;
-	/** Emulated who-am-i register */
-	uint8_t who_am_i_reg;
-	/** Emulated ctrl2 register */
-	uint8_t ctrl2_reg;
-	/** Soft reset count */
-	uint32_t soft_reset_count;
-};
-
-struct lis2dw12_emul_cfg {
-	/** Common I2C config */
-	struct i2c_common_emul_cfg common;
-};
-
-struct i2c_emul *lis2dw12_emul_to_i2c_emul(const struct emul *emul)
-{
-	struct lis2dw12_emul_data *data = emul->data;
-
-	return &(data->common.emul);
-}
-
-void lis2dw12_emul_reset(const struct emul *emul)
-{
-	struct lis2dw12_emul_data *data = emul->data;
-	struct i2c_emul *i2c_emul = lis2dw12_emul_to_i2c_emul(emul);
-
-	i2c_common_emul_set_read_fail_reg(i2c_emul,
-					  I2C_COMMON_EMUL_NO_FAIL_REG);
-	i2c_common_emul_set_write_fail_reg(i2c_emul,
-					   I2C_COMMON_EMUL_NO_FAIL_REG);
-	i2c_common_emul_set_read_func(i2c_emul, NULL, NULL);
-	i2c_common_emul_set_write_func(i2c_emul, NULL, NULL);
-	data->who_am_i_reg = LIS2DW12_WHO_AM_I;
-	data->ctrl2_reg = 0;
-	data->soft_reset_count = 0;
-}
-
-void lis2dw12_emul_set_who_am_i(const struct emul *emul, uint8_t who_am_i)
-{
-	struct lis2dw12_emul_data *data = emul->data;
-
-	data->who_am_i_reg = who_am_i;
-}
-
-uint32_t lis2dw12_emul_get_soft_reset_count(const struct emul *emul)
-{
-	struct lis2dw12_emul_data *data = emul->data;
-
-	return data->soft_reset_count;
-}
-
-static int lis2dw12_emul_read_byte(struct i2c_emul *emul, int reg, uint8_t *val,
-				   int bytes)
-{
-	struct lis2dw12_emul_data *data = LIS2DW12_DATA_FROM_I2C_EMUL(emul);
-
-	switch (reg) {
-	case LIS2DW12_WHO_AM_I_REG:
-		__ASSERT_NO_MSG(bytes == 0);
-		*val = data->who_am_i_reg;
-		break;
-	case LIS2DW12_CTRL2_ADDR:
-		__ASSERT_NO_MSG(bytes == 0);
-		*val = data->ctrl2_reg;
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
-
-static int lis2dw12_emul_write_byte(struct i2c_emul *emul, int reg, uint8_t val,
-				    int bytes)
-{
-	struct lis2dw12_emul_data *data = LIS2DW12_DATA_FROM_I2C_EMUL(emul);
-
-	switch (reg) {
-	case LIS2DW12_WHO_AM_I_REG:
-		LOG_ERR("Can't write to who-am-i register");
-		return -EINVAL;
-	case LIS2DW12_CTRL2_ADDR:
-		__ASSERT_NO_MSG(bytes == 1);
-		if ((val & LIS2DW12_SOFT_RESET_MASK) != 0) {
-			/* Soft reset */
-			data->soft_reset_count++;
-		}
-		data->ctrl2_reg = val & ~LIS2DW12_SOFT_RESET_MASK;
-		break;
-	default:
-		return -EINVAL;
-	}
-	return 0;
-}
-
-static struct i2c_emul_api lis2dw12_emul_api_i2c = {
-	.transfer = i2c_common_emul_transfer,
-};
-
-static int emul_lis2dw12_init(const struct emul *emul,
-			      const struct device *parent)
-{
-	const struct lis2dw12_emul_cfg *lis2dw12_cfg = emul->cfg;
-	const struct i2c_common_emul_cfg *cfg = &(lis2dw12_cfg->common);
-	struct lis2dw12_emul_data *data = emul->data;
-
-	data->common.emul.api = &lis2dw12_emul_api_i2c;
-	data->common.emul.addr = cfg->addr;
-	data->common.emul.parent = emul;
-	data->common.i2c = parent;
-	data->common.cfg = cfg;
-	i2c_common_emul_init(&data->common);
-
-	return i2c_emul_register(parent, emul->dev_label, &data->common.emul);
-}
-
-#define INIT_LIS2DW12(n)                                                  \
-	static struct lis2dw12_emul_data lis2dw12_emul_data_##n = {       \
-		.common = {                                               \
-			.write_byte = lis2dw12_emul_write_byte,           \
-			.read_byte = lis2dw12_emul_read_byte,             \
-		},                                                        \
-	};                                                                \
-	static const struct lis2dw12_emul_cfg lis2dw12_emul_cfg_##n = {   \
-		.common = {                                               \
-			.i2c_label = DT_INST_BUS_LABEL(n),                \
-			.dev_label = DT_INST_LABEL(n),                    \
-			.addr = DT_INST_REG_ADDR(n),                      \
-		},                                                        \
-	};                                                                \
-	EMUL_DEFINE(emul_lis2dw12_init, DT_DRV_INST(n),                   \
-		    &lis2dw12_emul_cfg_##n, &lis2dw12_emul_data_##n)
-
-DT_INST_FOREACH_STATUS_OKAY(INIT_LIS2DW12)