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

diff --git a/driver/usb_mux/tusb1064.c b/driver/usb_mux/tusb1064.c
deleted file mode 100644
index 1c0f0e4701..0000000000
--- a/driver/usb_mux/tusb1064.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 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.
- */
-
-#include "i2c.h"
-#include "tusb1064.h"
-#include "usb_mux.h"
-
-#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
-
-/*
- * configuration bits which never change in the General Register
- * e.g. REG_GENERAL_DP_EN_CTRL or REG_GENERAL_EQ_OVERRIDE
- */
-#define REG_GENERAL_STATIC_BITS REG_GENERAL_EQ_OVERRIDE
-
-static int tusb1064_read(const struct usb_mux *me, uint8_t reg, uint8_t *val)
-{
-	int buffer = 0xee;
-	int res = i2c_read8(me->i2c_port, me->i2c_addr_flags,
-			    (int)reg, &buffer);
-	*val = buffer;
-	return res;
-}
-
-static int tusb1064_write(const struct usb_mux *me, uint8_t reg, uint8_t val)
-{
-	return i2c_write8(me->i2c_port, me->i2c_addr_flags,
-			  (int)reg, (int)val);
-}
-
-/* Writes control register to set switch mode */
-static int tusb1064_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			    bool *ack_required)
-{
-	int reg = REG_GENERAL_STATIC_BITS;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= REG_GENERAL_CTLSEL_USB3;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= REG_GENERAL_CTLSEL_ANYDP;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= REG_GENERAL_FLIPSEL;
-
-	return tusb1064_write(me, TUSB1064_REG_GENERAL, reg);
-}
-
-/* Reads control register and updates mux_state accordingly */
-static int tusb1064_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	uint8_t reg;
-	int res;
-
-	res = tusb1064_read(me, TUSB1064_REG_GENERAL, &reg);
-	if (res)
-		return EC_ERROR_INVAL;
-
-	*mux_state = 0;
-	if (reg & REG_GENERAL_CTLSEL_USB3)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & REG_GENERAL_CTLSEL_ANYDP)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & REG_GENERAL_FLIPSEL)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-/* Generic driver init function */
-static int tusb1064_init(const struct usb_mux *me)
-{
-	int res;
-	uint8_t reg;
-	bool unused;
-
-	/* Default to "Floating Pin" DP Equalization */
-	reg = TUSB1064_DP1EQ(TUSB1064_DP_EQ_RX_10_0_DB) |
-		TUSB1064_DP3EQ(TUSB1064_DP_EQ_RX_10_0_DB);
-	res = tusb1064_write(me, TUSB1064_REG_DP1DP3EQ_SEL, reg);
-	if (res)
-		return res;
-
-	reg = TUSB1064_DP0EQ(TUSB1064_DP_EQ_RX_10_0_DB) |
-		TUSB1064_DP2EQ(TUSB1064_DP_EQ_RX_10_0_DB);
-	res = tusb1064_write(me, TUSB1064_REG_DP0DP2EQ_SEL, reg);
-	if (res)
-		return res;
-
-	/*
-	 * Note that bypassing the usb_mux API is okay for internal driver calls
-	 * since the task calling init already holds this port's mux lock.
-	 */
-	/* Disconnect USB3.1 and DP */
-	res = tusb1064_set_mux(me, USB_PD_MUX_NONE, &unused);
-	if (res)
-		return res;
-
-	/* Disable AUX mux override */
-	res = tusb1064_write(me, TUSB1064_REG_AUXDPCTRL, 0);
-	if (res)
-		return res;
-
-	return EC_SUCCESS;
-}
-
-const struct usb_mux_driver tusb1064_usb_mux_driver = {
-	/* CAUTION: This is an UFP/RX/SINK redriver mux */
-	.init = tusb1064_init,
-	.set = tusb1064_set_mux,
-	.get = tusb1064_get_mux,
-};