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

diff --git a/zephyr/shim/src/adc.c b/zephyr/shim/src/adc.c
deleted file mode 100644
index 4f66774466..0000000000
--- a/zephyr/shim/src/adc.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2021 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.
- */
-
-#include <drivers/adc.h>
-#include <logging/log.h>
-#include "adc.h"
-#include "zephyr_adc.h"
-
-LOG_MODULE_REGISTER(shim_adc, LOG_LEVEL_ERR);
-
-#define ADC_NODE DT_NODELABEL(adc0)
-const struct device *adc_dev;
-
-#define HAS_NAMED_ADC_CHANNELS DT_NODE_EXISTS(DT_INST(0, named_adc_channels))
-
-#if HAS_NAMED_ADC_CHANNELS
-#define ADC_CHANNEL_COMMA(node_id)                                        \
-	[ZSHIM_ADC_ID(node_id)] = {                                       \
-		.name = DT_LABEL(node_id),                                \
-		.input_ch = DT_PROP(node_id, channel),                    \
-		.factor_mul = DT_PROP(node_id, mul),                      \
-		.factor_div = DT_PROP(node_id, div),                      \
-		.channel_cfg = {                                          \
-			.channel_id = DT_PROP(node_id, channel),          \
-			.gain = DT_STRING_TOKEN(node_id, gain),           \
-			.reference = DT_STRING_TOKEN(node_id, reference), \
-			.acquisition_time =                               \
-				DT_PROP(node_id, acquisition_time),       \
-			.differential = DT_PROP(node_id, differential),   \
-		},                                                        \
-	},
-#ifdef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG
-struct adc_t adc_channels[] = { DT_FOREACH_CHILD(
-	DT_INST(0, named_adc_channels), ADC_CHANNEL_COMMA) };
-#else
-const struct adc_t adc_channels[] = { DT_FOREACH_CHILD(
-	DT_INST(0, named_adc_channels), ADC_CHANNEL_COMMA) };
-#endif
-#endif /* named_adc_channels */
-
-static int init_device_bindings(const struct device *device)
-{
-	ARG_UNUSED(device);
-	adc_dev = DEVICE_DT_GET(ADC_NODE);
-
-	if (!device_is_ready(adc_dev)) {
-		LOG_ERR("Error: device %s is not ready", adc_dev->name);
-		return -1;
-	}
-
-#if HAS_NAMED_ADC_CHANNELS
-	for (int i = 0; i < ARRAY_SIZE(adc_channels); i++)
-		adc_channel_setup(adc_dev, &adc_channels[i].channel_cfg);
-#endif
-
-	return 0;
-}
-SYS_INIT(init_device_bindings, POST_KERNEL, 51);
-
-int adc_read_channel(enum adc_channel ch)
-{
-	int ret = 0, rv;
-	struct adc_sequence seq = {
-		.options = NULL,
-		.channels = BIT(adc_channels[ch].input_ch),
-		.buffer = &ret,
-		.buffer_size = sizeof(ret),
-		.resolution = CONFIG_PLATFORM_EC_ADC_RESOLUTION,
-		.oversampling = CONFIG_PLATFORM_EC_ADC_OVERSAMPLING,
-		.calibrate = false,
-	};
-
-	rv = adc_read(adc_dev, &seq);
-	if (rv)
-		return rv;
-
-	adc_raw_to_millivolts(adc_ref_internal(adc_dev), ADC_GAIN_1,
-			      CONFIG_PLATFORM_EC_ADC_RESOLUTION, &ret);
-	ret = (ret * adc_channels[ch].factor_mul) / adc_channels[ch].factor_div;
-	return ret;
-}