Skip to content

Commit f51d340

Browse files
committed
Merge tag 'socfpga_dts_updates_for_v6.20_v3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt
SoCFPGA DTS updates for v6.20, version 3 - dt-bindings updates: - Add intel,socfpga-agilex5-socdk-modular for the Agilex5 mod board - Add intel,socfpga-agilex-emmc for the Agilex eMMC daughter board - Move entries in intel,socfpga.yaml into altera.yaml - Add syscon as a fallback for sys-mgr - Add dma-cohrerent property for Agilex5 NAND and DMA - Add support for the Agilex5 modular board - Add IOMMUS property for ethernet nodes for Agilex5 - Use lowercase hex for dts files - Add #address-cells and #size-cells for sram - Fix dtbs_check warning for fpga-region - Move dma controller node for Agilex5 under simple-bus - Add support for the Agilex eMMC daughter board * tag 'socfpga_dts_updates_for_v6.20_v3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: dt-bindings: intel: Add Agilex eMMC support arm64: dts: socfpga: agilex: add emmc support arm64: dts: intel: agilex5: Add simple-bus node on top of dma controller node ARM: dts: socfpga: fix dtbs_check warning for fpga-region ARM: dts: socfpga: add #address-cells and #size-cells for sram node dt-bindings: altera: document syscon as fallback for sys-mgr arm64: dts: altera: Use lowercase hex dt-bindings: arm: altera: combine Intel's SoCFPGA into altera.yaml arm64: dts: socfpga: agilex5: Add IOMMUS property for ethernet nodes arm64: dts: socfpga: agilex5: add support for modular board dt-bindings: intel: Add Agilex5 SoCFPGA modular board arm64: dts: socfpga: agilex5: Add dma-coherent property Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0a82d3d + 4d904af commit f51d340

14 files changed

Lines changed: 336 additions & 109 deletions

Documentation/devicetree/bindings/arm/altera.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Altera's SoCFPGA platform
99
maintainers:
1010
- Dinh Nguyen <dinguyen@kernel.org>
1111

12+
description:
13+
Altera/Intel boards with ARM 32/64 bits cores
14+
1215
properties:
1316
$nodename:
1417
const: "/"
@@ -81,6 +84,30 @@ properties:
8184
- altr,socfpga-stratix10-swvp
8285
- const: altr,socfpga-stratix10
8386

87+
- description: AgileX boards
88+
items:
89+
- enum:
90+
- intel,n5x-socdk
91+
- intel,socfpga-agilex-n6000
92+
- intel,socfpga-agilex-socdk
93+
- intel,socfpga-agilex-socdk-emmc
94+
- const: intel,socfpga-agilex
95+
96+
- description: Agilex3 boards
97+
items:
98+
- enum:
99+
- intel,socfpga-agilex3-socdk
100+
- const: intel,socfpga-agilex3
101+
- const: intel,socfpga-agilex5
102+
103+
- description: Agilex5 boards
104+
items:
105+
- enum:
106+
- intel,socfpga-agilex5-socdk
107+
- intel,socfpga-agilex5-socdk-013b
108+
- intel,socfpga-agilex5-socdk-nand
109+
- const: intel,socfpga-agilex5
110+
84111
- description: SoCFPGA VT
85112
items:
86113
- const: altr,socfpga-vt

Documentation/devicetree/bindings/arm/intel,socfpga.yaml

Lines changed: 0 additions & 40 deletions
This file was deleted.

Documentation/devicetree/bindings/soc/altera/altr,sys-mgr.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ properties:
1313
compatible:
1414
oneOf:
1515
- description: Cyclone5/Arria5/Arria10
16-
const: altr,sys-mgr
16+
items:
17+
- const: altr,sys-mgr
18+
- const: syscon
1719
- description: Stratix10 SoC
1820
items:
1921
- const: altr,sys-mgr-s10
@@ -45,7 +47,7 @@ additionalProperties: false
4547
examples:
4648
- |
4749
sysmgr@ffd08000 {
48-
compatible = "altr,sys-mgr";
50+
compatible = "altr,sys-mgr", "syscon";
4951
reg = <0xffd08000 0x1000>;
5052
cpu1-start-addr = <0xffd080c4>;
5153
};

arch/arm/boot/dts/intel/socfpga/socfpga.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,13 @@
8787
};
8888
};
8989

90-
base_fpga_region {
90+
base_fpga_region: fpga-region {
9191
compatible = "fpga-region";
9292
fpga-mgr = <&fpgamgr0>;
9393

9494
#address-cells = <0x1>;
9595
#size-cells = <0x1>;
96+
ranges;
9697
};
9798

9899
can0: can@ffc00000 {
@@ -785,6 +786,9 @@
785786
ocram: sram@ffff0000 {
786787
compatible = "mmio-sram";
787788
reg = <0xffff0000 0x10000>;
789+
#address-cells = <0x1>;
790+
#size-cells = <0x1>;
791+
ranges;
788792
};
789793

790794
qspi: spi@ff705000 {

arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@
8080
};
8181
};
8282

83-
base_fpga_region {
83+
base_fpga_region: fpga-region {
8484
#address-cells = <0x1>;
8585
#size-cells = <0x1>;
8686

8787
compatible = "fpga-region";
8888
fpga-mgr = <&fpga_mgr>;
89+
ranges;
8990
};
9091

9192
clkmgr@ffd04000 {
@@ -686,6 +687,9 @@
686687
ocram: sram@ffe00000 {
687688
compatible = "mmio-sram";
688689
reg = <0xffe00000 0x40000>;
690+
#address-cells = <1>;
691+
#size-cells = <1>;
692+
ranges;
689693
};
690694

691695
eccmgr: eccmgr {

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382

383383
pinctrl0: pinctrl@ffd13000 {
384384
compatible = "pinctrl-single";
385-
reg = <0xffd13000 0xA0>;
385+
reg = <0xffd13000 0xa0>;
386386
#pinctrl-cells = <1>;
387387
pinctrl-single,register-width = <32>;
388388
pinctrl-single,function-mask = <0x0000000f>;

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192

193193
root: partition@4200000 {
194194
label = "Root Filesystem - UBIFS";
195-
reg = <0x04200000 0x0BE00000>;
195+
reg = <0x04200000 0x0be00000>;
196196
};
197197
};
198198
};

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@
174174

175175
qspi_boot: partition@0 {
176176
label = "Boot and fpga data";
177-
reg = <0x0 0x03FE0000>;
177+
reg = <0x0 0x03fe0000>;
178178
};
179179

180180
qspi_rootfs: partition@3fe0000 {
181181
label = "Root Filesystem - JFFS2";
182-
reg = <0x03FE0000 0x0C020000>;
182+
reg = <0x03fe0000 0x0c020000>;
183183
};
184184
};
185185
};

arch/arm64/boot/dts/intel/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_n6000.dtb \
33
socfpga_agilex_socdk.dtb \
4+
socfpga_agilex_socdk_emmc.dtb \
45
socfpga_agilex_socdk_nand.dtb \
56
socfpga_agilex3_socdk.dtb \
67
socfpga_agilex5_socdk.dtb \
78
socfpga_agilex5_socdk_013b.dtb \
9+
socfpga_agilex5_socdk_modular.dtb \
810
socfpga_agilex5_socdk_nand.dtb \
911
socfpga_n5x_socdk.dtb
1012
dtb-$(CONFIG_ARCH_KEEMBAY) += keembay-evm.dtb

0 commit comments

Comments
 (0)