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

diff --git a/driver/ina2xx.c b/driver/ina2xx.c
deleted file mode 100644
index cf4389ba49..0000000000
--- a/driver/ina2xx.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Copyright 2014 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.
- *
- * TI INA219/231 Current/Power monitor driver.
- */
-
-#include "console.h"
-#include "hooks.h"
-#include "i2c.h"
-#include "system.h"
-#include "timer.h"
-#include "ina2xx.h"
-#include "util.h"
-
-/* Console output macros */
-#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
-
-/* I2C base address */
-#define INA2XX_I2C_ADDR_FLAGS 0x40
-
-uint16_t ina2xx_read(uint8_t idx, uint8_t reg)
-{
-	int res;
-	int val;
-
-	res = i2c_read16(I2C_PORT_MASTER, INA2XX_I2C_ADDR_FLAGS | idx,
-			 reg, &val);
-	if (res) {
-		CPRINTS("INA2XX I2C read failed");
-		return 0x0bad;
-	}
-	return (val >> 8) | ((val & 0xff) << 8);
-}
-
-int ina2xx_write(uint8_t idx, uint8_t reg, uint16_t val)
-{
-	int res;
-	uint16_t be_val = (val >> 8) | ((val & 0xff) << 8);
-
-	res = i2c_write16(I2C_PORT_MASTER, INA2XX_I2C_ADDR_FLAGS | idx,
-			  reg, be_val);
-	if (res)
-		CPRINTS("INA2XX I2C write failed");
-	return res;
-}
-
-int ina2xx_init(uint8_t idx, uint16_t config, uint16_t calib)
-{
-	int res;
-
-	res = ina2xx_write(idx, INA2XX_REG_CONFIG, config);
-	/* TODO(crosbug.com/p/29730): assume 1mA/LSB, revisit later */
-	res |= ina2xx_write(idx, INA2XX_REG_CALIB, calib);
-
-	return res;
-}
-
-int ina2xx_get_voltage(uint8_t idx)
-{
-	uint16_t bv = ina2xx_read(idx, INA2XX_REG_BUS_VOLT);
-	return INA2XX_BUS_MV((int)bv);
-}
-
-int ina2xx_get_current(uint8_t idx)
-{
-	int16_t curr = ina2xx_read(idx, INA2XX_REG_CURRENT);
-	/* Current calibration: LSB = 1mA/bit */
-	return (int)curr;
-}
-
-int ina2xx_get_power(uint8_t idx)
-{
-	uint16_t pow = ina2xx_read(idx, INA2XX_REG_POWER);
-	return INA2XX_POW_MW((int)pow);
-}
-
-int ina2xx_get_mask(uint8_t idx)
-{
-	return ina2xx_read(idx, INA2XX_REG_MASK);
-}
-
-int ina2xx_set_mask(uint8_t idx, uint16_t mask)
-{
-	return ina2xx_write(idx, INA2XX_REG_MASK, mask);
-}
-
-int ina2xx_get_alert(uint8_t idx)
-{
-	return ina2xx_read(idx, INA2XX_REG_ALERT);
-}
-
-int ina2xx_set_alert(uint8_t idx, uint16_t alert)
-{
-	return ina2xx_write(idx, INA2XX_REG_ALERT, alert);
-}
-
-#ifdef CONFIG_CMD_INA
-static void ina2xx_dump(uint8_t idx)
-{
-	uint16_t cfg = ina2xx_read(idx, INA2XX_REG_CONFIG);
-	int16_t sv = ina2xx_read(idx, INA2XX_REG_SHUNT_VOLT);
-	uint16_t bv = ina2xx_read(idx, INA2XX_REG_BUS_VOLT);
-	uint16_t pow = ina2xx_read(idx, INA2XX_REG_POWER);
-	int16_t curr = ina2xx_read(idx, INA2XX_REG_CURRENT);
-	uint16_t calib = ina2xx_read(idx, INA2XX_REG_CALIB);
-	uint16_t mask = ina2xx_read(idx, INA2XX_REG_MASK);
-	uint16_t alert = ina2xx_read(idx, INA2XX_REG_ALERT);
-
-	ccprintf("Configuration: %04x\n", cfg);
-	ccprintf("Shunt voltage: %04x => %d uV\n", sv,
-						   INA2XX_SHUNT_UV((int)sv));
-	ccprintf("Bus voltage  : %04x => %d mV\n", bv,
-						   INA2XX_BUS_MV((int)bv));
-	ccprintf("Power        : %04x => %d mW\n", pow,
-						   INA2XX_POW_MW((int)pow));
-	ccprintf("Current      : %04x => %d mA\n", curr, curr);
-	ccprintf("Calibration  : %04x\n", calib);
-	ccprintf("Mask/Enable  : %04x\n", mask);
-	ccprintf("Alert limit  : %04x\n", alert);
-}
-
-/*****************************************************************************/
-/* Console commands */
-
-static int command_ina(int argc, char **argv)
-{
-	char *e;
-	int idx;
-	uint16_t val;
-
-	if (argc < 2)
-		return EC_ERROR_PARAM_COUNT;
-
-	idx = strtoi(argv[1], &e, 10);
-	if (*e)
-		return EC_ERROR_PARAM1;
-
-	if (2 == argc) { /* dump all registers */
-		ina2xx_dump(idx);
-		return EC_SUCCESS;
-	} else if (4 == argc) {
-		val = strtoi(argv[3], &e, 16);
-		if (*e)
-			return EC_ERROR_PARAM3;
-
-		if (!strcasecmp(argv[2], "config")) {
-			ina2xx_write(idx, INA2XX_REG_CONFIG, val);
-		} else if (!strcasecmp(argv[2], "calib")) {
-			ina2xx_write(idx, INA2XX_REG_CALIB, val);
-		} else if (!strcasecmp(argv[2], "mask")) {
-			ina2xx_write(idx, INA2XX_REG_MASK, val);
-		} else if (!strcasecmp(argv[2], "alert")) {
-			ina2xx_write(idx, INA2XX_REG_ALERT, val);
-		} else { /* read one register */
-			ccprintf("Invalid register: %s\n", argv[1]);
-			return EC_ERROR_INVAL;
-		}
-		return EC_SUCCESS;
-	}
-
-	return EC_ERROR_INVAL;
-}
-DECLARE_CONSOLE_COMMAND(ina, command_ina,
-			"<index> [config|calib|mask|alert <val>]",
-			"INA2XX power/current sensing");
-#endif