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/usb_mux/ps8740.c b/driver/usb_mux/ps8740.c
deleted file mode 100644
index 618c74cd65..0000000000
--- a/driver/usb_mux/ps8740.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.
- *
- * Parade PS8740 (and PS8742)
- * USB Type-C Redriving Switch for USB Host / DisplayPort.
- */
-
-#include "common.h"
-#include "i2c.h"
-#include "ps8740.h"
-#include "usb_mux.h"
-#include "util.h"
-
-int ps8740_read(const struct usb_mux *me, uint8_t reg, int *val)
-{
-	return i2c_read8(me->i2c_port, me->i2c_addr_flags,
-			 reg, val);
-}
-
-int ps8740_write(const struct usb_mux *me, uint8_t reg, uint8_t val)
-{
-	return i2c_write8(me->i2c_port, me->i2c_addr_flags,
-			  reg, val);
-}
-
-static int ps8740_init(const struct usb_mux *me)
-{
-	int id1;
-	int id2;
-	int res;
-
-	/* Reset chip back to power-on state */
-	res = ps8740_write(me, PS8740_REG_MODE, PS8740_MODE_POWER_DOWN);
-	if (res)
-		return res;
-
-	/*
-	 * Verify chip ID registers.
-	 */
-	res = ps8740_read(me, PS8740_REG_CHIP_ID1, &id1);
-	if (res)
-		return res;
-
-	res  = ps8740_read(me, PS8740_REG_CHIP_ID2, &id2);
-	if (res)
-		return res;
-
-	if (id1 != PS8740_CHIP_ID1 || id2 != PS8740_CHIP_ID2)
-		return EC_ERROR_UNKNOWN;
-
-	/*
-	 * Verify revision ID registers.
-	 */
-	res = ps8740_read(me, PS8740_REG_REVISION_ID1, &id1);
-	if (res)
-		return res;
-
-	res = ps8740_read(me, PS8740_REG_REVISION_ID2, &id2);
-	if (res)
-		return res;
-
-	if (id1 != PS8740_REVISION_ID1)
-		return EC_ERROR_UNKNOWN;
-	/* PS8740 may have REVISION_ID2 as 0xa or 0xb */
-	if (id2 != PS8740_REVISION_ID2_0 && id2 != PS8740_REVISION_ID2_1)
-		return EC_ERROR_UNKNOWN;
-
-	return EC_SUCCESS;
-}
-
-/* Writes control register to set switch mode */
-static int ps8740_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			  bool *ack_required)
-{
-	uint8_t reg = 0;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= PS8740_MODE_USB_ENABLED;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= PS8740_MODE_DP_ENABLED;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= PS8740_MODE_POLARITY_INVERTED;
-
-	return ps8740_write(me, PS8740_REG_MODE, reg);
-}
-
-/* Reads control register and updates mux_state accordingly */
-static int ps8740_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	int reg;
-	int res;
-
-	res = ps8740_read(me, PS8740_REG_STATUS, &reg);
-	if (res)
-		return res;
-
-	*mux_state = 0;
-	if (reg & PS8740_STATUS_USB_ENABLED)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & PS8740_STATUS_DP_ENABLED)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & PS8740_STATUS_POLARITY_INVERTED)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-/* Tune USB Tx/Rx Equalization */
-int ps8740_tune_usb_eq(const struct usb_mux *me, uint8_t tx, uint8_t rx)
-{
-	int ret;
-
-	ret = ps8740_write(me, PS8740_REG_USB_EQ_TX, tx);
-	ret |= ps8740_write(me, PS8740_REG_USB_EQ_RX, rx);
-
-	return ret;
-}
-
-const struct usb_mux_driver ps8740_usb_mux_driver = {
-	.init = ps8740_init,
-	.set = ps8740_set_mux,
-	.get = ps8740_get_mux,
-};