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

diff --git a/driver/ppc/sn5s330.h b/driver/ppc/sn5s330.h
deleted file mode 100644
index f94a3e8e10..0000000000
--- a/driver/ppc/sn5s330.h
+++ /dev/null
@@ -1,161 +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.
- */
-
-/* TI SN5S330 Type-C Power Path Controller */
-
-#ifndef __CROS_EC_SN5S330_H
-#define __CROS_EC_SN5S330_H
-
-#include "common.h"
-
-#include "driver/ppc/sn5s330_public.h"
-
-struct sn5s330_config {
-	uint8_t i2c_port;
-	uint8_t i2c_addr_flags;
-};
-
-extern const struct sn5s330_config sn5s330_chips[];
-extern const unsigned int sn5s330_cnt;
-
-/* Power Path Indices */
-enum sn5s330_pp_idx {
-	SN5S330_PP1,
-	SN5S330_PP2,
-	SN5S330_PP_COUNT,
-};
-
-#define SN5S330_FUNC_SET1  0x50
-#define SN5S330_FUNC_SET2  0x51
-#define SN5S330_FUNC_SET3  0x52
-#define SN5S330_FUNC_SET4  0x53
-#define SN5S330_FUNC_SET5  0x54
-#define SN5S330_FUNC_SET6  0x55
-#define SN5S330_FUNC_SET7  0x56
-#define SN5S330_FUNC_SET8  0x57
-#define SN5S330_FUNC_SET9  0x58
-#define SN5S330_FUNC_SET10 0x59
-#define SN5S330_FUNC_SET11 0x5A
-#define SN5S330_FUNC_SET12 0x5B
-
-#define SN5S330_INT_STATUS_REG1 0x2F
-#define SN5S330_INT_STATUS_REG2 0x30
-#define SN5S330_INT_STATUS_REG3 0x31
-#define SN5S330_INT_STATUS_REG4 0x32
-
-#define SN5S330_INT_TRIP_RISE_REG1 0x20
-#define SN5S330_INT_TRIP_RISE_REG2 0x21
-#define SN5S330_INT_TRIP_RISE_REG3 0x22
-#define SN5S330_INT_TRIP_FALL_REG1 0x23
-#define SN5S330_INT_TRIP_FALL_REG2 0x24
-#define SN5S330_INT_TRIP_FALL_REG3 0x25
-
-#define SN5S330_INT_MASK_RISE_REG1 0x26
-#define SN5S330_INT_MASK_RISE_REG2 0x27
-#define SN5S330_INT_MASK_RISE_REG3 0x28
-#define SN5S330_INT_MASK_FALL_REG1 0x29
-#define SN5S330_INT_MASK_FALL_REG2 0x2A
-#define SN5S330_INT_MASK_FALL_REG3 0x2B
-
-#define PPX_ILIM_DEGLITCH_0_US_20     0x1
-#define PPX_ILIM_DEGLITCH_0_US_50     0x2
-#define PPX_ILIM_DEGLITCH_0_US_100    0x3
-#define PPX_ILIM_DEGLITCH_0_US_200    0x4
-#define PPX_ILIM_DEGLITCH_0_US_1000   0x5
-#define PPX_ILIM_DEGLITCH_0_US_2000   0x6
-#define PPX_ILIM_DEGLITCH_0_US_10000  0x7
-
-/* Internal VBUS Switch Current Limit Settings (min) */
-#define SN5S330_ILIM_0_35  0
-#define SN5S330_ILIM_0_63  1
-#define SN5S330_ILIM_0_90  2
-#define SN5S330_ILIM_1_14  3
-#define SN5S330_ILIM_1_38  4
-#define SN5S330_ILIM_1_62  5
-#define SN5S330_ILIM_1_86  6
-#define SN5S330_ILIM_2_10  7
-#define SN5S330_ILIM_2_34  8
-#define SN5S330_ILIM_2_58  9
-#define SN5S330_ILIM_2_82  10
-#define SN5S330_ILIM_3_06  11
-#define SN5S330_ILIM_3_30  12
-
-/* FUNC_SET_2 */
-#define SN5S330_SBU_EN			BIT(4)
-
-/* FUNC_SET_3 */
-#define SN5S330_PP1_EN			BIT(0)
-#define SN5S330_PP2_EN			BIT(1)
-#define SN5S330_VBUS_DISCH_EN		BIT(2)
-#define SN5S330_SET_RCP_MODE_PP1	BIT(5)
-#define SN5S330_SET_RCP_MODE_PP2	BIT(6)
-
-/* FUNC_SET_4 */
-#define SN5S330_VCONN_EN		BIT(0)
-#define SN5S330_CC_POLARITY		BIT(1)
-#define SN5S330_CC_EN			BIT(4)
-#define SN5S330_VCONN_ILIM_SEL		BIT(5)
-
-/* FUNC_SET_8 */
-#define SN5S330_VCONN_DEGLITCH_MASK	(3 << 6)
-#define SN5S330_VCONN_DEGLITCH_63_US	(0 << 6)
-#define SN5S330_VCONN_DEGLITCH_125_US	BIT(6)
-#define SN5S330_VCONN_DEGLITCH_640_US	(2 << 6)
-#define SN5S330_VCONN_DEGLITCH_1280_US	(3 << 6)
-
-/* FUNC_SET_9 */
-#define SN5S330_FORCE_OVP_EN_SBU	BIT(1)
-#define SN5S330_PP2_CONFIG		BIT(2)
-#define SN5S330_OVP_EN_CC		BIT(4)
-#define SN5S330_CONFIG_UVP		BIT(5)
-#define SN5S330_FORCE_ON_VBUS_OVP	BIT(6)
-#define SN5S330_FORCE_ON_VBUS_UVP	BIT(7)
-
-/* INT_STATUS_REG3 */
-#define SN5S330_VBUS_GOOD		BIT(0)
-
-/* INT_STATUS_REG4 */
-#define SN5S330_DIG_RES			BIT(0)
-#define SN5S330_DB_BOOT			BIT(1)
-#define SN5S330_VSAFE0V_STAT		BIT(2)
-#define SN5S330_VSAFE0V_MASK		BIT(3)
-
-/*
- * INT_MASK_RISE/FALL_EDGE_1
- *
- * The ILIM_PP1 bit indicates an overcurrent condition when sourcing on power
- * path 1.  For rising edge registers, this indicates an overcurrent has
- * occured; similarly for falling edge, it means the overcurrent condition is no
- * longer present.
- */
-#define SN5S330_ILIM_PP1_MASK BIT(4)
-
-/*
- * INT_MASK_RISE/FALL_EDGE2
- *
- * The VCONN_ILIM bit indicates an overcurrent condition on VCONN.  By default,
- * VCONN will be latched off.
- */
-#define SN5S330_VCONN_ILIM (1 << 1)
-
-/*
- * INT_MASK_RISE/FALL_EDGE2
- *
- * The OV_CC1_CON/OV_CC2_CON bit indicates an over-voltage occurred on
- * C_CC1/C_CC2.
- */
-#define SN5S330_CC1_CON (1 << 2)
-#define SN5S330_CC2_CON (1 << 3)
-
-/*
- * INT_MASK_RISE/FALL_EDGE_3
- *
- * The VBUS_GOOD bit indicates VBUS has increased beyond a 4.0V threshold.
- * For rising edge registers, this indicates VBUS has risen above 4.0V.
- * For falling edge registers, this indicates VBUS has fallen below 4.0V.
- */
-#define SN5S330_VBUS_GOOD_MASK BIT(0)
-
-#endif /* defined(__CROS_EC_SN5S330_H) */