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

diff --git a/driver/led/oz554.c b/driver/led/oz554.c
deleted file mode 100644
index 504ac55e90..0000000000
--- a/driver/led/oz554.c
+++ /dev/null
@@ -1,147 +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.
- *
- * O2 Micro OZ554 LED driver.
- */
-
-#include "console.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "i2c.h"
-#include "oz554.h"
-#include "task.h"
-#include "timer.h"
-
-#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args)
-#define CPRINTF(format, args...) cprintf(CC_I2C, format, ## args)
-
-#define I2C_ADDR_OZ554_FLAGS	0x31
-
-struct oz554_value {
-	uint8_t offset;
-	uint8_t data;
-};
-
-/*
- * OZ554ALN asserts the interrupt when it's ready for writing settings, which
- * are cleared when it's turned off. We enable the interrupt on HOOK_INIT and
- * keep it enabled in S0/S3/S5.
- *
- * It's assumed the device doesn't have a lid and OZ554ALN is powered only in
- * S0. For clamshell devices, different interrupt & power control scheme may be
- * needed.
- */
-
-/* This ordering is suggested by vendor. */
-static struct oz554_value oz554_conf[] = {
-	/*
-	 * Reigster 0x01: Operation frequency control
-	 * Frequency selection: 300(KHz)
-	 * Short circuit protection: 8(V)
-	 */
-	{.offset = 1, .data = 0x43},
-	/*
-	 * Reigster 0x02: LED current amplitude control
-	 * ISET Resistor: 10.2(Kohm)
-	 * Maximum LED current: 1636/10.2 = 160.4(mA)
-	 * Setting LED current: 65(mA)
-	 */
-	{.offset = 2, .data = 0x65},
-	/*
-	 * Reigster 0x03: LED backlight Status
-	 * Status function: Read only
-	 */
-	{.offset = 3, .data = 0x00},
-	/*
-	 * Reigster 0x04: LED current control with SMBus
-	 * SMBus PWM function: None Use
-	 */
-	{.offset = 4, .data = 0x00},
-	/*
-	 * Reigster 0x05: OVP, OCP control
-	 * Over Current Protection: 0.5(V)
-	 * Panel LED Voltage(Max): 47.8(V)
-	 * OVP setting: 54(V)
-	 */
-	{.offset = 5, .data = 0x97},
-	/*
-	 * Reigster 0x00: Dimming mode and string ON/OFF control
-	 * String Selection: 4(Number)
-	 * Interface Selection: 1
-	 * Brightness mode: 3
-	 */
-	{.offset = 0, .data = 0xF2},
-};
-static const int oz554_conf_size = ARRAY_SIZE(oz554_conf);
-
-static void set_oz554_reg(void)
-{
-	int i;
-
-	for (i = 0; i < oz554_conf_size; ++i) {
-		int rv = i2c_write8(I2C_PORT_BACKLIGHT,
-				    I2C_ADDR_OZ554_FLAGS,
-				    oz554_conf[i].offset, oz554_conf[i].data);
-		if (rv) {
-			CPRINTS("Write OZ554 register %d failed rv=%d" , i, rv);
-			return;
-		}
-	}
-	CPRINTS("Wrote OZ554 settings");
-}
-
-static void backlight_enable_deferred(void)
-{
-	if (gpio_get_level(GPIO_PANEL_BACKLIGHT_EN))
-		set_oz554_reg();
-}
-DECLARE_DEFERRED(backlight_enable_deferred);
-
-void backlight_enable_interrupt(enum gpio_signal signal)
-{
-	/*
-	 * 1. Spec says backlight should be turned on after 500ms
-	 *    after eDP signals are ready.
-	 *
-	 * 2. There's no way to get exact eDP ready time, therefore,
-	 *    give one second delay.
-	 *
-	 * power up  __/----------------
-	 * eDP       ______/------------
-	 * backlight _____________/-----
-	 *                 |- t1 -| : >=500 ms
-	 *             |-   t2   -| : 1 second is enough
-	 */
-	hook_call_deferred(&backlight_enable_deferred_data,
-                           OZ554_POWER_BACKLIGHT_DELAY);
-}
-
-int oz554_set_config(int offset, int data)
-{
-	int i;
-	for (i = 0; i < oz554_conf_size; i++) {
-		if (oz554_conf[i].offset == offset)
-			break;
-	}
-	if (i >= oz554_conf_size) {
-		/* Matching offset not found */
-		CPRINTS("oz554: offset %d not found", i);
-		return EC_ERROR_INVAL;
-	}
-	oz554_conf[i].data = data;
-	return EC_SUCCESS;
-}
-
-static void init_oz554(void)
-{
-	oz554_board_init();
-
-	gpio_enable_interrupt(GPIO_PANEL_BACKLIGHT_EN);
-}
-DECLARE_HOOK(HOOK_INIT, init_oz554, HOOK_PRIO_DEFAULT);
-
-
-__overridable void oz554_board_init(void)
-{
-}