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/retimer/tusb544.c b/driver/retimer/tusb544.c
deleted file mode 100644
index 9de543fd42..0000000000
--- a/driver/retimer/tusb544.c
+++ /dev/null
@@ -1,116 +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.
- *
- * TI TUSB544 USB Type-C Multi-Protocol Linear Redriver
- */
-#include "i2c.h"
-#include "tusb544.h"
-#include "usb_mux.h"
-
-static int tusb544_write(const struct usb_mux *me, int offset, int data)
-{
-	return i2c_write8(me->i2c_port,
-			  me->i2c_addr_flags,
-			  offset, data);
-}
-
-static int tusb544_read(const struct usb_mux *me, int offset, int *data)
-{
-	return i2c_read8(me->i2c_port,
-			 me->i2c_addr_flags,
-			 offset, data);
-}
-
-int tusb544_i2c_field_update8(const struct usb_mux *me, int offset,
-			     uint8_t field_mask, uint8_t set_value)
-{
-	int rv;
-
-	rv = i2c_field_update8(me->i2c_port,
-			       me->i2c_addr_flags,
-			       offset,
-			       field_mask,
-			       set_value);
-
-	return rv;
-}
-
-static int tusb544_enter_low_power_mode(const struct usb_mux *me)
-{
-	int reg;
-	int rv;
-
-	rv = tusb544_read(me, TUSB544_REG_GENERAL4, &reg);
-	if (rv)
-		return rv;
-
-	/* Setting CTL_SEL[0,1] to 0 powers down, per Table 5 */
-	reg &= ~TUSB544_GEN4_CTL_SEL;
-	/* Clear HPD */
-	reg &= ~TUSB544_GEN4_HPDIN;
-
-	return tusb544_write(me, TUSB544_REG_GENERAL4, reg);
-}
-
-static int tusb544_init(const struct usb_mux *me)
-{
-	return EC_SUCCESS;
-}
-
-static int tusb544_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			   bool *ack_required)
-{
-	int reg;
-	int rv;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	if (mux_state == USB_PD_MUX_NONE)
-		return tusb544_enter_low_power_mode(me);
-
-	rv = tusb544_read(me, TUSB544_REG_GENERAL4, &reg);
-	if (rv)
-		return rv;
-
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= TUSB544_GEN4_FLIP_SEL;
-	else
-		reg &= ~TUSB544_GEN4_FLIP_SEL;
-
-	reg &= ~TUSB544_GEN4_CTL_SEL;
-
-	if (IS_ENABLED(CONFIG_TUSB544_EQ_BY_REGISTER))
-		reg |= TUSB544_GEN4_EQ_OVRD;
-
-	if ((mux_state & USB_PD_MUX_USB_ENABLED) &&
-	    (mux_state & USB_PD_MUX_DP_ENABLED)) {
-		reg |= TUSB544_CTL_SEL_DP_USB;
-		reg |= TUSB544_GEN4_HPDIN;
-	} else if (mux_state & USB_PD_MUX_DP_ENABLED) {
-		reg |= TUSB544_CTL_SEL_DP_ONLY;
-		reg |= TUSB544_GEN4_HPDIN;
-	} else if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= TUSB544_CTL_SEL_USB_ONLY;
-
-	rv = tusb544_write(me, TUSB544_REG_GENERAL4, reg);
-	if (rv)
-		return rv;
-
-	rv = tusb544_read(me, TUSB544_REG_GENERAL6, &reg);
-	if (rv)
-		return rv;
-
-	reg &= ~TUSB544_GEN6_DIR_SEL;
-	/* All chromebooks are DP SRC */
-	reg |= TUSB544_DIR_SEL_USB_DP_SRC;
-
-	return tusb544_write(me, TUSB544_REG_GENERAL6, reg);
-}
-
-const struct usb_mux_driver tusb544_drv = {
-	.enter_low_power_mode = &tusb544_enter_low_power_mode,
-	.init = &tusb544_init,
-	.set = &tusb544_set_mux,
-};