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

diff --git a/driver/retimer/tusb544.h b/driver/retimer/tusb544.h
deleted file mode 100644
index e1599c78ca..0000000000
--- a/driver/retimer/tusb544.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2020 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.
- *
- * TI TUSB544 USB Type-C Multi-Protocol Linear Redriver
- */
-#include "usb_mux.h"
-
-#ifndef __CROS_EC_USB_REDRIVER_TUSB544_H
-#define __CROS_EC_USB_REDRIVER_TUSB544_H
-
-
-#define TUSB544_I2C_ADDR_FLAGS0 0x44
-
-#define TUSB544_REG_GENERAL4	0x0A
-#define TUSB544_GEN4_CTL_SEL		GENMASK(1, 0)
-#define TUSB544_GEN4_FLIP_SEL		BIT(2)
-#define TUSB544_GEN4_HPDIN		BIT(3)
-#define TUSB544_GEN4_EQ_OVRD		BIT(4)
-#define TUSB544_GEN4_SWAP_SEL		BIT(5)
-
-#define TUSB544_REG_DISPLAYPORT_1	0x10
-#define TUSB544_REG_DISPLAYPORT_2	0x11
-#define TUSB544_REG_USB3_1_1	0x20
-#define TUSB544_REG_USB3_1_2	0x21
-#define TUSB544_EQ_RX_DFP_MINUS14_UFP_MINUS33		(0)
-#define TUSB544_EQ_RX_DFP_04_UFP_MINUS15		(1)
-#define TUSB544_EQ_RX_DFP_17_UFP_0		(2)
-#define TUSB544_EQ_RX_DFP_32_UFP_14		(3)
-#define TUSB544_EQ_RX_DFP_41_UFP_24		(4)
-#define TUSB544_EQ_RX_DFP_52_UFP_35		(5)
-#define TUSB544_EQ_RX_DFP_61_UFP_43		(6)
-#define TUSB544_EQ_RX_DFP_69_UFP_52		(7)
-#define TUSB544_EQ_RX_DFP_77_UFP_60		(8)
-#define TUSB544_EQ_RX_DFP_83_UFP_66		(9)
-#define TUSB544_EQ_RX_DFP_88_UFP_72		(10)
-#define TUSB544_EQ_RX_DFP_94_UFP_77		(11)
-#define TUSB544_EQ_RX_DFP_98_UFP_81		(12)
-#define TUSB544_EQ_RX_DFP_103_UFP_86		(13)
-#define TUSB544_EQ_RX_DFP_106_UFP_90		(14)
-#define TUSB544_EQ_RX_DFP_110_UFP_94		(15)
-#define TUSB544_EQ_RX_MASK		(0x0F)
-
-#define TUSB544_EQ_TX_DFP_MINUS14_UFP_MINUS33		(0 << 4)
-#define TUSB544_EQ_TX_DFP_04_UFP_MINUS15		(1 << 4)
-#define TUSB544_EQ_TX_DFP_17_UFP_0		(2 << 4)
-#define TUSB544_EQ_TX_DFP_32_UFP_14		(3 << 4)
-#define TUSB544_EQ_TX_DFP_41_UFP_24		(4 << 4)
-#define TUSB544_EQ_TX_DFP_52_UFP_35		(5 << 4)
-#define TUSB544_EQ_TX_DFP_61_UFP_43		(6 << 4)
-#define TUSB544_EQ_TX_DFP_69_UFP_52		(7 << 4)
-#define TUSB544_EQ_TX_DFP_77_UFP_60		(8 << 4)
-#define TUSB544_EQ_TX_DFP_83_UFP_66		(9 << 4)
-#define TUSB544_EQ_TX_DFP_88_UFP_72		(10 << 4)
-#define TUSB544_EQ_TX_DFP_94_UFP_77		(11 << 4)
-#define TUSB544_EQ_TX_DFP_98_UFP_81		(12 << 4)
-#define TUSB544_EQ_TX_DFP_103_UFP_86		(13 << 4)
-#define TUSB544_EQ_TX_DFP_106_UFP_90		(14 << 4)
-#define TUSB544_EQ_TX_DFP_110_UFP_94		(15 << 4)
-#define TUSB544_EQ_TX_MASK		(0xF0)
-
-enum tusb544_ct_sel {
-	TUSB544_CTL_SEL_DISABLED,
-	TUSB544_CTL_SEL_USB_ONLY,
-	TUSB544_CTL_SEL_DP_ONLY,
-	TUSB544_CTL_SEL_DP_USB,
-};
-
-#define TUSB544_REG_GENERAL6	0x0C
-#define TUSB544_GEN6_DIR_SEL	GENMASK(1, 0)
-#define TUSB544_VOD_DCGAIN_SEL	GENMASK(5, 2)
-#define TUSB544_VOD_DCGAIN_OVERRIDE  BIT(6)
-
-enum tusb544_dir_sel {
-	TUSB544_DIR_SEL_USB_DP_SRC,
-	TUSB544_DIR_SEL_USB_DP_SNK,
-	TUSB544_DIR_SEL_CUSTOM_SRC,
-	TUSB544_DIS_SEL_CUSTOM_SNK,
-};
-
-enum tusb544_vod_dcgain_sel {
-	TUSB544_VOD_DCGAIN_SETTING_1,
-	TUSB544_VOD_DCGAIN_SETTING_2,
-	TUSB544_VOD_DCGAIN_SETTING_3,
-	TUSB544_VOD_DCGAIN_SETTING_4,
-	TUSB544_VOD_DCGAIN_SETTING_5,
-	TUSB544_VOD_DCGAIN_SETTING_6,
-	TUSB544_VOD_DCGAIN_SETTING_7,
-	TUSB544_VOD_DCGAIN_SETTING_8,
-};
-
-/*
- * Note: TUSB544 automatically snoops DP lanes to enable, but may be manually
- * directed which lanes to turn on when snoop is disabled
- */
-#define TUSB544_REG_DP4			0x13
-#define TUSB544_DP4_DP0_DISABLE		BIT(0)
-#define TUSB544_DP4_DP1_DISABLE		BIT(1)
-#define TUSB544_DP4_DP2_DISABLE		BIT(2)
-#define TUSB544_DP4_DP3_DISABLE		BIT(3)
-#define TUSB544_DP4_AUX_SBU_OVR		GENMASK(5, 4)
-#define TUSB544_DP4_AUX_SNOOP_DISABLE	BIT(7)
-
-extern const struct usb_mux_driver tusb544_drv;
-
-int tusb544_i2c_field_update8(const struct usb_mux *me, int offset,
-			     uint8_t field_mask, uint8_t set_value);
-
-#endif