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

diff --git a/driver/charger/sy21612.c b/driver/charger/sy21612.c
deleted file mode 100644
index 7bc6caa4ea..0000000000
--- a/driver/charger/sy21612.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Copyright 2017 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.
- *
- * SILERGY SY21612 buck-boost converter driver.
- */
-
-
-#include "console.h"
-#include "hooks.h"
-#include "i2c.h"
-#include "sy21612.h"
-#include "task.h"
-#include "util.h"
-
-/* Console output macros */
-#define CPUTS(outstr) cputs(CC_CHARGER, outstr)
-#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
-
-static int sy21612_clear_set_reg(int reg, int clear, int set)
-{
-	int val, old_val, rv;
-
-	rv = i2c_read8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS, reg, &old_val);
-	if (rv)
-		return rv;
-
-	val = old_val;
-	val &= ~clear;
-	val |= set;
-
-	if (val != old_val || clear || set)
-		rv = i2c_write8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS,
-				reg, val);
-
-	return rv;
-}
-
-static int sy21612_read(int reg, int *val)
-{
-	return i2c_read8(I2C_PORT_SY21612, SY21612_ADDR_FLAGS, reg, val);
-}
-
-int sy21612_enable_regulator(int enable)
-{
-	return enable ?
-		sy21612_clear_set_reg(SY21612_CTRL1, 0, SY21612_CTRL1_REG_EN) :
-		sy21612_clear_set_reg(SY21612_CTRL1, SY21612_CTRL1_REG_EN, 0);
-}
-
-int sy21612_enable_adc(int enable)
-{
-	return enable ?
-		sy21612_clear_set_reg(SY21612_CTRL1, 0, SY21612_CTRL1_ADC_EN) :
-		sy21612_clear_set_reg(SY21612_CTRL1, SY21612_CTRL1_ADC_EN, 0);
-}
-
-int sy21612_set_adc_mode(int auto_mode)
-{
-	return auto_mode ?
-		sy21612_clear_set_reg(SY21612_CTRL1,
-				      0, SY21612_CTRL1_ADC_AUTO_MODE) :
-		sy21612_clear_set_reg(SY21612_CTRL1,
-				      SY21612_CTRL1_ADC_AUTO_MODE, 0);
-}
-
-int sy21612_set_vbus_discharge(int auto_discharge)
-{
-	return auto_discharge ?
-		sy21612_clear_set_reg(SY21612_CTRL1,
-				      SY21612_CTRL1_VBUS_NDISCHG, 0) :
-		sy21612_clear_set_reg(SY21612_CTRL1,
-				      0, SY21612_CTRL1_VBUS_NDISCHG);
-}
-
-int sy21612_set_switching_freq(enum sy21612_switching_freq freq)
-{
-	return sy21612_clear_set_reg(SY21612_CTRL2,
-				     SY21612_CTRL2_FREQ_MASK,
-				     freq << SY21612_CTRL2_FREQ_SHIFT);
-}
-
-int sy21612_set_vbus_volt(enum sy21612_vbus_volt volt)
-{
-	return sy21612_clear_set_reg(SY21612_CTRL2,
-				     SY21612_CTRL2_VBUS_MASK,
-				     volt << SY21612_CTRL2_VBUS_SHIFT);
-}
-
-int sy21612_set_vbus_adj(enum sy21612_vbus_adj adj)
-{
-	return sy21612_clear_set_reg(SY21612_CTRL2,
-				     SY21612_CTRL2_VBUS_ADJ_MASK,
-				     adj << SY21612_CTRL2_VBUS_ADJ_SHIFT);
-}
-
-int sy21612_set_sink_mode(int sink_mode)
-{
-	return sink_mode ?
-		sy21612_clear_set_reg(SY21612_PROT2,
-				      0, SY21612_PROT2_SINK_MODE) :
-		sy21612_clear_set_reg(SY21612_PROT2,
-				      SY21612_PROT2_SINK_MODE, 0);
-}
-
-int sy21612_is_power_good(void)
-{
-	int reg;
-
-	if (sy21612_read(SY21612_STATE, &reg))
-		return 0;
-
-	return reg & SY21612_STATE_POWER_GOOD;
-}
-
-int sy21612_read_clear_int(void)
-{
-	int reg;
-
-	if (sy21612_read(SY21612_INT, &reg))
-		return 0;
-
-	return reg;
-}
-
-int sy21612_get_vbat_voltage(void)
-{
-	int reg;
-
-	if (sy21612_read(SY21612_VBAT_VOLT, &reg))
-		return 0;
-
-	return reg * 25000 / 255;
-}
-
-int sy21612_get_vbus_voltage(void)
-{
-	int reg;
-
-	if (sy21612_read(SY21612_VBUS_VOLT, &reg))
-		return 0;
-
-	return reg * 25000 / 255;
-}
-
-int sy21612_get_vbus_current(void)
-{
-	int reg;
-
-	if (sy21612_read(SY21612_VBUS_CURRENT, &reg))
-		return 0;
-
-	/*
-	 * delta V in range 0 ~ 67mV
-	 * sense resistor 10 mOhm
-	 */
-	return reg * 6700 / 255;
-}
-
-void sy21612_int(enum gpio_signal signal)
-{
-#ifdef HAS_TASK_SY21612
-	task_wake(TASK_ID_SY21612);
-#endif
-}
-
-#ifdef HAS_TASK_SY21612
-void sy21612_task(void *u)
-{
-	int flags;
-
-	while (1) {
-		task_wait_event(-1);
-		if (sy21612_read(SY21612_INT, &flags))
-			continue;
-		/* TODO: notify the error condition and enable regulator */
-		if (flags & SY21612_INT_VBUS_OCP)
-			CPUTS("buck-boost VBUS OCP\n");
-		if (flags & SY21612_INT_INDUCTOR_OCP)
-			CPUTS("buck-boost inductor OCP\n");
-		if (flags & SY21612_INT_UVP)
-			CPUTS("buck-boost UVP\n");
-		if (flags & SY21612_INT_OTP)
-			CPUTS("buck-boost OTP\n");
-	}
-}
-#endif
-
-#ifdef CONFIG_CMD_CHARGER
-static int command_sy21612(int argc, char **argv)
-{
-	int i, val, rv;
-
-	ccputs("sy21612 regs:\n");
-	for (i = 0; i < 9; i++) {
-		ccprintf("[%02x] ", i);
-		rv = sy21612_read(i, &val);
-		if (rv)
-			ccprintf(" x (%d)\n", rv);
-		else
-			ccprintf("%02x - %pb\n", val, BINARY_VALUE(val, 8));
-	}
-
-	ccprintf("vbat voltage: %d mV\n", sy21612_get_vbat_voltage());
-	ccprintf("vbus voltage: %d mV\n", sy21612_get_vbus_voltage());
-	ccprintf("vbus current: %d mA\n", sy21612_get_vbus_current());
-
-	return 0;
-}
-DECLARE_CONSOLE_COMMAND(sy21612, command_sy21612,
-			NULL, NULL);
-#endif