]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arch: arm: dts: agilex: Switch to using upstream Linux DT config
authorTingting Meng <tingting.meng@altera.com>
Mon, 4 Aug 2025 01:24:47 +0000 (18:24 -0700)
committerTien Fong Chee <tien.fong.chee@intel.com>
Fri, 8 Aug 2025 14:20:51 +0000 (22:20 +0800)
Migrate the legacy Agilex 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: Tingting Meng <tingting.meng@altera.com>
Signed-off-by: Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi@altera.com>
Reviewed-by: Tien Fong Chee <tien.fong.chee@altera.com>
arch/arm/dts/Makefile
arch/arm/dts/socfpga_agilex-u-boot.dtsi
arch/arm/dts/socfpga_agilex.dtsi [deleted file]
arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
arch/arm/dts/socfpga_agilex_socdk.dts [deleted file]
arch/arm/dts/socfpga_soc64_u-boot.dtsi
configs/socfpga_agilex_defconfig
configs/socfpga_agilex_vab_defconfig

index e212ed40b78bb89f0179571729275c183e820a54..eece3bdcdce76c18df7fec834f06e1f28f3d29be 100644 (file)
@@ -448,7 +448,6 @@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \
 dtb-$(CONFIG_TARGET_THUNDERX_88XX) += thunderx-88xx.dtb
 
 dtb-$(CONFIG_ARCH_SOCFPGA) +=                          \
-       socfpga_agilex_socdk.dtb                        \
        socfpga_agilex5_socdk.dtb                       \
        socfpga_arria5_secu1.dtb                        \
        socfpga_arria5_socdk.dtb                        \
index 91674669886a1f58b9e90d63cfdfe7e908f529e8..8c9bdf610aee680582c60ad96d2319d8d6efe991 100644 (file)
                freeze_br0 = &freeze_controller;
        };
 
