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

diff --git a/driver/usb_mux/pi3usb3x532.c b/driver/usb_mux/pi3usb3x532.c
deleted file mode 100644
index 2435157967..0000000000
--- a/driver/usb_mux/pi3usb3x532.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright 2015 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.
- *
- * Pericom PI3USB3X532 USB port switch driver.
- */
-
-#include "common.h"
-#include "i2c.h"
-#include "pi3usb3x532.h"
-#include "usb_mux.h"
-#include "util.h"
-
-static int pi3usb3x532_read(const struct usb_mux *me,
-			    uint8_t reg, uint8_t *val)
-{
-	int read, res;
-
-	/*
-	 * First byte read will be i2c address (ignored).
-	 * Second byte read will be vendor ID.
-	 * Third byte read will be selection control.
-	 */
-	res = i2c_read16(me->i2c_port, me->i2c_addr_flags, 0, &read);
-	if (res)
-		return res;
-
-	if (reg == PI3USB3X532_REG_VENDOR)
-		*val = read & 0xff;
-	else /* reg == PI3USB3X532_REG_CONTROL */
-		*val = (read >> 8) & 0xff;
-
-	return EC_SUCCESS;
-}
-
-static int pi3usb3x532_write(const struct usb_mux *me,
-			     uint8_t reg, uint8_t val)
-{
-	if (reg != PI3USB3X532_REG_CONTROL)
-		return EC_ERROR_UNKNOWN;
-
-	return i2c_write8(me->i2c_port, me->i2c_addr_flags, 0, val);
-}
-
-int pi3usb3x532_check_vendor(const struct usb_mux *me, int *val)
-{
-	int res;
-	uint8_t read;
-
-	res = pi3usb3x532_read(me, PI3USB3X532_REG_VENDOR, &read);
-	if (res)
-		return res;
-
-	*val = read;
-
-	return EC_SUCCESS;
-}
-
-static int pi3usb3x532_reset(const struct usb_mux *me)
-{
-	return pi3usb3x532_write(
-		me,
-		PI3USB3X532_REG_CONTROL,
-		(PI3USB3X532_MODE_POWERDOWN & PI3USB3X532_CTRL_MASK) |
-		PI3USB3X532_CTRL_RSVD);
-}
-
-static int pi3usb3x532_init(const struct usb_mux *me)
-{
-	uint8_t val;
-	int res;
-
-	res = pi3usb3x532_reset(me);
-	if (res)
-		return res;
-	res = pi3usb3x532_read(me, PI3USB3X532_REG_VENDOR, &val);
-	if (res)
-		return res;
-	if (val != PI3USB3X532_VENDOR_ID)
-		return EC_ERROR_UNKNOWN;
-
-	return EC_SUCCESS;
-}
-
-/* Writes control register to set switch mode */
-static int pi3usb3x532_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 |= PI3USB3X532_MODE_USB;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= PI3USB3X532_MODE_DP;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= PI3USB3X532_BIT_SWAP;
-
-	return pi3usb3x532_write(me, PI3USB3X532_REG_CONTROL,
-				 reg | PI3USB3X532_CTRL_RSVD);
-}
-
-/* Reads control register and updates mux_state accordingly */
-static int pi3usb3x532_get_mux(const struct usb_mux *me,
-			       mux_state_t *mux_state)
-{
-	uint8_t reg = 0;
-	uint8_t res;
-
-	*mux_state = 0;
-	res = pi3usb3x532_read(me, PI3USB3X532_REG_CONTROL, &reg);
-	if (res)
-		return res;
-
-	if (reg & PI3USB3X532_MODE_USB)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & PI3USB3X532_MODE_DP)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & PI3USB3X532_BIT_SWAP)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-const struct usb_mux_driver pi3usb3x532_usb_mux_driver = {
-	.init = pi3usb3x532_init,
-	.set = pi3usb3x532_set_mux,
-	.get = pi3usb3x532_get_mux,
-};