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

diff --git a/common/usbc_ppc.c b/common/usbc_ppc.c
deleted file mode 100644
index 0281ceaf64..0000000000
--- a/common/usbc_ppc.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Copyright 2017 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.
- */
-
-/* USB-C Power Path Controller Common Code */
-
-#include "atomic.h"
-#include "common.h"
-#include "console.h"
-#include "hooks.h"
-#include "timer.h"
-#include "usb_pd.h"
-#include "usbc_ppc.h"
-#include "util.h"
-
-#ifndef TEST_BUILD
-#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
-#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
-#else
-#define CPRINTF(args...)
-#define CPRINTS(args...)
-#endif
-
-int ppc_prints(const char *string, int port)
-{
-#ifndef TEST_BUILD
-	return CPRINTS("ppc p%d %s", port, string);
-#else
-	return 0;
-#endif
-}
-
-int ppc_err_prints(const char *string, int port, int error)
-{
-#ifndef TEST_BUILD
-	return CPRINTS("ppc p%d %s (%d)", port, string, error);
-#else
-	return 0;
-#endif
-}
-
-/* Simple wrappers to dispatch to the drivers. */
-
-int ppc_init(int port)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->init) {
-		rv = ppc->drv->init(port);
-		if (rv)
-			ppc_err_prints("init failed!", port, rv);
-		else
-			ppc_prints("init'd.", port);
-	}
-
-	return rv;
-}
-
-int ppc_is_sourcing_vbus(int port)
-{
-	int rv = 0;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return 0;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->is_sourcing_vbus)
-		rv = ppc->drv->is_sourcing_vbus(port);
-
-	return rv;
-}
-
-#ifdef CONFIG_USBC_PPC_POLARITY
-int ppc_set_polarity(int port, int polarity)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->set_polarity)
-		rv = ppc->drv->set_polarity(port, polarity);
-
-	return rv;
-}
-#endif
-
-int ppc_set_vbus_source_current_limit(int port, enum tcpc_rp_value rp)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->set_vbus_source_current_limit)
-		rv = ppc->drv->set_vbus_source_current_limit(port, rp);
-
-	return rv;
-}
-
-int ppc_discharge_vbus(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->discharge_vbus)
-		rv = ppc->drv->discharge_vbus(port, enable);
-
-	return rv;
-}
-
-#ifdef CONFIG_USBC_PPC_SBU
-int ppc_set_sbu(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->set_sbu)
-		rv = ppc->drv->set_sbu(port, enable);
-
-	return rv;
-}
-#endif /* defined(CONFIG_USBC_PPC_SBU) */
-
-#ifdef CONFIG_USBC_PPC_VCONN
-int ppc_set_vconn(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->set_vconn)
-		rv = ppc->drv->set_vconn(port, enable);
-
-	return rv;
-}
-#endif
-
-int ppc_dev_is_connected(int port, enum ppc_device_role dev)
-{
-	int rv = EC_SUCCESS;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->dev_is_connected)
-		rv = ppc->drv->dev_is_connected(port, dev);
-
-	return rv;
-}
-
-int ppc_vbus_sink_enable(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->vbus_sink_enable)
-		rv = ppc->drv->vbus_sink_enable(port, enable);
-
-	return rv;
-}
-
-int ppc_enter_low_power_mode(int port)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->enter_low_power_mode)
-		rv = ppc->drv->enter_low_power_mode(port);
-
-	return rv;
-}
-
-int ppc_vbus_source_enable(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->vbus_source_enable)
-		rv = ppc->drv->vbus_source_enable(port, enable);
-
-	return rv;
-}
-
-#ifdef CONFIG_USB_PD_FRS_PPC
-int ppc_set_frs_enable(int port, int enable)
-{
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-
-	if (ppc->drv->set_frs_enable)
-		rv = ppc->drv->set_frs_enable(port,enable);
-
-	return rv;
-}
-#endif /* defined(CONFIG_USB_PD_FRS_PPC) */
-
-#ifdef CONFIG_USB_PD_VBUS_DETECT_PPC
-int ppc_is_vbus_present(int port)
-{
-	int rv = 0;
-	const struct ppc_config_t *ppc;
-
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return 0;
-	}
-
-	ppc = &ppc_chips[port];
-
-	if (ppc->drv->is_vbus_present)
-		rv = ppc->drv->is_vbus_present(port);
-
-	return rv;
-}
-#endif /* defined(CONFIG_USB_PD_VBUS_DETECT_PPC) */
-
-#ifdef CONFIG_CMD_PPC_DUMP
-static int command_ppc_dump(int argc, char **argv)
-{
-	int port;
-	int rv = EC_ERROR_UNIMPLEMENTED;
-	const struct ppc_config_t *ppc;
-
-	if (argc < 2)
-		return EC_ERROR_PARAM_COUNT;
-
-	port = atoi(argv[1]);
-	if ((port < 0) || (port >= ppc_cnt)) {
-		CPRINTS("%s(%d) Invalid port!", __func__, port);
-		return EC_ERROR_INVAL;
-	}
-
-	ppc = &ppc_chips[port];
-	if (ppc->drv->reg_dump)
-		rv = ppc->drv->reg_dump(port);
-
-	return rv;
-}
-DECLARE_CONSOLE_COMMAND(ppc_dump, command_ppc_dump, "<Type-C port>",
-			"dump the PPC regs");
-#endif /* defined(CONFIG_CMD_PPC_DUMP) */