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

diff --git a/zephyr/include/emul/emul_syv682x.h b/zephyr/include/emul/emul_syv682x.h
deleted file mode 100644
index aa0d8840f7..0000000000
--- a/zephyr/include/emul/emul_syv682x.h
+++ /dev/null
@@ -1,143 +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.
- */
-
-/** @file
- *
- * @brief Backend API for SYV682X emulator
- */
-
-#ifndef __EMUL_SYV682X_H
-#define __EMUL_SYV682X_H
-
-#include <drivers/i2c_emul.h>
-#include <stdint.h>
-
-/* Register info copied from syv682.h */
-
-/* SYV682x register addresses */
-#define SYV682X_STATUS_REG		0x00
-#define SYV682X_CONTROL_1_REG		0x01
-#define SYV682X_CONTROL_2_REG		0x02
-#define SYV682X_CONTROL_3_REG		0x03
-#define SYV682X_CONTROL_4_REG		0x04
-
-/* Status Register */
-#define SYV682X_STATUS_OC_HV		BIT(7)
-#define SYV682X_STATUS_RVS		BIT(6)
-#define SYV682X_STATUS_OC_5V		BIT(5)
-#define SYV682X_STATUS_OVP		BIT(4)
-#define SYV682X_STATUS_FRS		BIT(3)
-#define SYV682X_STATUS_TSD		BIT(2)
-#define SYV682X_STATUS_VSAFE_5V		BIT(1)
-#define SYV682X_STATUS_VSAFE_0V		BIT(0)
-#define SYV682X_STATUS_INT_MASK		0xfc
-
-/* Control Register 1 */
-#define SYV682X_CONTROL_1_CH_SEL	BIT(1)
-#define SYV682X_CONTROL_1_HV_DR		BIT(2)
-#define SYV682X_CONTROL_1_PWR_ENB	BIT(7)
-
-#define SYV682X_5V_ILIM_MASK		0x18
-#define SYV682X_5V_ILIM_BIT_SHIFT	3
-#define SYV682X_5V_ILIM_1_25		0
-#define SYV682X_5V_ILIM_1_75		1
-#define SYV682X_5V_ILIM_2_25		2
-#define SYV682X_5V_ILIM_3_30		3
-
-#define SYV682X_HV_ILIM_MASK		0x60
-#define SYV682X_HV_ILIM_BIT_SHIFT	5
-#define SYV682X_HV_ILIM_1_25		0
-#define SYV682X_HV_ILIM_1_75		1
-#define SYV682X_HV_ILIM_3_30		2
-#define SYV682X_HV_ILIM_5_50		3
-
-/* Control Register 2 */
-#define SYV682X_OC_DELAY_MASK		GENMASK(7, 6)
-#define SYV682X_OC_DELAY_SHIFT		6
-#define SYV682X_OC_DELAY_1MS		0
-#define SYV682X_OC_DELAY_10MS		1
-#define SYV682X_OC_DELAY_50MS		2
-#define SYV682X_OC_DELAY_100MS		3
-#define SYV682X_DSG_TIME_MASK		GENMASK(5, 4)
-#define SYV682X_DSG_TIME_SHIFT		4
-#define SYV682X_DSG_TIME_50MS		0
-#define SYV682X_DSG_TIME_100MS		1
-#define SYV682X_DSG_TIME_200MS		2
-#define SYV682X_DSG_TIME_400MS		3
-#define SYV682X_DSG_RON_MASK		GENMASK(3, 2)
-#define SYV682X_DSG_RON_SHIFT		2
-#define SYV682X_DSG_RON_200_OHM		0
-#define SYV682X_DSG_RON_400_OHM		1
-#define SYV682X_DSG_RON_800_OHM		2
-#define SYV682X_DSG_RON_1600_OHM	3
-#define SYV682X_CONTROL_2_SDSG		BIT(1)
-#define SYV682X_CONTROL_2_FDSG		BIT(0)
-
-/* Control Register 3 */
-#define SYV682X_BUSY			BIT(7)
-#define SYV682X_RVS_MASK		BIT(3)
-#define SYV682X_RST_REG			BIT(0)
-#define SYV682X_OVP_MASK		0x70
-#define SYV682X_OVP_BIT_SHIFT		4
-#define SYV682X_OVP_06_0		0
-#define SYV682X_OVP_08_0		1
-#define SYV682X_OVP_11_1		2
-#define SYV682X_OVP_12_1		3
-#define SYV682X_OVP_14_2		4
-#define SYV682X_OVP_17_9		5
-#define SYV682X_OVP_21_6		6
-#define SYV682X_OVP_23_7		7
-
-/* Control Register 4 */
-#define SYV682X_CONTROL_4_CC1_BPS	BIT(7)
-#define SYV682X_CONTROL_4_CC2_BPS	BIT(6)
-#define SYV682X_CONTROL_4_VCONN1	BIT(5)
-#define SYV682X_CONTROL_4_VCONN2	BIT(4)
-#define SYV682X_CONTROL_4_VBAT_OVP	BIT(3)
-#define SYV682X_CONTROL_4_VCONN_OCP	BIT(2)
-#define SYV682X_CONTROL_4_CC_FRS	BIT(1)
-#define SYV682X_CONTROL_4_INT_MASK	0x0c
-
-/**
- * @brief Get pointer to SYV682x emulator using device tree order number.
- *
- * @param ord Device tree order number obtained from DT_DEP_ORD macro
- *
- * @return Pointer to smart battery emulator
- */
-struct i2c_emul *syv682x_emul_get(int ord);
-
-/**
- * @brief Set the underlying interrupt conditions affecting the status register
- *
- * @param emul SYV682x emulator
- * @param val  A status register value corresponding to the underlying
- *             conditions
- */
-void syv682x_emul_set_status(struct i2c_emul *emul, uint8_t val);
-
-/**
- * @brief Set value of a register of SYV682x
- *
- * @param emul SYV682x emulator
- * @param reg  Register address
- * @param val  Value to write to the register
- *
- * @return 0 on success, error code on error
- */
-int syv682x_emul_set_reg(struct i2c_emul *emul, int reg, uint8_t val);
-
-/**
- * @brief Get value of a register of SYV682x
- *
- * @param emul SYV682x emulator
- * @param reg  Register address
- * @param val  Pointer at which to store current value of register
- *
- * @return 0 on success, error code on error
- */
-int syv682x_emul_get_reg(struct i2c_emul *emul, int reg, uint8_t *val);
-
-#endif /* __EMUL_SYV682X_H */