-       memory {
+       memory@0 {
+               device_type = "memory";
                #address-cells = <2>;
                #size-cells = <2>;
                bootph-all;
        };
 
-       soc {
+       pmu {
+               compatible = "arm,armv8-pmuv3";
+       };
+
+       soc@0 {
                bootph-all;
 
                freeze_controller: freeze_controller@f9000450 {
        bootph-all;
 };
 
+&gmac0 {
+       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+       reset-names = "stmmaceth", "stmmaceth-ocp";
+       clocks = <&clkmgr AGILEX_EMAC0_CLK>;
+       clock-names = "stmmaceth";
+       phy-mode = "rgmii";
+       max-frame-size = <0x2328>;
+       status = "okay";
+
+       mdio0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "snps,dwmac-mdio";
+       };
+};
+
 &gmac1 {
+       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+       reset-names = "stmmaceth", "stmmaceth-ocp";
+       altr,sysmgr-syscon = <&sysmgr 0x48 0>;
+       clocks = <&clkmgr AGILEX_EMAC1_CLK>;
+       clock-names = "stmmaceth";
+       status = "disabled";
        altr,sysmgr-syscon = <&sysmgr 0x48 0>;
 };
 
 &gmac2 {
+       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
+       reset-names = "stmmaceth", "stmmaceth-ocp";
+       altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
+       clocks = <&clkmgr AGILEX_EMAC2_CLK>;
+       clock-names = "stmmaceth";
+       status = "disabled";
        altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
 };
 
 
 &qspi {
        bootph-all;
+       compatible = "cdns,qspi-nor";
+       flash0: flash@0 {
+       };
+};
+
+&flash0 {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       compatible = "jedec,spi-nor";
 };
 
 &rst {
 
 &uart0 {
        bootph-all;
+       clock-frequency = <100000000>;
 };
 
 &watchdog0 {
        bootph-all;
 };
 
+&nand {
+       clocks = <&clkmgr AGILEX_NAND_CLK>,
+       <&clkmgr AGILEX_NAND_X_CLK>;
+       clock-names = "nand", "nand_x";
+};
+
+&usb0 {
+       compatible = "snps,dwc2";
+};
+
+&usb1 {
+       compatible = "snps,dwc2";
+};
+
+&spi0 {
+       compatible = "intel,agilex-spi",
+                        "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
+};
+
+&spi1 {
+       compatible = "intel,agilex-spi",
+                        "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
+};
+
+&pdma {
+       #dma-channels = <8>;
+       #dma-requests = <32>;
+};
+
 #if !defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH)
 &binman {
        /delete-node/ kernel;
diff --git a/arch/arm/dts/socfpga_agilex.dtsi b/arch/arm/dts/socfpga_agilex.dtsi
deleted file mode 100644 (file)
index 84bc40d..0000000
+++ /dev/null
@@ -1,632 +0,0 @@
-// SPDX-License-Identifier:     GPL-2.0
-/*
- * Copyright (C) 2019-2023 Intel Corporation <www.intel.com>
- * Copyright (C) 2025 Altera Corporation <www.altera.com>
- */
-
-/dts-v1/;
-#include <dt-bindings/reset/altr,rst-mgr-s10.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/clock/agilex-clock.h>
-
-/ {
-       compatible = "intel,socfpga-agilex";
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               service_reserved: svcbuffer@0 {
-                       compatible = "shared-dma-pool";
-                       reg = <0x0 0x0 0x0 0x2000000>;
-                       alignment = <0x1000>;
-                       no-map;
-               };
-       };
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu0: cpu@0 {
-                       compatible = "arm,cortex-a53";
-                       device_type = "cpu";
-                       enable-method = "psci";
-                       reg = <0x0>;
-               };
-
-               cpu1: cpu@1 {
-                       compatible = "arm,cortex-a53";
-                       device_type = "cpu";
-                       enable-method = "psci";
-                       reg = <0x1>;
-               };
-
-               cpu2: cpu@2 {
-                       compatible = "arm,cortex-a53";
-                       device_type = "cpu";
-                       enable-method = "psci";
-                       reg = <0x2>;
-               };
-
-               cpu3: cpu@3 {
-                       compatible = "arm,cortex-a53";
-                       device_type = "cpu";
-                       enable-method = "psci";
-                       reg = <0x3>;
-               };
-       };
-
-       pmu {
-               compatible = "arm,armv8-pmuv3";
-               interrupts = <0 170 4>,
-                            <0 171 4>,
-                            <0 172 4>,
-                            <0 173 4>;
-               interrupt-affinity = <&cpu0>,
-                                    <&cpu1>,
-                                    <&cpu2>,
-                                    <&cpu3>;
-               interrupt-parent = <&intc>;
-       };
-
-       psci {
-               compatible = "arm,psci-0.2";
-               method = "smc";
-       };
-
-       intc: intc@fffc1000 {
-               compatible = "arm,gic-400", "arm,cortex-a15-gic";
-               #interrupt-cells = <3>;
-               interrupt-controller;
-               reg = <0x0 0xfffc1000 0x0 0x1000>,
-                     <0x0 0xfffc2000 0x0 0x2000>,
-                     <0x0 0xfffc4000 0x0 0x2000>,
-                     <0x0 0xfffc6000 0x0 0x2000>;
-       };
-
-       soc {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "simple-bus";
-               device_type = "soc";
-               interrupt-parent = <&intc>;
-               ranges = <0 0 0 0xffffffff>;
-
-               base_fpga_region {
-                       #address-cells = <0x1>;
-                       #size-cells = <0x1>;
-                       compatible = "fpga-region";
-                       fpga-mgr = <&fpga_mgr>;
-               };
-
-               clkmgr: clock-controller@ffd10000 {
-                       compatible = "intel,agilex-clkmgr";
-                       reg = <0xffd10000 0x1000>;
-                       #clock-cells = <1>;
-               };
-
-               clocks {
-                       cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                       };
-
-                       cb_intosc_ls_clk: cb-intosc-ls-clk {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                       };
-
-                       f2s_free_clk: f2s-free-clk {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                       };
-
-                       osc1: osc1 {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                       };
-
-                       qspi_clk: qspi-clk {
-                               #clock-cells = <0>;
-                               compatible = "fixed-clock";
-                               clock-frequency = <200000000>;
-                       };
-               };
-               gmac0: ethernet@ff800000 {
-                       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
-                       reg = <0xff800000 0x2000>;
-                       interrupts = <0 90 4>;
-                       interrupt-names = "macirq";
-                       mac-address = [00 00 00 00 00 00];
-                       resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
-                       reset-names = "stmmaceth", "stmmaceth-ocp";
-                       tx-fifo-depth = <16384>;
-                       rx-fifo-depth = <16384>;
-                       snps,multicast-filter-bins = <256>;
-                       iommus = <&smmu 1>;
-                       altr,sysmgr-syscon = <&sysmgr 0x44 0>;
-                       clocks = <&clkmgr AGILEX_EMAC0_CLK>;
-                       clock-names = "stmmaceth";
-                       status = "disabled";
-               };
-
-               gmac1: ethernet@ff802000 {
-                       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
-                       reg = <0xff802000 0x2000>;
-                       interrupts = <0 91 4>;
-                       interrupt-names = "macirq";
-                       mac-address = [00 00 00 00 00 00];
-                       resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
-                       reset-names = "stmmaceth", "stmmaceth-ocp";
-                       tx-fifo-depth = <16384>;
-                       rx-fifo-depth = <16384>;
-                       snps,multicast-filter-bins = <256>;
-                       iommus = <&smmu 2>;
-                       altr,sysmgr-syscon = <&sysmgr 0x48 8>;
-                       clocks = <&clkmgr AGILEX_EMAC1_CLK>;
-                       clock-names = "stmmaceth";
-                       status = "disabled";
-               };
-
-               gmac2: ethernet@ff804000 {
-                       compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
-                       reg = <0xff804000 0x2000>;
-                       interrupts = <0 92 4>;
-                       interrupt-names = "macirq";
-                       mac-address = [00 00 00 00 00 00];
-                       resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
-                       reset-names = "stmmaceth", "stmmaceth-ocp";
-                       tx-fifo-depth = <16384>;
-                       rx-fifo-depth = <16384>;
-                       snps,multicast-filter-bins = <256>;
-                       iommus = <&smmu 3>;
-                       altr,sysmgr-syscon = <&sysmgr 0x4c 16>;
-                       clocks = <&clkmgr AGILEX_EMAC2_CLK>;
-                       clock-names = "stmmaceth";
-                       status = "disabled";
-               };
-
-               gpio0: gpio@ffc03200 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,dw-apb-gpio";
-                       reg = <0xffc03200 0x100>;
-                       resets = <&rst GPIO0_RESET>;
-                       status = "disabled";
-
-                       porta: gpio-controller@0 {
-                               compatible = "snps,dw-apb-gpio-port";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                               snps,nr-gpios = <24>;
-                               reg = <0>;
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-                               interrupts = <0 110 4>;
-                       };
-               };
-
-               gpio1: gpio@ffc03300 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,dw-apb-gpio";
-                       reg = <0xffc03300 0x100>;
-                       resets = <&rst GPIO1_RESET>;
-                       status = "disabled";
-
-                       portb: gpio-controller@0 {
-                               compatible = "snps,dw-apb-gpio-port";
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                               snps,nr-gpios = <24>;
-                               reg = <0>;
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-                               interrupts = <0 111 4>;
-                       };
-               };
-
-               i2c0: i2c@ffc02800 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,designware-i2c";
-                       reg = <0xffc02800 0x100>;
-                       interrupts = <0 103 4>;
-                       resets = <&rst I2C0_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               i2c1: i2c@ffc02900 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,designware-i2c";
-                       reg = <0xffc02900 0x100>;
-                       interrupts = <0 104 4>;
-                       resets = <&rst I2C1_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               i2c2: i2c@ffc02a00 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,designware-i2c";
-                       reg = <0xffc02a00 0x100>;
-                       interrupts = <0 105 4>;
-                       resets = <&rst I2C2_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               i2c3: i2c@ffc02b00 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,designware-i2c";
-                       reg = <0xffc02b00 0x100>;
-                       interrupts = <0 106 4>;
-                       resets = <&rst I2C3_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               i2c4: i2c@ffc02c00 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "snps,designware-i2c";
-                       reg = <0xffc02c00 0x100>;
-                       interrupts = <0 107 4>;
-                       resets = <&rst I2C4_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               mmc: dwmmc0@ff808000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "altr,socfpga-dw-mshc";
-                       reg = <0xff808000 0x1000>;
-                       interrupts = <0 96 4>;
-                       fifo-depth = <0x400>;
-                       resets = <&rst SDMMC_RESET>;
-                       reset-names = "reset";
-                       clocks = <&clkmgr AGILEX_L4_MP_CLK>,
-                                <&clkmgr AGILEX_SDMMC_CLK>;
-                       clock-names = "biu", "ciu";
-                       iommus = <&smmu 5>;
-                       status = "disabled";
-               };
-
-               nand: nand@ffb90000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "altr,socfpga-denali-nand";
-                       reg = <0xffb90000 0x10000>,
-                             <0xffb80000 0x1000>;
-                       reg-names = "nand_data", "denali_reg";
-                       interrupts = <0 97 4>;
-                       clocks = <&clkmgr AGILEX_NAND_CLK>,
-                                <&clkmgr AGILEX_NAND_X_CLK>;
-                       clock-names = "nand", "nand_x";
-                       resets = <&rst NAND_RESET>, <&rst NAND_OCP_RESET>;
-                       status = "disabled";
-               };
-
-               ocram: sram@ffe00000 {
-                       compatible = "mmio-sram";
-                       reg = <0xffe00000 0x40000>;
-               };
-
-               pdma: pdma@ffda0000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       reg = <0xffda0000 0x1000>;
-                       interrupts = <0 81 4>,
-                                    <0 82 4>,
-                                    <0 83 4>,
-                                    <0 84 4>,
-                                    <0 85 4>,
-                                    <0 86 4>,
-                                    <0 87 4>,
-                                    <0 88 4>,
-                                    <0 89 4>;
-                       #dma-cells = <1>;
-                       #dma-channels = <8>;
-                       #dma-requests = <32>;
-                       resets = <&rst DMA_RESET>, <&rst DMA_OCP_RESET>;
-                       reset-names = "dma", "dma-ocp";
-                       clocks = <&clkmgr AGILEX_L4_MAIN_CLK>;
-                       clock-names = "apb_pclk";
-               };
-
-               rst: rstmgr@ffd11000 {
-                       #reset-cells = <1>;
-                       compatible = "altr,stratix10-rst-mgr";
-                       reg = <0xffd11000 0x100>;
-               };
-
-               smmu: iommu@fa000000 {
-                       compatible = "arm,mmu-500", "arm,smmu-v2";
-                       reg = <0xfa000000 0x40000>;
-                       #global-interrupts = <2>;
-                       #iommu-cells = <1>;
-                       interrupt-parent = <&intc>;
-                       interrupts = <0 128 4>, /* Global Secure Fault */
-                               <0 129 4>, /* Global Non-secure Fault */
-                               /* Non-secure Context Interrupts (32) */
-                               <0 138 4>, <0 139 4>, <0 140 4>, <0 141 4>,
-                               <0 142 4>, <0 143 4>, <0 144 4>, <0 145 4>,
-                               <0 146 4>, <0 147 4>, <0 148 4>, <0 149 4>,
-                               <0 150 4>, <0 151 4>, <0 152 4>, <0 153 4>,
-                               <0 154 4>, <0 155 4>, <0 156 4>, <0 157 4>,
-                               <0 158 4>, <0 159 4>, <0 160 4>, <0 161 4>,
-                               <0 162 4>, <0 163 4>, <0 164 4>, <0 165 4>,
-                               <0 166 4>, <0 167 4>, <0 168 4>, <0 169 4>;
-                       stream-match-mask = <0x7ff0>;
-                       status = "disabled";
-               };
-
-               spi0: spi@ffda4000 {
-                       compatible = "intel,agilex-spi",
-                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0xffda4000 0x1000>;
-                       interrupts = <0 99 4>;
-                       resets = <&rst SPIM0_RESET>;
-                       reg-io-width = <4>;
-                       num-cs = <4>;
-                       clocks = <&clkmgr AGILEX_L4_MAIN_CLK>;
-                       status = "disabled";
-               };
-
-               spi1: spi@ffda5000 {
-                       compatible = "intel,agilex-spi",
-                                    "snps,dw-apb-ssi-4.00a", "snps,dw-apb-ssi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0xffda5000 0x1000>;
-                       interrupts = <0 100 4>;
-                       resets = <&rst SPIM1_RESET>;
-                       reg-io-width = <4>;
-                       num-cs = <4>;
-                       clocks = <&clkmgr AGILEX_L4_MAIN_CLK>;
-                       status = "disabled";
-               };
-
-               sysmgr: sysmgr@ffd12000 {
-                       compatible = "altr,sys-mgr-s10","altr,sys-mgr";
-                       reg = <0xffd12000 0x500>;
-               };
-
-               /* Local timer */
-               timer {
-                       compatible = "arm,armv8-timer";
-                       interrupts = <1 13 0xf08>,
-                                    <1 14 0xf08>,
-                                    <1 11 0xf08>,
-                                    <1 10 0xf08>;
-               };
-
-               timer0: timer0@ffc03000 {
-                       compatible = "snps,dw-apb-timer";
-                       interrupts = <0 113 4>;
-                       reg = <0xffc03000 0x100>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       clock-names = "timer";
-               };
-
-               timer1: timer1@ffc03100 {
-                       compatible = "snps,dw-apb-timer";
-                       interrupts = <0 114 4>;
-                       reg = <0xffc03100 0x100>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       clock-names = "timer";
-               };
-
-               timer2: timer2@ffd00000 {
-                       compatible = "snps,dw-apb-timer";
-                       interrupts = <0 115 4>;
-                       reg = <0xffd00000 0x100>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       clock-names = "timer";
-               };
-
-               timer3: timer3@ffd00100 {
-                       compatible = "snps,dw-apb-timer";
-                       interrupts = <0 116 4>;
-                       reg = <0xffd00100 0x100>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       clock-names = "timer";
-               };
-
-               uart0: serial0@ffc02000 {
-                       compatible = "snps,dw-apb-uart";
-                       reg = <0xffc02000 0x100>;
-                       interrupts = <0 108 4>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       resets = <&rst UART0_RESET>;
-                       status = "disabled";
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       clock-frequency = <100000000>;
-               };
-
-               uart1: serial1@ffc02100 {
-                       compatible = "snps,dw-apb-uart";
-                       reg = <0xffc02100 0x100>;
-                       interrupts = <0 109 4>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       resets = <&rst UART1_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SP_CLK>;
-                       status = "disabled";
-               };
-
-               usbphy0: usbphy@0 {
-                       #phy-cells = <0>;
-                       compatible = "usb-nop-xceiv";
-                       status = "okay";
-               };
-
-               usb0: usb@ffb00000 {
-                       compatible = "snps,dwc2";
-                       reg = <0xffb00000 0x40000>;
-                       interrupts = <0 93 4>;
-                       phys = <&usbphy0>;
-                       phy-names = "usb2-phy";
-                       resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;
-                       reset-names = "dwc2", "dwc2-ecc";
-                       clocks = <&clkmgr AGILEX_USB_CLK>;
-                       iommus = <&smmu 6>;
-                       status = "disabled";
-               };
-
-               usb1: usb@ffb40000 {
-                       compatible = "snps,dwc2";
-                       reg = <0xffb40000 0x40000>;
-                       interrupts = <0 94 4>;
-                       phys = <&usbphy0>;
-                       phy-names = "usb2-phy";
-                       resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;
-                       reset-names = "dwc2", "dwc2-ecc";
-                       iommus = <&smmu 7>;
-                       clocks = <&clkmgr AGILEX_USB_CLK>;
-                       status = "disabled";
-               };
-
-               watchdog0: watchdog@ffd00200 {
-                       compatible = "snps,dw-wdt";
-                       reg = <0xffd00200 0x100>;
-                       interrupts = <0 117 4>;
-                       resets = <&rst WATCHDOG0_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SYS_FREE_CLK>;
-                       status = "disabled";
-               };
-
-               watchdog1: watchdog@ffd00300 {
-                       compatible = "snps,dw-wdt";
-                       reg = <0xffd00300 0x100>;
-                       interrupts = <0 118 4>;
-                       resets = <&rst WATCHDOG1_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SYS_FREE_CLK>;
-                       status = "disabled";
-               };
-
-               watchdog2: watchdog@ffd00400 {
-                       compatible = "snps,dw-wdt";
-                       reg = <0xffd00400 0x100>;
-                       interrupts = <0 125 4>;
-                       resets = <&rst WATCHDOG2_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SYS_FREE_CLK>;
-                       status = "disabled";
-               };
-
-               watchdog3: watchdog@ffd00500 {
-                       compatible = "snps,dw-wdt";
-                       reg = <0xffd00500 0x100>;
-                       interrupts = <0 126 4>;
-                       resets = <&rst WATCHDOG3_RESET>;
-                       clocks = <&clkmgr AGILEX_L4_SYS_FREE_CLK>;
-                       status = "disabled";
-               };
-
-               sdr: sdr@f8011100 {
-                       compatible = "altr,sdr-ctl", "syscon";
-                       reg = <0xf8011100 0xc0>;
-               };
-
-               eccmgr {
-                       compatible = "altr,socfpga-s10-ecc-manager",
-                                    "altr,socfpga-a10-ecc-manager";
-                       altr,sysmgr-syscon = <&sysmgr>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       interrupts = <0 15 4>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       ranges;
-
-                       sdramedac {
-                               compatible = "altr,sdram-edac-s10";
-                               altr,sdr-syscon = <&sdr>;
-                               interrupts = <16 4>;
-                       };
-
-                       ocram-ecc@ff8cc000 {
-                               compatible = "altr,socfpga-s10-ocram-ecc",
-                                            "altr,socfpga-a10-ocram-ecc";
-                               reg = <0xff8cc000 0x100>;
-                               altr,ecc-parent = <&ocram>;
-                               interrupts = <1 4>;
-                       };
-
-                       usb0-ecc@ff8c4000 {
-                               compatible = "altr,socfpga-s10-usb-ecc",
-                                            "altr,socfpga-usb-ecc";
-                               reg = <0xff8c4000 0x100>;
-                               altr,ecc-parent = <&usb0>;
-                               interrupts = <2 4>;
-                       };
-
-                       emac0-rx-ecc@ff8c0000 {
-                               compatible = "altr,socfpga-s10-eth-mac-ecc",
-                                            "altr,socfpga-eth-mac-ecc";
-                               reg = <0xff8c0000 0x100>;
-                               altr,ecc-parent = <&gmac0>;
-                               interrupts = <4 4>;
-                       };
-
-                       emac0-tx-ecc@ff8c0400 {
-                               compatible = "altr,socfpga-s10-eth-mac-ecc",
-                                            "altr,socfpga-eth-mac-ecc";
-                               reg = <0xff8c0400 0x100>;
-                               altr,ecc-parent = <&gmac0>;
-                               interrupts = <5 4>;
-                       };
-
-                       sdmmca-ecc@ff8c8c00 {
-                               compatible = "altr,socfpga-s10-sdmmc-ecc",
-                                            "altr,socfpga-sdmmc-ecc";
-                               reg = <0xff8c8c00 0x100>;
-                               altr,ecc-parent = <&mmc>;
-                               interrupts = <14 4>,
-                                            <15 4>;
-                       };
-               };
-
-               qspi: spi@ff8d2000 {
-                       compatible = "cdns,qspi-nor";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0xff8d2000 0x100>,
-                             <0xff900000 0x100000>;
-                       interrupts = <0 3 4>;
-                       cdns,fifo-depth = <128>;
-                       cdns,fifo-width = <4>;
-                       cdns,trigger-address = <0x00000000>;
-                       clocks = <&qspi_clk>;
-
-                       status = "disabled";
-               };
-
-               firmware {
-                       svc {
-                               compatible = "intel,stratix10-svc";
-                               method = "smc";
-                               memory-region = <&service_reserved>;
-
-                               fpga_mgr: fpga-mgr {
-                                       compatible = "intel,stratix10-soc-fpga-mgr";
-                               };
-                       };
-               };
-       };
-
-       aliases {
-               sysmgr = &sysmgr;
-       };
-};
index c2770424d9c8ba6b03a206e7e5c9771d8919ac54..369d9585174937ba72c8790068c99efe4b4c45a5 100644 (file)
                u-boot,spl-boot-order = &mmc,&flash0,&nand;
        };
 
