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

diff --git a/driver/tcpm/anx7688.c b/driver/tcpm/anx7688.c
deleted file mode 100644
index 5e37352bc5..0000000000
--- a/driver/tcpm/anx7688.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright 2016 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.
- */
-
-/* ANX7688 port manager */
-
-#include "hooks.h"
-#include "tcpm/tcpci.h"
-#include "tcpm/tcpm.h"
-#include "timer.h"
-#include "usb_mux.h"
-
-#if defined(CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE) || \
-	defined(CONFIG_USB_PD_TCPC_LOW_POWER) || \
-	defined(CONFIG_USB_PD_DISCHARGE_TCPC)
-#error "Unsupported config options of anx7688 PD driver"
-#endif
-
-#define ANX7688_VENDOR_ALERT    BIT(15)
-
-#define ANX7688_REG_STATUS      0x82
-#define ANX7688_REG_STATUS_LINK BIT(0)
-
-#define ANX7688_REG_HPD         0x83
-#define ANX7688_REG_HPD_HIGH    BIT(0)
-#define ANX7688_REG_HPD_IRQ     BIT(1)
-#define ANX7688_REG_HPD_ENABLE  BIT(2)
-
-#define ANX7688_USBC_ADDR_FLAGS		0x28
-#define ANX7688_REG_RAMCTRL		0xe7
-#define ANX7688_REG_RAMCTRL_BOOT_DONE	BIT(6)
-
-static int anx7688_init(int port)
-{
-	int rv = 0;
-	int mask = 0;
-
-	/*
-	 * 7688 POWER_STATUS[6] is not reliable for tcpci_tcpm_init() to poll
-	 * due to it is default 0 in HW, and we cannot write TCPC until it is
-	 * ready, or something goes wrong. (Issue 52772)
-	 * Instead we poll TCPC 0x50:0xe7 bit6 here to make sure bootdone is
-	 * ready(50ms). Then PD main flow can process cc debounce in 50ms ~
-	 * 100ms to follow cts.
-	 */
-	while (1) {
-		rv = i2c_read8(I2C_PORT_TCPC, ANX7688_USBC_ADDR_FLAGS,
-			       ANX7688_REG_RAMCTRL, &mask);
-
-		if (rv == EC_SUCCESS && (mask & ANX7688_REG_RAMCTRL_BOOT_DONE))
-			break;
-		msleep(10);
-	}
-
-	rv = tcpci_tcpm_drv.init(port);
-	if (rv)
-		return rv;
-
-	rv = tcpc_read16(port, TCPC_REG_ALERT_MASK, &mask);
-	if (rv)
-		return rv;
-
-	/* enable vendor specific alert */
-	mask |= ANX7688_VENDOR_ALERT;
-	rv = tcpc_write16(port, TCPC_REG_ALERT_MASK, mask);
-	return rv;
-}
-
-static int anx7688_release(int port)
-{
-	return EC_ERROR_UNIMPLEMENTED;
-}
-
-static void anx7688_update_hpd_enable(int port)
-{
-	int status, reg, rv;
-
-	rv = tcpc_read(port, ANX7688_REG_STATUS, &status);
-	rv |= tcpc_read(port, ANX7688_REG_HPD, &reg);
-	if (rv)
-		return;
-
-	if (!(reg & ANX7688_REG_HPD_ENABLE) ||
-	    !(status & ANX7688_REG_STATUS_LINK)) {
-		reg &= ~ANX7688_REG_HPD_IRQ;
-		tcpc_write(port, ANX7688_REG_HPD,
-			   (status & ANX7688_REG_STATUS_LINK)
-			   ? reg | ANX7688_REG_HPD_ENABLE
-			   : reg & ~ANX7688_REG_HPD_ENABLE);
-	}
-}
-
-int anx7688_hpd_disable(int port)
-{
-	return tcpc_write(port, ANX7688_REG_HPD, 0);
-}
-
-int anx7688_update_hpd(int port, int level, int irq)
-{
-	int reg, rv;
-
-	rv = tcpc_read(port, ANX7688_REG_HPD, &reg);
-	if (rv)
-		return rv;
-
-	if (level)
-		reg |= ANX7688_REG_HPD_HIGH;
-	else
-		reg &= ~ANX7688_REG_HPD_HIGH;
-
-	if (irq)
-		reg |= ANX7688_REG_HPD_IRQ;
-	else
-		reg &= ~ANX7688_REG_HPD_IRQ;
-
-	return tcpc_write(port, ANX7688_REG_HPD, reg);
-}
-
-int anx7688_enable_cable_detection(int port)
-{
-	return tcpc_write(port, TCPC_REG_COMMAND, 0xff);
-}
-
-int anx7688_set_power_supply_ready(int port)
-{
-	return tcpc_write(port, TCPC_REG_COMMAND, 0x77);
-}
-
-int anx7688_power_supply_reset(int port)
-{
-	return tcpc_write(port, TCPC_REG_COMMAND, 0x66);
-}
-
-static void anx7688_tcpc_alert(int port)
-{
-	int alert, rv;
-
-	rv = tcpc_read16(port, TCPC_REG_ALERT, &alert);
-	/* process and clear alert status */
-	tcpci_tcpc_alert(port);
-
-	if (!rv && (alert & ANX7688_VENDOR_ALERT))
-		anx7688_update_hpd_enable(port);
-}
-
-static int anx7688_mux_set(const struct usb_mux *me, mux_state_t mux_state,
-			   bool *ack_required)
-{
-	int reg = 0;
-	int rv, polarity;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	rv = mux_read(me, TCPC_REG_CONFIG_STD_OUTPUT, &reg);
-	if (rv != EC_SUCCESS)
-		return rv;
-
-	reg &= ~TCPC_REG_CONFIG_STD_OUTPUT_MUX_MASK;
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		reg |= TCPC_REG_CONFIG_STD_OUTPUT_MUX_USB;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		reg |= TCPC_REG_CONFIG_STD_OUTPUT_MUX_DP;
-
-	/* ANX7688 needs to set bit0 */
-	rv = mux_read(me, TCPC_REG_TCPC_CTRL, &polarity);
-	if (rv != EC_SUCCESS)
-		return rv;
-
-	/* copy the polarity from TCPC_CTRL[0], take care clear then set */
-	reg &= ~TCPC_REG_TCPC_CTRL_POLARITY(1);
-	reg |= TCPC_REG_TCPC_CTRL_POLARITY(polarity);
-	return mux_write(me, TCPC_REG_CONFIG_STD_OUTPUT, reg);
-}
-
-#ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-static bool anx7688_tcpm_check_vbus_level(int port, enum vbus_level level)
-{
-	int reg = 0;
-
-	/* On ANX7688, POWER_STATUS.VBusPresent (bit 2) is averaged 16 times, so
-	 * its value may not be set to 1 quickly enough during power role swap.
-	 * Therefore, we use a proprietary register to read the unfiltered VBus
-	 * value. See crosbug.com/p/55221 .
-	 */
-	i2c_read8(I2C_PORT_TCPC, 0x28, 0x40, &reg);
-
-	if (level == VBUS_PRESENT)
-		return ((reg & 0x10) ? 1 : 0);
-	else
-		return ((reg & 0x10) ? 0 : 1);
-}
-#endif
-
-/* ANX7688 is a TCPCI compatible port controller */
-const struct tcpm_drv anx7688_tcpm_drv = {
-	.init			= &anx7688_init,
-	.release		= &anx7688_release,
-	.get_cc			= &tcpci_tcpm_get_cc,
-#ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.check_vbus_level	= &anx7688_tcpm_check_vbus_level,
-#endif
-	.select_rp_value	= &tcpci_tcpm_select_rp_value,
-	.set_cc			= &tcpci_tcpm_set_cc,
-	.set_polarity		= &tcpci_tcpm_set_polarity,
-#ifdef CONFIG_USB_PD_DECODE_SOP
-	.sop_prime_enable	= &tcpci_tcpm_sop_prime_enable,
-#endif
-	.set_vconn		= &tcpci_tcpm_set_vconn,
-	.set_msg_header		= &tcpci_tcpm_set_msg_header,
-	.set_rx_enable		= &tcpci_tcpm_set_rx_enable,
-	.get_message_raw	= &tcpci_tcpm_get_message_raw,
-	.transmit		= &tcpci_tcpm_transmit,
-	.tcpc_alert		= &anx7688_tcpc_alert,
-	.set_bist_test_mode	= &tcpci_set_bist_test_mode,
-};
-
-#ifdef CONFIG_USB_PD_TCPM_MUX
-const struct usb_mux_driver anx7688_usb_mux_driver = {
-	.init = tcpci_tcpm_mux_init,
-	.set = anx7688_mux_set,
-	.get = tcpci_tcpm_mux_get,
-};
-#endif /* CONFIG_USB_PD_TCPM_MUX */