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

diff --git a/driver/retimer/nb7v904m.c b/driver/retimer/nb7v904m.c
deleted file mode 100644
index 94e96230b2..0000000000
--- a/driver/retimer/nb7v904m.c
+++ /dev/null
@@ -1,228 +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.
- *
- * ON Semiconductor NB7V904M USB Type-C DisplayPort Alt Mode Redriver
- */
-#include <stdbool.h>
-#include "common.h"
-#include "console.h"
-#include "ec_commands.h"
-#include "i2c.h"
-#include "nb7v904m.h"
-#include "usb_mux.h"
-
-#define CPRINTS(format, args...) cprints(CC_USB, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_USB, format, ## args)
-
-#ifdef CONFIG_NB7V904M_LPM_OVERRIDE
-int nb7v904m_lpm_disable = 0;
-#endif
-
-static int nb7v904m_write(const struct usb_mux *me, int offset, int data)
-{
-	return i2c_write8(me->i2c_port,
-			  me->i2c_addr_flags,
-			  offset, data);
-
-}
-
-static int nb7v904m_read(const struct usb_mux *me, int offset, int *regval)
-{
-	return i2c_read8(me->i2c_port,
-			 me->i2c_addr_flags,
-			 offset, regval);
-
-}
-
-static int set_low_power_mode(const struct usb_mux *me, bool enable)
-{
-	int regval;
-	int rv;
-
-	rv = nb7v904m_read(me, NB7V904M_REG_GEN_DEV_SETTINGS, &regval);
-	if (rv)
-		return rv;
-#ifdef CONFIG_NB7V904M_LPM_OVERRIDE
-	if (nb7v904m_lpm_disable)
-		enable = 0;
-#endif
-
-	if (enable)
-		regval &= ~NB7V904M_CHIP_EN;
-	else
-		regval |= NB7V904M_CHIP_EN;
-
-	return nb7v904m_write(me, NB7V904M_REG_GEN_DEV_SETTINGS, regval);
-}
-
-static int nb7v904m_enter_low_power_mode(const struct usb_mux *me)
-{
-	int rv = set_low_power_mode(me, 1);
-
-	if (rv)
-		CPRINTS("C%d: NB7V904M: Failed to enter low power mode!",
-			me->usb_port);
-	return rv;
-}
-
-/* Tune USB Eq All: This must be called on board_init context */
-int nb7v904m_tune_usb_set_eq(const struct usb_mux *me, uint8_t eq_a,
-			uint8_t eq_b, uint8_t eq_c, uint8_t eq_d)
-{
-	int rv = EC_SUCCESS;
-
-	if (eq_a != NB7V904M_CH_ALL_SKIP_EQ)
-		rv = nb7v904m_write(me, NB7V904M_REG_CH_A_EQ_SETTINGS, eq_a);
-
-	if (eq_b != NB7V904M_CH_ALL_SKIP_EQ)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_B_EQ_SETTINGS, eq_b);
-
-	if (eq_c != NB7V904M_CH_ALL_SKIP_EQ)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_C_EQ_SETTINGS, eq_c);
-
-	if (eq_d != NB7V904M_CH_ALL_SKIP_EQ)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_D_EQ_SETTINGS, eq_d);
-
-	return rv;
-}
-
-/* Tune USB Flat Gain: This must be called on board_init context */
-int nb7v904m_tune_usb_flat_gain(const struct usb_mux *me, uint8_t gain_a,
-			uint8_t gain_b, uint8_t gain_c, uint8_t gain_d)
-{
-	int rv = EC_SUCCESS;
-
-	if (gain_a != NB7V904M_CH_ALL_SKIP_GAIN)
-		rv = nb7v904m_write(me, NB7V904M_REG_CH_A_FLAT_GAIN, gain_a);
-
-	if (gain_b != NB7V904M_CH_ALL_SKIP_GAIN)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_B_FLAT_GAIN, gain_b);
-
-	if (gain_c != NB7V904M_CH_ALL_SKIP_GAIN)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_C_FLAT_GAIN, gain_c);
-
-	if (gain_d != NB7V904M_CH_ALL_SKIP_GAIN)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_D_FLAT_GAIN, gain_d);
-
-	return rv;
-}
-
-/* Set Loss Profile Matching : This must be called on board_init context */
-int nb7v904m_set_loss_profile_match(const struct usb_mux *me, uint8_t loss_a,
-			uint8_t loss_b, uint8_t loss_c, uint8_t loss_d)
-{
-	int rv = EC_SUCCESS;
-
-	if (loss_a != NB7V904M_CH_ALL_SKIP_LOSS)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_A_LOSS_CTRL, loss_a);
-
-	if (loss_b != NB7V904M_CH_ALL_SKIP_LOSS)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_B_LOSS_CTRL, loss_b);
-
-	if (loss_c != NB7V904M_CH_ALL_SKIP_LOSS)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_C_LOSS_CTRL, loss_c);
-
-	if (loss_d != NB7V904M_CH_ALL_SKIP_LOSS)
-		rv |= nb7v904m_write(me, NB7V904M_REG_CH_D_LOSS_CTRL, loss_d);
-
-	return rv;
-}
-
-/* Set AUX control switch */
-int nb7v904m_set_aux_ch_switch(const struct usb_mux *me, uint8_t aux_ch)
-{
-	int rv = EC_SUCCESS;
-
-	rv = nb7v904m_write(me, NB7V904M_REG_AUX_CH_CTRL, aux_ch);
-	return rv;
-}
-
-static int nb7v904m_init(const struct usb_mux *me)
-{
-	int rv = set_low_power_mode(me, 0);
-
-	if (rv)
-		CPRINTS("C%d: NB7V904M: init failed!", me->usb_port);
-	return rv;
-}
-
-static int nb7v904m_set_mux(const struct usb_mux *me, mux_state_t mux_state,
-			    bool *ack_required)
-{
-	int rv = EC_SUCCESS;
-	int regval;
-	int flipped = !!(mux_state & USB_PD_MUX_POLARITY_INVERTED);
-
-	/* This driver does not use host command ACKs */
-	*ack_required = false;
-
-	/* Turn off redriver if it's not needed at all. */
-	if (mux_state == USB_PD_MUX_NONE)
-		return nb7v904m_enter_low_power_mode(me);
-
-	rv = nb7v904m_init(me);
-	if (rv)
-		return rv;
-
-	/* Clear operation mode field */
-	rv = nb7v904m_read(me, NB7V904M_REG_GEN_DEV_SETTINGS, &regval);
-	if (rv) {
-		CPRINTS("C%d %s: Failed to obtain dev settings!",
-			me->usb_port, __func__);
-		return rv;
-	}
-	regval &= ~NB7V904M_OP_MODE_MASK;
-
-	if (mux_state & USB_PD_MUX_USB_ENABLED) {
-		/* USB with DP */
-		if (mux_state & USB_PD_MUX_DP_ENABLED) {
-			if (flipped)
-				regval |= NB7V904M_USB_DP_FLIPPED;
-			else
-				regval |= NB7V904M_USB_DP_NORMAL;
-		} else {
-			/* USB only */
-			regval |= NB7V904M_USB_ONLY;
-		}
-
-	} else if (mux_state & USB_PD_MUX_DP_ENABLED) {
-		/* 4 lanes DP */
-		regval |= NB7V904M_DP_ONLY;
-	}
-
-	if (mux_state & USB_PD_MUX_DP_ENABLED) {
-		/* Connect AUX */
-		rv = nb7v904m_write(me, NB7V904M_REG_AUX_CH_CTRL, flipped ?
-				    NB7V904M_AUX_CH_FLIPPED :
-				    NB7V904M_AUX_CH_NORMAL);
-		/* Enable all channels for DP */
-		regval |= NB7V904M_CH_EN_MASK;
-	} else {
-		/* Disconnect AUX since it's not being used. */
-		rv = nb7v904m_write(me, NB7V904M_REG_AUX_CH_CTRL,
-				    NB7V904M_AUX_CH_HI_Z);
-
-		/* Disable the unused channels to save power */
-		regval &= ~NB7V904M_CH_EN_MASK;
-		if (flipped) {
-			/* Only enable channels A & B */
-			regval |= NB7V904M_CH_A_EN | NB7V904M_CH_B_EN;
-		} else {
-			/* Only enable channels C & D */
-			regval |= NB7V904M_CH_C_EN | NB7V904M_CH_D_EN;
-		}
-	}
-
-	rv |= nb7v904m_write(me, NB7V904M_REG_GEN_DEV_SETTINGS, regval);
-	if (rv)
-		CPRINTS("C%d: %s failed!", me->usb_port, __func__);
-
-	return rv;
-}
-
-const struct usb_mux_driver nb7v904m_usb_redriver_drv = {
-	.enter_low_power_mode = &nb7v904m_enter_low_power_mode,
-	.init = &nb7v904m_init,
-	.set = &nb7v904m_set_mux,
-};