-       memory {
+       memory@0 {
                /* 8GB */
                reg = <0 0x00000000 0 0x80000000>,
                      <2 0x80000000 1 0x80000000>;
        };
 };
 
-&flash0 {
-       compatible = "jedec,spi-nor";
-       spi-tx-bus-width = <4>;
-       spi-rx-bus-width = <4>;
-       bootph-all;
-       /delete-property/ cdns,read-delay;
+&gmac0 {
+       mdio0 {
+               ethernet_phy0: ethernet-phy@0 {
+                       reg = <4>;
+                       txd0-skew-ps = <0>;
+                       txd1-skew-ps = <0>;
+                       txd2-skew-ps = <0>;
+                       txd3-skew-ps = <0>;
+                       rxd0-skew-ps = <0x1a4>;
+                       rxd1-skew-ps = <0x1a4>;
+                       rxd2-skew-ps = <0x1a4>;
+                       rxd3-skew-ps = <0x1a4>;
+                       txen-skew-ps = <0>;
+                       txc-skew-ps = <0x384>;
+                       rxdv-skew-ps = <0x1a4>;
+                       rxc-skew-ps = <0x690>;
+               };
+       };
 };
 
 &nand {
 
 &qspi {
        status = "okay";
+       /delete-property/ clocks;
+};
+
+&flash0 {
+       reg = <0>;
+       spi-tx-bus-width = <4>;
+       spi-rx-bus-width = <4>;
+       spi-max-frequency = <100000000>;
+       bootph-all;
+
+       m25p,fast-read;
+       cdns,page-size = <256>;
+       cdns,block-size = <16>;
+       cdns,read-delay = <1>;
+       cdns,tshsl-ns = <50>;
+       cdns,tsd2d-ns = <50>;
+       cdns,tchsh-ns = <4>;
+       cdns,tslch-ns = <4>;
+       /delete-property/ cdns,read-delay;
+
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               qspi_boot: partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x04200000>;
+               };
+
+               root: partition@4200000 {
+                       label = "root";
+                       reg = <0x04200000 0x0BE00000>;
+               };
+       };
 };
