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

diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi
deleted file mode 100644
index 9c84d5712d..0000000000
--- a/zephyr/include/cros/nuvoton/npcx.dtsi
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2021 The Chromium OS Authors
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-
-#include <cros/binman.dtsi>
-#include <nuvoton/npcx.dtsi>
-
-/ {
-
-	named-bbram-regions {
-		compatible = "named-bbram-regions";
-
-		scratchpad {
-			offset = <0x00>;
-			size = <0x04>;
-		};
-		saved-reset-flags {
-			offset = <0x04>;
-			size = <0x04>;
-		};
-		wake {
-			offset = <0x08>;
-			size = <0x04>;
-		};
-		pd0 {
-			offset = <0x0c>;
-			size = <0x01>;
-		};
-		pd1 {
-			offset = <0x0d>;
-			size = <0x01>;
-		};
-		try_slot {
-			offset = <0x0e>;
-			size = <0x01>;
-		};
-		pd2 {
-			offset = <0x0f>;
-			size = <0x01>;
-		};
-		ramlog {
-			offset = <0x20>;
-			size = <0x01>;
-		};
-		panic_flags {
-			offset = <0x23>;
-			size = <0x01>;
-		};
-		panic_bkup {
-			offset = <0x24>;
-			size = <0x1c>;
-		};
-		lct_time {
-			offset = <0x40>;
-			size = <0x04>;
-		};
-	};
-
-	soc {
-
-		cros_kb_raw: cros-kb-raw@400a3000 {
-			compatible = "nuvoton,npcx-cros-kb-raw";
-			reg = <0x400a3000 0x2000>;
-			label = "CROS_KB_RAW_0";
-			interrupts = <49 4>;
-			clocks = <&pcc NPCX_CLOCK_BUS_APB1 NPCX_PWDWN_CTL1 0>;
-			/*
-			 * No KSO2 (It's inverted and implemented by GPIO for
-			 * CONFIG_KEYBOARD_COL2_INVERTED.)
-			 */
-			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
-				     &alt9_no_kso15_sl
-				     &alta_no_kso16_sl
-				     &alta_no_kso17_sl
-				     >;
-			wui_maps = <&wui_io31 &wui_io30 &wui_io27 &wui_io26
-				    &wui_io25 &wui_io24 &wui_io23 &wui_io22>;
-		};
-
-		mtc: mtc@400b7000 {
-			compatible = "nuvoton,npcx-cros-mtc";
-			reg = <0x400b7000 0x2000>;
-			mtc-alarm = <&wui_mtc>;
-			label = "MTC";
-		};
-
-		fiu0: cros-flash@40020000 {
-			compatible = "nuvoton,npcx-cros-flash";
-			reg = <0x40020000 0x2000>;
-			clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL1 2>;
-			size = <0x80000>;
-			label = "FLASH_INTERFACE_UNIT0";
-			pinctrl-0 = <>;
-		};
-
-		shi: shi@4000f000 {
-			compatible = "nuvoton,npcx-cros-shi";
-			reg = <0x4000f000 0x120>;
-			interrupts = <18 1>;
-			clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>;
-			pinctrl-0 = <&altc_shi_sl>;
-			shi-cs-wui =<&wui_io53>;
-			label = "SHI";
-		};
-	};
-
-	power-states {
-		suspend_to_idle_instant: suspend_to_idle_instant {
-			compatible = "zephyr,power-state";
-			power-state-name = "suspend-to-idle";
-			substate-id = <0>;
-			min-residency-us = <500>;
-		};
-
-		suspend_to_idle_normal: suspend_to_idle_normal {
-			compatible = "zephyr,power-state";
-			power-state-name = "suspend-to-idle";
-			substate-id = <1>;
-			min-residency-us = <200100>;
-		};
-	};
-};
-
-&cpu0 {
-	cpu-power-states = <&suspend_to_idle_instant &suspend_to_idle_normal>;
-};
-
-&bbram {
-	status = "okay";
-};
-
-&mdc {
-	status = "okay";
-};