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

diff --git a/driver/usb_mux/ps8822.c b/driver/usb_mux/ps8822.c
deleted file mode 100644
index 7f25db37f4..0000000000
--- a/driver/usb_mux/ps8822.c
+++ /dev/null
@@ -1,134 +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.
- *
- * Parade PS8822
- * USB Type-C Redriving Switch for USB Host / DisplayPort.
- */
-
-#include "common.h"
-#include "i2c.h"
-#include "ps8822.h"
-#include "usb_mux.h"
-#include "util.h"
-
-static int ps8822_read(const struct usb_mux *me, int page, uint8_t reg,
-		       int *val)
-{
-	return i2c_read8(me->i2c_port, me->i2c_addr_flags + page,
-			 reg, val);
-}
-
-static int ps8822_write(const struct usb_mux *me, int page, uint8_t reg,
-			int val)
-{
-	return i2c_write8(me->i2c_port, me->i2c_addr_flags + page,
-			reg, val);
-}
-
-int ps8822_set_dp_rx_eq(const struct usb_mux *me, int db)
-{
-	int dpeq_reg;
-	int rv;
-
-	/* Read DP EQ register */
-	rv = ps8822_read(me, PS8822_REG_PAGE1, PS8822_REG_DP_EQ,
-			 &dpeq_reg);
-	if (rv)
-		return rv;
-
-	if (db < PS8822_DPEQ_LEVEL_UP_9DB || db > PS8822_DPEQ_LEVEL_UP_21DB)
-		return EC_ERROR_INVAL;
-
-	/* Disable auto eq */
-	dpeq_reg &= ~PS8822_DP_EQ_AUTO_EN;
-
-	/* Set gain to the requested value */
-	dpeq_reg &= ~(PS8822_DPEQ_LEVEL_UP_MASK <<
-		      PS8822_REG_DP_EQ_SHIFT);
-	dpeq_reg |= (db << PS8822_REG_DP_EQ_SHIFT);
-
-	/* Apply new EQ setting */
-	return ps8822_write(me, PS8822_REG_PAGE1, PS8822_REG_DP_EQ,
-			  dpeq_reg);
-}
-
-static int ps8822_init(const struct usb_mux *me)
-{
-	char id[PS8822_ID_LEN + 1];
-	int reg;
-	int i;
-	int rv = 0;
-
-	/* Read ID registers */
-	for (i = 0; i < PS8822_ID_LEN; i++) {
-		rv |= ps8822_read(me, PS8822_REG_PAGE0, PS8822_REG_DEV_ID1 + i,
-				  &reg);
-		if (!rv)
-			id[i] = reg;
-	}
-
-	if (!rv) {
-		id[PS8822_ID_LEN] = '\0';
-		/* Set mode register to default value */
-		rv = ps8822_write(me, PS8822_REG_PAGE0, PS8822_REG_MODE, 0);
-		rv |= strcasecmp("PS8822", id);
-	}
-
-	return rv;
-}
-
-/* Writes control register to set switch mode */
-static int ps8822_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;
-
-	rv = ps8822_read(me, PS8822_REG_PAGE0, PS8822_REG_MODE, &reg);
-	if (rv)
-		return rv;
-
-	/* Assume standby, preserve PIN_E config bit */
-	reg &= ~(PS8822_MODE_ALT_DP_EN | PS8822_MODE_USB_EN | PS8822_MODE_FLIP);
-
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= PS8822_MODE_USB_EN;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= PS8822_MODE_ALT_DP_EN;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= PS8822_MODE_FLIP;
-
-	return ps8822_write(me, PS8822_REG_PAGE0, PS8822_REG_MODE, reg);
-}
-
-/* Reads control register and updates mux_state accordingly */
-static int ps8822_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	int reg;
-	int res;
-
-	res = ps8822_read(me, PS8822_REG_PAGE0, PS8822_REG_MODE, &reg);
-	if (res)
-		return res;
-
-	*mux_state = 0;
-	if (reg & PS8822_MODE_USB_EN)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & PS8822_MODE_ALT_DP_EN)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & PS8822_MODE_FLIP)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-
-const struct usb_mux_driver ps8822_usb_mux_driver = {
-	.init = ps8822_init,
-	.set = ps8822_set_mux,
-	.get = ps8822_get_mux,
-};