* [PATCH v4 0/2] arm64: dts: altera: Consolidate SoCFPGA device trees
@ 2026-09-11 13:58 evon.chiam
2026-09-11 13:58 ` [PATCH v4 1/2] arm64: dts: altera: Move all SoCFPGA files to dts/altera evon.chiam
2026-09-11 13:58 ` [PATCH v4 2/2] MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE evon.chiam
0 siblings, 2 replies; 3+ messages in thread
From: evon.chiam @ 2026-09-11 13:58 UTC (permalink / raw)
To: Dinh Nguyen, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
devicetree, linux-kernel
From: "Chiam, Evon" <evon.chiam@altera.com>
The arch/arm64/boot/dts/intel/ directory holds two unrelated families:
the Altera SoCFPGA platforms (Stratix 10, Agilex, Agilex5, Agilex72,
Agilex7M, N5X) and Intel Keembay. Stratix 10 already lives in
arch/arm64/boot/dts/altera/, so the SoCFPGA device trees are split
across two directories today.
Patch 1 moves the remaining SoCFPGA DTS/DTSI files to dts/altera/ so
that all of them live in one place; only Keembay is left in dts/intel/.
Patch 2 then drops the now stale arch/arm64/boot/dts/intel/ path from
the ARM/SOCFPGA ARCHITECTURE MAINTAINERS entry.
---
Changes in v4:
- Split the MAINTAINERS change out of the move patch into its own patch
Changes in v3:
- Drop stale SoCFPGA MAINTAINERS F: entry for arch/arm64/boot/dts/intel/
Changes in v2:
- Reworded commit subject to drop redundant "device trees" and phrase
the move as "to dts/altera"
v3 patch link:
https://lore.kernel.org/all/47719884b157863b2253b415daa447b417cd3419.1789048358.git.evon.chiam@altera.com/
v2 patch link:
https://lore.kernel.org/all/4b78273b85041f74b12245d0bf222f018afd2bd6.1788933630.git.evon.chiam@altera.com/
v1 patch link:
https://lore.kernel.org/all/802bf0d27fbff9b1ddb6b9fc323a1a9f8f050f74.1788512748.git.evon.chiam@altera.com/
---
Chiam, Evon (2):
arm64: dts: altera: Move all SoCFPGA files to dts/altera
MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE
MAINTAINERS | 1 -
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 ------------
18 files changed, 13 insertions(+), 14 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%)
--
2.43.7
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v4 1/2] arm64: dts: altera: Move all SoCFPGA files to dts/altera
2026-09-11 13:58 [PATCH v4 0/2] arm64: dts: altera: Consolidate SoCFPGA device trees evon.chiam
@ 2026-09-11 13:58 ` evon.chiam
2026-09-11 13:58 ` [PATCH v4 2/2] MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE evon.chiam
1 sibling, 0 replies; 3+ messages in thread
From: evon.chiam @ 2026-09-11 13:58 UTC (permalink / raw)
To: Dinh Nguyen, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
devicetree, linux-kernel
From: "Chiam, Evon" <evon.chiam@altera.com>
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 DTS/DTSI contents are modified; the device
tree move is rename-only.
Link: https://lore.kernel.org/all/cd16fb78-551e-4630-83d6-a44a68e2e411@kernel.org/
Signed-off-by: Chiam, Evon <evon.chiam@altera.com>
---
Changes in v4:
- Split the MAINTAINERS change out into patch 2/2
v3 patch link:
https://lore.kernel.org/all/47719884b157863b2253b415daa447b417cd3419.1789048358.git.evon.chiam@altera.com/
Changes in v3:
- Drop stale SoCFPGA MAINTAINERS F: entry for arch/arm64/boot/dts/intel/
v2 patch link:
https://lore.kernel.org/all/4b78273b85041f74b12245d0bf222f018afd2bd6.1788933630.git.evon.chiam@altera.com/
Changes in v2:
- Reworded commit subject to drop redundant "device trees" and phrase
the move as "to dts/altera"
v1 patch link:
https://lore.kernel.org/all/802bf0d27fbff9b1ddb6b9fc323a1a9f8f050f74.1788512748.git.evon.chiam@altera.com/
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v4 2/2] MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE
2026-09-11 13:58 [PATCH v4 0/2] arm64: dts: altera: Consolidate SoCFPGA device trees evon.chiam
2026-09-11 13:58 ` [PATCH v4 1/2] arm64: dts: altera: Move all SoCFPGA files to dts/altera evon.chiam
@ 2026-09-11 13:58 ` evon.chiam
1 sibling, 0 replies; 3+ messages in thread
From: evon.chiam @ 2026-09-11 13:58 UTC (permalink / raw)
To: Dinh Nguyen, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
devicetree, linux-kernel
From: "Chiam, Evon" <evon.chiam@altera.com>
All Altera SoCFPGA device trees now live in arch/arm64/boot/dts/altera/,
so the arch/arm64/boot/dts/intel/ path listed under ARM/SOCFPGA
ARCHITECTURE no longer matches any SoCFPGA file. The only files left in
that directory belong to Keembay, which are already covered by the
ARM/INTEL KEEMBAY ARCHITECTURE entry.
Drop the stale path so get_maintainer.pl stops pointing Keembay DT
changes at the SoCFPGA maintainer.
Link: https://lore.kernel.org/all/cd16fb78-551e-4630-83d6-a44a68e2e411@kernel.org/
Signed-off-by: Chiam, Evon <evon.chiam@altera.com>
---
Changes in v4:
- New patch, split out from v3: separate the MAINTAINERS change from
the DTS move patch
v3 patch link:
https://lore.kernel.org/all/47719884b157863b2253b415daa447b417cd3419.1789048358.git.evon.chiam@altera.com/
MAINTAINERS | 1 -
1 file changed, 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 15011f5752a9..98f374ae7586 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3590,7 +3590,6 @@ F: arch/arm/boot/dts/intel/socfpga/
F: arch/arm/configs/socfpga_defconfig
F: arch/arm/mach-socfpga/
F: arch/arm64/boot/dts/altera/
-F: arch/arm64/boot/dts/intel/
ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
M: Dinh Nguyen <dinguyen@kernel.org>
--
2.43.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-09-11 13:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-11 13:58 [PATCH v4 0/2] arm64: dts: altera: Consolidate SoCFPGA device trees evon.chiam
2026-09-11 13:58 ` [PATCH v4 1/2] arm64: dts: altera: Move all SoCFPGA files to dts/altera evon.chiam
2026-09-11 13:58 ` [PATCH v4 2/2] MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE evon.chiam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox