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

diff --git a/driver/led/lp5562.c b/driver/led/lp5562.c
deleted file mode 100644
index e0758a8b91..0000000000
--- a/driver/led/lp5562.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Copyright 2013 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 LP5562 driver.
- */
-
-#include "console.h"
-#include "i2c.h"
-#include "lp5562.h"
-#include "timer.h"
-#include "util.h"
-
-/* I2C address */
-#define LP5562_I2C_ADDR_FLAGS 0x30
-
-inline int lp5562_write(uint8_t reg, uint8_t val)
-{
-	return i2c_write8(I2C_PORT_MASTER, LP5562_I2C_ADDR_FLAGS, reg, val);
-}
-
-inline int lp5562_read(uint8_t reg, int *val)
-{
-	return i2c_read8(I2C_PORT_MASTER, LP5562_I2C_ADDR_FLAGS, reg, val);
-}
-
-int lp5562_set_color(uint32_t rgb)
-{
-	int ret = 0;
-
-	ret |= lp5562_write(LP5562_REG_B_PWM, rgb & 0xff);
-	ret |= lp5562_write(LP5562_REG_G_PWM, (rgb >> 8) & 0xff);
-	ret |= lp5562_write(LP5562_REG_R_PWM, (rgb >> 16) & 0xff);
-
-	return ret;
-}
-
-int lp5562_set_engine(uint8_t r, uint8_t g, uint8_t b)
-{
-	return lp5562_write(LP5562_REG_LED_MAP, (r << 4) | (g << 2) | b);
-}
-
-int lp5562_engine_load(int engine, const uint8_t *program, int size)
-{
-	int prog_addr = LP5562_REG_ENG_PROG(engine);
-	int i, ret, val;
-	int shift = 6 - engine * 2;
-
-	ret = lp5562_read(LP5562_REG_OP_MODE, &val);
-	if (ret)
-		return ret;
-	val &= ~(0x3 << shift);
-	val |= 0x1 << shift;
-	ret = lp5562_write(LP5562_REG_OP_MODE, val);
-	if (ret)
-		return ret;
-
-	for (i = 0; i < size; ++i) {
-		ret = lp5562_write(prog_addr + i, program[i]);
-		if (ret)
-			return ret;
-	}
-
-	val &= ~(0x3 << shift);
-	val |= 0x2 << shift;
-	ret = lp5562_write(LP5562_REG_OP_MODE, val);
-
-	return ret;
-}
-
-int lp5562_engine_control(int eng1, int eng2, int eng3)
-{
-	int ret, val;
-
-	ret = lp5562_read(LP5562_REG_ENABLE, &val);
-	if (ret)
-		return ret;
-	val &= 0xc0;
-	val |= (eng1 << 4) | (eng2 << 2) | eng3;
-	return lp5562_write(LP5562_REG_ENABLE, val);
-}
-
-int lp5562_get_engine_state(int engine)
-{
-	int val;
-
-	if (lp5562_read(LP5562_REG_ENABLE, &val))
-		return 0xee;
-	return (val >> (6 - engine * 2)) & 0x3;
-}
-
-int lp5562_poweron(void)
-{
-	int ret = 0;
-
-	ret |= lp5562_write(LP5562_REG_ENABLE, 0x40);
-	udelay(500); /* start-up delay */
-
-	ret |= lp5562_write(LP5562_REG_CONFIG, 0x1);
-	ret |= lp5562_write(LP5562_REG_LED_MAP, 0x0);
-
-	return ret;
-}
-
-int lp5562_poweroff(void)
-{
-	return lp5562_write(LP5562_REG_ENABLE, 0x0);
-}
-
-int lp5562_get_pc(int engine)
-{
-	int ret;
-	if (lp5562_read(LP5562_REG_ENG1_PC + engine - 1, &ret))
-		return 0xee;
-	return ret;
-}
-
-int lp5562_set_pc(int engine, int val)
-{
-	return lp5562_write(LP5562_REG_ENG1_PC + engine - 1, val);
-}
-
-/*****************************************************************************/
-/* Console commands */
-#ifdef CONFIG_CMD_POWERLED
-static int command_lp5562(int argc, char **argv)
-{
-	if (argc == 4) {
-		char *e;
-		uint8_t red, green, blue;
-
-		red = strtoi(argv[1], &e, 0);
-		if (e && *e)
-			return EC_ERROR_PARAM1;
-		green = strtoi(argv[2], &e, 0);
-		if (e && *e)
-			return EC_ERROR_PARAM2;
-		blue = strtoi(argv[3], &e, 0);
-		if (e && *e)
-			return EC_ERROR_PARAM3;
-
-		return lp5562_set_color((red << 16) | (green << 8) | blue);
-	} else if (argc == 2) {
-		int v;
-
-		if (!parse_bool(argv[1], &v))
-			return EC_ERROR_PARAM1;
-
-		if (v)
-			return lp5562_poweron();
-		else
-			return lp5562_poweroff();
-	}
-
-	return EC_ERROR_INVAL;
-}
-DECLARE_CONSOLE_COMMAND(lp5562, command_lp5562,
-			"on | off | <red> <green> <blue>",
-			"Set the color of the LED");
-#endif