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

diff --git a/board/oak/led.c b/board/oak/led.c
deleted file mode 100644
index 877f115a12..0000000000
--- a/board/oak/led.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Copyright 2015 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.
- *
- * Battery LED and Power LED control for Oak Board.
- */
-
-#include "battery.h"
-#include "charge_state.h"
-#include "chipset.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "led_common.h"
-#include "util.h"
-#include "system.h"
-
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_BATTERY_LED
-};
-
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
-
-enum led_color {
-	BAT_LED_GREEN = 0,
-	BAT_LED_ORANGE,
-	BAT_LED_RED,
-	BAT_LED_AMBER,
-	PWR_LED_GREEN,
-	PWR_LED_ORANGE,
-	LED_COLOR_COUNT		/* Number of colors, not a color itself */
-};
-
-static int bat_led_set(enum led_color color, int on)
-{
-	/* Before Rev5, it's active low; After that, it's active high */
-	if (system_get_board_version() < OAK_REV5)
-		on = !on;
-
-	switch (color) {
-	case BAT_LED_GREEN:
-		gpio_set_level(GPIO_BAT_LED0, on); /* BAT_LED_GREEN */
-		break;
-	case BAT_LED_ORANGE:
-		/* for rev2 or before */
-		gpio_set_level(GPIO_BAT_LED1, on); /* BAT_LED_ORANGE */
-		break;
-	case BAT_LED_RED:
-		/* for rev3 or later */
-		gpio_set_level(GPIO_BAT_LED1, on); /* BAT_LED_RED */
-		break;
-	case BAT_LED_AMBER:
-		/* for rev3 or later */
-		gpio_set_level(GPIO_BAT_LED0, on); /* BAT_LED_AMBER */
-		gpio_set_level(GPIO_BAT_LED1, on);
-		break;
-	case PWR_LED_GREEN:
-		gpio_set_level(GPIO_PWR_LED0, on); /* PWR_LED_GREEN */
-		break;
-	case PWR_LED_ORANGE:
-		gpio_set_level(GPIO_PWR_LED1, on); /* PWR_LED_ORANGE */
-		break;
-	default:
-		return EC_ERROR_UNKNOWN;
-	}
-	return EC_SUCCESS;
-}
-
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
-{
-	/* Ignoring led_id as both leds support the same colors */
-	brightness_range[EC_LED_COLOR_RED] = 1;
-	brightness_range[EC_LED_COLOR_GREEN] = 1;
-	brightness_range[EC_LED_COLOR_YELLOW] = 1;
-}
-
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
-{
-	if (EC_LED_ID_BATTERY_LED == led_id) {
-		if (brightness[EC_LED_COLOR_GREEN] != 0) {
-			bat_led_set(BAT_LED_GREEN, 1);
-			bat_led_set(BAT_LED_ORANGE, 0);
-		} else if (brightness[EC_LED_COLOR_YELLOW] != 0) {
-			bat_led_set(BAT_LED_GREEN, 1);
-			bat_led_set(BAT_LED_ORANGE, 1);
-		} else if (brightness[EC_LED_COLOR_RED] != 0) {
-			bat_led_set(BAT_LED_GREEN, 0);
-			bat_led_set(BAT_LED_RED, 1);
-		} else {
-			bat_led_set(BAT_LED_GREEN, 0);
-			bat_led_set(BAT_LED_ORANGE, 0);
-		}
-		return EC_SUCCESS;
-	} else if (EC_LED_ID_POWER_LED == led_id) {
-		if (brightness[EC_LED_COLOR_GREEN] != 0) {
-			bat_led_set(PWR_LED_GREEN, 1);
-			bat_led_set(PWR_LED_ORANGE, 0);
-		} else if (brightness[EC_LED_COLOR_YELLOW] != 0) {
-			bat_led_set(PWR_LED_GREEN, 1);
-			bat_led_set(PWR_LED_ORANGE, 1);
-		} else {
-			bat_led_set(PWR_LED_GREEN, 0);
-			bat_led_set(PWR_LED_ORANGE, 0);
-		}
-		return EC_SUCCESS;
-	} else {
-		return EC_ERROR_UNKNOWN;
-	}
-}
-
-static void oak_led_set_power(int board_version)
-{
-	static int power_second;
-
-	power_second++;
-
-	switch(board_version) {
-	case OAK_REV3:
-	case OAK_REV4:
-		/*
-		 * For Rev3 and Rev4 revision.
-		 * PWR LED behavior:
-		 * Power on: Green ON
-		 * Suspend: Orange in breeze mode ( 1 sec on/ 3 sec off)
-		 * Power off: OFF
-		 */
-		if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
-			bat_led_set(PWR_LED_GREEN, 0);
-			bat_led_set(PWR_LED_ORANGE, 0);
-		} else if (chipset_in_state(CHIPSET_STATE_ON)) {
-			bat_led_set(PWR_LED_GREEN, 1);
-			bat_led_set(PWR_LED_ORANGE, 0);
-		} else if (chipset_in_state(CHIPSET_STATE_SUSPEND)) {
-			bat_led_set(PWR_LED_GREEN, 0);
-			bat_led_set(PWR_LED_ORANGE,
-				    (power_second & 3) ? 0 : 1);
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void oak_led_set_battery(int board_version)
-{
-	static int battery_second;
-
-	battery_second++;
-
-	switch(board_version) {
-	case OAK_REV3:
-	case OAK_REV4:
-		/*
-		 * For Rev3 and Rev4 revision:
-		 * BAT LED behavior:
-		 * - Fully charged / idle: Green ON
-		 * - Charging: Amber ON (BAT_LED_RED && BAT_LED_GREEN)
-		 * - Battery discharging capacity<10%, red blink
-		 * - Battery error: Red ON
-		 */
-		switch (charge_get_state()) {
-		case PWR_STATE_CHARGE:
-			bat_led_set(BAT_LED_AMBER, 1);
-			break;
-		case PWR_STATE_CHARGE_NEAR_FULL:
-			bat_led_set(BAT_LED_GREEN, 1);
-			bat_led_set(BAT_LED_RED, 0);
-			break;
-		case PWR_STATE_DISCHARGE:
-			bat_led_set(BAT_LED_GREEN, 0);
-			if (charge_get_percent() < 3)
-				bat_led_set(BAT_LED_RED,
-					  (battery_second & 1) ? 0 : 1);
-			else if (charge_get_percent() < 10)
-				bat_led_set(BAT_LED_RED,
-					  (battery_second & 3) ? 0 : 1);
-			else
-				bat_led_set(BAT_LED_RED, 0);
-			break;
-		case PWR_STATE_ERROR:
-			bat_led_set(BAT_LED_RED, 1);
-			break;
-		case PWR_STATE_IDLE: /* Ext. power connected in IDLE. */
-			bat_led_set(BAT_LED_GREEN, 1);
-			bat_led_set(BAT_LED_RED, 0);
-			break;
-		default:
-			/* Other states don't alter LED behavior */
-			break;
-		}
-		break; /* End of case OAK_REV3 & OAK_REV4 */
-	default:
-		/*
-		 * Put power control here since we are using the "battery" LED.
-		 * This allows LED autocontrol to be turned off by cmd during factory test.
-		 *
-		 * PWR LED behavior:
-		 * Power on: Green
-		 * Suspend: Green in breeze mode ( 1 sec on/ 3 sec off)
-		 * Power off: OFF
-		 */
-		if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
-			bat_led_set(BAT_LED_GREEN, 0);
-		else if (chipset_in_state(CHIPSET_STATE_ON))
-			bat_led_set(BAT_LED_GREEN, 1);
-		else if (chipset_in_state(CHIPSET_STATE_SUSPEND)) {
-			int cycle_time = 4;
-			/* Oak rev5 with GlaDOS ID has a extremely power
-			 * comsuming LED. Increase LED blink cycle time to reduce
-			 * S3 power comsuption. */
-			if (board_version >= OAK_REV5)
-				cycle_time = 10;
-			bat_led_set(BAT_LED_GREEN,
-				    (battery_second % cycle_time) ? 0 : 1);
-		}
-
-		/* BAT LED behavior:
-		 * Fully charged / idle: Off
-		 * Under charging: Orange
-		 * Bat. low (10%): Orange in breeze mode (1s on, 3s off)
-		 * Bat. critical low (less than 3%) or abnormal battery
-		 *   situation: Orange in blinking mode (1s on, 1s off)
-		 * Using battery or not connected to AC power: OFF
-		 */
-		switch (charge_get_state()) {
-		case PWR_STATE_CHARGE:
-			bat_led_set(BAT_LED_ORANGE, 1);
-			break;
-		case PWR_STATE_CHARGE_NEAR_FULL:
-			bat_led_set(BAT_LED_ORANGE, 1);
-			break;
-		case PWR_STATE_DISCHARGE:
-			if (charge_get_percent() < 3)
-				bat_led_set(BAT_LED_ORANGE,
-					  (battery_second & 1) ? 0 : 1);
-			else if (charge_get_percent() < 10)
-				bat_led_set(BAT_LED_ORANGE,
-					  (battery_second & 3) ? 0 : 1);
-			else
-				bat_led_set(BAT_LED_ORANGE, 0);
-			break;
-		case PWR_STATE_ERROR:
-			bat_led_set(BAT_LED_ORANGE,
-				    (battery_second & 1) ? 0 : 1);
-			break;
-		case PWR_STATE_IDLE: /* Ext. power connected in IDLE. */
-			bat_led_set(BAT_LED_ORANGE, 0);
-			break;
-		default:
-			/* Other states don't alter LED behavior */
-			break;
-		}
-		break; /* End of default */
-	}
-}
-
-/**
- * Called by hook task every 1 sec
- */
-static void led_second(void)
-{
-	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
-		oak_led_set_power(system_get_board_version());
-	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
-		oak_led_set_battery(system_get_board_version());
-}
-DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT);