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>

13 files changed, 0 insertions, 1278 deletions

diff --git a/zephyr/projects/volteer/volteer/CMakeLists.txt b/zephyr/projects/volteer/volteer/CMakeLists.txt
deleted file mode 100644
index 8c01874b1b..0000000000
--- a/zephyr/projects/volteer/volteer/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020 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.
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.13.1)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(volteer)
-
-set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/volteer" CACHE PATH
-    "Path to the platform/ec board directory")
-set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/volteer" CACHE PATH
-    "Path to the platform/ec baseboard directory")
-
-# Include board specific header files
-zephyr_library_include_directories(
-  include
-  "${PLATFORM_EC_BASEBOARD}"
-  "${PLATFORM_EC_BOARD}")
-
-# Include selected EC source for the baseboard
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
-  "${PLATFORM_EC_BASEBOARD}/battery_presence.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGE_MANAGER
-  "${PLATFORM_EC_BASEBOARD}/charger.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
-  "${PLATFORM_EC_BASEBOARD}/cbi.c"
-  "${PLATFORM_EC_BASEBOARD}/cbi_ec_fw_config.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ
-  "${PLATFORM_EC_BASEBOARD}/power.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USB_POWER_DELIVERY
-  "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
-  "${PLATFORM_EC_BASEBOARD}/usbc_config.c")
-
-# Include selected EC source for the board
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY
-  "${PLATFORM_EC_BOARD}/battery.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM
-  "${PLATFORM_EC_BOARD}/cbi.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
-  "${PLATFORM_EC_BOARD}/led.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
-  "${PLATFORM_EC_BOARD}/usbc_config.c")
diff --git a/zephyr/projects/volteer/volteer/bb_retimer.dts b/zephyr/projects/volteer/volteer/bb_retimer.dts
deleted file mode 100644
index 226356d030..0000000000
--- a/zephyr/projects/volteer/volteer/bb_retimer.dts
+++ /dev/null
@@ -1,18 +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.
- */
-
-&i2c3_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-
-	usb_c1_bb_retimer: jhl8040r@40 {
-		compatible = "intel,jhl8040r";
-		reg = <0x40>;
-		label = "USB_C1_BB_RETIMER";
-		int-gpios = <&gpio_usb_c1_mix_int_odl>;
-		reset-gpios = <&gpio_usb_c1_rt_rst_odl>;
-		ls-en-gpios = <&gpio_unused_gpio41>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/cbi_eeprom.dts b/zephyr/projects/volteer/volteer/cbi_eeprom.dts
deleted file mode 100644
index 65248a5f48..0000000000
--- a/zephyr/projects/volteer/volteer/cbi_eeprom.dts
+++ /dev/null
@@ -1,68 +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.
- */
-
-&i2c7_0 {
-	cbi_eeprom: eeprom@50 {
-		compatible = "atmel,at24";
-		reg = <0x50>;
-		label = "EEPROM_CBI";
-		size = <2048>;
-		pagesize = <16>;
-		address-width = <8>;
-		timeout = <5>;
-		wp-gpios = <&gpio_ec_wp_l>;
-	};
-};
-
-&cbi_ssfc_base_sensor {
-	base_sensor_bmi160: bmi160 {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <1>;
-	};
-	base_sensor_icm426xx: icm426xx {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <2>;
-	};
-	base_sensor_kx022: kx022 {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <3>;
-	};
-};
-
-&cbi_ssfc_lid_sensor {
-	lid_sensor_bma255: bma255 {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <1>;
-	};
-	lid_sensor_kx022: kx022 {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <2>;
-	};
-};
-
-&cbi_ssfc_lightbar {
-	lightbar_10_led: 10_led {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <1>;
-	};
-	lightbar_12_led: 12_led {
-		compatible = "named-cbi-ssfc-value";
-		status = "okay";
-
-		value = <2>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/fan.dts b/zephyr/projects/volteer/volteer/fan.dts
deleted file mode 100644
index e8fcc7194c..0000000000
--- a/zephyr/projects/volteer/volteer/fan.dts
+++ /dev/null
@@ -1,29 +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-fans {
-		compatible = "named-fans";
-
-		fan_0 {
-			label = "FAN_0";
-			pwm = <&pwm_fan>;
-			rpm_min = <1900>;
-			rpm_start = <1900>;
-			rpm_max = <5900>;
-			tach = <&tach1>;
-			enable_gpio = <&gpio_en_pp5000_fan>;
-		};
-	};
-};
-
-/* Tachemeter for fan speed measurement */
-&tach1 {
-	status = "okay";
-	pinctrl-0 = <&alt3_ta1_sl1>; /* Use TA1 as input pin */
-	port = <NPCX_TACH_PORT_A>; /* port-A is selected */
-	sample-clk = <NPCX_TACH_FREQ_LFCLK>; /* Use LFCLK as sampling clock */
-	pulses-per-round = <2>; /* number of pulses per round of encoder */
-};
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>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/include/gpio_map.h b/zephyr/projects/volteer/volteer/include/gpio_map.h
deleted file mode 100644
index 2d6f5f87ee..0000000000
--- a/zephyr/projects/volteer/volteer/include/gpio_map.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#include <devicetree.h>
-#include <gpio_signal.h>
-
-#include "extpower.h"
-#include "lid_switch.h"
-#include "power_button.h"
-
-/*
- * Without https://github.com/zephyrproject-rtos/zephyr/pull/29282, we need
- * to manually link GPIO_ defines that platform/ec code expects to the
- * enum gpio_signal values that are generated by device tree bindings.
- *
- * Note we only need to create aliases for GPIOs that are referenced in common
- * platform/ec code.
- */
-#define CONFIG_TEMP_SENSOR_POWER_GPIO GPIO_PG_EC_DSW_PWROK
-
-/* Helper macros for generating CROS_EC_GPIO_INTERRUPTS */
-#ifdef CONFIG_PLATFORM_EC_POWERSEQ
-#define POWER_SIGNAL_INT(gpio, edge) \
-	GPIO_INT(gpio, edge, power_signal_interrupt)
-#define AP_PROCHOT_INT(gpio, edge) \
-	GPIO_INT(gpio, edge, throttle_ap_prochot_input_interrupt)
-#define POWER_BUTTON_INT(gpio, edge) \
-	GPIO_INT(gpio, edge, power_button_interrupt)
-#else
-#define POWER_SIGNAL_INT(gpio, edge)
-#define AP_PROCHOT_INT(gpio, edge)
-#define POWER_BUTTON_INT(gpio, edge)
-#endif
-
-#ifdef CONFIG_PLATFORM_EC_USBC
-#define TCPC_ALERT_INT(gpio, edge) GPIO_INT(gpio, edge, tcpc_alert_event)
-#define PPC_INT(gpio, edge) GPIO_INT(gpio, edge, ppc_interrupt)
-#define BC12_INT(gpio, edge) GPIO_INT(gpio, edge, bc12_interrupt)
-#else
-#define TCPC_ALERT_INT(gpio, edge)
-#define PPC_INT(gpio, edge)
-#define BC12_INT(gpio, edge)
-#endif
-
-#ifdef CONFIG_PLATFORM_EC_ALS_TCS3400
-#define TCS3400_INT(gpio, edge) GPIO_INT(gpio, edge, tcs3400_interrupt)
-#else
-#define TCS3400_INT(gpio, edge)
-#endif
-
-#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI260
-#define BMI260_INT(gpio, edge) GPIO_INT(gpio, edge, bmi260_interrupt)
-#else
-#define BMI260_INT(gpio, edge)
-#endif
-
-#ifdef CONFIG_PLATFORM_EC_GMR_TABLET_MODE
-#define GMR_TABLET_MODE_INT(gpio, edge) GPIO_INT(gpio, edge, \
-						 gmr_tablet_switch_isr)
-#define GMR_TABLET_MODE_GPIO_L	GPIO_TABLET_MODE_L
-#else
-#define GMR_TABLET_MODE_INT(gpio, edge)
-#endif
-
-#define GPIO_EC_BATT_PRES_ODL GPIO_BATT_PRES_ODL
-
-/*
- * Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items.
- *
- * Each GPIO_INT requires three parameters:
- *   gpio_signal - The enum gpio_signal for the interrupt gpio
- *   interrupt_flags - The interrupt-related flags (e.g. GPIO_INT_EDGE_BOTH)
- *   handler - The platform/ec interrupt handler.
- *
- * Ensure that this files includes all necessary headers to declare all
- * referenced handler functions.
- *
- * For example, one could use the follow definition:
- * #define EC_CROS_GPIO_INTERRUPTS \
- *   GPIO_INT(NAMED_GPIO(h1_ec_pwr_btn_odl), GPIO_INT_EDGE_BOTH, button_print)
- */
-#define EC_CROS_GPIO_INTERRUPTS                                            \
-	BMI260_INT(GPIO_EC_IMU_INT_L, GPIO_INT_EDGE_FALLING)               \
-	GMR_TABLET_MODE_INT(GPIO_TABLET_MODE_L, GPIO_INT_EDGE_BOTH)        \
-	GPIO_INT(GPIO_AC_PRESENT, GPIO_INT_EDGE_BOTH, extpower_interrupt)  \
-	GPIO_INT(GPIO_LID_OPEN, GPIO_INT_EDGE_BOTH, lid_interrupt)         \
-	GPIO_INT(GPIO_EC_WP_L, GPIO_INT_EDGE_BOTH, switch_interrupt)       \
-	POWER_SIGNAL_INT(GPIO_PCH_SLP_S0_L, GPIO_INT_EDGE_BOTH)            \
-	POWER_SIGNAL_INT(GPIO_PCH_SLP_S3_L, GPIO_INT_EDGE_BOTH)            \
-	POWER_SIGNAL_INT(GPIO_PCH_SLP_SUS_L, GPIO_INT_EDGE_BOTH)           \
-	POWER_SIGNAL_INT(GPIO_PG_EC_DSW_PWROK, GPIO_INT_EDGE_BOTH)         \
-	POWER_SIGNAL_INT(GPIO_PG_EC_RSMRST_ODL, GPIO_INT_EDGE_BOTH)        \
-	POWER_SIGNAL_INT(GPIO_PCH_DSW_PWROK, GPIO_INT_EDGE_BOTH)           \
-	POWER_SIGNAL_INT(GPIO_PG_EC_ALL_SYS_PWRGD, GPIO_INT_EDGE_BOTH)     \
-	POWER_BUTTON_INT(GPIO_POWER_BUTTON_L, GPIO_INT_EDGE_BOTH)          \
-	TCPC_ALERT_INT(GPIO_USB_C0_TCPC_INT_ODL, GPIO_INT_EDGE_BOTH)       \
-	TCPC_ALERT_INT(GPIO_USB_C1_TCPC_INT_ODL, GPIO_INT_EDGE_BOTH)       \
-	TCS3400_INT(GPIO_EC_ALS_RGB_INT_L, GPIO_INT_EDGE_FALLING)          \
-	PPC_INT(GPIO_USB_C0_PPC_INT_ODL, GPIO_INT_EDGE_BOTH)               \
-	PPC_INT(GPIO_USB_C1_PPC_INT_ODL, GPIO_INT_EDGE_BOTH)               \
-	BC12_INT(GPIO_USB_C0_BC12_INT_ODL, GPIO_INT_EDGE_BOTH)             \
-	BC12_INT(GPIO_USB_C1_MIX_INT_ODL, GPIO_INT_EDGE_BOTH)              \
-	AP_PROCHOT_INT(GPIO_EC_PROCHOT_IN_L, GPIO_INT_EDGE_BOTH)           \
-	GPIO_INT(GPIO_VOLUME_DOWN_L, GPIO_INT_EDGE_BOTH, button_interrupt) \
-	GPIO_INT(GPIO_VOLUME_UP_L, GPIO_INT_EDGE_BOTH, button_interrupt)
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/volteer/volteer/include/pwm_map.h b/zephyr/projects/volteer/volteer/include/pwm_map.h
deleted file mode 100644
index 67ab70936f..0000000000
--- a/zephyr/projects/volteer/volteer/include/pwm_map.h
+++ /dev/null
@@ -1,25 +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.
- */
-
-#ifndef __ZEPHYR_CHROME_PWM_MAP_H
-#define __ZEPHYR_CHROME_PWM_MAP_H
-
-#include <devicetree.h>
-
-#include "config.h"
-
-#include "pwm/pwm.h"
-
-/*
- * TODO(b/177452529): eliminate the dependency on enum pwm_channel
- * and configure this information directly from the device tree.
- */
-#define PWM_CH_LED4_SIDESEL	NAMED_PWM(led3_sidesel)
-
-#define PWM_CH_KBLIGHT		NAMED_PWM(kblight)
-
-#define PWM_CH_FAN		NAMED_PWM(fan)
-
-#endif /* __ZEPHYR_CHROME_PWM_MAP_H */
diff --git a/zephyr/projects/volteer/volteer/keyboard.dts b/zephyr/projects/volteer/volteer/keyboard.dts
deleted file mode 100644
index e9b5cdf0a1..0000000000
--- a/zephyr/projects/volteer/volteer/keyboard.dts
+++ /dev/null
@@ -1,28 +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.
- */
-
-/ {
-	cros-keyscan {
-		compatible = "cros-keyscan";
-
-		actual-key-mask = <
-			0x14	/* C0 */
-			0xff	/* C1 */
-			0xff	/* C2 */
-			0xff	/* C3 */
-			0xff	/* C4 */
-			0xf5	/* C5 */
-			0xff	/* C6 */
-			0xa4	/* C7 */
-			0xff	/* C8 */
-			0xfe	/* C9 */
-			0x55	/* C10 */
-			0xfa	/* C11 */
-			0xca	/* C12 */
-			0	/* C13 - for keypad */
-			0	/* C14 - for keypad */
-			>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/motionsense.dts b/zephyr/projects/volteer/volteer/motionsense.dts
deleted file mode 100644
index e22d5571dc..0000000000
--- a/zephyr/projects/volteer/volteer/motionsense.dts
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2020 The Chromium OS Authors
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <dt-bindings/motionsense/utils.h>
-
-
-/ {
-	aliases {
-		/*
-		 * motion sense's <>_INT_EVENT is handled
-		 * by alias. Using the alias, each driver creates
-		 * its own <>_INT_EVENT.
-		 */
-		bmi260-int = &base_accel;
-		tcs3400-int = &als_clear;
-	};
-
-	/*
-	 * Declare mutexes used by sensor drivers.
-	 * A mutex node is used to create an instance of mutex_t.
-	 * A mutex node is referenced by a sensor node if the
-	 * corresponding sensor driver needs to use the
-	 * instance of the mutex.
-	 */
-	motionsense-mutex {
-		compatible = "cros-ec,motionsense-mutex";
-		mutex_bma255: bma255-mutex {
-			label = "BMA255_MUTEX";
-		};
-
-		mutex_bmi260: bmi260-mutex {
-			label = "BMI260_MUTEX";
-		};
-	};
-
-	/* Rotation matrix used by drivers. */
-	motionsense-rotation-ref {
-		compatible = "cros-ec,motionsense-rotation-ref";
-		lid_rot_ref: lid-rotation-ref {
-			mat33 = <1 0 0
-				 0 (-1) 0
-				 0 0 (-1)>;
-		};
-		base_rot_ref: base-rotation-ref {
-			mat33 = <0 1 0
-				 (-1) 0 0
-				 0 0 1>;
-		};
-	};
-
-	/*
-	 * Driver specific data. A driver-specific data can be shared with
-	 * different motion sensors while they are using the same driver.
-	 *
-	 * If a node's compatible starts with "cros-ec,accelgyro-", it is for
-	 * a common structure defined in accelgyro.h.
-	 * e.g) compatible = "cros-ec,accelgyro-als-drv-data" is for
-	 * "struct als_drv_data_t" in accelgyro.h
-	 */
-	motionsense-sensor-data {
-		bma255_data: bma255-drv-data {
-			compatible = "cros-ec,drvdata-bma255";
-			status = "okay";
-		};
-
-		bmi260_data: bmi260-drv-data {
-			compatible = "cros-ec,drvdata-bmi260";
-			status = "okay";
-		};
-
-		tcs_clear_data: tcs3400-clear-drv-data {
-			compatible = "cros-ec,drvdata-tcs3400-clear";
-			status = "okay";
-
-			als-drv-data {
-				compatible = "cros-ec,accelgyro-als-drv-data";
-				als-cal {
-					scale = <1>;
-					uscale = <0>;
-					offset = <0>;
-					als-channel-scale {
-					compatible =
-					"cros-ec,accelgyro-als-channel-scale";
-						k-channel-scale = <1>;
-						cover-scale = <1>;
-					};
-				};
-			};
-		};
-
-		tcs_rgb_data: tcs3400-rgb-drv-data {
-			compatible = "cros-ec,drvdata-tcs3400-rgb";
-			status = "okay";
-
-			/* node for rgb_calibration_t defined in accelgyro.h */
-			rgb_calibration {
-				compatible =
-					"cros-ec,accelgyro-rgb-calibration";
-
-				irt = <1>;
-
-				rgb-cal-x {
-					offset = <0>;
-					coeff = <0 0 0 0>;
-					als-channel-scale {
-					compatible =
-					"cros-ec,accelgyro-als-channel-scale";
-						k-channel-scale = <1>;
-						cover-scale = <1>;
-					};
-				};
-				rgb-cal-y {
-					offset = <0>;
-					coeff = <0 0 0 0>;
-					als-channel-scale {
-					compatible =
-					"cros-ec,accelgyro-als-channel-scale";
-						k-channel-scale = <1>;
-						cover-scale = <1>;
-					};
-				};
-				rgb-cal-z {
-					offset = <0>;
-					coeff = <0 0 0 0>;
-					als-channel-scale {
-					compatible =
-					"cros-ec,accelgyro-als-channel-scale";
-						k-channel-scale = <1>;
-						cover-scale = <1>;
-					};
-				};
-			};
-		};
-	};
-
-	/*
-	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
-	 * motion sensor IDs for lid angle calculation.
-	 */
-	motionsense-sensor {
-		lid_accel: lid-accel {
-			compatible = "cros-ec,bma255";
-			status = "okay";
-
-			label = "Lid Accel";
-			active-mask = "SENSOR_ACTIVE_S0_S3";
-			location = "MOTIONSENSE_LOC_LID";
-			mutex = <&mutex_bma255>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&lid_rot_ref>;
-			default-range = <2>;
-			drv-data = <&bma255_data>;
-			i2c-spi-addr-flags = "BMA2x2_I2C_ADDR1_FLAGS";
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-			};
-		};
-
-		base_accel: base-accel {
-			compatible = "cros-ec,bmi260-accel";
-			status = "okay";
-
-			label = "Base Accel";
-			active-mask = "SENSOR_ACTIVE_S0_S3";
-			location = "MOTIONSENSE_LOC_BASE";
-			mutex = <&mutex_bmi260>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&base_rot_ref>;
-			default-range = <4>;
-			drv-data = <&bmi260_data>;
-			i2c-spi-addr-flags = "BMI260_ADDR0_FLAGS";
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-					ec-rate = <(100 * USEC_PER_MSEC)>;
-				};
-				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-					ec-rate = <(100 * USEC_PER_MSEC)>;
-				};
-			};
-		};
-
-		base-gyro {
-			compatible = "cros-ec,bmi260-gyro";
-			status = "okay";
-
-			label = "Base Gyro";
-			active-mask = "SENSOR_ACTIVE_S0_S3";
-			location = "MOTIONSENSE_LOC_BASE";
-			mutex = <&mutex_bmi260>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&base_rot_ref>;
-			default-range = <1000>; /* dps */
-			drv-data = <&bmi260_data>;
-			i2c-spi-addr-flags = "BMI260_ADDR0_FLAGS";
-		};
-
-		als_clear: base-als-clear {
-			compatible = "cros-ec,tcs3400-clear";
-			status = "okay";
-
-			label = "Clear Light";
-			active-mask = "SENSOR_ACTIVE_S0_S3";
-			location = "MOTIONSENSE_LOC_BASE";
-			port = <&i2c_sensor>;
-			default-range = <0x10000>;
-			drv-data = <&tcs_clear_data>;
-			i2c-spi-addr-flags = "TCS3400_I2C_ADDR_FLAGS";
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					/* Run ALS sensor in S0 */
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <1000>;
-				};
-			};
-		};
-
-		base-als-rgb {
-			compatible = "cros-ec,tcs3400-rgb";
-			status = "okay";
-
-			label = "RGB Light";
-			active-mask = "SENSOR_ACTIVE_S0_S3";
-			location = "MOTIONSENSE_LOC_BASE";
-			default-range = <0x10000>; /* scale = 1x, uscale = 0 */
-			drv-data = <&tcs_rgb_data>;
-		};
-	};
-
-	motionsense-sensor-info {
-		compatible = "cros-ec,motionsense-sensor-info";
-
-		/* list of entries for motion_als_sensors */
-		als-sensors = <&als_clear>;
-		/*
-		 * list of GPIO interrupts that have to
-		 * be enabled at initial stage
-		 */
-		sensor-irqs = <&gpio_ec_imu_int_l &gpio_ec_als_rgb_int_l>;
-		/* list of sensors in force mode */
-		accel-force-mode-sensors = <&lid_accel &als_clear>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/prj.conf b/zephyr/projects/volteer/volteer/prj.conf
deleted file mode 100644
index 80bdc2ad44..0000000000
--- a/zephyr/projects/volteer/volteer/prj.conf
+++ /dev/null
@@ -1,152 +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.
-
-CONFIG_CROS_EC=y
-
-CONFIG_WATCHDOG=y
-
-# SoC configuration
-CONFIG_AP=y
-CONFIG_AP_X86_INTEL_TGL=y
-CONFIG_FPU=y
-CONFIG_ARM_MPU=y
-
-# eSPI
-CONFIG_ESPI=y
-CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y
-
-CONFIG_PLATFORM_EC=y
-CONFIG_SHIMMED_TASKS=y
-CONFIG_I2C=y
-CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
-CONFIG_PLATFORM_EC_LID_SWITCH=y
-CONFIG_PLATFORM_EC_POWER_BUTTON=y
-CONFIG_PLATFORM_EC_CBI_EEPROM=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_HCDEBUG=n
-CONFIG_PLATFORM_EC_CONSOLE_CMD_CHGRAMP=n
-
-# Keyboard
-CONFIG_PLATFORM_EC_KEYBOARD=y
-CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y
-CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD=y
-CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2=y
-CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
-
-# Battery
-CONFIG_PLATFORM_EC_BATTERY=y
-CONFIG_PLATFORM_EC_BATTERY_SMART=y
-CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
-CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
-
-CONFIG_PLATFORM_EC_BATTERY_HW_PRESENT_CUSTOM=y
-CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT=y
-CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y
-CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CHARGER=y
-
-# Keyboard Backlight
-CONFIG_PLATFORM_EC_PWM_KBLIGHT=y
-
-# LED
-CONFIG_PLATFORM_EC_LED_COMMON=y
-CONFIG_PLATFORM_EC_LED_PWM=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_LEDTEST=n
-
-# Power Sequencing
-CONFIG_PLATFORM_EC_POWERSEQ=y
-CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y
-CONFIG_PLATFORM_EC_POWERSEQ_S0IX=y
-CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
-CONFIG_PLATFORM_EC_THROTTLE_AP=y
-
-# PWM
-CONFIG_PWM=y
-CONFIG_PWM_SHELL=n
-CONFIG_PLATFORM_EC_PWM=y
-
-# Fan
-CONFIG_PLATFORM_EC_FAN=y
-CONFIG_SENSOR=y
-CONFIG_SENSOR_SHELL=n
-CONFIG_TACH_NPCX=y
-
-# Sensors
-CONFIG_PLATFORM_EC_MOTIONSENSE=y
-CONFIG_PLATFORM_EC_ACCEL_FIFO=y
-CONFIG_PLATFORM_EC_ACCEL_INTERRUPTS=y
-CONFIG_PLATFORM_EC_ALS=y
-CONFIG_PLATFORM_EC_ALS_COUNT=1
-CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT=y
-CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y
-CONFIG_PLATFORM_EC_LID_ANGLE=y
-CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y
-CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y
-CONFIG_PLATFORM_EC_TABLET_MODE=y
-
-# Sensor Drivers
-CONFIG_PLATFORM_EC_ACCEL_BMA255=y
-CONFIG_PLATFORM_EC_ACCELGYRO_BMI260=y
-CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y
-CONFIG_PLATFORM_EC_ALS_TCS3400=y
-
-# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
-
-# Miscellaneous tasks
-CONFIG_HAS_TASK_KEYPROTO=y
-CONFIG_HAS_TASK_POWERBTN=y
-
-# Miscellaneous configs
-CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y
-CONFIG_PLATFORM_EC_HIBERNATE_PSL=y
-
-# MKBP event
-CONFIG_PLATFORM_EC_MKBP_EVENT=y
-CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y
-
-# USB-C and charging
-CONFIG_HAS_TASK_CHARGER=y
-CONFIG_PLATFORM_EC_CHARGER_ISL9241=y
-CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON=3
-CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC=1
-CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT=15000
-CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=15001
-CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
-CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10
-CONFIG_HAS_TASK_USB_CHG_P1=y
-CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
-CONFIG_PLATFORM_EC_USB_PID=0x503e
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
-CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB=y
-CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
-CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL=y
-CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL=2
-CONFIG_PLATFORM_EC_USB_PD_ALT_MODE_UFP=y
-CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
-CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
-CONFIG_PLATFORM_EC_USB_PD_FRS=y
-CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y
-CONFIG_PLATFORM_EC_USB_PD_REV30=y
-CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
-CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
-CONFIG_HAS_TASK_PD_C1=y
-CONFIG_HAS_TASK_PD_INT_C1=y
-CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
-CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP=n
-CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP=n
-
-# Flash
-CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH=n
-
-# RTC
-CONFIG_PLATFORM_EC_RTC=y
-
-CONFIG_SYSCON=y
diff --git a/zephyr/projects/volteer/volteer/pwm.dts b/zephyr/projects/volteer/volteer/pwm.dts
deleted file mode 100644
index f8a0fef7df..0000000000
--- a/zephyr/projects/volteer/volteer/pwm.dts
+++ /dev/null
@@ -1,80 +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-pwms {
-		compatible = "named-pwms";
-
-		led1_blue: led1_blue {
-			#pwm-cells = <0>;
-			pwms = <&pwm2 0 PWM_POLARITY_INVERTED>;
-			label = "LED1_BLUE";
-			frequency = <4800>;
-		};
-		led2_green: led2_green  {
-			#pwm-cells = <0>;
-			pwms = <&pwm0 0 PWM_POLARITY_INVERTED>;
-			label = "LED2_GREEN";
-			frequency = <4800>;
-		};
-		led3_red: led3_red {
-			#pwm-cells = <0>;
-			pwms = <&pwm1 0 PWM_POLARITY_INVERTED>;
-			label = "LED3_RED";
-			frequency = <4800>;
-		};
-		led3_sidesel: led3_sidesel {
-			#pwm-cells = <0>;
-			pwms = <&pwm7 0 PWM_POLARITY_INVERTED>;
-			label = "LED4_SIDESEL";
-			frequency = <2400>;
-		};
-		kblight {
-			pwms = <&pwm3 0 0>;
-			label = "KBLIGHT";
-			frequency = <2400>;
-		};
-		pwm_fan: fan {
-			pwms = <&pwm5 0 0>;
-			label = "FAN";
-			frequency = <25000>;
-		};
-	};
-};
-
-/* Green LED */
-&pwm0 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-};
-
-/* Red LED */
-&pwm1 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-};
-
-/* Blue LED */
-&pwm2 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-};
-
-/* Keyboard backlight */
-&pwm3 {
-	status = "okay";
-};
-
-/* Fan control */
-&pwm5 {
-	status = "okay";
-	drive-open-drain;
-};
-
-/* Side selection LED */
-&pwm7 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-};
diff --git a/zephyr/projects/volteer/volteer/pwm_leds.dts b/zephyr/projects/volteer/volteer/pwm_leds.dts
deleted file mode 100644
index 659cdecbf2..0000000000
--- a/zephyr/projects/volteer/volteer/pwm_leds.dts
+++ /dev/null
@@ -1,32 +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.
- */
-
-/ {
-	pwmleds {
-		compatible = "pwm-leds";
-		pwm_led0: pwm_led_0 {
-			pwms = <&led3_red
-				&led2_green
-				&led1_blue
-				&led3_sidesel
-				>;
-		};
-	};
-
-	cros-pwmleds {
-		compatible = "cros-ec,pwm-leds";
-
-		leds = <&pwm_led0>;
-
-		color-map-red    = <100   0   0>;
-		color-map-green  = <  0 100   0>;
-		color-map-blue   = <  0   0 100>;
-		color-map-yellow = <100  70   0>;
-		color-map-white  = <100  70 100>;
-		color-map-amber  = <100  20   0>;
-
-		brightness-range = <255 255 255 0 0 0>;
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/zmake.yaml b/zephyr/projects/volteer/volteer/zmake.yaml
deleted file mode 100644
index a89c0287af..0000000000
--- a/zephyr/projects/volteer/volteer/zmake.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020 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.
-
-board: volteer
-dts-overlays:
-  - bb_retimer.dts
-  - cbi_eeprom.dts
-  - fan.dts
-  - gpio.dts
-  - keyboard.dts
-  - motionsense.dts
-  - pwm.dts
-  - pwm_leds.dts
-supported-toolchains:
-  - coreboot-sdk
-  - zephyr
-supported-zephyr-versions:
-  - v2.6
-output-type: npcx