dts: Move vendor-specific dtsi to dedicated folder

Move all the vendor-specific dtsi files that were in dts/common to a new folder under dts/ designated for vendor-specific files, since they are not common at all, except for one vendor. Change MAINTAINERS.yml to reflect the moving of the files. Update migration guide for this change. Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
6 months ago · 7962eaeca6
77 changed files with 43 additions and 38 deletions
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@ -955,8 +955,6 @@ Devicetree:
    - include/zephyr/dt-bindings/dt-util.h
    - dts/binding-template.yaml
    - dts/bindings/base/
  files-exclude:
    - dts/common/nordic/
  labels:
    - "area: Devicetree"
  tests:
@ -3522,7 +3520,7 @@ Bouffalolab Platforms:
 Broadcom Platforms:
  status: odd fixes
  files:
-    - dts/arm/broadcom/
+    - dts/*/broadcom/
    - soc/brcm/
    - boards/brcm/
@ -4240,8 +4238,7 @@ Espressif Platforms:
    - drivers/*/*esp32*.c
    - boards/espressif/
    - soc/espressif/
-    - dts/xtensa/espressif/
+    - dts/*/espressif/
    - dts/riscv/espressif/
    - dts/bindings/*/*esp32*
    - samples/boards/espressif/
    - tests/boards/espressif/
