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

diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c
deleted file mode 100644
index e66642224c..0000000000
--- a/driver/temp_sensor/bd99992gw.c
+++ /dev/null
@@ -1,182 +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.
- */
-
-/*
- * BD99992GW PMIC temperature sensor module for Chrome EC.
- * Note that ADC / temperature sensor registers are only active while
- * the PMIC is in S0.
- */
-
-#include "bd99992gw.h"
-#include "chipset.h"
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "i2c.h"
-#include "temp_sensor.h"
-#include "temp_sensor/thermistor.h"
-#include "timer.h"
-#include "util.h"
-
-/* Console output macros */
-#define CPUTS(outstr) cputs(CC_THERMAL, outstr)
-#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args)
-
-/* List of active channels, ordered by pointer register */
-static enum bd99992gw_adc_channel
-	active_channels[BD99992GW_ADC_POINTER_REG_COUNT];
-
-/*
- * Use 27ms as the period between ADC conversions, as we will typically be
- * sampling temperature sensors every second, and 27ms is the longest
- * supported period.
- */
-#define ADC_LOOP_PERIOD BD99992GW_ADC1CNTL1_SLP27MS
-
-static int raw_read8(const int offset, int *data_ptr)
-{
-	int ret;
-	ret = i2c_read8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS,
-			offset, data_ptr);
-	if (ret != EC_SUCCESS)
-		CPRINTS("bd99992gw read fail %d", ret);
-	return ret;
-}
-
-static int raw_write8(const int offset, int data)
-{
-	int ret;
-	ret = i2c_write8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS,
-			 offset, data);
-	if (ret != EC_SUCCESS)
-		CPRINTS("bd99992gw write fail %d", ret);
-	return ret;
-}
-
-static void bd99992gw_init(void)
-{
-	int i;
-	int active_channel_count = 0;
-	uint8_t pointer_reg = BD99992GW_REG_ADC1ADDR0;
-
-	/* Mark active channels from the board temp sensor table */
-	for (i = 0; i < TEMP_SENSOR_COUNT; ++i)
-		if (temp_sensors[i].read == bd99992gw_get_val)
-			active_channels[active_channel_count++] =
-				temp_sensors[i].idx;
-
-	/* Make sure we don't have too many active channels. */
-	ASSERT(active_channel_count <= ARRAY_SIZE(active_channels));
-
-	/* Mark the first unused channel so we know where to stop searching */
-	if (active_channel_count != ARRAY_SIZE(active_channels))
-		active_channels[active_channel_count] =
-			BD99992GW_ADC_CHANNEL_NONE;
-
-	/* Now write pointer regs with channel to monitor */
-	for (i = 0; i < active_channel_count; ++i)
-		/* Write stop bit on last channel */
-		if (raw_write8(pointer_reg + i, active_channels[i] |
-			  ((i == active_channel_count - 1) ?
-			  BD99992GW_ADC1ADDR_STOP : 0)))
-			return;
-
-	/* Enable ADC interrupts */
-	if (raw_write8(BD99992GW_REG_MADC1INT, 0xf & ~BD99992GW_MADC1INT_RND))
-		return;
-	if (raw_write8(BD99992GW_REG_IRQLVL1MSK, BD99992GW_IRQLVL1MSK_MADC))
-		return;
-
-	/* Enable ADC sequencing */
-	if (raw_write8(BD99992GW_REG_ADC1CNTL2, BD99992GW_ADC1CNTL2_ADCTHERM))
-		return;
-
-	/* Start round-robin conversions at 27ms period */
-	raw_write8(BD99992GW_REG_ADC1CNTL1, ADC_LOOP_PERIOD |
-		   BD99992GW_ADC1CNTL1_ADEN | BD99992GW_ADC1CNTL1_ADSTRT);
-}
-/*
- * Some regs only work in S0, so we must initialize on AP startup in
- * addition to INIT.
- */
-DECLARE_HOOK(HOOK_INIT, bd99992gw_init, HOOK_PRIO_DEFAULT);
-DECLARE_HOOK(HOOK_CHIPSET_RESUME, bd99992gw_init, HOOK_PRIO_DEFAULT);
-
-/* Convert ADC result to temperature in celsius */
-static int bd99992gw_get_temp(uint16_t adc)
-{
-#ifdef CONFIG_THERMISTOR_NCP15WB
-	return ncp15wb_calculate_temp(adc);
-#else
-#error "Unknown thermistor for bd99992gw"
-	return 0;
-#endif
-}
-
-/* Get temperature from requested sensor */
-int bd99992gw_get_val(int idx, int *temp_ptr)
-{
-	uint16_t adc;
-	int i, read, ret;
-	enum bd99992gw_adc_channel channel;
-
-	/* ADC unit is only functional in S0 */
-	if (!chipset_in_state(CHIPSET_STATE_ON))
-		return EC_ERROR_NOT_POWERED;
-
-	/* Find requested channel */
-	for (i = 0; i < ARRAY_SIZE(active_channels); ++i) {
-		channel = active_channels[i];
-		if (channel == idx ||
-		    channel == BD99992GW_ADC_CHANNEL_NONE)
-			break;
-	}
-
-	/* Make sure we found it */
-	if (i == ARRAY_SIZE(active_channels) ||
-	    active_channels[i] != idx) {
-		CPRINTS("Bad ADC channel %d", idx);
-		return EC_ERROR_INVAL;
-	}
-
-	/* Pause conversions */
-	ret = raw_write8(0x80,
-			 ADC_LOOP_PERIOD |
-			 BD99992GW_ADC1CNTL1_ADEN |
-			 BD99992GW_ADC1CNTL1_ADSTRT |
-			 BD99992GW_ADC1CNTL1_ADPAUSE);
-	if (ret)
-		return ret;
-
-	/* Read 10-bit ADC result */
-	ret = raw_read8(BD99992GW_REG_ADC1DATA0L + 2 * i, &read);
-	if (ret)
-		return ret;
-	adc = read;
-	ret = raw_read8(BD99992GW_REG_ADC1DATA0H + 2 * i, &read);
-	if (ret)
-		return ret;
-	adc |= read << 2;
-
-	/* Convert temperature to C / K */
-	*temp_ptr = C_TO_K(bd99992gw_get_temp(adc));
-
-	/* Clear interrupts */
-	ret = raw_write8(BD99992GW_REG_ADC1INT, BD99992GW_ADC1INT_RND);
-	if (ret)
-		return ret;
-	ret = raw_write8(BD99992GW_REG_IRQLVL1, BD99992GW_IRQLVL1_ADC);
-	if (ret)
-		return ret;
-
-	/* Resume conversions */
-	ret = raw_write8(BD99992GW_REG_ADC1CNTL1, ADC_LOOP_PERIOD |
-		   BD99992GW_ADC1CNTL1_ADEN | BD99992GW_ADC1CNTL1_ADSTRT);
-	if (ret)
-		return ret;
-
-	return EC_SUCCESS;
-}