zephyr: remove Volteer board

Volteer was the first reference board with EC based on Zephyr. At this
stage of migrating to Zephyr, the support for Volteer can be dropped, so
remove volteer project.

BUG=b:218888909
TEST=zmake testall
BRANCH=main

Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: Ie78cc69e478267f45446b9d11fc2f433136ebfe0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3521781
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>

21 files changed, 16 insertions, 1599 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 064fc16ba2..dd5b635475 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -203,11 +203,6 @@ skyrim_coverage:
     PROJECT: "skyrim"
   <<: *coverage_template
 
-volteer:
-  variables:
-    PROJECT: "volteer"
-  <<: *build_template
-
 ec_coverage:
   stage: test
   needs: ["seed_cache"]
diff --git a/docs/reducing_ec_image_size.md b/docs/reducing_ec_image_size.md
index 56fe78ae2d..5e09c99e51 100644
--- a/docs/reducing_ec_image_size.md
+++ b/docs/reducing_ec_image_size.md
@@ -13,7 +13,7 @@ The EC codebase supports two build types:
 1. `cros-ec` builds are the legacy EC images built using Make (e.g. `make
    BOARD=volteer`)
 1. `zephyr-ec` builds are the EC images built using the Zephyr RTOS kernel using
-   zmake/Cmake (e.g. `zmake build volteer`)
+   zmake/Cmake (e.g. `zmake build herobrine`)
 
 ### Checking a single cros-ec build
 
@@ -88,17 +88,21 @@ By default, `zmake` will display the flash and SRAM usage of the
 board.
 
 ```
-$ zmake build volteer
+$ zmake build herobrine
     ...
-Building /mnt/host/source/src/platform/ec/build/zephyr/volteer:ro: /usr/bin/ninja -C /mnt/host/source/src/platform/ec/build/zephyr/volteer/build-ro
+Building herobrine:ro: /usr/bin/ninja -C /mnt/host/source/src/platform/ec/build/zephyr/herobrine/build-ro
+-- git describe warned: warning: tag 'upstream/v2.7.99' is externally known as 'v2.7.99'
+-- Zephyr version: 3.0.99 (/mnt/host/source/src/third_party/zephyr/main), build: v2.7.99-5035-ga17c05c7228e
 Memory region         Used Size  Region Size  %age Used
-           FLASH:      230852 B       512 KB     44.03%
-            SRAM:       51520 B        62 KB     81.15%
+           FLASH:      219920 B       256 KB     83.89%
+            SRAM:       49688 B        64 KB     75.82%
         IDT_LIST:          0 GB         2 KB      0.00%
-Building /mnt/host/source/src/platform/ec/build/zephyr/volteer:rw: /usr/bin/ninja -C /mnt/host/source/src/platform/ec/build/zephyr/volteer/build-rw
+Building herobrine:rw: /usr/bin/ninja -C /mnt/host/source/src/platform/ec/build/zephyr/herobrine/build-rw
+-- git describe warned: warning: tag 'upstream/v2.7.99' is externally known as 'v2.7.99'
+-- Zephyr version: 3.0.99 (/mnt/host/source/src/third_party/zephyr/main), build: v2.7.99-5035-ga17c05c7228e
 Memory region         Used Size  Region Size  %age Used
-           FLASH:      230852 B       512 KB     44.03%
-            SRAM:       51520 B        62 KB     81.15%
+           FLASH:      219920 B       256 KB     83.89%
+            SRAM:       49688 B        64 KB     75.82%
         IDT_LIST:          0 GB         2 KB      0.00%
 ```
 
@@ -118,14 +122,14 @@ working outside the chroot.  Follow the [instructions][1] for building zephyr-ec
 images outside chroot before running the commands below.
 
 ```
-# Configure the Volteer zephyr project, storing the build files in /tmp/zephyr-volteer
-$ zmake configure -B /tmp/zephyr-volteer volteer
+# Configure the Herobrine zephyr project, storing the build files in /tmp/zephyr-herobrine
+$ zmake configure -B /tmp/zephyr-herobrine herobrine
 
 # Build the RO image
-$ ninja -C /tmp/zephyr-volteer/volteer/build-ro
+$ ninja -C /tmp/zephyr-herobrine/herobrine/build-ro
 
 # Generate the ROM report, report sent to stdout
-$ ninja -C /tmp/zephyr-volteer/volteer/build-ro rom_report
+$ ninja -C /tmp/zephyr-herobrine/herobrine/build-ro rom_report
 ```
 
 Please refer to the [Zephyr Optimization Tools][3] documentation for details on
