[PATCH v3 6/7] arch: arm: dts: n5x: switch to using upstream Linux DT config

[Chee, Tien Fong]

Hi Lok,


On 8/6/2026 9:27 am, Chen Huei Lok wrote:
> Migrate the legacy n5x platform to use the upstream Linux device tree
> configuration. This helps reduce maintenance overhead and aligns U-Boot
> with the Linux kernel's DTS hierarchy and naming conventions.
>
> This change improves consistency between U-Boot and Linux by removing
> custom/legacy DTS handling and instead relying on the standardized
> definitions provided by the upstream Linux DTS.
>
> Signed-off-by: Chen Huei Lok <chen.huei.lok at altera.com>
> ---
>
> Changes in v3:
> - Fix CONFIG_OF_UPSTREAM position in defconfig: correctly placed after
>    CONFIG_CMD_FS_GENERIC per canonical savedefconfig ordering (was
>    placed at end of file in v2)
>
>   arch/arm/dts/Makefile                      |  3 +--
>   arch/arm/dts/socfpga_n5x-u-boot.dtsi       | 17 +++++++++++++++--
>   arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi | 13 ++++++-------
>   configs/socfpga_n5x_defconfig              |  3 ++-
>   4 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index cbb58180814..c753564f134 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -452,8 +452,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
>   	socfpga_cyclone5_sr1500.dtb			\
>   	socfpga_cyclone5_vining_fpga.dtb		\
>   	socfpga_cyclone5_ac501soc.dtb			\
> -	socfpga_cyclone5_ac550soc.dtb			\
> -	socfpga_n5x_socdk.dtb
> +	socfpga_cyclone5_ac550soc.dtb

P6 removes:  arch/arm/dts/Makefile entry socfpga_n5x_socdk.dtb
P6 changes:  CONFIG_DEFAULT_DEVICE_TREE → intel/socfpga_n5x_socdk
Still present: arch/arm/dts/socfpga_n5x_socdk.dts
Upstream:    dts/upstream/src/arm64/intel/socfpga_n5x_socdk.dts

Runtime build no longer uses the in-tree vendor socfpga_n5x_socdk.dts 
once OF_UPSTREAM is enabled. Leaving it creates a stale duplicate that 
may confuse reviewers.


Best regards,

Tien Fong