Commit 265f34c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a956f4e2 c932edea

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

+1 −1
Original line number Diff line number Diff line
@@ -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>;

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			status = "disabled";

		};

		dma: dma@3000000 {

		dma: dma-controller@3000000 {

			compatible = "sifive,fu540-c000-pdma";

			reg = <0x0 0x3000000 0x0 0x8000>;

			interrupt-parent = <&plic0>;