Skip to content

Commit 265f34c

Browse files
committed
Merge tag 'riscv-for-linus-5.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt: - fix the fu540-c000 device tree to avoid a schema check failure on the DMA node name - fix typo in the PolarFire SOC device tree * tag 'riscv-for-linus-5.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: riscv: dts: microchip: fix gpio1 reg property typo riscv: dts: sifive: fu540-c000: align dma node name with dtschema
2 parents a956f4e + c932ede commit 265f34c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi

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

367367
gpio1: gpio@20121000 {
368368
compatible = "microchip,mpfs-gpio";
369-
reg = <000 0x20121000 0x0 0x1000>;
369+
reg = <0x0 0x20121000 0x0 0x1000>;
370370
interrupt-parent = <&plic>;
371371
interrupt-controller;
372372
#interrupt-cells = <1>;

arch/riscv/boot/dts/sifive/fu540-c000.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
clocks = <&prci FU540_PRCI_CLK_TLCLK>;
168168
status = "disabled";
169169
};
170-
dma: dma@3000000 {
170+
dma: dma-controller@3000000 {
171171
compatible = "sifive,fu540-c000-pdma";
172172
reg = <0x0 0x3000000 0x0 0x8000>;
173173
interrupt-parent = <&plic0>;

0 commit comments

Comments
 (0)