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

diff --git a/driver/led/lm3630a.c b/driver/led/lm3630a.c
deleted file mode 100644
index a2c4aaa74c..0000000000
--- a/driver/led/lm3630a.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2018 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 LM3630A LED driver.
- */
-
-#include "hooks.h"
-#include "i2c.h"
-#include "lm3630a.h"
-#include "timer.h"
-
-
-/* I2C address */
-#define LM3630A_I2C_ADDR_FLAGS 0x36
-
-static inline int lm3630a_write(uint8_t reg, uint8_t val)
-{
-	return i2c_write8(I2C_PORT_KBLIGHT, LM3630A_I2C_ADDR_FLAGS,
-			  reg, val);
-}
-
-static inline int lm3630a_read(uint8_t reg, int *val)
-{
-	return i2c_read8(I2C_PORT_KBLIGHT, LM3630A_I2C_ADDR_FLAGS,
-			 reg, val);
-}
-
-static void deferred_lm3630a_poweron(void)
-{
-	/*
-	 * Set full brightness so that PWM will control. This needs to happen
-	 * after setting the control register, because enabling the banks
-	 * resets the value to 0.
-	 */
-	lm3630a_write(LM3630A_REG_A_BRIGHTNESS, 0xff);
-}
-DECLARE_DEFERRED(deferred_lm3630a_poweron);
-
-int lm3630a_poweron(void)
-{
-	int ret = 0;
-
-	/*
-	 * LM3630A will NAK I2C transactions for 1ms (tWAIT in the datasheet)
-	 * after HWEN asserted or after SW reset.
-	 */
-	msleep(1);
-
-	/* Sample PWM every 8 periods. */
-	ret |= lm3630a_write(LM3630A_REG_FILTER_STRENGTH, 0x3);
-
-	/* Enable feedback and PWM for banks A. */
-	ret |= lm3630a_write(LM3630A_REG_CONFIG,
-				LM3630A_CFG_BIT_FB_EN_A |
-				LM3630A_CFG_BIT_PWM_EN_A);
-
-	/* 24V, 800mA overcurrent protection, 500kHz boost frequency. */
-	ret |= lm3630a_write(LM3630A_REG_BOOST_CONTROL,
-				LM3630A_BOOST_OVP_24V |
-				LM3630A_BOOST_OCP_800MA |
-				LM3630A_FMODE_500KHZ);
-
-	/* Limit current to 24.5mA */
-	ret |= lm3630a_write(LM3630A_REG_A_CURRENT, 0x1a);
-
-	/* Enable bank A, put in linear mode, and connect LED2 to bank A. */
-	ret |= lm3630a_write(LM3630A_REG_CONTROL,
-				LM3630A_CTRL_BIT_LINEAR_A |
-				LM3630A_CTRL_BIT_LED_EN_A |
-				LM3630A_CTRL_BIT_LED2_ON_A);
-
-	/*
-	 * Only set the brightness after ~100 ms. Without this, LED may blink
-	 * for a short duration, as the PWM sampler sometimes appears to be
-	 * confused, and slowly dim from a large initial PWM input value.
-	 */
-	hook_call_deferred(&deferred_lm3630a_poweron_data, 100 * MSEC);
-
-	return ret;
-}
-
-int lm3630a_poweroff(void)
-{
-	return lm3630a_write(LM3630A_REG_CONTROL, LM3630A_CTRL_BIT_SLEEP_CMD);
-}