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

diff --git a/driver/mp4245.c b/driver/mp4245.c
deleted file mode 100644
index 2b38e5c9e9..0000000000
--- a/driver/mp4245.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright 2020 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.
- */
-
-/* MPS MP4245 Buck-Boost converter driver. */
-
-#include "common.h"
-#include "console.h"
-#include "i2c.h"
-#include "mp4245.h"
-#include "util.h"
-
-
-static int mp4245_reg16_write(int offset, int data)
-{
-	return i2c_write16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS, offset,
-			   data);
-}
-
-int mp4245_set_voltage_out(int desired_mv)
-{
-	int vout;
-
-	/*
-	 * For a desired voltage output Vdes, Vout = Vdes * 1024. This means
-	 * there are 10 fractional and 6 integer bits. Vdes is stored in in mV
-	 * so this scaling to mV must also be accounted for.
-	 *
-	 * VOUT_COMMAND = (Vdes (mV) * 1024 / 1000) / 1024
-	 */
-	vout = (desired_mv * MP4245_VOUT_FROM_MV + (MP4245_VOUT_1V >> 1))
-		/ MP4245_VOUT_1V;
-
-	return mp4245_reg16_write(MP4245_CMD_VOUT_COMMAND, vout);
-}
-
-int mp4245_set_current_lim(int desired_ma)
-{
-	int limit;
-
-	/* Current limit is stored as number of 50 mA steps */
-	limit = (desired_ma + (MP4245_ILIM_STEP_MA / 2)) / MP4245_ILIM_STEP_MA;
-
-	return mp4245_reg16_write(MP4245_CMD_MFR_CURRENT_LIM, limit);
-}
-
-int mp4245_votlage_out_enable(int enable)
-{
-	int cmd_val = enable ? MP4245_CMD_OPERATION_ON : 0;
-
-	return i2c_write8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-			MP4245_CMD_OPERATION, cmd_val);
-}
-
-int mp3245_get_vbus(int *mv, int *ma)
-{
-	int vbus = 0;
-	int ibus = 0;
-	int rv;
-
-	/* Get Vbus/Ibus raw measurements */
-	rv = i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_READ_VOUT, &vbus);
-	rv |= i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_READ_IOUT, &ibus);
-
-	if (rv == EC_SUCCESS) {
-		/* Convert Vbus/Ibus to mV/mA */
-		vbus = MP4245_VOUT_TO_MV(vbus);
-		ibus = MP4245_IOUT_TO_MA(ibus);
-	}
-
-	*mv = vbus;
-	*ma = ibus;
-
-	return rv;
-}
-
-struct mp4245_info {
-	uint8_t cmd;
-	uint8_t len;
-};
-
-static struct mp4245_info  mp4245_cmds[] = {
-	{MP4245_CMD_OPERATION,          1},
-	{MP4245_CMD_CLEAR_FAULTS,       1},
-	{MP4245_CMD_WRITE_PROTECT,      1},
-	{MP4245_CMD_STORE_USER_ALL,     1},
-	{MP4245_CMD_RESTORE_USER_ALL,   1},
-	{MP4245_CMD_VOUT_MODE,          1},
-	{MP4245_CMD_VOUT_COMMAND,       2},
-	{MP4245_CMD_VOUT_SCALE_LOOP,    2},
-	{MP4245_CMD_STATUS_BYTE,        1},
-	{MP4245_CMD_STATUS_WORD,        2},
-	{MP4245_CMD_STATUS_VOUT,        1},
-	{MP4245_CMD_STATUS_INPUT,       1},
-	{MP4245_CMD_STATUS_TEMP,        1},
-	{MP4245_CMD_STATUS_CML,         1},
-	{MP4245_CMD_READ_VIN,           2},
-	{MP4245_CMD_READ_VOUT,          2},
-	{MP4245_CMD_READ_IOUT,          2},
-	{MP4245_CMD_READ_TEMP,          2},
-	{MP4245_CMD_MFR_MODE_CTRL,      1},
-	{MP4245_CMD_MFR_CURRENT_LIM,    1},
-	{MP4245_CMD_MFR_LINE_DROP,      1},
-	{MP4245_CMD_MFR_OT_FAULT_LIM,   1},
-	{MP4245_CMD_MFR_OT_WARN_LIM,    1},
-	{MP4245_CMD_MFR_CRC_ERROR,      1},
-	{MP4245_CMD_MFF_MTP_CFG_CODE,   1},
-	{MP4245_CMD_MFR_MTP_REV_NUM,    1},
-	{MP4245_CMD_MFR_STATUS_MASK,    1},
-};
-
-static void mp4245_dump_reg(void)
-{
-	int i;
-	int val;
-	int rv;
-
-	for (i = 0; i < ARRAY_SIZE(mp4245_cmds); i++) {
-		if (mp4245_cmds[i].len == 1) {
-			rv = i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-				       mp4245_cmds[i].cmd, &val);
-		} else {
-			rv = i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-				       mp4245_cmds[i].cmd, &val);
-		}
-
-		if (!rv)
-			ccprintf("[%02x]:\t%04x\n", mp4245_cmds[i].cmd, val);
-	}
-}
-
-void mp4245_get_status(void)
-{
-	int status;
-	int on;
-	int vbus;
-	int ibus;
-	int ilim;
-	int vout;
-
-	/* Get Operation register */
-	i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_OPERATION, &on);
-	/* Vbus on/off is bit 7 */
-	on >>= 7;
-
-	/* Get status word */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_STATUS_WORD, &status);
-
-	/* Get Vbus measurement */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_READ_VOUT, &vbus);
-	vbus = MP4245_VOUT_TO_MV(vbus);
-
-	/* Get Ibus measurement */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		  MP4245_CMD_READ_IOUT, &ibus);
-	ibus = MP4245_IOUT_TO_MA(ibus);
-
-	/* Get Vout command (sets Vbus level) */
-	i2c_read16(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_VOUT_COMMAND, &vout);
-	vout = MP4245_VOUT_TO_MV(vout);
-
-	/* Get Input current limit */
-	i2c_read8(I2C_PORT_MP4245, MP4245_I2C_ADDR_FLAGS,
-		   MP4245_CMD_MFR_CURRENT_LIM, &ilim);
-	ilim *= MP4245_ILIM_STEP_MA;
-
-	ccprintf("mp4245 Vbus %s:\n", on ? "On" : "Off");
-	ccprintf("\tstatus = 0x%04x\n", status);
-	ccprintf("\tVout   = %d mV, Vbus = %d mV\n", vout, vbus);
-	ccprintf("\tIlim   = %d mA, Ibus = %d mA\n", ilim, ibus);
-}
-
-static int command_mp4245(int argc, char **argv)
-{
-	char *e;
-	int val;
-
-	if (argc < 2)
-		return EC_ERROR_PARAM_COUNT;
-
-	if (!strcasecmp(argv[1], "info")) {
-		mp4245_get_status();
-	} else if (!strcasecmp(argv[1], "dump")) {
-		mp4245_dump_reg();
-	} else if (!strcasecmp(argv[1], "vbus")) {
-		if (argc < 3)
-			return EC_ERROR_PARAM_COUNT;
-		val = strtoi(argv[2], &e, 10);
-		/* If value out of bounds, turn off */
-		if (val < 0 || val > 20) {
-			return EC_ERROR_PARAM2;
-		}
-		if (val == 0) {
-			mp4245_votlage_out_enable(0);
-		} else {
-			mp4245_set_voltage_out(val * 1000);
-			mp4245_votlage_out_enable(1);
-		}
-	} else {
-		return EC_ERROR_PARAM1;
-	}
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(mp4245, command_mp4245,
-			"<info|dump|vbus|ilim>",
-			"Turn on/off|set vbus.");
-