From 0af2e0ef04ada80efd7570cd3429ce7caa9acb0c Mon Sep 17 00:00:00 2001 From: Mulin Chao Date: Mon, 25 Jul 2022 02:27:08 -0700 Subject: [PATCH] dts: npcx: move npcx/npcx7/npcx9.dtsi to npcx folder Move dt files related to SoC family and series to npcx folder. It only leaves SoC dt file in `dts/arm/nuvoton folder` in case of confusion with the other Nuvoton SoCs. The dt files path will be: dts/arm/nuvoton |--npcx | |--npcx7 | | |--npcx7-miwus-wui-map.dtsi | | |--npcx7-alts-map.dtsi | | |--..... | +--npcx9 | | |--npcx9-miwus-wui-map.dtsi | | |--npcx9-alts-map.dtsi | | +--..... | |--npcx-miwus-wui-map.dtsi | |--npcx-alts-map.dtsi | |--npcx.dtsi | |--npcx7.dtsi | |--npcx9.dtsi |--npcx7m6fb.dtsi |--npcx7m6fc.dtsi |--npcx9m8f.dtsi +--npcx9m3f.dtsi Signed-off-by: Mulin Chao --- dts/arm/nuvoton/{ => npcx}/npcx.dtsi | 0 dts/arm/nuvoton/{ => npcx}/npcx7.dtsi | 10 +++++----- dts/arm/nuvoton/{ => npcx}/npcx9.dtsi | 10 +++++----- dts/arm/nuvoton/npcx7m6fb.dtsi | 2 +- dts/arm/nuvoton/npcx7m6fc.dtsi | 2 +- dts/arm/nuvoton/npcx7m7fc.dtsi | 2 +- dts/arm/nuvoton/npcx9m3f.dtsi | 2 +- dts/arm/nuvoton/npcx9m6f.dtsi | 2 +- dts/arm/nuvoton/npcx9m7f.dtsi | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename dts/arm/nuvoton/{ => npcx}/npcx.dtsi (100%) rename dts/arm/nuvoton/{ => npcx}/npcx7.dtsi (96%) rename dts/arm/nuvoton/{ => npcx}/npcx9.dtsi (97%) diff --git a/dts/arm/nuvoton/npcx.dtsi b/dts/arm/nuvoton/npcx/npcx.dtsi similarity index 100% rename from dts/arm/nuvoton/npcx.dtsi rename to dts/arm/nuvoton/npcx/npcx.dtsi diff --git a/dts/arm/nuvoton/npcx7.dtsi b/dts/arm/nuvoton/npcx/npcx7.dtsi similarity index 96% rename from dts/arm/nuvoton/npcx7.dtsi rename to dts/arm/nuvoton/npcx/npcx7.dtsi index 00d74f93e81..a1b92d83a87 100644 --- a/dts/arm/nuvoton/npcx7.dtsi +++ b/dts/arm/nuvoton/npcx/npcx7.dtsi @@ -5,15 +5,15 @@ */ /* NPCX7 series pinmux mapping table */ -#include "npcx/npcx7/npcx7-alts-map.dtsi" +#include "npcx7/npcx7-alts-map.dtsi" /* NPCX7 series mapping table between MIWU wui bits and source device */ -#include "npcx/npcx7/npcx7-miwus-wui-map.dtsi" +#include "npcx7/npcx7-miwus-wui-map.dtsi" /* NPCX7 series mapping table between MIWU groups and interrupts */ -#include "npcx/npcx7/npcx7-miwus-int-map.dtsi" +#include "npcx7/npcx7-miwus-int-map.dtsi" /* NPCX7 series eSPI VW mapping table */ -#include "npcx/npcx7/npcx7-espi-vws-map.dtsi" +#include "npcx7/npcx7-espi-vws-map.dtsi" /* NPCX7 series low-voltage io controls mapping table */ -#include "npcx/npcx7/npcx7-lvol-ctrl-map.dtsi" +#include "npcx7/npcx7-lvol-ctrl-map.dtsi" /* Device tree declarations of npcx soc family */ #include "npcx.dtsi" diff --git a/dts/arm/nuvoton/npcx9.dtsi b/dts/arm/nuvoton/npcx/npcx9.dtsi similarity index 97% rename from dts/arm/nuvoton/npcx9.dtsi rename to dts/arm/nuvoton/npcx/npcx9.dtsi index b24965fedb1..300c589b3ac 100644 --- a/dts/arm/nuvoton/npcx9.dtsi +++ b/dts/arm/nuvoton/npcx/npcx9.dtsi @@ -5,15 +5,15 @@ */ /* NPCX9 series pinmux mapping table */ -#include "npcx/npcx9/npcx9-alts-map.dtsi" +#include "npcx9/npcx9-alts-map.dtsi" /* NPCX9 series mapping table between MIWU wui bits and source device */ -#include "npcx/npcx9/npcx9-miwus-wui-map.dtsi" +#include "npcx9/npcx9-miwus-wui-map.dtsi" /* NPCX9 series mapping table between MIWU groups and interrupts */ -#include "npcx/npcx9/npcx9-miwus-int-map.dtsi" +#include "npcx9/npcx9-miwus-int-map.dtsi" /* NPCX9 series eSPI VW mapping table */ -#include "npcx/npcx9/npcx9-espi-vws-map.dtsi" +#include "npcx9/npcx9-espi-vws-map.dtsi" /* NPCX9 series low-voltage io controls mapping table */ -#include "npcx/npcx9/npcx9-lvol-ctrl-map.dtsi" +#include "npcx9/npcx9-lvol-ctrl-map.dtsi" /* Device tree declarations of npcx soc family */ #include "npcx.dtsi" diff --git a/dts/arm/nuvoton/npcx7m6fb.dtsi b/dts/arm/nuvoton/npcx7m6fb.dtsi index df77f4857be..c4bd84bf531 100644 --- a/dts/arm/nuvoton/npcx7m6fb.dtsi +++ b/dts/arm/nuvoton/npcx7m6fb.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx7.dtsi" +#include "npcx/npcx7.dtsi" / { flash0: flash@10090000 { diff --git a/dts/arm/nuvoton/npcx7m6fc.dtsi b/dts/arm/nuvoton/npcx7m6fc.dtsi index 9c6d31110e6..531b6da6329 100644 --- a/dts/arm/nuvoton/npcx7m6fc.dtsi +++ b/dts/arm/nuvoton/npcx7m6fc.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx7.dtsi" +#include "npcx/npcx7.dtsi" / { flash0: flash@10090000 { diff --git a/dts/arm/nuvoton/npcx7m7fc.dtsi b/dts/arm/nuvoton/npcx7m7fc.dtsi index c0ccc503d7d..31670039d69 100644 --- a/dts/arm/nuvoton/npcx7m7fc.dtsi +++ b/dts/arm/nuvoton/npcx7m7fc.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx7.dtsi" +#include "npcx/npcx7.dtsi" / { flash0: flash@10070000 { diff --git a/dts/arm/nuvoton/npcx9m3f.dtsi b/dts/arm/nuvoton/npcx9m3f.dtsi index e47d3003a8e..4f32f2f0632 100644 --- a/dts/arm/nuvoton/npcx9m3f.dtsi +++ b/dts/arm/nuvoton/npcx9m3f.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx9.dtsi" +#include "npcx/npcx9.dtsi" / { flash0: flash@10080000 { diff --git a/dts/arm/nuvoton/npcx9m6f.dtsi b/dts/arm/nuvoton/npcx9m6f.dtsi index 4f92635b5cf..a918784f46a 100644 --- a/dts/arm/nuvoton/npcx9m6f.dtsi +++ b/dts/arm/nuvoton/npcx9m6f.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx9.dtsi" +#include "npcx/npcx9.dtsi" / { flash0: flash@10090000 { diff --git a/dts/arm/nuvoton/npcx9m7f.dtsi b/dts/arm/nuvoton/npcx9m7f.dtsi index f52dd88f449..646225431ce 100644 --- a/dts/arm/nuvoton/npcx9m7f.dtsi +++ b/dts/arm/nuvoton/npcx9m7f.dtsi @@ -5,7 +5,7 @@ */ #include -#include "npcx9.dtsi" +#include "npcx/npcx9.dtsi" / { flash0: flash@10070000 {