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

diff --git a/driver/retimer/pi3dpx1207.c b/driver/retimer/pi3dpx1207.c
deleted file mode 100644
index 8829c508a1..0000000000
--- a/driver/retimer/pi3dpx1207.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2019 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.
- *
- * PI3DPX1207 retimer.
- */
-
-#include "pi3dpx1207.h"
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "i2c.h"
-#include "ioexpander.h"
-#include "usb_mux.h"
-
-#define I2C_MAX_RETRIES 2
-
-/* Stack space is limited, so put the buffer somewhere else */
-static uint8_t buf[PI3DPX1207_NUM_REGISTERS];
-
-/**
- * Local utility functions
- */
-static int pi3dpx1207_i2c_write(const struct usb_mux *me,
-				uint8_t offset,
-				uint8_t val)
-{
-	int rv = EC_SUCCESS;
-	int attempt;
-
-	if (offset >= PI3DPX1207_NUM_REGISTERS)
-		return EC_ERROR_INVAL;
-
-	/*
-	 * PI3DPX1207 does not support device register offset in
-	 * the typical I2C sense. Have to read the values starting
-	 * from 0, modify the byte and then write the block.
-	 *
-	 * NOTE: The device may not respond correctly if it was
-	 * just powered or has gone to sleep.  Allow for retries
-	 * in case this happens.
-	 */
-	if (offset > 0) {
-		attempt = 0;
-		do {
-			attempt++;
-			rv = i2c_xfer(me->i2c_port, me->i2c_addr_flags,
-				      NULL, 0, buf, offset);
-		} while ((rv != EC_SUCCESS) && (attempt < I2C_MAX_RETRIES));
-	}
-
-	if (rv == EC_SUCCESS) {
-		buf[offset] = val;
-
-		attempt = 0;
-		do {
-			attempt++;
-			rv = i2c_xfer(me->i2c_port, me->i2c_addr_flags,
-				      buf, offset + 1, NULL, 0);
-		} while ((rv != EC_SUCCESS) && (attempt < I2C_MAX_RETRIES));
-	}
-	return rv;
-}
-
-static void pi3dpx1207_shutoff_power(const struct usb_mux *me)
-{
-	const int port = me->usb_port;
-	const int gpio_enable = pi3dpx1207_controls[port].enable_gpio;
-	const int gpio_dp_enable = pi3dpx1207_controls[port].dp_enable_gpio;
-
-	gpio_or_ioex_set_level(gpio_enable, 0);
-	gpio_or_ioex_set_level(gpio_dp_enable, 0);
-}
-
-/**
- * Driver interface code
- */
-static int pi3dpx1207_init(const struct usb_mux *me)
-{
-	const int port = me->usb_port;
-	const int gpio_enable = pi3dpx1207_controls[port].enable_gpio;
-
-	gpio_or_ioex_set_level(gpio_enable, 1);
-	return EC_SUCCESS;
-}
-
-static int pi3dpx1207_enter_low_power_mode(const struct usb_mux *me)
-{
-	pi3dpx1207_shutoff_power(me);
-	return EC_SUCCESS;
-}
-
-static int pi3dpx1207_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			      bool *ack_required)
-{
-	int rv = EC_SUCCESS;
-	uint8_t mode_val = PI3DPX1207_MODE_WATCHDOG_EN;
-	const int port = me->usb_port;
-	const int gpio_enable = pi3dpx1207_controls[port].enable_gpio;
-	const int gpio_dp_enable = pi3dpx1207_controls[port].dp_enable_gpio;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	/* USB */
-	if (mux_state & USB_PD_MUX_USB_ENABLED) {
-		gpio_or_ioex_set_level(gpio_enable, 1);
-		/* USB with DP */
-		if (mux_state & USB_PD_MUX_DP_ENABLED) {
-			gpio_or_ioex_set_level(gpio_dp_enable, 1);
-			mode_val |= (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-					? PI3DPX1207_MODE_CONF_USB_DP_FLIP
-					: PI3DPX1207_MODE_CONF_USB_DP;
-		}
-		/* USB without DP */
-		else {
-			gpio_or_ioex_set_level(gpio_dp_enable, 0);
-			mode_val |= (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-					? PI3DPX1207_MODE_CONF_USB_FLIP
-					: PI3DPX1207_MODE_CONF_USB;
-		}
-	}
-	/* DP without USB */
-	else if (mux_state & USB_PD_MUX_DP_ENABLED) {
-		gpio_or_ioex_set_level(gpio_enable, 1);
-		gpio_or_ioex_set_level(gpio_dp_enable, 1);
-		mode_val |= (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-				? PI3DPX1207_MODE_CONF_DP_FLIP
-				: PI3DPX1207_MODE_CONF_DP;
-	}
-	/* Nothing enabled, power down the retimer */
-	else {
-		pi3dpx1207_shutoff_power(me);
-		return EC_SUCCESS;
-	}
-
-	/* Write the retimer config byte */
-	rv = pi3dpx1207_i2c_write(me, PI3DPX1207_MODE_OFFSET, mode_val);
-	return rv;
-}
-
-const struct usb_mux_driver pi3dpx1207_usb_retimer = {
-	.init = pi3dpx1207_init,
-	.set = pi3dpx1207_set_mux,
-	.enter_low_power_mode = pi3dpx1207_enter_low_power_mode,
-};