diff --git a/zephyr/boards/arm/volteer/Kconfig.board b/zephyr/boards/arm/volteer/Kconfig.board
deleted file mode 100644
index 5a0390e16f..0000000000
--- a/zephyr/boards/arm/volteer/Kconfig.board
+++ /dev/null
@@ -1,13 +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.
-
-# Note: this Zephyr board more closely represents the Chrome OS
-# concept of a baseboard.  Zephyr boards and Chrome OS boards do not
-# have a 1:1 mapping.
-config BOARD_VOLTEER
-	bool "Google Volteer Baseboard"
-	depends on SOC_NPCX7M6FC || SOC_NPCX7M7FC
-	# NPCX doesn't actually have enough ram for coverage, but this will
-	# allow generating initial 0 line coverage.
-	select HAS_COVERAGE_SUPPORT
diff --git a/zephyr/boards/arm/volteer/Kconfig.defconfig b/zephyr/boards/arm/volteer/Kconfig.defconfig
deleted file mode 100644
index 05361962d9..0000000000
--- a/zephyr/boards/arm/volteer/Kconfig.defconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Google Volteer EC
-
-# Copyright 2020 The Chromium OS Authors
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_VOLTEER
-
-config BOARD
-	default "volteer"
-
-endif # BOARD_VOLTEER
diff --git a/zephyr/boards/arm/volteer/board.cmake b/zephyr/boards/arm/volteer/board.cmake
deleted file mode 100644
index e29e12278d..0000000000
--- a/zephyr/boards/arm/volteer/board.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-set(NPCX_IMAGE_FILE ${PROJECT_BINARY_DIR}/zephyr.npcx.bin)
diff --git a/zephyr/boards/arm/volteer/volteer.dts b/zephyr/boards/arm/volteer/volteer.dts
deleted file mode 100644
index 0d2b060967..0000000000
--- a/zephyr/boards/arm/volteer/volteer.dts
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2020 The Chromium OS Authors
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <cros/nuvoton/npcx7.dtsi>
-#include <dt-bindings/adc/adc.h>
-#include <dt-bindings/charger/intersil_isl9241.h>
-#include <dt-bindings/gpio_defines.h>
-#include <nuvoton/npcx7m7fc.dtsi>
-#include <cros/thermistor/thermistor.dtsi>
-
-/ {
-	model = "Google Volteer EC";
-
-	aliases {
-		i2c-0 = &i2c0_0;
-		i2c-1 = &i2c1_0;
-		i2c-2 = &i2c2_0;
-		i2c-3 = &i2c3_0;
-		i2c-5 = &i2c5_0;
-		i2c-7 = &i2c7_0;
-	};
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,console = &uart1;
-		zephyr,shell-uart = &uart1;
-		zephyr,flash = &flash0;
-		zephyr,flash-controller = &int_flash;
-		cros,rtc = &mtc;
-	};
-
-	ec-console {
-		compatible = "ec-console";
-
-		disabled = "hostcmd";
-	};
-
-	named-batteries {
-		compatible = "named-batteries";
-
-		lgc011 {
-			enum-name = "lgc011";
-		};
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		i2c_sensor: sensor {
-			i2c-port = <&i2c0_0>;
-			enum-name = "I2C_PORT_SENSOR";
-		};
-		i2c-accel {
-			i2c-port = <&i2c0_0>;
-			enum-name = "I2C_PORT_ACCEL";
-		};
-		i2c_usb_c0: usb-c0 {
-			i2c-port = <&i2c1_0>;
-			enum-name = "I2C_PORT_USB_C0";
-		};
-		i2c_usb_c1: usb-c1 {
-			i2c-port = <&i2c2_0>;
-			enum-name = "I2C_PORT_USB_C1";
-		};
-		usb1-mix {
-			i2c-port = <&i2c3_0>;
-			enum-name = "I2C_PORT_USB_1_MIX";
-		};
-		power {
-			i2c-port = <&i2c5_0>;
-			enum-name = "I2C_PORT_POWER";
-		};
-		battery {
-			i2c-port = <&i2c5_0>;
-			enum-name = "I2C_PORT_BATTERY";
-		};
-		eeprom {
-			i2c-port = <&i2c7_0>;
-			enum-name = "I2C_PORT_EEPROM";
-		};
-		charger {
-			i2c-port = <&i2c7_0>;
-			enum-name = "I2C_PORT_CHARGER";
-		};
-	};
-
-	named-adc-channels {
-		compatible = "named-adc-channels";
-
-		adc_charger: charger {
-			label = "TEMP_CHARGER";
-			enum-name = "ADC_TEMP_SENSOR_CHARGER";
-			io-channels = <&adc0 0>;
-		};
-		adc_pp3300_regulator: pp3300_regulator {
-			label = "TEMP_PP3300_REGULATOR";
-			enum-name = "ADC_TEMP_SENSOR_PP3300_REGULATOR";
-			io-channels = <&adc0 1>;
-		};
-		adc_ddr_soc: ddr_soc {
-			label = "TEMP_DDR_SOC";
-			enum-name = "ADC_TEMP_SENSOR_DDR_SOC";
-			io-channels = <&adc0 8>;
-		};
-		adc_fan: fan {
-			label = "TEMP_FAN";
-			enum-name = "ADC_TEMP_SENSOR_FAN";
-			io-channels = <&adc0 3>;
-		};
-	};
-
-	named-temp-sensors {
-		charger {
-			compatible = "cros-ec,temp-sensor-thermistor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "TEMP_SENSOR_CHARGER";
-			enum-name = "TEMP_SENSOR_CHARGER";
-			temp_fan_off = <40>;
-			temp_fan_max = <55>;
-			temp_host_high = <75>;
-			temp_host_halt = <80>;
-			temp_host_release_high = <65>;
-			adc = <&adc_charger>;
-		};
-		pp3300_regulator {
-			compatible = "cros-ec,temp-sensor-thermistor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "TEMP_SENSOR_PP3300_REGULATOR";
-			enum-name = "TEMP_SENSOR_PP3300_REGULATOR";
-			temp_fan_off = <40>;
-			temp_fan_max = <55>;
-			temp_host_high = <75>;
-			temp_host_halt = <80>;
-			temp_host_release_high = <65>;
-			adc = <&adc_pp3300_regulator>;
-		};
-		ddr_soc {
-			compatible = "cros-ec,temp-sensor-thermistor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "TEMP_SENSOR_DDR_SOC";
-			enum-name = "TEMP_SENSOR_DDR_SOC";
-			temp_fan_off = <35>;
-			temp_fan_max = <50>;
-			temp_host_high = <70>;
-			temp_host_halt = <80>;
-			temp_host_release_high = <65>;
-			adc = <&adc_ddr_soc>;
-		};
-		fan {
-			compatible = "cros-ec,temp-sensor-thermistor";
-			thermistor = <&thermistor_3V3_30K9_47K_4050B>;
-			label = "TEMP_SENSOR_FAN";
-			enum-name = "TEMP_SENSOR_FAN";
-			temp_fan_off = <35>;
-			temp_fan_max = <50>;
-			temp_host_high = <70>;
-			temp_host_halt = <80>;
-			temp_host_release_high = <65>;
-			adc = <&adc_fan>;
-		};
-	};
-
-	vsby-psl-in-list {
-		/* Use PSL_IN1/2/3/4 as detection pins from hibernate mode */
-		psl-in-pads = <&psl_in1 &psl_in2 &psl_in3 &psl_in4>;
-		status = "okay";
-	};
-
-	/*
-	 * The CBI Second Source Factory Cache (SSFC) layout definition.
-	 * Specific fields values are defined per board.
-	 */
-	cbi-ssfc {
-		compatible = "named-cbi-ssfc";
-
-		cbi_ssfc_base_sensor: base_sensor {
-			enum-name = "BASE_SENSOR";
-			size = <3>;
-		};
-		cbi_ssfc_lid_sensor: lid_sensor {
-			enum-name = "LID_SENSOR";
-			size = <3>;
-		};
-		cbi_ssfc_lightbar: lightbar {
-			enum-name = "LIGHTBAR";
-			size = <2>;
-		};
-	};
-};
-
-&uart1 {
-	status = "okay";
-	current-speed = <115200>;
-	pinctrl-0 = <&altc_uart1_sl2>; /* Use UART1_SL2 ie. PIN64.65 */
-};
-
-&i2c0_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c_ctrl0 {
-	status = "okay";
-};
-
-&i2c1_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-};
-
-&i2c_ctrl1 {
-	status = "okay";
-};
-
-&i2c2_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-};
-
-&i2c_ctrl2 {
-	status = "okay";
-};
-
-&i2c3_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&i2c_ctrl3 {
-	status = "okay";
-};
-
-&i2c5_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-};
-
-&i2c_ctrl5 {
-	status = "okay";
-};
-
-&i2c7_0 {
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-
-	isl9241: isl9241@9 {
-		compatible = "intersil,isl9241";
-		reg = <0x09>;
-		label = "ISL9241_CHARGER";
-		switching-frequency = <SWITCHING_FREQ_724KHZ>;
-	};
-};
-
-&i2c_ctrl7 {
-	status = "okay";
-};
-
-&cros_kb_raw {
-	status = "okay";
-	/* No KSO2 (it's inverted and implemented by GPIO) */
-	pinctrl-0 = <&alt7_no_ksi0_sl
-		     &alt7_no_ksi1_sl
-		     &alt7_no_ksi2_sl
-		     &alt7_no_ksi3_sl
-		     &alt7_no_ksi4_sl
-		     &alt7_no_ksi5_sl
-		     &alt7_no_ksi6_sl
-		     &alt7_no_ksi7_sl
-		     &alt8_no_kso00_sl
-		     &alt8_no_kso01_sl
-		     &alt8_no_kso03_sl
-		     &alt8_no_kso04_sl
-		     &alt8_no_kso05_sl
-		     &alt8_no_kso06_sl
-		     &alt8_no_kso07_sl
-		     &alt9_no_kso08_sl
-		     &alt9_no_kso09_sl
-		     &alt9_no_kso10_sl
-		     &alt9_no_kso11_sl
-		     &alt9_no_kso12_sl
-		     &alt9_no_kso13_sl
-		     &alt9_no_kso14_sl
-		     >;
-};
-
-&adc0 {
-	status = "okay";
-};
-
-/* Power switch logic input pads */
-&psl_in1 {
-	flag = <NPCX_PSL_RISING_EDGE>;
-};
-
-&psl_in2 {
-	flag = <NPCX_PSL_RISING_EDGE>;
-};
-
-&psl_in3 {
-	flag = <NPCX_PSL_FALLING_EDGE>;
-};
-
-&psl_in4 {
-	flag = <NPCX_PSL_RISING_EDGE>;
-};
-
-&thermistor_3V3_30K9_47K_4050B {
-	status = "okay";
-};
diff --git a/zephyr/boards/arm/volteer/volteer_defconfig b/zephyr/boards/arm/volteer/volteer_defconfig
deleted file mode 100644
index db34ab2610..0000000000
--- a/zephyr/boards/arm/volteer/volteer_defconfig
+++ /dev/null
@@ -1,54 +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.
-
-# Zephyr Kernel Configuration
-CONFIG_SOC_SERIES_NPCX7=y
-CONFIG_SOC_NPCX7M7FC=y
-
-# Platform Configuration
-CONFIG_BOARD_VOLTEER=y
-
-# Serial Drivers
-CONFIG_SERIAL=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-
-# Pinmux Driver
-CONFIG_PINMUX=y
-
-# GPIO Controller
-CONFIG_GPIO=y
-
-# Clock configuration
-CONFIG_CLOCK_CONTROL=y
-
-# WATCHDOG configuration
-CONFIG_WATCHDOG=y
-
-# ADC
-# The resolution and oversamplig values are fixed by the NPCX ADC driver
-CONFIG_ADC=y
-CONFIG_ADC_SHELL=n
-
-# Power Management
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
-CONFIG_PM_POLICY_APP=y
-CONFIG_UART_CONSOLE_INPUT_EXPIRED=y
-CONFIG_NPCX_PM_TRACE=y
-
-# BBRAM
-CONFIG_BBRAM=y
-CONFIG_BBRAM_NPCX=y
-
-# SPI
-CONFIG_SPI=y
-
-# Flash
-CONFIG_FLASH=y
-CONFIG_SPI_NOR=y
-CONFIG_FLASH_JESD216_API=y
diff --git a/zephyr/projects/volteer/volteer/BUILD.py b/zephyr/projects/volteer/volteer/BUILD.py
deleted file mode 100644
index f19c55c57b..0000000000
--- a/zephyr/projects/volteer/volteer/BUILD.py
+++ /dev/null
@@ -1,19 +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.
-
-register_npcx_project(
-    project_name="volteer",
-    zephyr_board="volteer",
-    dts_overlays=[
-        "bb_retimer.dts",
-        "cbi_eeprom.dts",
-        "fan.dts",
-        "gpio.dts",
-        "interrupts.dts",
-        "keyboard.dts",
-        "motionsense.dts",
-        "pwm_leds.dts",
-        "usbc.dts",
-    ],
-)
diff --git a/zephyr/projects/volteer/volteer/CMakeLists.txt b/zephyr/projects/volteer/volteer/CMakeLists.txt
deleted file mode 100644
index 01181e4aff..0000000000
--- a/zephyr/projects/volteer/volteer/CMakeLists.txt
+++ /dev/null
@@ -1,43 +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
-cros_ec_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_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 bb9a001cb0..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-pin = <&gpio_usb_c1_mix_int_odl>;
-		reset-pin = <&gpio_usb_c1_rt_rst_odl>;
-		ls-en-pin = <&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 fc44a421d5..0000000000
--- a/zephyr/projects/volteer/volteer/cbi_eeprom.dts
+++ /dev/null
@@ -1,67 +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>;
-	};
-};
-
-&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 9544747ad8..0000000000
--- a/zephyr/projects/volteer/volteer/fan.dts
+++ /dev/null
@@ -1,35 +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";
-			pwms = <&pwm5 0 PWM_POLARITY_NORMAL>;
-			pwm-frequency = <25000>;
-			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 */
-};
-
-&pwm5 {
-	status = "okay";
-	drive-open-drain;
-};
diff --git a/zephyr/projects/volteer/volteer/gpio.dts b/zephyr/projects/volteer/volteer/gpio.dts
deleted file mode 100644
index e205927405..0000000000
--- a/zephyr/projects/volteer/volteer/gpio.dts
+++ /dev/null
@@ -1,301 +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.
- */
-
-/ {
-	aliases {
-		gpio-wp = &gpio_wp;
-		gpio-kbd-kso2 = &gpio_ec_kso_02_inv;
-	};
-
-	named-gpios {
-		compatible = "named-gpios";
-
-		gpio_ec_lid_open: ec_lid_open {
-			gpios = <&gpiod 2 GPIO_INPUT>;
-			enum-name = "GPIO_LID_OPEN";
-		};
-		gpio_wp: ec_wp_l {
-			gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
-		};
-		gpio_h1_ec_pwr_btn_odl: h1_ec_pwr_btn_odl {
-			gpios = <&gpio0 1 GPIO_INPUT>;
-			enum-name = "GPIO_POWER_BUTTON_L";
-		};
-		gpio_acok_od: acok_od {
-			gpios = <&gpio0 0 GPIO_INPUT>;
-			enum-name = "GPIO_AC_PRESENT";
-		};
-		gpio_slp_s0_l: slp_s0_l {
-			gpios = <&gpiod 5 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S0_L";
-		};
-		gpio_slp_s3_l: slp_s3_l {
-			gpios = <&gpioa 5 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_S3_L";
-		};
-		gpio_pch_slp_sus_l: pch_slp_sus_l {
-			gpios = <&gpiod 7 GPIO_INPUT>;
-			enum-name = "GPIO_PCH_SLP_SUS_L";
-		};
-		gpio_slp_sus_l: slp_sus_l {
-			gpios = <&gpiod 7 GPIO_INPUT>;
-			enum-name = "GPIO_SLP_SUS_L";
-		};
-		gpio_pg_ec_rsmrst_odl: pg_ec_rsmrst_odl {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_RSMRST_ODL";
-		};
-		gpio_pg_ec_dsw_pwrok: pg_ec_dsw_pwrok {
-			gpios = <&gpioc 7 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_DSW_PWROK";
-		};
-		gpio_pg_ec_all_sys_pwrgd: pg_ec_all_sys_pwrgd {
-			gpios = <&gpiof 4 GPIO_INPUT>;
-			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
-		};
-		gpio_ec_imu_int_l: ec_imu_int_l {
-			gpios = <&gpio5 6 GPIO_INPUT>;
-		};
-		gpio_ec_als_rgb_int_l: ec_als_rgb_int_l {
-			gpios = <&gpiod 4 GPIO_INPUT>;
-		};
-		gpio_tablet_mode_l: tablet_mode_l {
-			gpios = <&gpio9 5 GPIO_INPUT>;
-			enum-name = "GPIO_TABLET_MODE_L";
-		};
-		gpio_ec_accel_int: ec_accel_int {
-			gpios = <&gpio8 1 GPIO_INPUT_PULL_UP>;
-		};
-		gpio_usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl {
-			gpios = <&gpioe 0 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
-		};
-		gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl {
-			gpios = <&gpioa 2 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
-		};
-		gpio_usb_c0_ppc_int_odl: usb_c0_ppc_int_odl {
-			gpios = <&gpio6 2 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
-		};
-		gpio_usb_c1_ppc_int_odl: usb_c1_ppc_int_odl {
-			gpios = <&gpiof 5 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
-		};
-		gpio_usb_c0_bc12_int_odl: usb_c0_bc12_int_odl {
-			gpios = <&gpioe 4 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_BC12_INT_ODL";
-		};
-		gpio_usb_c1_mix_int_odl: usb_c1_mix_int_odl {
-			gpios = <&gpio0 3 GPIO_INPUT>;
-		};
-		gpio_usb_c1_bc12_int_odl: usb_c1_bc12_int_odl {
-			gpios = <&gpio0 3 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_BC12_INT_ODL";
-		};
-		usb_c1_frs_en {
-			gpios = <&gpio9 4 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_USB_C1_FRS_EN";
-		};
-		gpio_ec_voldn_btn_odl: ec_voldn_btn_odl {
-			gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_VOLUME_DOWN_L";
-		};
-		gpio_ec_volup_btn_odl: ec_volup_btn_odl {
-			gpios = <&gpio9 7 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_VOLUME_UP_L";
-		};
-		en_pp3300_a {
-			gpios = <&gpioa 3 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PP3300_A";
-		};
-		en_pp5000 {
-			gpios = <&gpioa 4 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PP5000";
-		};
-		en_pp5000_a {
-			gpios = <&gpioa 4 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PP5000_A";
-		};
-		en_ppvar_vccin {
-			gpios = <&gpio4 3 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PPVAR_VCCIN";
-		};
-		gpio_ec_pch_dsw_pwrok: ec_pch_dsw_pwrok {
-			gpios = <&gpioc 0 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_PCH_DSW_PWROK";
-		};
-		ec_rst_odl {
-			gpios = <&gpio0 2 GPIO_INPUT>;
-		};
-		ec_pch_sys_pwrok {
-			gpios = <&gpio3 7 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EC_PCH_SYS_PWROK";
-		};
-		ec_pch_rsmrst_odl {
-			gpios = <&gpioa 6 GPIO_ODR_LOW>;
-			enum-name = "GPIO_PCH_RSMRST_L";
-		};
-		ec_pch_pwr_btn_odl {
-			gpios = <&gpioc 1 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_PCH_PWRBTN_L";
-		};
-		ec_pch_rtcrst {
-			gpios = <&gpio7 6 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_PCH_RTCRST";
-		};
-		gpio_ec_pch_wake_odl: ec_pch_wake_odl {
-			gpios = <&gpio7 4 GPIO_ODR_HIGH>;
-		};
-		ec_entering_rw {
-			gpios = <&gpioe 3 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_ENTERING_RW";
-		};
-		ec_prochot_odl {
-			gpios = <&gpio6 3 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_CPU_PROCHOT";
-		};
-		gpio_ec_prochot_in_l: ec_prochot_in_l {
-			gpios = <&gpiof 0 GPIO_INPUT>;
-			enum-name = "GPIO_EC_PROCHOT_IN_L";
-		};
-		sys_rst_odl {
-			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_SYS_RESET_L";
-		};
-		ec_pch_int_odl {
-			gpios = <&gpiob 0 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_EC_INT_L";
-		};
-		en_pp5000_usba {
-			gpios = <&gpioc 6 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_EN_PP5000_USBA";
-		};
-		usb_a_low_pwr_od {
-			gpios = <&gpio6 6 GPIO_ODR_LOW>;
-		};
-		gpio_usb_c1_rt_rst_odl_boardid_0: usb_c1_rt_rst_odl_boardid_0 {
-			gpios = <&gpio3 2 GPIO_ODR_LOW>;
-		};
-		gpio_usb_c1_rt_rst_odl: usb_c1_rt_rst_odl {
-			gpios = <&gpio8 3 GPIO_ODR_LOW>;
-			enum-name = "GPIO_USB_C1_RT_RST_ODL";
-		};
-		usb_c0_oc_odl {
-			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C0_OC_ODL";
-		};
-		usb_c1_oc_odl {
-			gpios = <&gpio5 0 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C1_OC_ODL";
-		};
-		usb_c1_rt_int_odl {
-			gpios = <&gpiof 3 GPIO_INPUT>;
-		};
-		ec_h1_packet_mode {
-			gpios = <&gpio7 5 GPIO_OUTPUT_LOW>;
-			enum-name = "GPIO_PACKET_MODE_EN";
-		};
-		m2_ssd_pln {
-			gpios = <&gpioa 0 GPIO_ODR_HIGH>;
-		};
-		m2_ssd_pla {
-			gpios = <&gpio7 0 GPIO_INPUT>;
-		};
-		ccd_mode_odl {
-			gpios = <&gpioe 5 GPIO_INPUT>;
-		};
-		ec_slp_s0ix {
-			gpios = <&gpio7 2 GPIO_INPUT_PULL_UP>;
-		};
-		gpio_unused_gpio41: unused_gpio41 {
-			gpios = <&gpio4 1 GPIO_INPUT_PULL_UP>;
-			enum-name = "GPIO_USB_C1_LS_EN";
-		};
-		ec_kb_bl_en {
-			gpios = <&gpio8 6 GPIO_INPUT_PULL_UP>;
-		};
-		ec_espi_alert_l {
-			gpios = <&gpio5 7 GPIO_INPUT_PULL_UP>;
-		};
-		ec_edp_bl_en {
-			gpios = <&gpiod 3 GPIO_OUTPUT_HIGH>;
-			enum-name = "GPIO_ENABLE_BACKLIGHT";
-		};
-		ec_i2c0_sensor_scl {
-			gpios = <&gpiob 5 GPIO_INPUT>;
-		};
-		ec_i2c0_sensor_sda {
-			gpios = <&gpiob 4 GPIO_INPUT>;
-		};
-		ec_i2c1_usb_c0_scl {
-			gpios = <&gpio9 0 GPIO_INPUT>;
-		};
-		ec_i2c1_usb_c0_sda {
-			gpios = <&gpio8 7 GPIO_INPUT>;
-		};
-		ec_i2c2_usb_c1_scl {
-			gpios = <&gpio9 2 GPIO_INPUT>;
-		};
-		ec_i2c2_usb_c1_sda {
-			gpios = <&gpio9 1 GPIO_INPUT>;
-		};
-		ec_i2c3_usb_1_mix_scl {
-			gpios = <&gpiod 1 GPIO_INPUT>;
-		};
-		ec_i2c3_usb_1_mix_sda {
-			gpios = <&gpiod 0 GPIO_INPUT>;
-		};
-		ec_i2c5_battery_scl {
-			gpios = <&gpio3 3 GPIO_INPUT>;
-		};
-		ec_i2c5_battery_sda {
-			gpios = <&gpio3 6 GPIO_INPUT>;
-		};
-		ec_i2c7_eeprom_pwr_scl_r {
-			gpios = <&gpiob 3 GPIO_INPUT>;
-		};
-		ec_i2c7_eeprom_pwr_sda_r {
-			gpios = <&gpiob 2 GPIO_INPUT>;
-		};
-		/*
-		 * TODO(b:190743662) Cleanup to possibly remove the enum
-		 */
-		ec_batt_pres_odl {
-			gpios = <&gpioe 1 GPIO_INPUT>;
-			enum-name = "GPIO_BATT_PRES_ODL";
-		};
-		gpio_en_pp5000_fan: en_pp5000_fan {
-			gpios = <&gpio6 1 GPIO_OUTPUT_LOW>;
-		};
-		gpio_ec_kso_02_inv: ec_kso_02_inv {
-			gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>;
-		};
-	};
-
-	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 d7078c7cf6..0000000000
--- a/zephyr/projects/volteer/volteer/include/gpio_map.h
+++ /dev/null
@@ -1,27 +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 GPIO_TEMP_SENSOR_POWER GPIO_PG_EC_DSW_PWROK
-#define GPIO_EC_BATT_PRES_ODL GPIO_BATT_PRES_ODL
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/volteer/volteer/interrupts.dts b/zephyr/projects/volteer/volteer/interrupts.dts
deleted file mode 100644
index 46a0860b49..0000000000
--- a/zephyr/projects/volteer/volteer/interrupts.dts
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright 2022 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.
- */
-
-/ {
-	aliases {
-		int-wp = &int_wp;
-	};
-
-	gpio-interrupts {
-		compatible = "cros-ec,gpio-interrupts";
-
-		int_imu: imu {
-			irq-pin = <&gpio_ec_imu_int_l>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "bmi260_interrupt";
-		};
-		int_tablet_mode: tablet_mode {
-			irq-pin = <&gpio_tablet_mode_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "gmr_tablet_switch_isr";
-		};
-		int_ac_present: ac_present {
-			irq-pin = <&XG>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "XH";
-		};
-		int_ac_present: ac_present {
-			irq-pin = <&gpio_acok_od>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "extpower_interrupt";
-		};
-		int_lid_open: lid_open {
-			irq-pin = <&gpio_ec_lid_open>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "lid_interrupt";
-		};
-		int_wp: wp {
-			irq-pin = <&gpio_wp>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "switch_interrupt";
-		};
-		int_pch_slp_s0: pch_slp_s0 {
-			irq-pin = <&gpio_slp_s0_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_pch_slp_s3: pch_slp_s3 {
-			irq-pin = <&gpio_slp_s3_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_pch_slp_sus: pch_slp_sus {
-			irq-pin = <&gpio_pch_slp_sus_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_dsw_pwrok: dsw_pwrok {
-			irq-pin = <&gpio_pg_ec_dsw_pwrok>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_pg_rsmrst: pg_rsmrst {
-			irq-pin = <&gpio_pg_ec_rsmrst_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_ec_pch_dsw_pwrok: ec_pch_dsw_pwrok {
-			irq-pin = <&gpio_ec_pch_dsw_pwrok>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_pg_all_pwrgd: pg_all_pwrgd {
-			irq-pin = <&gpio_pg_ec_all_sys_pwrgd>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_pwr_btn: pwr_btn {
-			irq-pin = <&gpio_h1_ec_pwr_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "power_signal_interrupt";
-		};
-		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-pin = <&gpio_usb_c0_tcpc_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "tcpc_alert_event";
-		};
-		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-pin = <&gpio_usb_c1_tcpc_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "tcpc_alert_event";
-		};
-		int_als_rgb: als_rgb {
-			irq-pin = <&gpio_ec_als_rgb_int_l>;
-			flags = <GPIO_INT_EDGE_FALLING>;
-			handler = "tcs3400_interrupt";
-		};
-		int_usb_c0_ppc: usb_c0_ppc {
-			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "ppc_interrupt";
-		};
-		int_usb_c1_ppc: usb_c1_ppc {
-			irq-pin = <&gpio_usb_c1_ppc_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "ppc_interrupt";
-		};
-		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "bc12_interrupt";
-		};
-		int_usb_c1_mix_bc12: usb_c1_mix_bc12 {
-			irq-pin = <&gpio_usb_c1_mix_int_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "bc12_interrupt";
-		};
-		int_prochot_in: prochot_in {
-			irq-pin = <&gpio_ec_prochot_in_l>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "throttle_ap_prochot_input_interrupt";
-		};
-		int_volume_up: volume_up {
-			irq-pin = <&gpio_ec_volup_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "button_interrupt";
-		};
-		int_volume_down: volume_down {
-			irq-pin = <&gpio_ec_voldn_btn_odl>;
-			flags = <GPIO_INT_EDGE_BOTH>;
-			handler = "button_interrupt";
-		};
-	};
-};
diff --git a/zephyr/projects/volteer/volteer/keyboard.dts b/zephyr/projects/volteer/volteer/keyboard.dts
deleted file mode 100644
index a429173353..0000000000
--- a/zephyr/projects/volteer/volteer/keyboard.dts
+++ /dev/null
@@ -1,38 +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 */
-			>;
-	};
-
-	kblight {
-		compatible = "cros-ec,kblight-pwm";
-		pwms = <&pwm3 0 PWM_POLARITY_NORMAL>;
-		frequency = <2400>;
-	};
-};
-
-&pwm3 {
-	status = "okay";
-};
diff --git a/zephyr/projects/volteer/volteer/motionsense.dts b/zephyr/projects/volteer/volteer/motionsense.dts
deleted file mode 100644
index 726abb2f80..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 = <&int_imu &int_als_rgb>;
-		/* 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 51f3cb7d5e..0000000000
--- a/zephyr/projects/volteer/volteer/prj.conf
+++ /dev/null
@@ -1,153 +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_ESPI_VW_SLP_S5=y
-
-# CBI
-CONFIG_EEPROM=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_SHELL=n
-CONFIG_PLATFORM_EC_CBI_EEPROM=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_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_POWERSEQ_S4=y
-CONFIG_PLATFORM_EC_POWERSEQ_ICELAKE=y
-CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
-CONFIG_PLATFORM_EC_THROTTLE_AP=y
-
-# PWM
-CONFIG_PWM=y
-CONFIG_PWM_SHELL=n
-
-# 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_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_TEMP_SENSOR_POWER=y
-CONFIG_PLATFORM_EC_THERMISTOR=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_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_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_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
-CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
-CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
-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_leds.dts b/zephyr/projects/volteer/volteer/pwm_leds.dts
deleted file mode 100644
index fb82090c67..0000000000
--- a/zephyr/projects/volteer/volteer/pwm_leds.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.
- */
-
-/ {
-	pwmleds {
-		compatible = "pwm-leds";
-		pwm_led0: pwm_led_0 {
-			pwms = <&pwm1 0 PWM_POLARITY_INVERTED
-				&pwm0 0 PWM_POLARITY_INVERTED
-				&pwm2 0 PWM_POLARITY_INVERTED>;
-		};
-		pwm_sidesel: pwm_sidesel {
-			pwms = <&pwm7 0 PWM_POLARITY_INVERTED>;
-		};
-	};
-
-	cros-pwmleds {
-		compatible = "cros-ec,pwm-leds";
-
-		leds = <&pwm_led0>;
-		sidesel = <&pwm_sidesel>;
-
-		frequency = <4800>;
-
-		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>;
-
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		pwm_led_0@0 {
-			reg = <0>;
-			ec-led-name = "EC_LED_ID_POWER_LED";
-		};
-	};
-};
-
-/* 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";
-};
-
-/* Side selection LED */
-&pwm7 {
-	status = "okay";
-	clock-bus = "NPCX_CLOCK_BUS_LFCLK";
-};
diff --git a/zephyr/projects/volteer/volteer/usbc.dts b/zephyr/projects/volteer/volteer/usbc.dts
deleted file mode 100644
index c07ff7e037..0000000000
--- a/zephyr/projects/volteer/volteer/usbc.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-/ {
-	usbc {
-		port0: usbc-port0 {
-			bc12 {
-				compatible = "pericom,pi3usb9201";
-				port = <&i2c_usb_c0>;
-				irq = <&int_usb_c0_bc12>;
-			};
-		};
-
-		port1: usbc-port1 {
-			bc12 {
-				compatible = "pericom,pi3usb9201";
-				port = <&i2c_usb_c1>;
-				irq = <&int_usb_c1_mix_bc12>;
-			};
-		};
-	};
-};
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 431bbea75e..27b72b428a 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -919,7 +919,6 @@ extern struct jump_data mock_jump_data;
 #define PD_MAX_CURRENT_MA	3000
 #define PD_MAX_VOLTAGE_MV	20000
 
-/* TODO: b/144165680 - measure and check these values on Volteer */
 #define PD_POWER_SUPPLY_TURN_ON_DELAY	30000 /* us */
 #define PD_POWER_SUPPLY_TURN_OFF_DELAY	30000 /* us */
 #endif