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

diff --git a/board/servo_v4p1/fusb302b.c b/board/servo_v4p1/fusb302b.c
deleted file mode 100644
index 4e144dec05..0000000000
--- a/board/servo_v4p1/fusb302b.c
+++ /dev/null
@@ -1,219 +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.
- */
-
-#include "i2c.h"
-#include "fusb302b.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "ioexpanders.h"
-#include "util.h"
-#include "task.h"
-#include "time.h"
-#include "usb_pd.h"
-
-static int port;
-static int status0;
-static int status1;
-static int interrupt;
-static struct mutex measure_lock;
-
-static int tcpc_write(int reg, int val)
-{
-	return i2c_write8(port, FUSB302_I2C_ADDR_FLAGS, reg, val);
-}
-
-static int tcpc_read(int reg, int *val)
-{
-	return i2c_read8(port, FUSB302_I2C_ADDR_FLAGS, reg, val);
-}
-
-int init_fusb302b(int p)
-{
-	int ret;
-	int reg;
-	int interrupta;
-	int interruptb;
-
-	/* Configure fusb302b for SNK only operation */
-	port = p;
-
-	ret = tcpc_write(TCPC_REG_RESET, TCPC_REG_RESET_SW_RESET);
-	if (ret)
-		return ret;
-
-	/* Create interrupt masks */
-	reg = 0xFF;
-	/* CC level changes */
-	reg &= ~TCPC_REG_MASK_BC_LVL;
-	/* misc alert */
-	reg &= ~TCPC_REG_MASK_ALERT;
-	/* VBUS threshold crossed (~4.0V) */
-	reg &= ~TCPC_REG_MASK_VBUSOK;
-	tcpc_write(TCPC_REG_MASK, reg);
-
-	/* Interrupt Enable */
-	ret = tcpc_read(TCPC_REG_CONTROL0, &reg);
-	if (ret)
-		return ret;
-
-	reg &= ~TCPC_REG_CONTROL0_INT_MASK;
-	ret = tcpc_write(TCPC_REG_CONTROL0, reg);
-	if (ret)
-		return ret;
-
-	ret = tcpc_write(TCPC_REG_POWER, TCPC_REG_POWER_PWR_ALL);
-	if (ret)
-		return ret;
-
-	/* reading interrupt registers clears them */
-	ret = tcpc_read(TCPC_REG_INTERRUPT, &interrupt);
-	if (ret)
-		return ret;
-
-
-	ret = tcpc_read(TCPC_REG_INTERRUPTA, &interrupta);
-	if (ret)
-		return ret;
-
-	ret = tcpc_read(TCPC_REG_INTERRUPTB, &interruptb);
-	if (ret)
-		return ret;
-
-	/* Call this, will detect a charger that's already plugged in */
-	update_status_fusb302b();
-
-	/* Enable interrupt */
-	gpio_enable_interrupt(GPIO_CHGSRV_TCPC_INT_ODL);
-
-	return EC_SUCCESS;
-}
-
-void fusb302b_irq(void)
-{
-	tcpc_read(TCPC_REG_INTERRUPT, &interrupt);
-	tcpc_read(TCPC_REG_STATUS0, &status0);
-	tcpc_read(TCPC_REG_STATUS1, &status1);
-
-	task_wake(TASK_ID_PD_C2);
-}
-DECLARE_DEFERRED(fusb302b_irq);
-
-int update_status_fusb302b(void)
-{
-	hook_call_deferred(&fusb302b_irq_data, 0);
-	return EC_SUCCESS;
-}
-
-int is_vbus_present(void)
-{
-	return (status0 & 0x80);
-}
-
-/* Convert BC LVL values (in FUSB302) to Type-C CC Voltage Status */
-static int convert_bc_lvl(int bc_lvl)
-{
-	int ret;
-
-	switch (bc_lvl) {
-	case 1:
-		ret = TYPEC_CC_VOLT_RP_DEF;
-		break;
-	case 2:
-		ret = TYPEC_CC_VOLT_RP_1_5;
-		break;
-	case 3:
-		ret = TYPEC_CC_VOLT_RP_3_0;
-		break;
-	default:
-		ret = TYPEC_CC_VOLT_OPEN;
-	}
-
-	return ret;
-}
-
-int get_cc(int *cc1, int *cc2)
-{
-	int reg;
-	int orig_meas_cc1;
-	int orig_meas_cc2;
-	int bc_lvl_cc1;
-	int bc_lvl_cc2;
-
-	mutex_lock(&measure_lock);
-
-	/*
-	 * Measure CC1 first.
-	 */
-	tcpc_read(TCPC_REG_SWITCHES0, &reg);
-
-	/* save original state to be returned to later... */
-	if (reg & TCPC_REG_SWITCHES0_MEAS_CC1)
-		orig_meas_cc1 = 1;
-	else
-		orig_meas_cc1 = 0;
-
-	if (reg & TCPC_REG_SWITCHES0_MEAS_CC2)
-		orig_meas_cc2 = 1;
-	else
-		orig_meas_cc2 = 0;
-
-
-	/* Disable CC2 measurement switch, enable CC1 measurement switch */
-	reg &= ~TCPC_REG_SWITCHES0_MEAS_CC2;
-	reg |= TCPC_REG_SWITCHES0_MEAS_CC1;
-
-	tcpc_write(TCPC_REG_SWITCHES0, reg);
-
-	/* CC1 is now being measured by FUSB302. */
-
-	/* Wait on measurement */
-	usleep(250);
-
-	tcpc_read(TCPC_REG_STATUS0, &bc_lvl_cc1);
-
-	/* mask away unwanted bits */
-	bc_lvl_cc1 &= (TCPC_REG_STATUS0_BC_LVL0 | TCPC_REG_STATUS0_BC_LVL1);
-
-	/*
-	 * Measure CC2 next.
-	 */
-
-	tcpc_read(TCPC_REG_SWITCHES0, &reg);
-
-	/* Disable CC1 measurement switch, enable CC2 measurement switch */
-	reg &= ~TCPC_REG_SWITCHES0_MEAS_CC1;
-	reg |= TCPC_REG_SWITCHES0_MEAS_CC2;
-
-	tcpc_write(TCPC_REG_SWITCHES0, reg);
-
-	/* CC2 is now being measured by FUSB302. */
-
-	/* Wait on measurement */
-	usleep(250);
-
-	tcpc_read(TCPC_REG_STATUS0, &bc_lvl_cc2);
-
-	/* mask away unwanted bits */
-	bc_lvl_cc2 &= (TCPC_REG_STATUS0_BC_LVL0 | TCPC_REG_STATUS0_BC_LVL1);
-
-	*cc1 = convert_bc_lvl(bc_lvl_cc1);
-	*cc2 = convert_bc_lvl(bc_lvl_cc2);
-
-	/* return MEAS_CC1/2 switches to original state */
-	tcpc_read(TCPC_REG_SWITCHES0, &reg);
-	if (orig_meas_cc1)
-		reg |= TCPC_REG_SWITCHES0_MEAS_CC1;
-	else
-		reg &= ~TCPC_REG_SWITCHES0_MEAS_CC1;
-	if (orig_meas_cc2)
-		reg |= TCPC_REG_SWITCHES0_MEAS_CC2;
-	else
-		reg &= ~TCPC_REG_SWITCHES0_MEAS_CC2;
-
-	tcpc_write(TCPC_REG_SWITCHES0, reg);
-
-	mutex_unlock(&measure_lock);
-	return 0;
-}