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

diff --git a/driver/ioexpander/pca9675.c b/driver/ioexpander/pca9675.c
deleted file mode 100644
index 3fe3bfa0c4..0000000000
--- a/driver/ioexpander/pca9675.c
+++ /dev/null
@@ -1,127 +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.
- *
- * NXP PCA9675PW I/O Port expander driver source
- */
-
-#include "i2c.h"
-#include "ioexpander.h"
-#include "pca9675.h"
-
-struct pca9675_ioexpander {
-	/* I/O port direction (1 = input, 0 = output) */
-	uint16_t io_direction;
-	uint16_t cache_out_pins;
-};
-
-static struct pca9675_ioexpander pca9675_iox[CONFIG_IO_EXPANDER_PORT_COUNT];
-
-static int pca9675_read16(int ioex, uint16_t *data)
-{
-	return i2c_xfer(ioex_config[ioex].i2c_host_port,
-			ioex_config[ioex].i2c_addr_flags,
-			NULL, 0, (uint8_t *)data, 2);
-}
-
-static int pca9675_write16(int ioex, uint16_t data)
-{
-	/*
-	 * PCA9675 is Quasi-bidirectional I/O architecture hence
-	 * append the direction (1 = input, 0 = output) to prevent
-	 * overwriting I/O pins inadvertently.
-	 */
-	data |= pca9675_iox[ioex].io_direction;
-
-	return i2c_xfer(ioex_config[ioex].i2c_host_port,
-			ioex_config[ioex].i2c_addr_flags,
-			(uint8_t *)&data, 2, NULL, 0);
-}
-
-static int pca9675_reset(int ioex)
-{
-	uint8_t reset = PCA9675_RESET_SEQ_DATA;
-
-	return i2c_xfer(ioex_config[ioex].i2c_host_port,
-			0, &reset, 1, NULL, 0);
-}
-
-static int pca9675_get_flags_by_mask(int ioex, int port, int mask, int *flags)
-{
-	*flags = mask & pca9675_iox[ioex].io_direction ?
-				GPIO_INPUT : GPIO_OUTPUT;
-
-	return EC_SUCCESS;
-}
-
-static int pca9675_get_level(int ioex, int port, int mask, int *val)
-{
-	int rv = EC_SUCCESS;
-	uint16_t data_read;
-
-	/* Read from IO-expander only if the pin is input */
-	if (pca9675_iox[ioex].io_direction & mask) {
-		rv = pca9675_read16(ioex, &data_read);
-		if (!rv)
-			*val = !!(data_read & mask);
-	} else {
-		*val = !!(pca9675_iox[ioex].cache_out_pins & mask);
-	}
-
-	return rv;
-}
-
-static int pca9675_set_level(int ioex, int port, int mask, int val)
-{
-	/* Update the output pins */
-	if (val)
-		pca9675_iox[ioex].cache_out_pins |= mask;
-	else
-		pca9675_iox[ioex].cache_out_pins &= ~mask;
-
-	return pca9675_write16(ioex, pca9675_iox[ioex].cache_out_pins);
-}
-
-static int pca9675_set_flags_by_mask(int ioex, int port, int mask, int flags)
-{
-	int rv = EC_SUCCESS;
-
-	/* Initialize the I/O directions */
-	if (flags & GPIO_INPUT) {
-		pca9675_iox[ioex].io_direction |= mask;
-	} else {
-		pca9675_iox[ioex].io_direction &= ~mask;
-
-		/* Initialize the pin */
-		rv = pca9675_set_level(ioex, port, mask, flags & GPIO_HIGH);
-	}
-
-	return rv;
-}
-
-static int pca9675_enable_interrupt(int ioex, int port, int mask, int enable)
-{
-	/*
-	 * Nothing to do as an interrupt is generated by any rising or
-	 * falling edge of the port inputs.
-	 */
-	return EC_SUCCESS;
-}
-
-int pca9675_init(int ioex)
-{
-	pca9675_iox[ioex].io_direction = PCA9675_DEFAULT_IO_DIRECTION;
-	pca9675_iox[ioex].cache_out_pins = 0;
-
-	/* Set pca9675 to Power-on reset */
-	return pca9675_reset(ioex);
-}
-
-const struct ioexpander_drv pca9675_ioexpander_drv = {
-	.init			= &pca9675_init,
-	.get_level		= &pca9675_get_level,
-	.set_level		= &pca9675_set_level,
-	.get_flags_by_mask	= &pca9675_get_flags_by_mask,
-	.set_flags_by_mask	= &pca9675_set_flags_by_mask,
-	.enable_interrupt	= &pca9675_enable_interrupt,
-};