diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-20 21:13:32 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-20 21:13:32 +0300 |
commit | 265f34c25bad0d92ca439838529db366adb0e620 (patch) | |
tree | 83825892ef146aa9758e7d47d405e3153cdd2382 /arch/riscv/boot/dts/microchip | |
parent | a956f4e281fe548a541a4970a6e8a0ec283b0d6d (diff) | |
parent | c932edeaf6d6e6cc25088e61c3fcf585c30497c0 (diff) | |
download | linux-265f34c25bad0d92ca439838529db366adb0e620.tar.xz |
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
Diffstat (limited to 'arch/riscv/boot/dts/microchip')
-rw-r--r-- | arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi index 746c4d4e7686..cf2f55e1dcb6 100644 --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi @@ -366,7 +366,7 @@ gpio1: gpio@20121000 { compatible = "microchip,mpfs-gpio"; - reg = <000 0x20121000 0x0 0x1000>; + reg = <0x0 0x20121000 0x0 0x1000>; interrupt-parent = <&plic>; interrupt-controller; #interrupt-cells = <1>; |