diff --git a/arch/arm/dts/socfpga_agilex_socdk.dts b/arch/arm/dts/socfpga_agilex_socdk.dts
deleted file mode 100644 (file)
index 9cb9ff9..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// SPDX-License-Identifier:     GPL-2.0
-/*
- * Copyright (C) 2019, Intel Corporation
- * Copyright (C) 2025 Altera Corporation <www.altera.com>
- */
-#include "socfpga_agilex.dtsi"
-
-/ {
-       model = "SoCFPGA Agilex SoCDK";
-
-       aliases {
-               serial0 = &uart0;
-               ethernet0 = &gmac0;
-               ethernet1 = &gmac1;
-               ethernet2 = &gmac2;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               hps0 {
-                       label = "hps_led0";
-                       gpios = <&portb 20 GPIO_ACTIVE_HIGH>;
-               };
-
-               hps1 {
-                       label = "hps_led1";
-                       gpios = <&portb 19 GPIO_ACTIVE_HIGH>;
-               };
-
-               hps2 {
-                       label = "hps_led2";
-                       gpios = <&portb 21 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               /* We expect the bootloader to fill in the reg */
-               reg = <0 0 0 0>;
-       };
-
-       soc {
-               clocks {
-                       osc1 {
-                               clock-frequency = <25000000>;
-                       };
-               };
-       };
-};
-
-&gpio1 {
-       status = "okay";
-};
-
-&gmac0 {
-       status = "okay";
-       phy-mode = "rgmii";
-       phy-handle = <&phy0>;
-
-       max-frame-size = <9000>;
-
-       mdio0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "snps,dwmac-mdio";
-               phy0: ethernet-phy@0 {
-                       reg = <4>;
-
-                       txd0-skew-ps = <0>; /* -420ps */
-                       txd1-skew-ps = <0>; /* -420ps */
-                       txd2-skew-ps = <0>; /* -420ps */
-                       txd3-skew-ps = <0>; /* -420ps */
-                       rxd0-skew-ps = <420>; /* 0ps */
-                       rxd1-skew-ps = <420>; /* 0ps */
-                       rxd2-skew-ps = <420>; /* 0ps */
-                       rxd3-skew-ps = <420>; /* 0ps */
-                       txen-skew-ps = <0>; /* -420ps */
-                       txc-skew-ps = <900>; /* 0ps */
-                       rxdv-skew-ps = <420>; /* 0ps */
-                       rxc-skew-ps = <1680>; /* 780ps */
-               };
-       };
-};
-
-&mmc {
-       status = "okay";
-       cap-sd-highspeed;
-       broken-cd;
-       bus-width = <4>;
-};
-
-&uart0 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-       disable-over-current;
-};
-
-&watchdog0 {
-       status = "okay";
-};
-
-&qspi {
-       flash0: flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mt25qu02g";
-               reg = <0>;
-               spi-max-frequency = <100000000>;
-
-               m25p,fast-read;
-               cdns,page-size = <256>;
-               cdns,block-size = <16>;
-               cdns,read-delay = <1>;
-               cdns,tshsl-ns = <50>;
-               cdns,tsd2d-ns = <50>;
-               cdns,tchsh-ns = <4>;
-               cdns,tslch-ns = <4>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       qspi_boot: partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x04200000>;
-                       };
-
-                       root: partition@4200000 {
-                               label = "root";
-                               reg = <0x04200000 0x0BE00000>;
-                       };
-               };
-       };
-};
index 0164d1a713c986882486d3752d02bb649f41afa9..ce5b37ef547882daabe26bd595fe97490076519a 100644 (file)
@@ -6,7 +6,7 @@
  */
 
 / {
-       soc {
+       soc@0 {
                socfpga-system-mgr-firewall {
                        compatible = "intel,socfpga-dtreg";
                        #address-cells = <1>;
index f5e730005613141d0b65ee9771e1f73c869f17fb..628b3fbc062ae1674adad6eca9631dc48f5ec654 100644 (file)
@@ -8,7 +8,8 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
 CONFIG_SF_DEFAULT_MODE=0x2003
 CONFIG_ENV_SIZE=0x2000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk"
+CONFIG_DEFAULT_DEVICE_TREE="intel/socfpga_agilex_socdk"
+CONFIG_OF_UPSTREAM=y
 CONFIG_DM_RESET=y
 CONFIG_SPL_STACK=0xffe3f000
 CONFIG_SPL_TEXT_BASE=0xFFE00000
index 8eec3d8d67ad1fb1aded2957645f6c75f84ed9fa..825d2869f84388b37bf8ae7e0e2b0b01119db134 100644 (file)
@@ -11,7 +11,8 @@ CONFIG_SF_DEFAULT_MODE=0x2003
 CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x200
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk"
+CONFIG_DEFAULT_DEVICE_TREE="intel/socfpga_agilex_socdk"
+CONFIG_OF_UPSTREAM=y
 CONFIG_DM_RESET=y
 CONFIG_SPL_STACK=0xffe3f000
 CONFIG_SPL_TEXT_BASE=0xFFE00000