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

diff --git a/driver/usb_mux/anx3443.c b/driver/usb_mux/anx3443.c
deleted file mode 100644
index 2e57f4d30c..0000000000
--- a/driver/usb_mux/anx3443.c
+++ /dev/null
@@ -1,162 +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.
- *
- * ANX3443: 10G Active Mux (6x4) with
- * Integrated Re-timers for USB3.2/DisplayPort
- */
-
-#include "anx3443.h"
-#include "chipset.h"
-#include "common.h"
-#include "console.h"
-#include "i2c.h"
-#include "time.h"
-#include "usb_mux.h"
-#include "util.h"
-
-/*
- * Empirical testing found it takes ~12ms to wake mux.
- * Setting timeout to 20ms for some buffer.
- */
-#define ANX3443_I2C_WAKE_TIMEOUT_MS 20
-#define ANX3443_I2C_WAKE_RETRY_DELAY_US 500
-
-#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
-
-static inline int anx3443_read(const struct usb_mux *me,
-			       uint8_t reg, int *val)
-{
-	return i2c_read8(me->i2c_port, me->i2c_addr_flags, reg, val);
-}
-
-static inline int anx3443_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 anx3443_power_off(const struct usb_mux *me)
-{
-	/*
-	 * The mux will not send an acknowledgment when powered off, so ignore
-	 * response and always return success.
-	 */
-	anx3443_write(me, ANX3443_REG_POWER_CNTRL, ANX3443_POWER_CNTRL_OFF);
-	return EC_SUCCESS;
-}
-
-static int anx3443_wake_up(const struct usb_mux *me)
-{
-	timestamp_t start;
-	int rv;
-	int val;
-
-	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
-		return EC_ERROR_NOT_POWERED;
-
-	/* Keep reading top register until mux wakes up or timesout */
-	start = get_time();
-	do {
-		rv = anx3443_read(me, 0x0, &val);
-		if (!rv)
-			break;
-		usleep(ANX3443_I2C_WAKE_RETRY_DELAY_US);
-	} while (time_since32(start) < ANX3443_I2C_WAKE_TIMEOUT_MS * MSEC);
-	if (rv) {
-		CPRINTS("ANX3443: Failed to wake mux rv:%d", rv);
-		return EC_ERROR_TIMEOUT;
-	}
-
-	/* ULTRA_LOW_POWER must always be disabled (Fig 2-2) */
-	RETURN_ERROR(anx3443_write(me, ANX3443_REG_ULTRA_LOW_POWER,
-				   ANX3443_ULTRA_LOW_POWER_DIS));
-
-	return EC_SUCCESS;
-}
-
-static int anx3443_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			   bool *ack_required)
-{
-	int reg;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	/* Mux is not powered in Z1 */
-	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
-		return (mux_state == USB_PD_MUX_NONE) ? EC_SUCCESS
-						      : EC_ERROR_NOT_POWERED;
-
-	/* To disable both DP and USB the mux must be powered off. */
-	if (!(mux_state & (USB_PD_MUX_USB_ENABLED | USB_PD_MUX_DP_ENABLED)))
-		return anx3443_power_off(me);
-
-	RETURN_ERROR(anx3443_wake_up(me));
-
-	/* ULP_CFG_MODE_EN overrides pin control. Always set it */
-	reg = ANX3443_ULP_CFG_MODE_EN;
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= ANX3443_ULP_CFG_MODE_USB_EN;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= ANX3443_ULP_CFG_MODE_DP_EN;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		reg |= ANX3443_ULP_CFG_MODE_FLIP;
-
-	return anx3443_write(me, ANX3443_REG_ULP_CFG_MODE, reg);
-}
-
-static int anx3443_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	int reg;
-
-	/* Mux is not powered in Z1 */
-	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
-		return USB_PD_MUX_NONE;
-
-	RETURN_ERROR(anx3443_wake_up(me));
-
-	*mux_state = 0;
-	RETURN_ERROR(anx3443_read(me, ANX3443_REG_ULP_CFG_MODE, &reg));
-
-	if (reg & ANX3443_ULP_CFG_MODE_USB_EN)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (reg & ANX3443_ULP_CFG_MODE_DP_EN)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (reg & ANX3443_ULP_CFG_MODE_FLIP)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return EC_SUCCESS;
-}
-
-static int anx3443_init(const struct usb_mux *me)
-{
-	uint64_t now;
-	bool unused;
-
-	/*
-	 * ANX3443 requires 30ms to power on. EC and ANX3443 are on the same
-	 * power rail, so just wait 30ms since EC boot.
-	 */
-	now = get_time().val;
-	if (now < ANX3443_I2C_READY_DELAY)
-		usleep(ANX3443_I2C_READY_DELAY - now);
-
-	RETURN_ERROR(anx3443_wake_up(me));
-
-	/*
-	 * 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.
-	 */
-	/* Default to USB mode */
-	RETURN_ERROR(anx3443_set_mux(me, USB_PD_MUX_USB_ENABLED, &unused));
-
-	return EC_SUCCESS;
-}
-
-const struct usb_mux_driver anx3443_usb_mux_driver = {
-	.init = anx3443_init,
-	.set = anx3443_set_mux,
-	.get = anx3443_get_mux,
-};