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

diff --git a/board/servo_v4p1/chg_control.c b/board/servo_v4p1/chg_control.c
deleted file mode 100644
index 19be03a755..0000000000
--- a/board/servo_v4p1/chg_control.c
+++ /dev/null
@@ -1,80 +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 "chg_control.h"
-#include "gpio.h"
-#include "ioexpanders.h"
-#include "registers.h"
-#include "timer.h"
-#include "usb_pd.h"
-
-#define CHG_P5V_POWER  0
-#define CHG_VBUS_POWER 1
-
-void chg_reset(void)
-{
-	/* Disconnect DUT Power */
-	chg_power_select(CHG_POWER_OFF);
-
-	/* Disconnect CHG CC1(Rd) and CC2(Rd) */
-	chg_attach_cc_rds(0);
-
-	/* Give time for CHG to detach, use tErrorRecovery. */
-	msleep(PD_T_ERROR_RECOVERY);
-
-	/* Connect CHG CC1(Rd) and CC2(Rd) to detect charger */
-	chg_attach_cc_rds(1);
-}
-
-void chg_power_select(enum chg_power_select_t type)
-{
-	switch (type) {
-	case CHG_POWER_OFF:
-		dut_chg_en(0);
-		vbus_dischrg_en(1);
-		break;
-	case CHG_POWER_PP5000:
-		vbus_dischrg_en(0);
-		host_or_chg_ctl(CHG_P5V_POWER);
-		dut_chg_en(1);
-		break;
-	case CHG_POWER_VBUS:
-		vbus_dischrg_en(0);
-		host_or_chg_ctl(CHG_VBUS_POWER);
-		dut_chg_en(1);
-		break;
-	}
-}
-
-void chg_attach_cc_rds(bool en)
-{
-	if (en) {
-		/*
-		 * Configure USB_CHG_CC1_MCU and USB_CHG_CC2_MCU as
-		 * ANALOG input
-		 */
-		STM32_GPIO_MODER(GPIO_A) = (STM32_GPIO_MODER(GPIO_A)
-			| (3 << (2*2)) | /* PA2 in ANALOG mode */
-			  (3 << (2*4))); /* PA4 in ANALOG mode */
-	} else {
-		/*
-		 * Configure USB_CHG_CC1_MCU and USB_CHG_CC2_MCU as GPIO and
-		 * drive high to trigger disconnect.
-		 * NOTE: The CC line has an external fixed Rd pull-down.
-		 * Driving the CC line High overrides the pull down and this
-		 * triggers a disconnection.
-		 */
-		/* Set level high */
-		gpio_set_level(GPIO_USB_CHG_CC1_MCU, 1);
-		gpio_set_level(GPIO_USB_CHG_CC2_MCU, 1);
-
-		/* Disable Analog mode and Enable GPO */
-		STM32_GPIO_MODER(GPIO_A) = (STM32_GPIO_MODER(GPIO_A)
-			& ~(3 << (2*2) | /* PA2 disable ADC */
-			    3 << (2*4))) /* PA4 disable ADC */
-			|  (1 << (2*2) | /* Set as GPO */
-			    1 << (2*4)); /* Set as GPO */
-	}
-}