[PATCH] arm64: dts: altera: move all SoCFPGA device trees from dts/intel
From: <hidden>
Date: 2026-09-04 10:07:06
Also in:
lkml
Subsystem:
arm/socfpga architecture, the rest · Maintainers:
Dinh Nguyen, Linus Torvalds
From: "Chiam, Evon" <redacted> The dts/intel/ directory contains two distinct families: - Altera SoCFPGA platforms (Stratix 10, Agilex, Agilex5, Agilex72, Agilex7M, N5X) - Intel Keembay All Altera SoCFPGA device trees already have a home in dts/altera/ (Stratix 10 has been there since the directory was introduced). Move the remaining SoCFPGA DTS/DTSI files from dts/intel/ to dts/altera/ to consolidate all Altera SoCFPGA device trees under a single directory. Only the Keembay files remain in dts/intel/. All inter-file includes are relative so no include paths need to change. The set of DTBs produced by dtbs_install is unchanged; they are simply built from dts/altera/ instead of dts/intel/. No compatible strings or file contents are modified; this is a rename-only change. Link: https://lore.kernel.org/all/cd16fb78-551e-4630-83d6-a44a68e2e411@kernel.org/ (local) Signed-off-by: Chiam, Evon <redacted> --- This patch is a follow-up to the Agilex72 DTS series [Link above]. Reviewer feedback noted that moving only the Agilex72 files from dts/intel/ was confusing since all other files there are also Altera SoCFPGA. This patch moves all SoCFPGA device trees to dts/altera/, leaving only the Keembay files in dts/intel/. No compatible strings or file contents are modified; this is a rename-only change. arch/arm64/boot/dts/altera/Makefile | 14 +++++++++++++- .../boot/dts/{intel => altera}/socfpga_agilex.dtsi | 0 .../{intel => altera}/socfpga_agilex3_socdk.dts | 0 .../dts/{intel => altera}/socfpga_agilex5.dtsi | 0 .../{intel => altera}/socfpga_agilex5_socdk.dts | 0 .../socfpga_agilex5_socdk_013b.dts | 0 .../socfpga_agilex5_socdk_modular.dts | 0 .../socfpga_agilex5_socdk_nand.dts | 0 .../dts/{intel => altera}/socfpga_agilex72.dtsi | 0 .../{intel => altera}/socfpga_agilex72_socdk.dts | 0 .../{intel => altera}/socfpga_agilex7m_socdk.dts | 0 .../dts/{intel => altera}/socfpga_agilex_n6000.dts | 0 .../dts/{intel => altera}/socfpga_agilex_socdk.dts | 0 .../socfpga_agilex_socdk_emmc.dts | 0 .../socfpga_agilex_socdk_nand.dts | 0 .../dts/{intel => altera}/socfpga_n5x_socdk.dts | 0 arch/arm64/boot/dts/intel/Makefile | 12 ------------ 17 files changed, 13 insertions(+), 13 deletions(-) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex.dtsi (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex3_socdk.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5.dtsi (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_013b.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_modular.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_nand.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72.dtsi (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72_socdk.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex7m_socdk.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_n6000.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_emmc.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_nand.dts (100%) rename arch/arm64/boot/dts/{intel => altera}/socfpga_n5x_socdk.dts (100%)
diff --git a/arch/arm64/boot/dts/altera/Makefile b/arch/arm64/boot/dts/altera/Makefile
index 540bb5ae746b..8f41349103b8 100644
--- a/arch/arm64/boot/dts/altera/Makefile
+++ b/arch/arm64/boot/dts/altera/Makefile@@ -1,5 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only -dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_stratix10_socdk.dtb \ +dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_n6000.dtb \ + socfpga_agilex_socdk.dtb \ + socfpga_agilex_socdk_emmc.dtb \ + socfpga_agilex_socdk_nand.dtb \ + socfpga_agilex3_socdk.dtb \ + socfpga_agilex5_socdk.dtb \ + socfpga_agilex5_socdk_013b.dtb \ + socfpga_agilex5_socdk_modular.dtb \ + socfpga_agilex5_socdk_nand.dtb \ + socfpga_agilex72_socdk.dtb \ + socfpga_agilex7m_socdk.dtb \ + socfpga_n5x_socdk.dtb \ + socfpga_stratix10_socdk.dtb \ socfpga_stratix10_socdk_emmc.dtb \ socfpga_stratix10_socdk_nand.dtb \ socfpga_stratix10_swvp.dtb
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex.dtsi b/arch/arm64/boot/dts/altera/socfpga_agilex.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
rename to arch/arm64/boot/dts/altera/socfpga_agilex.dtsi
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex3_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_agilex3_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex3_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex3_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi b/arch/arm64/boot/dts/altera/socfpga_agilex5.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi
rename to arch/arm64/boot/dts/altera/socfpga_agilex5.dtsi
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_agilex5_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex5_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_013b.dts b/arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_013b.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_013b.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_013b.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_modular.dts b/arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_modular.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_modular.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_modular.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_nand.dts b/arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_nand.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_nand.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_nand.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex72.dtsi b/arch/arm64/boot/dts/altera/socfpga_agilex72.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex72.dtsi
rename to arch/arm64/boot/dts/altera/socfpga_agilex72.dtsi
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex72_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_agilex72_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex72_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex72_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex7m_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_agilex7m_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex7m_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex7m_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_n6000.dts b/arch/arm64/boot/dts/altera/socfpga_agilex_n6000.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex_n6000.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex_n6000.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_agilex_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_emmc.dts b/arch/arm64/boot/dts/altera/socfpga_agilex_socdk_emmc.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex_socdk_emmc.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex_socdk_emmc.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts b/arch/arm64/boot/dts/altera/socfpga_agilex_socdk_nand.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts
rename to arch/arm64/boot/dts/altera/socfpga_agilex_socdk_nand.dts
diff --git a/arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_n5x_socdk.dts
similarity index 100%
rename from arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts
rename to arch/arm64/boot/dts/altera/socfpga_n5x_socdk.dts
diff --git a/arch/arm64/boot/dts/intel/Makefile b/arch/arm64/boot/dts/intel/Makefile
index 270c70fdf084..5b030fb8d165 100644
--- a/arch/arm64/boot/dts/intel/Makefile
+++ b/arch/arm64/boot/dts/intel/Makefile@@ -1,14 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_n6000.dtb \ - socfpga_agilex_socdk.dtb \ - socfpga_agilex_socdk_emmc.dtb \ - socfpga_agilex_socdk_nand.dtb \ - socfpga_agilex3_socdk.dtb \ - socfpga_agilex5_socdk.dtb \ - socfpga_agilex5_socdk_013b.dtb \ - socfpga_agilex5_socdk_modular.dtb \ - socfpga_agilex5_socdk_nand.dtb \ - socfpga_agilex72_socdk.dtb \ - socfpga_agilex7m_socdk.dtb \ - socfpga_n5x_socdk.dtb dtb-$(CONFIG_ARCH_KEEMBAY) += keembay-evm.dtb
--
2.43.7