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

diff --git a/driver/retimer/ps8802.c b/driver/retimer/ps8802.c
deleted file mode 100644
index 9738123ace..0000000000
--- a/driver/retimer/ps8802.c
+++ /dev/null
@@ -1,317 +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.
- *
- * PS8802 retimer.
- */
-
-#include "chipset.h"
-#include "common.h"
-#include "console.h"
-#include "i2c.h"
-#include "ps8802.h"
-#include "timer.h"
-#include "usb_mux.h"
-
-#define PS8802_DEBUG 0
-#define PS8802_I2C_WAKE_DELAY 500
-
-#define CPRINTS(format, args...) cprints(CC_USB, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USB, format, ## args)
-
-int ps8802_i2c_read(const struct usb_mux *me, int page, int offset, int *data)
-{
-	int rv;
-
-	rv = i2c_read8(me->i2c_port,
-		       me->i2c_addr_flags + page,
-		       offset, data);
-
-	if (PS8802_DEBUG)
-		ccprintf("%s(%d:0x%02X, 0x%02X) =>0x%02X\n", __func__,
-			 me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, *data);
-
-	return rv;
-}
-
-int ps8802_i2c_write(const struct usb_mux *me, int page, int offset, int data)
-{
-	int rv;
-	int pre_val, post_val;
-
-	if (PS8802_DEBUG)
-		i2c_read8(me->i2c_port,
-			me->i2c_addr_flags + page,
-			offset, &pre_val);
-
-	rv = i2c_write8(me->i2c_port,
-			me->i2c_addr_flags + page,
-			offset, data);
-
-	if (PS8802_DEBUG) {
-		i2c_read8(me->i2c_port,
-			me->i2c_addr_flags + page,
-			offset, &post_val);
-
-		ccprintf("%s(%d:0x%02X, 0x%02X, 0x%02X) "
-			"0x%02X=>0x%02X\n",
-			 __func__,
-			 me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, data,
-			 pre_val, post_val);
-	}
-
-	return rv;
-}
-
-int ps8802_i2c_write16(const struct usb_mux *me, int page, int offset,
-		       int data)
-{
-	int rv;
-	int pre_val, post_val;
-
-	if (PS8802_DEBUG)
-		i2c_read16(me->i2c_port,
-			   me->i2c_addr_flags + page,
-			   offset, &pre_val);
-
-	rv = i2c_write16(me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, data);
-
-	if (PS8802_DEBUG) {
-		i2c_read16(me->i2c_port,
-			   me->i2c_addr_flags + page,
-			   offset, &post_val);
-
-		ccprintf("%s(%d:0x%02X, 0x%02X, 0x%04X) "
-			 "0x%04X=>0x%04X\n",
-			 __func__,
-			 me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, data,
-			 pre_val, post_val);
-	}
-
-	return rv;
-}
-
-int ps8802_i2c_field_update8(const struct usb_mux *me, int page, int offset,
-			     uint8_t field_mask, uint8_t set_value)
-{
-	int rv;
-	int pre_val, post_val;
-
-	if (PS8802_DEBUG)
-		i2c_read8(me->i2c_port,
-			  me->i2c_addr_flags + page,
-			  offset, &pre_val);
-
-	rv = i2c_field_update8(me->i2c_port,
-			       me->i2c_addr_flags + page,
-			       offset,
-			       field_mask,
-			       set_value);
-
-	if (PS8802_DEBUG) {
-		i2c_read8(me->i2c_port,
-			  me->i2c_addr_flags + page,
-			  offset, &post_val);
-
-		ccprintf("%s(%d:0x%02X, 0x%02X, 0x%02X, 0x%02X) "
-			 "0x%02X=>0x%02X\n",
-			 __func__,
-			 me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, field_mask, set_value,
-			 pre_val, post_val);
-	}
-
-	return rv;
-}
-
-int ps8802_i2c_field_update16(const struct usb_mux *me, int page, int offset,
-			     uint16_t field_mask, uint16_t set_value)
-{
-	int rv;
-	int pre_val, post_val;
-
-	if (PS8802_DEBUG)
-		i2c_read16(me->i2c_port,
-			   me->i2c_addr_flags + page,
-			   offset, &pre_val);
-
-	rv = i2c_field_update16(me->i2c_port,
-				me->i2c_addr_flags + page,
-				offset,
-				field_mask,
-				set_value);
-
-	if (PS8802_DEBUG) {
-		i2c_read16(me->i2c_port,
-			   me->i2c_addr_flags + page,
-			   offset, &post_val);
-
-		ccprintf("%s(%d:0x%02X, 0x%02X, 0x%02X, 0x%04X) "
-			 "0x%04X=>0x%04X\n",
-			 __func__,
-			 me->i2c_port,
-			 me->i2c_addr_flags + page,
-			 offset, field_mask, set_value,
-			 pre_val, post_val);
-	}
-
-	return rv;
-}
-
-/*
- * If PS8802 is in I2C standby mode, wake it up by reading PS8802_REG_MODE.
- * From Application Note: 1) Activate by reading any Page 2 register. 2) Wait
- * 500 microseconds. 3) After 5 seconds idle, PS8802 will return to standby.
- */
-int ps8802_i2c_wake(const struct usb_mux *me)
-{
-	int data;
-	int rv = EC_ERROR_UNKNOWN;
-
-	/* If in standby, first read will fail, second should succeed. */
-	for (int i = 0; i < 2; i++) {
-		rv = ps8802_i2c_read(me,
-				     PS8802_REG_PAGE2,
-				     PS8802_REG2_MODE,
-				     &data);
-		if (rv == EC_SUCCESS)
-			return rv;
-
-		usleep(PS8802_I2C_WAKE_DELAY);
-	}
-
-	return rv;
-}
-
-/*
- * Setting operation mode to standby mode
- */
-static int ps8802_enter_low_power_mode(const struct usb_mux *me)
-{
-	int rv;
-
-	rv = ps8802_i2c_write(me, PS8802_REG_PAGE2, PS8802_REG2_MODE,
-		  PS8802_MODE_STANDBY_MODE);
-
-	if (rv)
-		CPRINTS("C%d: PS8802: Failed to enter low power mode!",
-			me->usb_port);
-
-	return rv;
-}
-
-static int ps8802_init(const struct usb_mux *me)
-{
-	ps8802_enter_low_power_mode(me);
-	return EC_SUCCESS;
-}
-
-static int ps8802_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			  bool *ack_required)
-{
-	int val;
-	int rv;
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
-		return (mux_state == USB_PD_MUX_NONE) ? EC_SUCCESS
-						      : EC_ERROR_NOT_POWERED;
-
-	/* Make sure the PS8802 is awake */
-	rv = ps8802_i2c_wake(me);
-	if (rv)
-		return rv;
-
-	if (PS8802_DEBUG)
-		ccprintf("%s(%d, 0x%02X) %s %s %s\n",
-			 __func__, me->usb_port, mux_state,
-			 (mux_state & USB_PD_MUX_USB_ENABLED)	? "USB" : "",
-			 (mux_state & USB_PD_MUX_DP_ENABLED)	? "DP" : "",
-			 (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-								? "FLIP" : "");
-
-	/* Set the mode and flip */
-	val = (PS8802_MODE_DP_REG_CONTROL |
-	       PS8802_MODE_USB_REG_CONTROL |
-	       PS8802_MODE_FLIP_REG_CONTROL |
-	       PS8802_MODE_IN_HPD_REG_CONTROL);
-
-	if (mux_state & USB_PD_MUX_USB_ENABLED)
-		val |= PS8802_MODE_USB_ENABLE;
-	if (mux_state & USB_PD_MUX_DP_ENABLED)
-		val |= PS8802_MODE_DP_ENABLE | PS8802_MODE_IN_HPD_ENABLE;
-	if (mux_state & USB_PD_MUX_POLARITY_INVERTED)
-		val |= PS8802_MODE_FLIP_ENABLE;
-
-	rv = ps8802_i2c_write(me,
-			      PS8802_REG_PAGE2,
-			      PS8802_REG2_MODE,
-			      val);
-
-	return rv;
-}
-
-static int ps8802_get_mux(const struct usb_mux *me, mux_state_t *mux_state)
-{
-	int rv;
-	int val;
-
-	*mux_state = USB_PD_MUX_NONE;
-
-	if (chipset_in_state(CHIPSET_STATE_HARD_OFF))
-		return EC_ERROR_NOT_POWERED;
-
-	rv = ps8802_i2c_wake(me);
-	if (rv)
-		return rv;
-
-	rv = ps8802_i2c_read(me,
-			     PS8802_REG_PAGE2,
-			     PS8802_REG2_MODE,
-			     &val);
-	if (rv)
-		return rv;
-
-	if (val & PS8802_MODE_USB_ENABLE)
-		*mux_state |= USB_PD_MUX_USB_ENABLED;
-	if (val & PS8802_MODE_DP_ENABLE)
-		*mux_state |= USB_PD_MUX_DP_ENABLED;
-	if (val & PS8802_MODE_FLIP_ENABLE)
-		*mux_state |= USB_PD_MUX_POLARITY_INVERTED;
-
-	return rv;
-}
-
-const struct usb_mux_driver ps8802_usb_mux_driver = {
-	.init = ps8802_init,
-	.set = ps8802_set_mux,
-	.get = ps8802_get_mux,
-	.enter_low_power_mode = &ps8802_enter_low_power_mode,
-};
-
-/*
- * If PS8802 I2c address was conflicted, change
- * the I2c address in page 0x0A, offset 0xB0
- * switch to 0x50 8-bit address
- */
-int ps8802_chg_i2c_addr(int i2c_port)
-{
-	int rv;
-
-	rv = i2c_write8(i2c_port,
-			PS8802_P1_ADDR, PS8802_ADDR_CFG,
-			PS8802_I2C_ADDR_FLAGS_ALT);
-
-	return rv;
-}