--- a/boards/actinius/icarus/actinius_icarus_common.dtsi
+++ b/boards/actinius/icarus/actinius_icarus_common.dtsi
@ -170,4 +170,4 @@
 #include "feather_connector.dtsi"
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi
+++ b/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi
@ -157,4 +157,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi
+++ b/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi
@ -66,4 +66,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi
+++ b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi
@ -159,4 +159,4 @@ neopixel_spi: &spi1 {
 #include "arduino_connector.dtsi"
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi
+++ b/boards/circuitdojo/feather/circuitdojo_feather_nrf9160_common.dtsi
@ -183,4 +183,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/ct/ctcc/ctcc_nrf9161_common.dtsi
+++ b/boards/ct/ctcc/ctcc_nrf9161_common.dtsi
@ -76,4 +76,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/innblue/innblue21/innblue21_common.dtsi
+++ b/boards/innblue/innblue21/innblue21_common.dtsi
@ -160,4 +160,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/innblue/innblue22/innblue22_common.dtsi
+++ b/boards/innblue/innblue22/innblue22_common.dtsi
@ -163,4 +163,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@ -132,4 +132,4 @@
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
 * buffer won't be used.
 */
- #include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+ #include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
+++ b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@ -92,4 +92,4 @@
 /* We re-use the IPC shared buffer definition from the real HW. But note the start address of the
 * buffer won't be used.
 */
- #include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+ #include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi
@ -264,5 +264,5 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
 #include "nrf5340_audio_dk_nrf5340_shared.dtsi"
--- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts
@ -86,5 +86,5 @@ arduino_spi: &spi0 {
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
 #include "nrf5340_audio_dk_nrf5340_shared.dtsi"
--- a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi
@ -172,4 +172,4 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts
@ -108,4 +108,4 @@ arduino_spi: &spi0 {
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
+++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi
@ -247,4 +247,4 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
+++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts
@ -182,4 +182,4 @@ arduino_spi: &spi0 {
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi
+++ b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi
@ -181,4 +181,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi
+++ b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi
@ -223,4 +223,4 @@ arduino_spi: &spi3 {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi
+++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi
@ -226,4 +226,4 @@ arduino_spi: &spi3 {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi
+++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi
@ -223,4 +223,4 @@ arduino_spi: &spi3 {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
+++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi
@ -327,4 +327,4 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
+++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts
@ -173,4 +173,4 @@ fem_spi: &spi0 {
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/norik/octopus_som/octopus_som_common.dtsi
+++ b/boards/norik/octopus_som/octopus_som_common.dtsi
@ -91,4 +91,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts
+++ b/boards/panasonic/pan1783/pan1783_evb_nrf5340_cpunet.dts
@ -20,4 +20,4 @@
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi
+++ b/boards/panasonic/pan1783/pan1783_nrf5340_cpuapp_common.dtsi
@ -271,4 +271,4 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi
+++ b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_common.dtsi
@ -204,4 +204,4 @@ arduino_spi: &spi0 {
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts
+++ b/boards/panasonic/pan1783/pan1783a_evb_nrf5340_cpunet.dts
@ -20,4 +20,4 @@
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts
+++ b/boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts
@ -30,4 +30,4 @@
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts
+++ b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpuapp_common.dts
@ -207,4 +207,4 @@ zephyr_udc0: &usbd {
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts
+++ b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_common.dts
@ -57,4 +57,4 @@
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts
+++ b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_common.dts
@ -160,4 +160,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <nordic/nrf5340_cpuapp_partition.dtsi>
--- a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts
+++ b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_common.dts
@ -57,4 +57,4 @@
 };
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <nordic/nrf5340_shared_sram_partition.dtsi>
--- a/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi
+++ b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi
@ -183,4 +183,4 @@
 };
 /* Include default memory partition configuration file */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <nordic/nrf91xx_partition.dtsi>
--- a/cmake/modules/pre_dt.cmake
+++ b/cmake/modules/pre_dt.cmake
@ -71,6 +71,7 @@ function(pre_dt_module_run)
        include
        include/zephyr
        dts/common
        dts/vendor
        ${arch_include}
        dts
        )
--- a/doc/releases/migration-guide-4.2.rst
+++ b/doc/releases/migration-guide-4.2.rst
@ -79,6 +79,13 @@ Boards
 Device Drivers and Devicetree
 *****************************
 Devicetree
 ==========
 * Many of the vendor-specific and arch-specific files that were in dts/common have been moved
  to more specific locations. Therefore, any dts files which ``#include <common/some_file.dtsi>``
  a file from in the zephyr tree will need to be changed to just ``#include <some_file.dtsi>``.
 DAI
 ===
--- a/dts/vendor/amd/versalnet.dtsi
+++ b/dts/vendor/amd/versalnet.dtsi
--- a/dts/vendor/broadcom/viper-common.dtsi
+++ b/dts/vendor/broadcom/viper-common.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp_16M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp_16M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp_2M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp_2M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp_32M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp_32M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp_4M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp_4M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_amp_8M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_amp_8M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default_16M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default_16M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default_2M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default_2M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default_32M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default_32M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default_4M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default_4M.dtsi
--- a/dts/vendor/espressif/partitions_0x0_default_8M.dtsi
+++ b/dts/vendor/espressif/partitions_0x0_default_8M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp_16M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp_16M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp_2M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp_2M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp_32M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp_32M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp_4M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp_4M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_amp_8M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_amp_8M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default_16M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default_16M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default_2M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default_2M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default_32M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default_32M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default_4M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default_4M.dtsi
--- a/dts/vendor/espressif/partitions_0x1000_default_8M.dtsi
+++ b/dts/vendor/espressif/partitions_0x1000_default_8M.dtsi
--- a/dts/vendor/nordic/nrf52840_partition.dtsi
+++ b/dts/vendor/nordic/nrf52840_partition.dtsi
--- a/dts/vendor/nordic/nrf52840_partition_uf2_sdv6.dtsi
+++ b/dts/vendor/nordic/nrf52840_partition_uf2_sdv6.dtsi
--- a/dts/vendor/nordic/nrf52840_partition_uf2_sdv7.dtsi
+++ b/dts/vendor/nordic/nrf52840_partition_uf2_sdv7.dtsi
--- a/dts/vendor/nordic/nrf5340_cpuapp_partition.dtsi
+++ b/dts/vendor/nordic/nrf5340_cpuapp_partition.dtsi
--- a/dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi
+++ b/dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi
--- a/dts/vendor/nordic/nrf54h20.dtsi
+++ b/dts/vendor/nordic/nrf54h20.dtsi
--- a/dts/vendor/nordic/nrf54l05.dtsi
+++ b/dts/vendor/nordic/nrf54l05.dtsi
--- a/dts/vendor/nordic/nrf54l09.dtsi
+++ b/dts/vendor/nordic/nrf54l09.dtsi
--- a/dts/vendor/nordic/nrf54l10.dtsi
+++ b/dts/vendor/nordic/nrf54l10.dtsi
--- a/dts/vendor/nordic/nrf54l15.dtsi
+++ b/dts/vendor/nordic/nrf54l15.dtsi
--- a/dts/vendor/nordic/nrf54l20.dtsi
+++ b/dts/vendor/nordic/nrf54l20.dtsi
--- a/dts/vendor/nordic/nrf54l_05_10_15.dtsi
+++ b/dts/vendor/nordic/nrf54l_05_10_15.dtsi
--- a/dts/vendor/nordic/nrf91xx_partition.dtsi
+++ b/dts/vendor/nordic/nrf91xx_partition.dtsi
--- a/dts/vendor/nordic/nrf9280.dtsi
+++ b/dts/vendor/nordic/nrf9280.dtsi
--- a/dts/vendor/nordic/nrf_common.dtsi
+++ b/dts/vendor/nordic/nrf_common.dtsi