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

diff --git a/zephyr/dts/bindings/adc/named-adc.yaml b/zephyr/dts/bindings/adc/named-adc.yaml
deleted file mode 100644
index 6f06d73b86..0000000000
--- a/zephyr/dts/bindings/adc/named-adc.yaml
+++ /dev/null
@@ -1,107 +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.
-
-description: ADC parent node
-
-compatible: "named-adc-channels"
-
-child-binding:
-  description: Named ADCs child node
-  properties:
-    label:
-      required: true
-      type: string
-      description:
-        Human-readable string describing the device (used as
-        device_get_binding() argument)
-    channel:
-      required: true
-      type: int
-      description: ADC channel used
-    mul:
-      required: false
-      type: int
-      default: 1
-      description: Multiplication factor of ADC measurement
-    div:
-      required: false
-      type: int
-      default: 1
-      description: Division factor of ADC measurement
-    gain:
-      required: false
-      type: string
-      description:
-        Gain selection for the ADC channel. Source of valid gain settings is
-        "enum adc_gain" found in <zephyr-base>/include/drivers/adc.h
-      enum:
-        - ADC_GAIN_1_6
-        - ADC_GAIN_1_5
-        - ADC_GAIN_1_4
-        - ADC_GAIN_1_3
-        - ADC_GAIN_1_2
-        - ADC_GAIN_2_3
-        - ADC_GAIN_1
-        - ADC_GAIN_2
-        - ADC_GAIN_3
-        - ADC_GAIN_4
-        - ADC_GAIN_8
-        - ADC_GAIN_16
-        - ADC_GAIN_32
-        - ADC_GAIN_64
-        - ADC_GAIN_128
-      default: ADC_GAIN_1
-    reference:
-      required: false
-      type: string
-      description:
-        Sets the reference voltage for the ADC channel. Source of valid
-        reference voltages is "enum adc_reference" found in
-        <zephyr-base>/include/drivers/adc.
-      enum:
-        - ADC_REF_VDD_1
-        - ADC_REF_VDD_1_2
-        - ADC_REF_VDD_1_3
-        - ADC_REF_VDD_1_4
-        - ADC_REF_INTERNAL
-        - ADC_REF_EXTERNAL0
-        - ADC_REF_EXTERNAL1
-      default: ADC_REF_INTERNAL
-    acquisition-time:
-      required: false
-      type: int
-      description:
-        Set the acquisition time for ADC conversion. Use the ADC_ACQ_TIME macro
-        to compose this value. If the hardware doesn't support a configurable
-        acquisition time, use ADC_ACQ_TIME_DEFAULT (0).
-      default: 0
-    differential:
-      required: false
-      type: boolean
-      description:
-        Set the ADC acquisition mode to differential. Default mode is
-        single-ended acquisition.
-    enum-name:
-      type: string
-      required: true
-      description:
-        Enum values used in the source code to refer to the ADC channels
-      enum:
-      - ADC_AMON_BMON
-      - ADC_BOARD_ID_0
-      - ADC_BOARD_ID_1
-      - ADC_PMON
-      - ADC_PSYS
-      - ADC_TEMP_SENSOR_CHARGER
-      - ADC_TEMP_SENSOR_DDR_SOC
-      - ADC_TEMP_SENSOR_FAN
-      - ADC_TEMP_SENSOR_PP3300_REGULATOR
-      - ADC_VBUS
-      - ADC_VBUS_C0
-      - ADC_VBUS_C1
-      - ADC_EVB_CH_0
-      - ADC_EVB_CH_1
-      - ADC_EVB_CH_2
-      - ADC_EVB_CH_3
-      - ADC_EVB_CH_4