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

diff --git a/common/ioexpander.c b/common/ioexpander.c
deleted file mode 100644
index ccf3cc7c4a..0000000000
--- a/common/ioexpander.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/* Copyright 2019 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.
- */
-
-/* IO Expander Controller Common Code */
-
-#include "console.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "ioexpander.h"
-#include "system.h"
-#include "util.h"
-
-#define CPRINTF(format, args...) cprintf(CC_GPIO, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args)
-
-static uint8_t last_val[(IOEX_COUNT + 7) / 8];
-
-static int last_val_changed(enum ioex_signal signal, int v)
-{
-	const int i = signal - IOEX_SIGNAL_START;
-
-	ASSERT(signal_is_ioex(signal));
-
-	if (v && !(last_val[i / 8] & (BIT(i % 8)))) {
-		last_val[i / 8] |= BIT(i % 8);
-		return 1;
-	} else if (!v && last_val[i / 8] & (BIT(i % 8))) {
-		last_val[i / 8] &= ~(BIT(i % 8));
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-int signal_is_ioex(int signal)
-{
-	return ((signal >= IOEX_SIGNAL_START) && (signal < IOEX_SIGNAL_END));
-}
-
-static const struct ioex_info *ioex_get_signal_info(enum ioex_signal signal)
-{
-	const struct ioex_info *g;
-
-	ASSERT(signal_is_ioex(signal));
-
-	g = ioex_list + signal - IOEX_SIGNAL_START;
-
-	if (ioex_config[g->ioex].flags & IOEX_FLAGS_DISABLED) {
-		CPRINTS("ioex %s disabled", g->name);
-		return NULL;
-	}
-
-	return g;
-}
-
-static int ioex_is_valid_interrupt_signal(enum ioex_signal signal)
-{
-	const struct ioexpander_drv *drv;
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return EC_ERROR_BUSY;
-
-	/* Fail if no interrupt handler */
-	if (signal - IOEX_SIGNAL_START >= ioex_ih_count)
-		return EC_ERROR_PARAM1;
-
-	drv = ioex_config[g->ioex].drv;
-	/*
-	 * Not every IOEX chip can support interrupt, check it before enabling
-	 * the interrupt function
-	 */
-	if (drv->enable_interrupt == NULL) {
-		CPRINTS("IOEX chip port %d doesn't support INT", g->ioex);
-		return EC_ERROR_UNIMPLEMENTED;
-	}
-
-	return EC_SUCCESS;
-}
-
-int ioex_enable_interrupt(enum ioex_signal signal)
-{
-	int rv;
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-	const struct ioexpander_drv *drv;
-
-	rv = ioex_is_valid_interrupt_signal(signal);
-	if (rv != EC_SUCCESS)
-		return  rv;
-
-	drv = ioex_config[g->ioex].drv;
-	return drv->enable_interrupt(g->ioex, g->port, g->mask, 1);
-}
-
-int ioex_disable_interrupt(enum ioex_signal signal)
-{
-	int rv;
-	const struct ioexpander_drv *drv;
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	rv = ioex_is_valid_interrupt_signal(signal);
-	if (rv != EC_SUCCESS)
-		return  rv;
-
-	drv = ioex_config[g->ioex].drv;
-	return drv->enable_interrupt(g->ioex, g->port, g->mask, 0);
-}
-
-int ioex_get_flags(enum ioex_signal signal, int *flags)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return EC_ERROR_BUSY;
-
-	return ioex_config[g->ioex].drv->get_flags_by_mask(g->ioex,
-						g->port, g->mask, flags);
-}
-
-int ioex_set_flags(enum ioex_signal signal, int flags)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return EC_ERROR_BUSY;
-
-	return ioex_config[g->ioex].drv->set_flags_by_mask(g->ioex,
-						g->port, g->mask, flags);
-}
-
-int ioex_get_level(enum ioex_signal signal, int *val)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return EC_ERROR_BUSY;
-
-	return ioex_config[g->ioex].drv->get_level(g->ioex, g->port,
-							g->mask, val);
-}
-
-int ioex_set_level(enum ioex_signal signal, int value)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return EC_ERROR_BUSY;
-
-	return ioex_config[g->ioex].drv->set_level(g->ioex, g->port,
-							g->mask, value);
-}
-
-#ifdef CONFIG_IO_EXPANDER_SUPPORT_GET_PORT
-int ioex_get_port(int ioex, int port, int *val)
-{
-	if (ioex_config[ioex].drv->get_port == NULL)
-		return EC_ERROR_UNIMPLEMENTED;
-
-	return ioex_config[ioex].drv->get_port(ioex, port, val);
-}
-#endif
-
-int ioex_init(int ioex)
-{
-	const struct ioex_info *g = ioex_list;
-	const struct ioexpander_drv *drv = ioex_config[ioex].drv;
-	int rv;
-	int i;
-
-	if (ioex_config[ioex].flags & IOEX_FLAGS_DISABLED)
-		return EC_ERROR_BUSY;
-
-	if (drv->init != NULL) {
-		rv = drv->init(ioex);
-		if (rv != EC_SUCCESS)
-			return rv;
-	}
-
-	/*
-	 * Set all IO expander GPIOs to default flags according to the setting
-	 * in gpio.inc
-	 */
-	for (i = 0; i < IOEX_COUNT; i++, g++) {
-		int flags = g->flags;
-
-		if (g->ioex == ioex && g->mask && !(flags & GPIO_DEFAULT)) {
-			/* Late-sysJump should not set the output levels */
-			if (system_jumped_late())
-				flags &= ~(GPIO_LOW | GPIO_HIGH);
-
-			drv->set_flags_by_mask(g->ioex, g->port,
-						g->mask, flags);
-		}
-	}
-
-	return EC_SUCCESS;
-}
-
-static void ioex_init_default(void)
-{
-	int i;
-
-	for (i = 0; i < CONFIG_IO_EXPANDER_PORT_COUNT; i++)
-		ioex_init(i);
-}
-DECLARE_HOOK(HOOK_INIT, ioex_init_default, HOOK_PRIO_INIT_I2C + 1);
-
-const char *ioex_get_name(enum ioex_signal signal)
-{
-	const struct ioex_info *g = ioex_list + signal - IOEX_SIGNAL_START;
-
-	return g->name;
-}
-
-static void print_ioex_info(enum ioex_signal signal)
-{
-	int changed, v, val;
-	int flags = 0;
-	const struct ioex_info *g = ioex_list + signal - IOEX_SIGNAL_START;
-
-	if (ioex_config[g->ioex].flags & IOEX_FLAGS_DISABLED) {
-		ccprintf("  DISABLED %s\n", ioex_get_name(signal));
-		return;
-	}
-
-
-	v = ioex_get_level(signal, &val);
-	if (v) {
-		ccprintf("Fail to get %s level\n", ioex_get_name(signal));
-		return;
-	}
-	v = ioex_get_flags(signal, &flags);
-	if (v) {
-		ccprintf("Fail to get %s flags\n", ioex_get_name(signal));
-		return;
-	}
-
-	changed = last_val_changed(signal, val);
-
-	ccprintf("  %d%c %s%s%s%s%s%s\n", val,
-		 (changed ? '*' : ' '),
-		 (flags & GPIO_INPUT ? "I " : ""),
-		 (flags & GPIO_OUTPUT ? "O " : ""),
-		 (flags & GPIO_LOW ? "L " : ""),
-		 (flags & GPIO_HIGH ? "H " : ""),
-		 (flags & GPIO_OPEN_DRAIN ? "ODR " : ""),
-		ioex_get_name(signal));
-
-	/* Flush console to avoid truncating output */
-	cflush();
-}
-
-static int ioex_get_default_flags(enum ioex_signal signal)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return 0;
-
-	return g->flags;
-}
-
-/* IO expander commands */
-static enum ioex_signal find_ioex_by_name(const char *name)
-{
-	enum ioex_signal signal;
-
-	if (!name)
-		return IOEX_SIGNAL_END;
-
-	for (signal = IOEX_SIGNAL_START; signal < IOEX_SIGNAL_END; signal++) {
-		if (!strcasecmp(name, ioex_get_name(signal)))
-			return signal;
-	}
-
-	return IOEX_SIGNAL_END;
-}
-
-static enum ec_error_list ioex_set(const char *name, int value)
-{
-	enum ioex_signal signal = find_ioex_by_name(name);
-
-	if (!signal_is_ioex(signal))
-		return EC_ERROR_INVAL;
-
-	if (!(ioex_get_default_flags(signal) & GPIO_OUTPUT))
-		return EC_ERROR_INVAL;
-
-	return ioex_set_level(signal, value);
-}
-
-static int command_ioex_set(int argc, char **argv)
-{
-	char *e;
-	int v;
-
-	if (argc < 3)
-		return EC_ERROR_PARAM_COUNT;
-
-	v = strtoi(argv[2], &e, 0);
-	if (*e)
-		return EC_ERROR_PARAM2;
-
-	if (ioex_set(argv[1], v) != EC_SUCCESS)
-		return EC_ERROR_PARAM1;
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(ioexset, command_ioex_set,
-			"name <0 | 1>",
-			"Set level of a IO expander IO");
-
-static int command_ioex_get(int argc, char **argv)
-{
-	enum ioex_signal signal;
-
-	/* If a signal is specified, print only that one */
-	if (argc == 2) {
-		signal = find_ioex_by_name(argv[1]);
-		if (!signal_is_ioex(signal))
-			return EC_ERROR_PARAM1;
-		print_ioex_info(signal);
-
-		return EC_SUCCESS;
-	}
-
-	/* Otherwise print them all */
-	for (signal = IOEX_SIGNAL_START; signal < IOEX_SIGNAL_END; signal++)
-		print_ioex_info(signal);
-
-	return EC_SUCCESS;
-}
-DECLARE_SAFE_CONSOLE_COMMAND(ioexget, command_ioex_get,
-			     "[name]",
-			     "Read level of IO expander pin(s)");
-