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

diff --git a/driver/temp_sensor/thermistor_ncp15wb.c b/driver/temp_sensor/thermistor_ncp15wb.c
deleted file mode 100644
index dba06ee326..0000000000
--- a/driver/temp_sensor/thermistor_ncp15wb.c
+++ /dev/null
@@ -1,100 +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.
- */
-
-/* NCP15WB thermistor module for Chrome EC */
-
-#include "common.h"
-#include "temp_sensor/thermistor.h"
-#include "util.h"
-
-/*
- * ADC-to-temp conversion assumes recommended thermistor / resistor
- * configuration (NCP15WB* / 24.9K) with a 10-bit ADC.
- * For 50C through 100C, use linear interpolation from discreet points
- * in table below. For temps < 50C, use a simplified linear function.
- */
-#define ADC_DISCREET_RANGE_START_TEMP	50
-/* 10 bit ADC result corresponding to START_TEMP */
-#define ADC_DISCREET_RANGE_START_RESULT	407
-
-#define ADC_DISCREET_RANGE_LIMIT_TEMP	100
-/* 10 bit ADC result corresponding to LIMIT_TEMP */
-#define ADC_DISCREET_RANGE_LIMIT_RESULT	107
-
-/* Table entries in steppings of 5C */
-#define ADC_DISCREET_RANGE_STEP		5
-
-/* Discreet range ADC results (9 bit) per temperature, in 5 degree steps */
-static const uint8_t adc_result[] = {
-	203,	/* 50 C */
-	178,	/* 55 C */
-	157,	/* 60 C */
-	138,	/* 65 C */
-	121,	/* 70 C */
-	106,	/* 75 C */
-	93,	/* 80 C */
-	81,	/* 85 C */
-	70,	/* 90 C */
-	61,	/* 95 C */
-	53,	/* 100 C */
-};
-
-/*
- * From 20C (reasonable lower limit of temperatures we care about accuracy)
- * to 50C, the temperature curve is roughly linear, so we don't need to include
- * data points in our table.
- */
-#define adc_to_temp(result) (ADC_DISCREET_RANGE_START_TEMP - \
-	(((result) - ADC_DISCREET_RANGE_START_RESULT) * 3 + 16) / 32)
-
-/* Convert ADC result (10 bit) to temperature in celsius */
-int ncp15wb_calculate_temp(uint16_t adc)
-{
-	int temp;
-	int head, tail, mid;
-	uint8_t delta, step;
-
-	/* Is ADC result in linear range? */
-	if (adc >= ADC_DISCREET_RANGE_START_RESULT)
-		temp = adc_to_temp(adc);
-	/* Hotter than our discreet range limit? */
-	else if (adc <= ADC_DISCREET_RANGE_LIMIT_RESULT)
-		temp = ADC_DISCREET_RANGE_LIMIT_TEMP;
-	/* We're in the discreet range */
-	else {
-		/* Table uses 9 bit ADC values */
-		adc /= 2;
-
-		/* Binary search to find proper table entry */
-		head = 0;
-		tail = ARRAY_SIZE(adc_result) - 1;
-		while (head != tail) {
-			mid = (head + tail) / 2;
-			if (adc_result[mid] >= adc &&
-			    adc_result[mid+1] < adc)
-				break;
-			if (adc_result[mid] > adc)
-				head = mid + 1;
-			else
-				tail = mid;
-		}
-
-		/* Now fit between table entries using linear interpolation. */
-		if (head != tail) {
-			delta = adc_result[mid] - adc_result[mid + 1];
-			step = ((adc_result[mid] - adc) *
-				ADC_DISCREET_RANGE_STEP + delta / 2) / delta;
-		} else {
-			/* Edge case where adc = max */
-			mid = head;
-			step = 0;
-		}
-
-		temp = ADC_DISCREET_RANGE_START_TEMP +
-		       ADC_DISCREET_RANGE_STEP * mid + step;
-	}
-
-	return temp;
-}