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

diff --git a/zephyr/projects/volteer/volteer/gpio.dts b/zephyr/projects/volteer/volteer/gpio.dts
deleted file mode 100644
index 4466689481..0000000000
--- a/zephyr/projects/volteer/volteer/gpio.dts
+++ /dev/null
@@ -1,406 +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.
- */
-
-/ {
-	named-gpios {
-		compatible = "named-gpios";
-
-		ec_lid_open {
-			gpios = <&gpiod 2 GPIO_INPUT>;
-			enum-name = "GPIO_LID_OPEN";
-			label = "EC_LID_OPEN";
-		};
-		gpio_ec_wp_l: ec_wp_l {
-			#gpio-cells = <0>;
-			gpios = <&gpioa 1 GPIO_INPUT>;
-			enum-name = "GPIO_EC_WP_L";
-			label = "EC_WP_L";
-		};
-		wp_l {
-			gpios = <&gpioa 1 GPIO_INPUT>;
-			enum-name = "GPIO_WP_L";
-			label = "WP_L";
-		};
-		h1_ec_pwr_btn_odl {
-			gpios = <&gpio0 1 GPIO_INPUT>;
-			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "H1_EC_PWR_BTN_ODL";
-		};
-		acok_od {
-			gpios = <&gpio0 0 GPIO_INPUT>;
-			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
-		};
-		slp_s0_l {
-			gpios = <&gpiod 5 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S0_L";
-			label = "SLP_S0_L";
-		};
-		slp_s3_l {
-			gpios = <&gpioa 5 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S3_L";
-			label = "SLP_S3_L";
-		};
-		pch_slp_sus_l {
-			gpios = <&gpiod 7 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_SUS_L";
-			label = "PCH_SLP_SUS_L";
-		};
-		slp_sus_l {
-			gpios = <&gpiod 7 GPIO_INPUT>;
-			enum-name = "GPIO_SLP_SUS_L";
-			label = "SLP_SUS_L";
-		};
-		pg_ec_rsmrst_odl {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_RSMRST_ODL";
-			label = "PG_EC_RSMRST_ODL";
-		};
-		rsmrst_l_pgood {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-			enum-name = "GPIO_RSMRST_L_PGOOD";
-			label = "RSMRST_L_PGOOD";
-		};
-		pg_ec_dsw_pwrok {
-			gpios = <&gpioc 7 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_DSW_PWROK";
-			label = "PG_EC_DSW_PWROK";
-		};
-		pg_ec_all_sys_pwrgd {
-			gpios = <&gpiof 4 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
-			label = "PG_EC_ALL_SYS_PWRGD";
-		};
-		gpio_ec_imu_int_l: ec_imu_int_l {
-			gpios = <&gpio5 6 GPIO_INPUT>;
-			enum-name = "GPIO_EC_IMU_INT_L";
-			label = "EC_IMU_INT_L";
-		};
-		gpio_ec_als_rgb_int_l: ec_als_rgb_int_l {
-			gpios = <&gpiod 4 GPIO_INPUT>;
-			enum-name = "GPIO_EC_ALS_RGB_INT_L";
-			label = "EC_ALS_RGB_INT_L";
-		};
-		tablet_mode_l {
-			gpios = <&gpio9 5 GPIO_INPUT>;
-			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
-		};
-		ec_accel_int {
-			gpios = <&gpio8 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_EC_ACCEL_INT";
-			label = "EC_ACCEL_INT";
-		};
-		usb_c0_tcpc_int_odl {
-			gpios = <&gpioe 0 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
-			label = "USB_C0_TCPC_INT_ODL";
-		};
-		usb_c1_tcpc_int_odl {
-			gpios = <&gpioa 2 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
-			label = "USB_C1_TCPC_INT_ODL";
-		};
-		usb_c0_ppc_int_odl {
-			gpios = <&gpio6 2 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
-			label = "USB_C0_PPC_INT_ODL";
-		};
-		usb_c1_ppc_int_odl {
-			gpios = <&gpiof 5 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
-			label = "USB_C1_PPC_INT_ODL";
-		};
-		usb_c0_bc12_int_odl {
-			gpios = <&gpioe 4 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_BC12_INT_ODL";
-			label = "USB_C0_BC12_INT_ODL";
-		};
-		gpio_usb_c1_mix_int_odl: usb_c1_mix_int_odl {
-			#gpio-cells = <0>;
-			gpios = <&gpio0 3 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_MIX_INT_ODL";
-			label = "USB_C1_MIX_INT_ODL";
-		};
-		usb_c1_bc12_int_odl {
-			#gpio-cells = <0>;
-			gpios = <&gpio0 3 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_BC12_INT_ODL";
-			label = "USB_C1_BC12_INT_ODL";
-		};
-		usb_c1_frs_en {
-			gpios = <&gpio9 4 GPIO_OUT_LOW>;
-			enum-name = "GPIO_USB_C1_FRS_EN";
-			label = "USB_C1_FRS_EN";
-		};
-		ec_voldn_btn_odl {
-			gpios = <&gpio9 3 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
-		};
-		ec_volup_btn_odl {
-			gpios = <&gpio9 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
-		};
-		en_pp3300_a {
-			gpios = <&gpioa 3 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
-		};
-		en_pp5000 {
-			gpios = <&gpioa 4 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000";
-		};
-		en_pp5000_a {
-			gpios = <&gpioa 4 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP5000_A";
-			label = "EN_PP5000_A";
-		};
-		en_ppvar_vccin {
-			gpios = <&gpio4 3 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PPVAR_VCCIN";
-			label = "EN_PPVAR_VCCIN";
-		};
-		ec_pch_dsw_pwrok {
-			gpios = <&gpioc 0 GPIO_OUT_LOW>;
-			enum-name = "GPIO_PCH_DSW_PWROK";
-			label = "EC_PCH_DSW_PWROK";
-		};
-		ec_rst_odl {
-			gpios = <&gpio0 2 GPIO_INPUT>;
-			label = "EC_RST_ODL";
-		};
-		ec_pch_sys_pwrok {
-			gpios = <&gpio3 7 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EC_PCH_SYS_PWROK";
-			label = "EC_PCH_SYS_PWROK";
-		};
-		ec_pch_rsmrst_odl {
-			gpios = <&gpioa 6 GPIO_ODR_LOW>;
-			enum-name = "GPIO_PCH_RSMRST_L";
-			label = "EC_PCH_RSMRST_ODL";
-		};
-		ec_pch_pwr_btn_odl {
-			gpios = <&gpioc 1 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_PCH_PWRBTN_L";
-			label = "EC_PCH_PWR_BTN_ODL";
-		};
-		ec_pch_rtcrst {
-			gpios = <&gpio7 6 GPIO_OUT_LOW>;
-			enum-name = "GPIO_PCH_RTCRST";
-			label = "EC_PCH_RTCRST";
-		};
-		ec_pch_wake_odl {
-			gpios = <&gpio7 4 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "EC_PCH_WAKE_ODL";
-		};
-		ec_entering_rw {
-			gpios = <&gpioe 3 GPIO_OUT_LOW>;
-			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
-		};
-		ec_prochot_odl {
-			gpios = <&gpio6 3 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_CPU_PROCHOT";
-			label = "EC_PROCHOT_ODL";
-		};
-		ec_prochot_in_l {
-			gpios = <&gpiof 0 GPIO_INPUT>;
-			enum-name = "GPIO_EC_PROCHOT_IN_L";
-			label = "EC_PROCHOT_IN_L";
-		};
-		sys_rst_odl {
-			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_SYS_RESET_L";
-			label = "SYS_RST_ODL";
-		};
-		ec_pch_int_odl {
-			gpios = <&gpiob 0 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_EC_INT_L";
-			label = "EC_PCH_INT_ODL";
-		};
-		en_pp5000_usba {
-			gpios = <&gpioc 6 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP5000_USBA";
-			label = "EN_PP5000_USBA";
-		};
-		usb_a_low_pwr_od {
-			gpios = <&gpio6 6 GPIO_ODR_LOW>;
-			enum-name = "GPIO_USB_A_LOW_PWR_OD";
-			label = "USB_A_LOW_PWR_OD";
-		};
-		gpio_usb_c1_rt_rst_odl_boardid_0: usb_c1_rt_rst_odl_boardid_0 {
-			#gpio-cells = <0>;
-			gpios = <&gpio3 2 GPIO_ODR_LOW>;
-			label = "USB_C1_RT_RST_ODL_BOARDID_0";
-		};
-		gpio_usb_c1_rt_rst_odl: usb_c1_rt_rst_odl {
-			#gpio-cells = <0>;
-			gpios = <&gpio8 3 GPIO_ODR_LOW>;
-			enum-name = "GPIO_USB_C1_RT_RST_ODL";
-			label = "USB_C1_RT_RST_ODL";
-		};
-		usb_c0_oc_odl {
-			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C0_OC_ODL";
-			label = "USB_C0_OC_ODL";
-		};
-		usb_c1_oc_odl {
-			gpios = <&gpio5 0 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C1_OC_ODL";
-			label = "USB_C1_OC_ODL";
-		};
-		usb_c1_rt_int_odl {
-			gpios = <&gpiof 3 GPIO_INPUT>;
-			label = "USB_C1_RT_INT_ODL";
-		};
-		ec_h1_packet_mode {
-			gpios = <&gpio7 5 GPIO_OUT_LOW>;
-			enum-name = "GPIO_PACKET_MODE_EN";
-			label = "EC_H1_PACKET_MODE";
-		};
-		m2_ssd_pln {
-			gpios = <&gpioa 0 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_M2_SSD_PLN";
-			label = "M2_SSD_PLN";
-		};
-		m2_ssd_pla {
-			gpios = <&gpio7 0 GPIO_INPUT>;
-			label = "M2_SSD_PLA";
-		};
-		ccd_mode_odl {
-			gpios = <&gpioe 5 GPIO_INPUT>;
-			label = "CCD_MODE_ODL";
-		};
-		ec_slp_s0ix {
-			gpios = <&gpio7 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_SLP_S0IX";
-		};
-		gpio_unused_gpio41: unused_gpio41 {
-			#gpio-cells = <0>;
-			gpios = <&gpio4 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_USB_C1_LS_EN";
-			label = "UNUSED_GPIO41";
-		};
-		ec_kb_bl_en {
-			gpios = <&gpio8 6 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_KB_BL_EN";
-		};
-		ec_espi_alert_l {
-			gpios = <&gpio5 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_ESPI_ALERT_L";
-		};
-		ec_edp_bl_en {
-			gpios = <&gpiod 3 GPIO_OUT_HIGH>;
-			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_EDP_BL_EN";
-		};
-		ec_i2c0_sensor_scl {
-			gpios = <&gpiob 5 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C0_SENSOR_SCL";
-			label = "EC_I2C0_SENSOR_SCL";
-		};
-		ec_i2c0_sensor_sda {
-			gpios = <&gpiob 4 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C0_SENSOR_SDA";
-			label = "EC_I2C0_SENSOR_SDA";
-		};
-		ec_i2c1_usb_c0_scl {
-			gpios = <&gpio9 0 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C1_USB_C0_SCL";
-			label = "EC_I2C1_USB_C0_SCL";
-		};
-		ec_i2c1_usb_c0_sda {
-			gpios = <&gpio8 7 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C1_USB_C0_SDA";
-			label = "EC_I2C1_USB_C0_SDA";
-		};
-		ec_i2c2_usb_c1_scl {
-			gpios = <&gpio9 2 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C2_USB_C1_SCL";
-			label = "EC_I2C2_USB_C1_SCL";
-		};
-		ec_i2c2_usb_c1_sda {
-			gpios = <&gpio9 1 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C2_USB_C1_SDA";
-			label = "EC_I2C2_USB_C1_SDA";
-		};
-		ec_i2c3_usb_1_mix_scl {
-			gpios = <&gpiod 1 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C3_USB_1_MIX_SCL";
-			label = "EC_I2C3_USB_1_MIX_SCL";
-		};
-		ec_i2c3_usb_1_mix_sda {
-			gpios = <&gpiod 0 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C3_USB_1_MIX_SDA";
-			label = "EC_I2C3_USB_1_MIX_SDA";
-		};
-		ec_i2c5_battery_scl {
-			gpios = <&gpio3 3 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C5_BATTERY_SCL";
-			label = "EC_I2C5_BATTERY_SCL";
-		};
-		ec_i2c5_battery_sda {
-			gpios = <&gpio3 6 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C5_BATTERY_SDA";
-			label = "EC_I2C5_BATTERY_SDA";
-		};
-		ec_i2c7_eeprom_pwr_scl_r {
-			gpios = <&gpiob 3 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C7_EEPROM_PWR_SCL_R";
-			label = "EC_I2C7_EEPROM_PWR_SCL_R";
-		};
-		ec_i2c7_eeprom_pwr_sda_r {
-			gpios = <&gpiob 2 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C7_EEPROM_PWR_SDA_R";
-			label = "EC_I2C7_EEPROM_PWR_SDA_R";
-		};
-		/*
-		 * TODO(b:190743662) Cleanup to possibly remove the enum
-		 */
-		ec_batt_pres_odl {
-			gpios = <&gpioe 1 GPIO_INPUT>;
-			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
-		};
-		gpio_en_pp5000_fan: en_pp5000_fan {
-			gpios = <&gpio6 1 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP5000_FAN";
-			label = "EN_PP5000_FAN";
-		};
-		ec_kso_02_inv {
-			gpios = <&gpio1 7 GPIO_OUT_LOW>;
-			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
-		};
-	};
-
-	def-lvol-io-list {
-		compatible = "nuvoton,npcx-lvolctrl-def";
-		lvol-io-pads = <&lvol_iob4 &lvol_iob5>; /* I2C_SDA0 & SCL0 */
-	};
-
-	unused-pins {
-		compatible = "unused-gpios";
-		unused-gpios =
-			<&gpio3 4 0>,
-			<&gpio4 1 0>,
-			<&gpio5 7 0>, /* EC_ESPI_ALERT_L not stuffed */
-			<&gpio9 6 0>,
-			<&gpio7 2 0>, /* EC_SLP_S0IX not stuffed */
-			<&gpio8 6 0>, /* EC_KB_BL_EN not stuffed */
-			<&gpioa 7 0>, /* EN_PP5000_USB_AG not stuffed */
-			<&gpiof 2 0>,
-			/*
-			 * GPIOB6 cannot be configured as an input.
-			 * Drive output low so signal level doesn't
-			 * depend on default setting of PxDOUT register.
-			 */
-			 <&gpiob 6 GPIO_OUTPUT_LOW>;
-	};
-};