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

diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c
deleted file mode 100644
index 4da5c4e0e8..0000000000
--- a/driver/temp_sensor/tmp112.c
+++ /dev/null
@@ -1,124 +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.
- */
-
-/* TMP112 temperature sensor module for Chrome EC */
-
-#include "common.h"
-#include "console.h"
-#include "tmp112.h"
-#include "i2c.h"
-#include "hooks.h"
-#include "math_util.h"
-#include "util.h"
-
-#define TMP112_RESOLUTION 12
-#define TMP112_SHIFT1 (16 - TMP112_RESOLUTION)
-#define TMP112_SHIFT2 (TMP112_RESOLUTION - 8)
-
-#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args)
-
-static int temp_mk_local[TMP112_COUNT];
-
-static int raw_read16(int sensor, const int offset, int *data_ptr)
-{
-#ifdef CONFIG_I2C_BUS_MAY_BE_UNPOWERED
-	/*
-	 * Don't try to read if the port is unpowered
-	 */
-	if (!board_is_i2c_port_powered(tmp112_sensors[sensor].i2c_port))
-		return EC_ERROR_NOT_POWERED;
-#endif
-	return i2c_read16(tmp112_sensors[sensor].i2c_port,
-			  tmp112_sensors[sensor].i2c_addr_flags,
-			  offset, data_ptr);
-}
-
-static int raw_write16(int sensor, const int offset, int data)
-{
-#ifdef CONFIG_I2C_BUS_MAY_BE_UNPOWERED
-	/*
-	 * Don't try to write if the port is unpowered
-	 */
-	if (!board_is_i2c_port_powered(tmp112_sensors[sensor].i2c_port))
-		return EC_ERROR_NOT_POWERED;
-#endif
-	return i2c_write16(tmp112_sensors[sensor].i2c_port,
-			   tmp112_sensors[sensor].i2c_addr_flags,
-			   offset, data);
-}
-
-static int get_reg_temp(int sensor, int *temp_ptr)
-{
-	int rv;
-	int temp_raw = 0;
-
-	rv = raw_read16(sensor, TMP112_REG_TEMP, &temp_raw);
-	if (rv)
-		return rv;
-
-	*temp_ptr = (int)(int16_t)temp_raw;
-	return EC_SUCCESS;
-}
-
-static inline int tmp112_reg_to_mk(int16_t reg)
-{
-	int temp_mc;
-
-	temp_mc = (((reg >> TMP112_SHIFT1) * 1000) >> TMP112_SHIFT2);
-
-	return MILLI_CELSIUS_TO_MILLI_KELVIN(temp_mc);
-}
-
-int tmp112_get_val_k(int idx, int *temp_k_ptr)
-{
-	if (idx >= TMP112_COUNT)
-		return EC_ERROR_INVAL;
-
-	*temp_k_ptr = MILLI_KELVIN_TO_KELVIN(temp_mk_local[idx]);
-	return EC_SUCCESS;
-}
-
-int tmp112_get_val_mk(int idx, int *temp_mk_ptr)
-{
-	if (idx >= TMP112_COUNT)
-		return EC_ERROR_INVAL;
-
-	*temp_mk_ptr = temp_mk_local[idx];
-	return EC_SUCCESS;
-}
-
-static void tmp112_poll(void)
-{
-	int s;
-	int temp_reg = 0;
-
-	for (s = 0; s < TMP112_COUNT; s++) {
-		if (get_reg_temp(s, &temp_reg) == EC_SUCCESS)
-			temp_mk_local[s] = tmp112_reg_to_mk(temp_reg);
-	}
-}
-DECLARE_HOOK(HOOK_SECOND, tmp112_poll, HOOK_PRIO_TEMP_SENSOR);
-
-void tmp112_init(void)
-{
-	int tmp, s, rv;
-	int set_mask, clr_mask;
-
-	/* 12 bit mode */
-	set_mask = (3 << 5);
-
-	/* not oneshot mode */
-	clr_mask = BIT(7);
-
-	for (s = 0; s < TMP112_COUNT; s++) {
-		rv = raw_read16(s, TMP112_REG_CONF, &tmp);
-		if (rv != EC_SUCCESS) {
-			CPRINTS("TMP112-%d: Failed to init (rv %d)", s, rv);
-			continue;
-		}
-		raw_write16(s, TMP112_REG_CONF, (tmp & ~clr_mask) | set_mask);
-	}
-}
-DECLARE_HOOK(HOOK_INIT, tmp112_init, HOOK_PRIO_DEFAULT);