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

diff --git a/driver/temp_sensor/tmp468.c b/driver/temp_sensor/tmp468.c
deleted file mode 100644
index 46e77ca696..0000000000
--- a/driver/temp_sensor/tmp468.c
+++ /dev/null
@@ -1,101 +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.
- */
-
-/* TMP468 temperature sensor module for Chrome EC */
-
-#include "common.h"
-#include "console.h"
-#include "tmp432.h"
-#include "gpio.h"
-#include "i2c.h"
-#include "hooks.h"
-#include "util.h"
-
-#include "tmp468.h"
-
-
-static int fake_temp[TMP468_CHANNEL_COUNT] = {-1, -1, -1, -1, -1, -1, -1 , -1, -1};
-static int temp_val[TMP468_CHANNEL_COUNT]  = {0, 0, 0, 0, 0, 0, 0 , 0, 0};
-static uint8_t is_sensor_shutdown;
-
-static int has_power(void)
-{
-	return !is_sensor_shutdown;
-}
-
-static int raw_read16(const int offset, int *data_ptr)
-{
-	return i2c_read16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS,
-			  offset, data_ptr);
-}
-
-static int raw_write16(const int offset, int data_ptr)
-{
-	return i2c_write16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS,
-			   offset, data_ptr);
-}
-
-static int tmp468_shutdown(uint8_t want_shutdown)
-{
-	int ret, value;
-
-	if (want_shutdown == is_sensor_shutdown)
-		return EC_SUCCESS;
-
-	ret = raw_read16(TMP468_CONFIGURATION, &value);
-	if (ret < 0) {
-		ccprintf("ERROR: Temp sensor I2C read16 error.\n");
-		return ret;
-	}
-
-	if (want_shutdown)
-		value |= TMP468_SHUTDOWN;
-	else
-		value &= ~TMP468_SHUTDOWN;
-
-	ret = raw_write16(TMP468_CONFIGURATION, value);
-	if (ret == EC_SUCCESS)
-		is_sensor_shutdown = want_shutdown;
-
-	return EC_SUCCESS;
-}
-
-int tmp468_get_val(int idx, int *temp_ptr)
-{
-	if(!has_power())
-		return EC_ERROR_NOT_POWERED;
-
-	if (idx < TMP468_CHANNEL_COUNT) {
-		*temp_ptr = C_TO_K(temp_val[idx]);
-		return EC_SUCCESS;
-	}
-
-	return EC_ERROR_INVAL;
-}
-
-static void temp_sensor_poll(void)
-{
-	int i, ret;
-
-	if (!has_power())
-		return;
-
-	for (i = 0; i < TMP468_CHANNEL_COUNT; i++)
-		if (fake_temp[i] != -1) {
-			temp_val[i] = fake_temp[i];
-		} else {
-			ret = raw_read16(TMP468_LOCAL + i, &temp_val[i]);
-			if (ret < 0)
-				return;
-			temp_val[i] >>= TMP468_SHIFT1;
-		}
-}
-DECLARE_HOOK(HOOK_SECOND, temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR);
-
-int tmp468_set_power(enum tmp468_power_state power_on)
-{
-	uint8_t shutdown = (power_on == TMP468_POWER_OFF) ? 1 : 0;
-	return tmp468_shutdown(shutdown);
-}