Skip to content

Commit c708140

Browse files
arndbarndb
committed
Merge tag 'socfpga_dts_updates_for_v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt
SoCFPGA DTS updates for v6.6 - Fix dtbs_check warnings for usbphy, sram, rstmgr, memory, partitions - Updated "stmmaceth-ocp" reset-names to "ahb" for stmmac ethernet - Add initial support for Agilex5 * tag 'socfpga_dts_updates_for_v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: dts: agilex5: add initial support for Intel Agilex5 SoCFPGA dt-bindings: clock: add Intel Agilex5 clock manager dt-bindings: reset: add reset IDs for Agilex5 dt-bindings: intel: Add Intel Agilex5 compatible arm64: dts: socfpga: change the reset-name of "stmmaceth-ocp" to "ahb" arm64: dts: socfpga: n5x/stratix10: fix dtbs_check warning for partitions arm64: dts: agilex/stratix10: Updated QSPI Flash layout for UBIFS arm64: dts: agilex/stratix10/n5x: fix dtbs_check for rstmgr arm64: dts: stratix10/agilex/n5x: fix dtbs_check warning for memory node arm64: dts: socfpga: stratix10: fix dtbs_check warning for usbphy arm64: dts: socfpga: agilex/stratix10: fix dtbs_check warnings for sram Link: https://lore.kernel.org/r/20230819161418.931258-1-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents ecd2dc2 + 2d599bc commit c708140

17 files changed

+703
-42
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ properties:
2121
- intel,socfpga-agilex-n6000
2222
- intel,socfpga-agilex-socdk
2323
- const: intel,socfpga-agilex
24+
- description: Agilex5 boards
25+
items:
26+
- enum:
27+
- intel,socfpga-agilex5-socdk
28+
- const: intel,socfpga-agilex5
2429

2530
additionalProperties: true
2631

‎Documentation/devicetree/bindings/clock/intel,agilex5-clkmgr.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/intel,agilex5-clkmgr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intel SoCFPGA Agilex5 clock manager
8+
9+
maintainers:
10+
- Dinh Nguyen <dinguyen@kernel.org>
11+
12+
description:
13+
The Intel Agilex5 Clock Manager is an integrated clock controller, which
14+
generates and supplies clock to all the modules.
15+
16+
properties:
17+
compatible:
18+
const: intel,agilex5-clkmgr
19+
20+
reg:
21+
maxItems: 1
22+
23+
'#clock-cells':
24+
const: 1
25+
26+
required:
27+
- compatible
28+
- reg
29+
- '#clock-cells'
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
clkmgr: clock-controller@10d10000 {
36+
compatible = "intel,agilex5-clkmgr";
37+
reg = <0x10d10000 0x1000>;
38+
#clock-cells = <1>;
39+
};
40+
...

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
441441
clock-names = "stmmaceth", "ptp_ref";
442442
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
443-
reset-names = "stmmaceth", "stmmaceth-ocp";
443+
reset-names = "stmmaceth", "ahb";
444444
snps,axi-config = <&socfpga_axi_setup>;
445445
status = "disabled";
446446
};
@@ -460,7 +460,7 @@
460460
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
461461
clock-names = "stmmaceth", "ptp_ref";
462462
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
463-
reset-names = "stmmaceth", "stmmaceth-ocp";
463+
reset-names = "stmmaceth", "ahb";
464464
snps,axi-config = <&socfpga_axi_setup>;
465465
status = "disabled";
466466
};
@@ -480,7 +480,7 @@
480480
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
481481
clock-names = "stmmaceth", "ptp_ref";
482482
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
483-
reset-names = "stmmaceth", "stmmaceth-ocp";
483+
reset-names = "stmmaceth", "ahb";
484484
snps,axi-config = <&socfpga_axi_setup>;
485485
status = "disabled";
486486
};

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
interrupt-names = "macirq";
154154
mac-address = [00 00 00 00 00 00];
155155
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
156-
reset-names = "stmmaceth", "stmmaceth-ocp";
156+
reset-names = "stmmaceth", "ahb";
157157
clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
158158
clock-names = "stmmaceth", "ptp_ref";
159159
tx-fifo-depth = <16384>;
@@ -171,7 +171,7 @@
171171
interrupt-names = "macirq";
172172
mac-address = [00 00 00 00 00 00];
173173
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
174-
reset-names = "stmmaceth", "stmmaceth-ocp";
174+
reset-names = "stmmaceth", "ahb";
175175
clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
176176
clock-names = "stmmaceth", "ptp_ref";
177177
tx-fifo-depth = <16384>;
@@ -189,7 +189,7 @@
189189
interrupt-names = "macirq";
190190
mac-address = [00 00 00 00 00 00];
191191
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
192-
reset-names = "stmmaceth", "stmmaceth-ocp";
192+
reset-names = "stmmaceth", "ahb";
193193
clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
194194
clock-names = "stmmaceth", "ptp_ref";
195195
tx-fifo-depth = <16384>;
@@ -331,6 +331,9 @@
331331
ocram: sram@ffe00000 {
332332
compatible = "mmio-sram";
333333
reg = <0xffe00000 0x100000>;
334+
#address-cells = <1>;
335+
#size-cells = <1>;
336+
ranges = <0 0xffe00000 0x100000>;
334337
};
335338

