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

diff --git a/driver/usb_mux/anx7440.c b/driver/usb_mux/anx7440.c
deleted file mode 100644
index 89e593217d..0000000000
--- a/driver/usb_mux/anx7440.c
+++ /dev/null
@@ -1,112 +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.
- *
- * Analogix ANX7440 USB Type-C Active mux with
- * Integrated Re-timers for USB3.1/DisplayPort.
- */
-
-#include "anx7440.h"
-#include "common.h"
-#include "console.h"
-#include "i2c.h"
-#include "usb_mux.h"
-#include "util.h"
-
-#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
-
-static inline int anx7440_read(const struct usb_mux *me,
-			       uint8_t reg, int *val)
-{
-	return i2c_read8(me->i2c_port, me->i2c_addr_flags, reg, val);
-}
-
-static inline int anx7440_write(const struct usb_mux *me,
-				uint8_t reg, uint8_t val)
-{
-	return i2c_write8(me->i2c_port, me->i2c_addr_flags, reg, val);
-}
-
-struct anx7440_id_t {
-	uint8_t val;
-	uint8_t reg;
-};
-
-static const struct anx7440_id_t anx7440_device_ids[] = {
-	{ ANX7440_VENDOR_ID_L, ANX7440_REG_VENDOR_ID_L },
-	{ ANX7440_VENDOR_ID_H, ANX7440_REG_VENDOR_ID_H },
-	{ ANX7440_DEVICE_ID_L, ANX7440_REG_DEVICE_ID_L },
-	{ ANX7440_DEVICE_ID_H, ANX7440_REG_DEVICE_ID_H },
-	{ ANX7440_DEVICE_VERSION, ANX7440_REG_DEVICE_VERSION },
-};
-
-static int anx7440_init(const struct usb_mux *me)
-{
-	int i;
-	int val;
-	int res;
-
-	/* Verify device id / version registers */
-	for (i = 0; i < ARRAY_SIZE(anx7440_device_ids); i++) {
-		res = anx7440_read(me, anx7440_device_ids[i].reg, &val);
-		if (res)
-			return res;
-
-		if (val != anx7440_device_ids[i].val)
-			return EC_ERROR_UNKNOWN;
-	}
-
-	return EC_SUCCESS;
-}
-
-/* Writes control register to set switch mode */
-static int anx7440_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			   bool *ack_required)
-{
-	int reg, res;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	res = anx7440_read(me, ANX7440_REG_CHIP_CTRL, &reg);
-	if (res)
-		return res;
-
-	reg &= ~ANX7440_CHIP_CTRL_SW_OP_MODE_CLEAR;
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= ANX7440_CHIP_CTRL_SW_OP_MODE_USB;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= ANX7440_CHIP_CTRL_SW_OP_MODE_DP;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= ANX7440_CHIP_CTRL_SW_FLIP;
-
-	return anx7440_write(me, ANX7440_REG_CHIP_CTRL, reg);
-}
-
-/* Reads control register and updates mux_state accordingly */
-static int anx7440_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	int reg, res;
-
-	*mux_state = 0;
-	res = anx7440_read(me, ANX7440_REG_CHIP_CTRL, &reg);
-	if (res)
-		return res;
-
-	if (reg & ANX7440_CHIP_CTRL_OP_MODE_FINAL_USB)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & ANX7440_CHIP_CTRL_OP_MODE_FINAL_DP)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & ANX7440_CHIP_CTRL_FINAL_FLIP)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-const struct usb_mux_driver anx7440_usb_mux_driver = {
-	.init = anx7440_init,
-	.set = anx7440_set_mux,
-	.get = anx7440_get_mux,
-	/* TODO(b/146683781): add low power mode */
-};