Skip to content

Commit e736f2a

Browse files
committed
Merge tag 'socfpga_dts_updates_v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt
SoCFPGA DTS updates for v6.14 - Remove unused and undocumented property "snps,max-mtu" - Add gpio and spi node for Agilex5 - Add VGIC maintenance interrupt for Agilex - Use correct reset name of "stmmaceth-ocp" instead of "ahb" - Drop unused #address-cells/#size-cells in the cyclone5-mcvevk * tag 'socfpga_dts_updates_v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: dts: altera: Remove unused and undocumented "snps,max-mtu" property arm64: dts: socfpga: agilex5: Add gpio0 node and spi dma handshake id arm64: dts: socfpga: agilex: Add VGIC maintenance interrupt arm: dts: socfpga: use reset-name "stmmaceth-ocp" instead of "ahb" ARM: dts: socfpga_cyclone5_mcvevk: Drop unused #address-cells/#size-cells Link: https://lore.kernel.org/r/20250103023012.1268627-1-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 596f35f + 91e8b7c commit e736f2a

5 files changed

Lines changed: 29 additions & 7 deletions

File tree

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", "ahb";
443+
reset-names = "stmmaceth", "stmmaceth-ocp";
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", "ahb";
463+
reset-names = "stmmaceth", "stmmaceth-ocp";
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", "ahb";
483+
reset-names = "stmmaceth", "stmmaceth-ocp";
484484
snps,axi-config = <&socfpga_axi_setup>;
485485
status = "disabled";
486486
};

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050

5151
stmpe1: stmpe811@41 {
5252
compatible = "st,stmpe811";
53-
#address-cells = <1>;
54-
#size-cells = <0>;
5553
reg = <0x41>;
5654
id = <0>;
5755
blocks = <0x5>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
status = "okay";
6464
phy-mode = "rgmii";
6565
phy-addr = <0xffffffff>;
66-
snps,max-mtu = <0x0>;
6766
};
6867

6968
&gmac1 {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,13 @@
101101
compatible = "arm,gic-400", "arm,cortex-a15-gic";
102102
#interrupt-cells = <3>;
103103
interrupt-controller;
104+
interrupt-parent = <&intc>;
104105
reg = <0x0 0xfffc1000 0x0 0x1000>,
105106
<0x0 0xfffc2000 0x0 0x2000>,
106107
<0x0 0xfffc4000 0x0 0x2000>,
107108
<0x0 0xfffc6000 0x0 0x2000>;
109+
/* VGIC maintenance interrupt */
110+
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
108111
};
109112

110113
clocks {

arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,26 @@
222222
status = "disabled";
223223
};
224224

225+
gpio0: gpio@ffc03200 {
226+
compatible = "snps,dw-apb-gpio";
227+
reg = <0xffc03200 0x100>;
228+
#address-cells = <1>;
229+
#size-cells = <0>;
230+
resets = <&rst GPIO0_RESET>;
231+
status = "disabled";
232+
233+
porta: gpio-controller@0 {
234+
compatible = "snps,dw-apb-gpio-port";
235+
reg = <0>;
236+
gpio-controller;
237+
#gpio-cells = <2>;
238+
snps,nr-gpios = <24>;
239+
interrupt-controller;
240+
#interrupt-cells = <2>;
241+
interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
242+
};
243+
};
244+
225245
gpio1: gpio@10c03300 {
226246
compatible = "snps,dw-apb-gpio";
227247
reg = <0x10c03300 0x100>;
@@ -314,7 +334,7 @@
314334
reg-io-width = <4>;
315335
num-cs = <4>;
316336
clocks = <&clkmgr AGILEX5_L4_MAIN_CLK>;
317-
dmas = <&dmac0 2>, <&dmac0 3>;
337+
dmas = <&dmac0 16>, <&dmac0 17>;
318338
dma-names = "tx", "rx";
319339
status = "disabled";
320340

@@ -331,6 +351,8 @@
331351
reg-io-width = <4>;
332352
num-cs = <4>;
333353
clocks = <&clkmgr AGILEX5_L4_MAIN_CLK>;
354+
dmas = <&dmac0 20>, <&dmac0 21>;
355+
dma-names = "tx", "rx";
334356
status = "disabled";
335357
};
336358

0 commit comments

Comments
 (0)