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

diff --git a/board/servo_v4p1/dacs.c b/board/servo_v4p1/dacs.c
deleted file mode 100644
index 087a334873..0000000000
--- a/board/servo_v4p1/dacs.c
+++ /dev/null
@@ -1,140 +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 "dacs.h"
-#include "i2c.h"
-#include "ioexpanders.h"
-#include "util.h"
-
-#define MAX_MV 5000
-
-#define CC1_DAC_ADDR 0x48
-#define CC2_DAC_ADDR 0x49
-
-#define REG_NOOP    0
-#define REG_DEVID   1
-#define REG_SYNC    2
-#define REG_CONFIG  3
-#define REG_GAIN    4
-#define REG_TRIGGER 5
-#define REG_STATUS  7
-#define REG_DAC     8
-
-#define DAC1	BIT(0)
-#define DAC2	BIT(1)
-
-static uint8_t dac_enabled;
-
-void init_dacs(void)
-{
-	/* Disable both DACS by default */
-	enable_dac(CC1_DAC, 0);
-	enable_dac(CC2_DAC, 0);
-	dac_enabled = 0;
-}
-
-void enable_dac(enum dac_t dac, uint8_t en)
-{
-	switch (dac) {
-	case CC1_DAC:
-		if (en) {
-			fault_clear_cc(1);
-			fault_clear_cc(0);
-			en_vout_buf_cc1(1);
-			/* Power ON DAC */
-			i2c_write8(1, CC1_DAC_ADDR, REG_CONFIG, 0);
-			dac_enabled |= DAC1;
-		} else {
-			en_vout_buf_cc1(0);
-			/* Power OFF DAC */
-			i2c_write8(1, CC1_DAC_ADDR, REG_CONFIG, 1);
-			dac_enabled &= ~DAC1;
-		}
-		break;
-	case CC2_DAC:
-		if (en) {
-			fault_clear_cc(1);
-			fault_clear_cc(0);
-			en_vout_buf_cc2(1);
-			i2c_write8(1, CC2_DAC_ADDR, REG_CONFIG, 0);
-			dac_enabled |= DAC2;
-		} else {
-			en_vout_buf_cc2(0);
-			/* Power down DAC */
-			i2c_write8(1, CC2_DAC_ADDR, REG_CONFIG, 1);
-			dac_enabled &= ~DAC2;
-		}
-		break;
-	}
-}
-
-int write_dac(enum dac_t dac, uint16_t value)
-{
-	uint16_t tmp;
-
-	/*
-	 * Data are MSB aligned in straight binary format, and
-	 * use the following format: DATA[13:0], 0, 0
-	 */
-	tmp = (value << 8) & 0xff00;
-	tmp |= (value >> 8) & 0xff;
-	tmp <<= 2;
-
-	switch (dac) {
-	case CC1_DAC:
-		if (!(dac_enabled & DAC1)) {
-			ccprintf("CC1_DAC is disabled\n");
-			return EC_ERROR_ACCESS_DENIED;
-		}
-		i2c_write16(1, CC1_DAC_ADDR, REG_DAC, tmp);
-		break;
-	case CC2_DAC:
-		if (!(dac_enabled & DAC2)) {
-			ccprintf("CC2_DAC is disabled\n");
-			return EC_ERROR_ACCESS_DENIED;
-		}
-		i2c_write16(1, CC2_DAC_ADDR, REG_DAC, tmp);
-		break;
-	}
-	return EC_SUCCESS;
-}
-
-#ifdef SECTION_IS_RO
-static int cmd_cc_dac(int argc, char *argv[])
-{
-	uint8_t dac;
-	uint64_t mv;
-	uint64_t round_up;
-	char *e;
-
-	if (argc < 3)
-		return EC_ERROR_PARAM_COUNT;
-
-	dac = strtoi(argv[1], &e, 10);
-	if (*e || (dac != CC1_DAC && dac != CC2_DAC))
-		return EC_ERROR_PARAM2;
-
-	if (!strcasecmp(argv[2], "on")) {
-		enable_dac(dac, 1);
-	} else if (!strcasecmp(argv[2], "off")) {
-		enable_dac(dac, 0);
-	} else {
-		/* get value in mV */
-		mv = strtoi(argv[2], &e, 10);
-		/* 5000 mV max */
-		if (*e || mv > MAX_MV)
-			return EC_ERROR_PARAM3;
-		/* 305176 = (5V / 2^14) * 1000000 */
-		/* 152588 = 305176 / 2 : used for round up after division */
-		round_up = (((mv * 1000000) + 152588) / 305176);
-		if (!write_dac(dac, (uint16_t)round_up))
-			ccprintf("Setting DAC to %lld counts\n", round_up);
-	}
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(cc_dac, cmd_cc_dac,
-			"dac <\"on\"|\"off\"|mv>",
-			"Set Servo v4.1 CC dacs");
-#endif