336339
pdma: dma-controller@ffda0000 {
@@ -484,12 +487,6 @@
484487
status = "disabled";
485488
};
486489

487-
usbphy0: usbphy@0 {
488-
#phy-cells = <0>;
489-
compatible = "usb-nop-xceiv";
490-
status = "okay";
491-
};
492-
493490
usb0: usb@ffb00000 {
494491
compatible = "snps,dwc2";
495492
reg = <0xffb00000 0x40000>;
@@ -636,4 +633,9 @@
636633
};
637634
};
638635
};
636+
637+
usbphy0: usbphy0 {
638+
compatible = "usb-nop-xceiv";
639+
#phy-cells = <0>;
640+
};
639641
};

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
};
3939
};
4040

41-
memory {
41+
memory@80000000 {
4242
device_type = "memory";
4343
/* We expect the bootloader to fill in the reg */
44-
reg = <0 0 0 0>;
44+
reg = <0 0x80000000 0 0>;
4545
};
4646

4747
ref_033v: regulator-v-ref {
@@ -202,12 +202,12 @@
202202

203203
qspi_boot: partition@0 {
204204
label = "Boot and fpga data";
205-
reg = <0x0 0x03FE0000>;
205+
reg = <0x0 0x04200000>;
206206
};
207207

208-
qspi_rootfs: partition@3FE0000 {
209-
label = "Root Filesystem - JFFS2";
210-
reg = <0x03FE0000 0x0C020000>;
208+
root: partition@4200000 {
209+
label = "Root Filesystem - UBIFS";
210+
reg = <0x04200000 0x0BE00000>;
211211
};
212212
};
213213
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
};
3939
};
4040

41-
memory {
41+
memory@80000000 {
4242
device_type = "memory";
4343
/* We expect the bootloader to fill in the reg */
44-
reg = <0 0 0 0>;
44+
reg = <0 0x80000000 0 0>;
4545
};
4646

4747
ref_033v: regulator-v-ref {
@@ -103,9 +103,9 @@
103103
status = "okay";
104104

105105
flash@0 {
106+
reg = <0>;
106107
#address-cells = <1>;
107108
#size-cells = <1>;
108-
reg = <0>;
109109
nand-bus-width = <16>;
110110

111111
partition@0 {
@@ -194,7 +194,7 @@
194194
reg = <0x0 0x03FE0000>;
195195
};
196196

197-
qspi_rootfs: partition@3FE0000 {
197+
qspi_rootfs: partition@3fe0000 {
198198
label = "Root Filesystem - JFFS2";
199199
reg = <0x03FE0000 0x0C020000>;
200200
};

‎arch/arm64/boot/dts/altera/socfpga_stratix10_swvp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
linux,initrd-end = <0x125c8324>;
3030
};
3131

32-
memory {
32+
memory@80000000 {
3333
device_type = "memory";
3434
reg = <0x0 0x0 0x0 0x80000000>;
3535
};

‎arch/arm64/boot/dts/intel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_n6000.dtb \
33
socfpga_agilex_socdk.dtb \
44
socfpga_agilex_socdk_nand.dtb \
5+
socfpga_agilex5_socdk.dtb \
56
socfpga_n5x_socdk.dtb
67
dtb-$(CONFIG_ARCH_KEEMBAY) += keembay-evm.dtb

‎arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
interrupt-names = "macirq";
159159
mac-address = [00 00 00 00 00 00];
160160
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
161-
reset-names = "stmmaceth", "stmmaceth-ocp";
161+
reset-names = "stmmaceth", "ahb";
162162
tx-fifo-depth = <16384>;
163163
rx-fifo-depth = <16384>;
164164
snps,multicast-filter-bins = <256>;
@@ -176,7 +176,7 @@
176176
interrupt-names = "macirq";
177177
mac-address = [00 00 00 00 00 00];
178178
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
179-
reset-names = "stmmaceth", "stmmaceth-ocp";
179+
reset-names = "stmmaceth", "ahb";
180180
tx-fifo-depth = <16384>;
181181
rx-fifo-depth = <16384>;
182182
snps,multicast-filter-bins = <256>;
@@ -194,7 +194,7 @@
194194
interrupt-names = "macirq";
195195
mac-address = [00 00 00 00 00 00];
196196
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
197-
reset-names = "stmmaceth", "stmmaceth-ocp";
197+
reset-names = "stmmaceth", "ahb";
198198
tx-fifo-depth = <16384>;
199199
rx-fifo-depth = <16384>;
200200
snps,multicast-filter-bins = <256>;
@@ -336,6 +336,9 @@
336336
ocram: sram@ffe00000 {
337337
compatible = "mmio-sram";
338338
reg = <0xffe00000 0x40000>;
339+
#address-cells = <1>;
340+
#size-cells = <1>;
341+
ranges = <0 0xffe00000 0x40000>;
339342
};
340343

341344
pdma: dma-controller@ffda0000 {
@@ -373,9 +376,9 @@
373376
};
374377

375378
rst: rstmgr@ffd11000 {
376-
#reset-cells = <1>;
377-
compatible = "altr,stratix10-rst-mgr";
379+
compatible = "altr,stratix10-rst-mgr", "altr,rst-mgr";
378380
reg = <0xffd11000 0x100>;
381+
#reset-cells = <1>;
379382
};
380383

381384
smmu: iommu@fa000000 {

0 commit comments

Comments
 (0)