From ef02567cc156af5acbe398ba7bc7af8f31c192e5 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 9 Jun 2025 11:53:24 -0400 Subject: [PATCH] dts: arm: microchip: Organize MEC parts into a subfolder Microchip is adding more non-MEC devices to Zephyr such as SAM and PIC32. Each device family will have its own subfolder. We moved the existing MEC DTSI files into a new mec subfolder. We also updated the existing MEC boards include paths. Signed-off-by: Scott Worley --- .../mec1501modular_assy6885-pinctrl.dtsi | 4 ++-- .../mec15xxevb_assy6853/mec15xxevb_assy6853-pinctrl.dtsi | 4 ++-- boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts | 4 ++-- .../mec172xmodular_assy6930/mec172xmodular_assy6930.dts | 4 ++-- boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts | 2 +- boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts | 2 +- boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts | 2 +- boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts | 2 +- dts/arm/microchip/{ => mec}/mec1501hsz.dtsi | 0 dts/arm/microchip/{ => mec}/mec152x/mec1523hsz-pinctrl.dtsi | 0 dts/arm/microchip/{ => mec}/mec152x/mec152xhsz-pinctrl.dtsi | 0 dts/arm/microchip/{ => mec}/mec1727nsz.dtsi | 0 dts/arm/microchip/{ => mec}/mec172x/mec172x-vw-routing.dtsi | 0 dts/arm/microchip/{ => mec}/mec172x/mec172xnlj-pinctrl.dtsi | 0 dts/arm/microchip/{ => mec}/mec172x/mec172xnsz-pinctrl.dtsi | 0 dts/arm/microchip/{ => mec}/mec172x_common.dtsi | 0 dts/arm/microchip/{ => mec}/mec172xnlj.dtsi | 0 dts/arm/microchip/{ => mec}/mec172xnsz.dtsi | 0 dts/arm/microchip/{ => mec}/mec5.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_dma_chan16.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_dma_chan20.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_eeprom_8kb.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_gpspi_v1.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_gpspi_v2.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_i3c.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_pkg176_pwms.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_pkg176_uarts.dtsi | 0 dts/arm/microchip/{ => mec}/mec5/mec5_power_guards.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mec1743qlj.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mec1743qsz.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mec1753qlj.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mec1753qsz.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mech1723nlj.dtsi | 0 dts/arm/microchip/{ => mec}/mec5_mech1723nsz.dtsi | 0 34 files changed, 12 insertions(+), 12 deletions(-) rename dts/arm/microchip/{ => mec}/mec1501hsz.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec152x/mec1523hsz-pinctrl.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec152x/mec152xhsz-pinctrl.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec1727nsz.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172x/mec172x-vw-routing.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172x/mec172xnlj-pinctrl.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172x/mec172xnsz-pinctrl.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172x_common.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172xnlj.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec172xnsz.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_dma_chan16.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_dma_chan20.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_eeprom_8kb.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_gpspi_v1.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_gpspi_v2.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_i3c.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_pkg176_pwms.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_pkg176_uarts.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5/mec5_power_guards.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mec1743qlj.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mec1743qsz.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mec1753qlj.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mec1753qsz.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mech1723nlj.dtsi (100%) rename dts/arm/microchip/{ => mec}/mec5_mech1723nsz.dtsi (100%) diff --git a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885-pinctrl.dtsi b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885-pinctrl.dtsi index 6ab77f6ae48..6397b98f659 100644 --- a/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885-pinctrl.dtsi +++ b/boards/microchip/mec1501modular_assy6885/mec1501modular_assy6885-pinctrl.dtsi @@ -6,8 +6,8 @@ /dts-v1/; -#include -#include +#include +#include &ps2_clk0b_gpio007 { drive-open-drain; diff --git a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853-pinctrl.dtsi b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853-pinctrl.dtsi index 6ab77f6ae48..6397b98f659 100644 --- a/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853-pinctrl.dtsi +++ b/boards/microchip/mec15xxevb_assy6853/mec15xxevb_assy6853-pinctrl.dtsi @@ -6,8 +6,8 @@ /dts-v1/; -#include -#include +#include +#include &ps2_clk0b_gpio007 { drive-open-drain; diff --git a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts index bc2ad391664..97bbc8efdac 100644 --- a/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts +++ b/boards/microchip/mec172xevb_assy6906/mec172xevb_assy6906.dts @@ -6,8 +6,8 @@ /dts-v1/; -#include -#include +#include +#include / { model = "Microchip MEC172XEVB_ASSY6906 evaluation board"; diff --git a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts index e5d7e888baa..79c95ef63b8 100644 --- a/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts +++ b/boards/microchip/mec172xmodular_assy6930/mec172xmodular_assy6930.dts @@ -6,8 +6,8 @@ /dts-v1/; -#include -#include +#include +#include / { model = "Microchip MEC172XMODULAR_ASSY6930 evaluation board"; diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts index a2b52bd505c..719cf811593 100644 --- a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts +++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qlj.dts @@ -6,7 +6,7 @@ /dts-v1/; -#include +#include #include / { diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts index fc4eb98d568..83f79dca552 100644 --- a/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts +++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1743_qsz.dts @@ -6,7 +6,7 @@ /dts-v1/; -#include +#include #include / { diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts index 1187fef8a07..52e655e828f 100644 --- a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts +++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qlj.dts @@ -6,7 +6,7 @@ /dts-v1/; -#include +#include #include / { diff --git a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts index b2e7c570cc6..fc8756cda33 100644 --- a/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts +++ b/boards/microchip/mec_assy6941/mec_assy6941_mec1753_qsz.dts @@ -6,7 +6,7 @@ /dts-v1/; -#include +#include #include / { diff --git a/dts/arm/microchip/mec1501hsz.dtsi b/dts/arm/microchip/mec/mec1501hsz.dtsi similarity index 100% rename from dts/arm/microchip/mec1501hsz.dtsi rename to dts/arm/microchip/mec/mec1501hsz.dtsi diff --git a/dts/arm/microchip/mec152x/mec1523hsz-pinctrl.dtsi b/dts/arm/microchip/mec/mec152x/mec1523hsz-pinctrl.dtsi similarity index 100% rename from dts/arm/microchip/mec152x/mec1523hsz-pinctrl.dtsi rename to dts/arm/microchip/mec/mec152x/mec1523hsz-pinctrl.dtsi diff --git a/dts/arm/microchip/mec152x/mec152xhsz-pinctrl.dtsi b/dts/arm/microchip/mec/mec152x/mec152xhsz-pinctrl.dtsi similarity index 100% rename from dts/arm/microchip/mec152x/mec152xhsz-pinctrl.dtsi rename to dts/arm/microchip/mec/mec152x/mec152xhsz-pinctrl.dtsi diff --git a/dts/arm/microchip/mec1727nsz.dtsi b/dts/arm/microchip/mec/mec1727nsz.dtsi similarity index 100% rename from dts/arm/microchip/mec1727nsz.dtsi rename to dts/arm/microchip/mec/mec1727nsz.dtsi diff --git a/dts/arm/microchip/mec172x/mec172x-vw-routing.dtsi b/dts/arm/microchip/mec/mec172x/mec172x-vw-routing.dtsi similarity index 100% rename from dts/arm/microchip/mec172x/mec172x-vw-routing.dtsi rename to dts/arm/microchip/mec/mec172x/mec172x-vw-routing.dtsi diff --git a/dts/arm/microchip/mec172x/mec172xnlj-pinctrl.dtsi b/dts/arm/microchip/mec/mec172x/mec172xnlj-pinctrl.dtsi similarity index 100% rename from dts/arm/microchip/mec172x/mec172xnlj-pinctrl.dtsi rename to dts/arm/microchip/mec/mec172x/mec172xnlj-pinctrl.dtsi diff --git a/dts/arm/microchip/mec172x/mec172xnsz-pinctrl.dtsi b/dts/arm/microchip/mec/mec172x/mec172xnsz-pinctrl.dtsi similarity index 100% rename from dts/arm/microchip/mec172x/mec172xnsz-pinctrl.dtsi rename to dts/arm/microchip/mec/mec172x/mec172xnsz-pinctrl.dtsi diff --git a/dts/arm/microchip/mec172x_common.dtsi b/dts/arm/microchip/mec/mec172x_common.dtsi similarity index 100% rename from dts/arm/microchip/mec172x_common.dtsi rename to dts/arm/microchip/mec/mec172x_common.dtsi diff --git a/dts/arm/microchip/mec172xnlj.dtsi b/dts/arm/microchip/mec/mec172xnlj.dtsi similarity index 100% rename from dts/arm/microchip/mec172xnlj.dtsi rename to dts/arm/microchip/mec/mec172xnlj.dtsi diff --git a/dts/arm/microchip/mec172xnsz.dtsi b/dts/arm/microchip/mec/mec172xnsz.dtsi similarity index 100% rename from dts/arm/microchip/mec172xnsz.dtsi rename to dts/arm/microchip/mec/mec172xnsz.dtsi diff --git a/dts/arm/microchip/mec5.dtsi b/dts/arm/microchip/mec/mec5.dtsi similarity index 100% rename from dts/arm/microchip/mec5.dtsi rename to dts/arm/microchip/mec/mec5.dtsi diff --git a/dts/arm/microchip/mec5/mec5_dma_chan16.dtsi b/dts/arm/microchip/mec/mec5/mec5_dma_chan16.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_dma_chan16.dtsi rename to dts/arm/microchip/mec/mec5/mec5_dma_chan16.dtsi diff --git a/dts/arm/microchip/mec5/mec5_dma_chan20.dtsi b/dts/arm/microchip/mec/mec5/mec5_dma_chan20.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_dma_chan20.dtsi rename to dts/arm/microchip/mec/mec5/mec5_dma_chan20.dtsi diff --git a/dts/arm/microchip/mec5/mec5_eeprom_8kb.dtsi b/dts/arm/microchip/mec/mec5/mec5_eeprom_8kb.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_eeprom_8kb.dtsi rename to dts/arm/microchip/mec/mec5/mec5_eeprom_8kb.dtsi diff --git a/dts/arm/microchip/mec5/mec5_gpspi_v1.dtsi b/dts/arm/microchip/mec/mec5/mec5_gpspi_v1.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_gpspi_v1.dtsi rename to dts/arm/microchip/mec/mec5/mec5_gpspi_v1.dtsi diff --git a/dts/arm/microchip/mec5/mec5_gpspi_v2.dtsi b/dts/arm/microchip/mec/mec5/mec5_gpspi_v2.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_gpspi_v2.dtsi rename to dts/arm/microchip/mec/mec5/mec5_gpspi_v2.dtsi diff --git a/dts/arm/microchip/mec5/mec5_i3c.dtsi b/dts/arm/microchip/mec/mec5/mec5_i3c.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_i3c.dtsi rename to dts/arm/microchip/mec/mec5/mec5_i3c.dtsi diff --git a/dts/arm/microchip/mec5/mec5_pkg176_pwms.dtsi b/dts/arm/microchip/mec/mec5/mec5_pkg176_pwms.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_pkg176_pwms.dtsi rename to dts/arm/microchip/mec/mec5/mec5_pkg176_pwms.dtsi diff --git a/dts/arm/microchip/mec5/mec5_pkg176_uarts.dtsi b/dts/arm/microchip/mec/mec5/mec5_pkg176_uarts.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_pkg176_uarts.dtsi rename to dts/arm/microchip/mec/mec5/mec5_pkg176_uarts.dtsi diff --git a/dts/arm/microchip/mec5/mec5_power_guards.dtsi b/dts/arm/microchip/mec/mec5/mec5_power_guards.dtsi similarity index 100% rename from dts/arm/microchip/mec5/mec5_power_guards.dtsi rename to dts/arm/microchip/mec/mec5/mec5_power_guards.dtsi diff --git a/dts/arm/microchip/mec5_mec1743qlj.dtsi b/dts/arm/microchip/mec/mec5_mec1743qlj.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mec1743qlj.dtsi rename to dts/arm/microchip/mec/mec5_mec1743qlj.dtsi diff --git a/dts/arm/microchip/mec5_mec1743qsz.dtsi b/dts/arm/microchip/mec/mec5_mec1743qsz.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mec1743qsz.dtsi rename to dts/arm/microchip/mec/mec5_mec1743qsz.dtsi diff --git a/dts/arm/microchip/mec5_mec1753qlj.dtsi b/dts/arm/microchip/mec/mec5_mec1753qlj.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mec1753qlj.dtsi rename to dts/arm/microchip/mec/mec5_mec1753qlj.dtsi diff --git a/dts/arm/microchip/mec5_mec1753qsz.dtsi b/dts/arm/microchip/mec/mec5_mec1753qsz.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mec1753qsz.dtsi rename to dts/arm/microchip/mec/mec5_mec1753qsz.dtsi diff --git a/dts/arm/microchip/mec5_mech1723nlj.dtsi b/dts/arm/microchip/mec/mec5_mech1723nlj.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mech1723nlj.dtsi rename to dts/arm/microchip/mec/mec5_mech1723nlj.dtsi diff --git a/dts/arm/microchip/mec5_mech1723nsz.dtsi b/dts/arm/microchip/mec/mec5_mech1723nsz.dtsi similarity index 100% rename from dts/arm/microchip/mec5_mech1723nsz.dtsi rename to dts/arm/microchip/mec/mec5_mech1723nsz.dtsi