diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2022-06-16 15:13:10 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2022-06-16 15:13:10 -0700 |
| commit | a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47 (patch) | |
| tree | 809b8384dc76c01c438c038c9b90a201732e5baf | |
| parent | f2906aa863381afb0015a9eb7fefad885d4e5a56 (diff) | |
| parent | 5e757deddd918edb8cb2fdb56eb79656ffc6dade (diff) | |
| download | staging-a7c1c97fb1e64b0825a2ee892d60da6fd22d3b47.tar.gz | |
Merge tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/conor/linux into fixes
Microchip RISC-V devicetree fixes for 5.19-rc3
A single fix for mpfs.dtsi:
- The sifive pdma entry fell through the cracks between versions of my
dt patches & I gave Zong the wrong conflict resolution, so it is
added back.
* tag 'dt-fixes-for-palmer-5.19-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/conor/linux:
riscv: dts: microchip: re-add pdma to mpfs device tree
| -rw-r--r-- | arch/riscv/boot/dts/microchip/mpfs.dtsi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi index 8c32591341942..3095d08453a11 100644 --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi @@ -192,6 +192,15 @@ riscv,ndev = <186>; }; + pdma: dma-controller@3000000 { + compatible = "sifive,fu540-c000-pdma", "sifive,pdma0"; + reg = <0x0 0x3000000 0x0 0x8000>; + interrupt-parent = <&plic>; + interrupts = <5 6>, <7 8>, <9 10>, <11 12>; + dma-channels = <4>; + #dma-cells = <1>; + }; + clkcfg: clkcfg@20002000 { compatible = "microchip,mpfs-clkcfg"; reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>; |