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

diff --git a/driver/retimer/ps8811.h b/driver/retimer/ps8811.h
deleted file mode 100644
index c3a98c1660..0000000000
--- a/driver/retimer/ps8811.h
+++ /dev/null
@@ -1,99 +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.
- *
- * PS8811 retimer.
- */
-
-#include "usb_mux.h"
-
-#ifndef __CROS_EC_USB_RETIMER_PS8811_H
-#define __CROS_EC_USB_RETIMER_PS8811_H
-
-/*
- * PS8811 uses 7-bit I2C addresses 0x28 to 0x29 (ADDR=LL).
- * Page 0 = 0x28, Page 1 = 0x29.
- * PS8811 uses 7-bit I2C addresses 0x2A to 0x2B (ADDR=LH).
- * Page 0 = 0x2A, Page 1 = 0x2B.
- * PS8811 uses 7-bit I2C addresses 0x70 to 0x71 (ADDR=HL).
- * Page 0 = 0x70, Page 1 = 0x71.
- * PS8811 uses 7-bit I2C addresses 0x72 to 0x73 (ADDR=HH).
- * Page 0 = 0x72, Page 1 = 0x73.
- */
-#define PS8811_I2C_ADDR_FLAGS0	0x28
-#define PS8811_I2C_ADDR_FLAGS1	0x2A
-#define PS8811_I2C_ADDR_FLAGS2	0x70
-#define PS8811_I2C_ADDR_FLAGS3	0x72
-
-/*
- * PAGE 1 Register Definitions
- */
-#define PS8811_REG_PAGE1			0x01
-
-#define PS8811_REG1_USB_BEQ_LEVEL		0x05
-#define PS8811_BEQ_PIN_LEVEL_UP_9DB		0x00
-#define PS8811_BEQ_PIN_LEVEL_UP_10_5DB		0x01
-#define PS8811_BEQ_PIN_LEVEL_UP_12DB		0x02
-#define PS8811_BEQ_PIN_LEVEL_UP_13DB		0x03
-#define PS8811_BEQ_PIN_LEVEL_UP_16DB		0x04
-#define PS8811_BEQ_PIN_LEVEL_UP_17DB		0x05
-#define PS8811_BEQ_PIN_LEVEL_UP_18DB		0x06
-#define PS8811_BEQ_PIN_LEVEL_UP_19DB		0x07
-#define PS8811_BEQ_PIN_LEVEL_UP_20DB		0x08
-#define PS8811_BEQ_PIN_LEVEL_UP_21DB		0x09
-#define PS8811_BEQ_PIN_LEVEL_UP_23DB		0x0A
-#define PS8811_BEQ_I2C_LEVEL_UP_9DB		0x00
-#define PS8811_BEQ_I2C_LEVEL_UP_10_5DB		0x10
-#define PS8811_BEQ_I2C_LEVEL_UP_12DB		0x20
-#define PS8811_BEQ_I2C_LEVEL_UP_13DB		0x30
-#define PS8811_BEQ_I2C_LEVEL_UP_16DB		0x40
-#define PS8811_BEQ_I2C_LEVEL_UP_17DB		0x50
-#define PS8811_BEQ_I2C_LEVEL_UP_18DB		0x60
-#define PS8811_BEQ_I2C_LEVEL_UP_19DB		0x70
-#define PS8811_BEQ_I2C_LEVEL_UP_20DB		0x80
-#define PS8811_BEQ_I2C_LEVEL_UP_21DB		0x90
-#define PS8811_BEQ_I2C_LEVEL_UP_23DB		0xA0
-
-#define PS8811_REG1_USB_BEQ_CONFIG		0x06
-#define PS8811_BEQ_CONFIG_REG_ENABLE		BIT(0)
-
-#define PS8811_REG1_USB_CHAN_A_SWING		0x66
-#define PS8811_CHAN_A_SWING_MASK		GENMASK(6, 4)
-#define PS8811_CHAN_A_SWING_SHIFT		4
-
-#define PS8811_REG1_USB_CHAN_B_SWING		0xA4
-#define PS8811_CHAN_B_SWING_MASK		GENMASK(2, 0)
-#define PS8811_CHAN_B_SWING_SHIFT		0
-
-/* De-emphasis -2.2 dB, Pre-shoot 1.2 dB */
-#define PS8811_CHAN_B_DE_2_2_PS_1_2_LSB		0x1
-#define PS8811_CHAN_B_DE_2_2_PS_1_2_MSB		0x13
-
-/* De-emphasis -3.5 dB, Pre-shoot 0 dB */
-#define PS8811_CHAN_B_DE_3_5_PS_0_LSB		0x0
-#define PS8811_CHAN_B_DE_3_5_PS_0_MSB		0x5
-
-/* De-emphasis -4.5 dB, Pre-shoot 0 dB */
-#define PS8811_CHAN_B_DE_4_5_PS_0_LSB		0x0
-#define PS8811_CHAN_B_DE_4_5_PS_0_MSB		0x6
-
-/* De-emphasis -6 dB, Pre-shoot 1.5 dB */
-#define PS8811_CHAN_B_DE_6_PS_1_5_LSB		0x2
-#define PS8811_CHAN_B_DE_6_PS_1_5_MSB		0x16
-
-/* De-emphasis -6 dB, Pre-shoot 3 dB */
-#define PS8811_CHAN_B_DE_6_PS_3_LSB		0x4
-#define PS8811_CHAN_B_DE_6_PS_3_MSB		0x16
-
-#define PS8811_REG1_USB_CHAN_B_DE_PS_LSB	0xA5
-#define PS8811_CHAN_B_DE_PS_LSB_MASK		GENMASK(2, 0)
-
-#define PS8811_REG1_USB_CHAN_B_DE_PS_MSB	0xA6
-#define PS8811_CHAN_B_DE_PS_MSB_MASK		GENMASK(5, 0)
-
-int ps8811_i2c_read(const struct usb_mux *me, int page, int offset, int *data);
-int ps8811_i2c_write(const struct usb_mux *me, int page, int offset, int data);
-int ps8811_i2c_field_update(const struct usb_mux *me, int page, int offset,
-			    uint8_t field_mask, uint8_t set_value);
-
-#endif /* __CROS_EC_USB_RETIMER_PS8802_H */