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

diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c
deleted file mode 100644
index aef13d3d68..0000000000
--- a/driver/temp_sensor/g78x.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* Copyright 2016 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.
- */
-
-/* G781/G782 temperature sensor module for Chrome EC */
-
-#include "common.h"
-#include "console.h"
-#include "g78x.h"
-#include "gpio.h"
-#include "i2c.h"
-#include "hooks.h"
-#include "util.h"
-
-static int temp_val_local;
-static int temp_val_remote1;
-#ifdef CONFIG_TEMP_SENSOR_G782
-static int temp_val_remote2;
-#endif
-
-/**
- * Determine whether the sensor is powered.
- *
- * @return non-zero the g781/g782 sensor is powered.
- */
-static int has_power(void)
-{
-#ifdef CONFIG_TEMP_SENSOR_POWER_GPIO
-	return gpio_get_level(CONFIG_TEMP_SENSOR_POWER_GPIO);
-#else
-	return 1;
-#endif
-}
-
-static int raw_read8(const int offset, int *data_ptr)
-{
-	return i2c_read8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS,
-			 offset, data_ptr);
-}
-
-#ifdef CONFIG_CMD_TEMP_SENSOR
-static int raw_write8(const int offset, int data)
-{
-	return i2c_write8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS,
-			  offset, data);
-}
-#endif
-
-static int get_temp(const int offset, int *temp_ptr)
-{
-	int rv;
-	int temp_raw = 0;
-
-	rv = raw_read8(offset, &temp_raw);
-	if (rv < 0)
-		return rv;
-
-	*temp_ptr = (int)(int8_t)temp_raw;
-	return EC_SUCCESS;
-}
-
-#ifdef CONFIG_CMD_TEMP_SENSOR
-static int set_temp(const int offset, int temp)
-{
-	if (temp < -127 || temp > 127)
-		return EC_ERROR_INVAL;
-
-	return raw_write8(offset, (uint8_t)temp);
-}
-#endif
-
-int g78x_get_val(int idx, int *temp_ptr)
-{
-	if (!has_power())
-		return EC_ERROR_NOT_POWERED;
-
-	switch (idx) {
-	case G78X_IDX_INTERNAL:
-		*temp_ptr = temp_val_local;
-		break;
-	case G78X_IDX_EXTERNAL1:
-		*temp_ptr = temp_val_remote1;
-		break;
-#ifdef CONFIG_TEMP_SENSOR_G782
-	case G78X_IDX_EXTERNAL2:
-		*temp_ptr = temp_val_remote2;
-		break;
-#endif
-	default:
-		return EC_ERROR_UNKNOWN;
-	}
-
-	return EC_SUCCESS;
-}
-
-static void temp_sensor_poll(void)
-{
-	if (!has_power())
-		return;
-
-	get_temp(G78X_TEMP_LOCAL, &temp_val_local);
-	temp_val_local = C_TO_K(temp_val_local);
-
-	get_temp(G78X_TEMP_REMOTE1, &temp_val_remote1);
-	temp_val_remote1 = C_TO_K(temp_val_remote1);
-
-#ifdef CONFIG_TEMP_SENSOR_G782
-	get_temp(G78X_TEMP_REMOTE2, &temp_val_remote2);
-	temp_val_remote2 = C_TO_K(temp_val_remote2);
-#endif
-}
-DECLARE_HOOK(HOOK_SECOND, temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR);
-
-#ifdef CONFIG_CMD_TEMP_SENSOR
-static void print_temps(const char *name,
-			const int temp_reg,
-			const int therm_limit_reg,
-			const int high_limit_reg,
-			const int low_limit_reg)
-{
-	int value;
-
-	ccprintf("%s:\n", name);
-
-	if (get_temp(temp_reg, &value) == EC_SUCCESS)
-		ccprintf("  Temp:       %3dC\n", value);
-
-	if (get_temp(therm_limit_reg, &value) == EC_SUCCESS)
-		ccprintf("  Therm Trip: %3dC\n", value);
-
-	if (get_temp(high_limit_reg, &value) == EC_SUCCESS)
-		ccprintf("  High Alarm: %3dC\n", value);
-
-	if (get_temp(low_limit_reg, &value) == EC_SUCCESS)
-		ccprintf("  Low Alarm:  %3dC\n", value);
-}
-
-static int print_status(void)
-{
-	int value;
-
-	if (!has_power()) {
-		ccprintf("ERROR: Temp sensor not powered.\n");
-		return EC_ERROR_NOT_POWERED;
-	}
-
-	print_temps("Local", G78X_TEMP_LOCAL,
-		    G78X_LOCAL_TEMP_THERM_LIMIT,
-		    G78X_LOCAL_TEMP_HIGH_LIMIT_R,
-		    G78X_LOCAL_TEMP_LOW_LIMIT_R);
-
-	print_temps("Remote1", G78X_TEMP_REMOTE1,
-		    G78X_REMOTE1_TEMP_THERM_LIMIT,
-		    G78X_REMOTE1_TEMP_HIGH_LIMIT_R,
-		    G78X_REMOTE1_TEMP_LOW_LIMIT_R);
-
-#ifdef CONFIG_TEMP_SENSOR_G782
-	print_temps("Remote2", G78X_TEMP_REMOTE1,
-		    G78X_REMOTE2_TEMP_THERM_LIMIT,
-		    G78X_REMOTE2_TEMP_HIGH_LIMIT_R,
-		    G78X_REMOTE2_TEMP_LOW_LIMIT_R);
-#endif
-
-	ccprintf("\n");
-
-	if (raw_read8(G78X_STATUS, &value) == EC_SUCCESS)
-		ccprintf("STATUS:  %pb\n", BINARY_VALUE(value, 8));
-
-#ifdef CONFIG_TEMP_SENSOR_G782
-	if (raw_read8(G78X_STATUS1, &value) == EC_SUCCESS)
-		ccprintf("STATUS1: %pb\n", BINARY_VALUE(value, 8));
-#endif
-
-	if (raw_read8(G78X_CONFIGURATION_R, &value) == EC_SUCCESS)
-		ccprintf("CONFIG:  %pb\n", BINARY_VALUE(value, 8));
-
-	return EC_SUCCESS;
-}
-
-static int command_g78x(int argc, char **argv)
-{
-	char *command;
-	char *e;
-	int data;
-	int offset;
-	int rv;
-
-	if (!has_power()) {
-		ccprintf("ERROR: Temp sensor not powered.\n");
-		return EC_ERROR_NOT_POWERED;
-	}
-
-	/* If no args just print status */
-	if (argc == 1)
-		return print_status();
-
-	if (argc < 3)
-		return EC_ERROR_PARAM_COUNT;
-
-	command = argv[1];
-	offset = strtoi(argv[2], &e, 0);
-	if (*e || offset < 0 || offset > 255)
-		return EC_ERROR_PARAM2;
-
-	if (!strcasecmp(command, "getbyte")) {
-		rv = raw_read8(offset, &data);
-		if (rv < 0)
-			return rv;
-		ccprintf("Byte at offset 0x%02x is %pb\n",
-			 offset, BINARY_VALUE(data, 8));
-		return rv;
-	}
-
-	/* Remaining commands are of the form "g78x set-command offset data" */
-	if (argc != 4)
-		return EC_ERROR_PARAM_COUNT;
-
-	data = strtoi(argv[3], &e, 0);
-	if (*e)
-		return EC_ERROR_PARAM3;
-
-	if (!strcasecmp(command, "settemp")) {
-		ccprintf("Setting 0x%02x to %dC\n", offset, data);
-		rv = set_temp(offset, data);
-	} else if (!strcasecmp(command, "setbyte")) {
-		ccprintf("Setting 0x%02x to 0x%02x\n", offset, data);
-		rv = raw_write8(offset, data);
-	} else
-		return EC_ERROR_PARAM1;
-
-	return rv;
-}
-DECLARE_CONSOLE_COMMAND(g78x, command_g78x,
-	"[settemp|setbyte <offset> <value>] or [getbyte <offset>]. "
-	"Temps in Celsius.",
-	"Print g781/g782 temp sensor status or set parameters.");
-#endif