diff options
author | Tom Rini | 2024-05-20 09:54:58 -0600 |
---|---|---|
committer | Tom Rini | 2024-05-20 09:55:18 -0600 |
commit | 85854bc3324edd0c81047780ee60033d056fd490 (patch) | |
tree | 63f280b485f19f65f2a871d502a7db7238176b57 /dts/upstream/src/riscv/microchip/mpfs.dtsi | |
parent | 4820864a67b8483e18213d1bc57e12740256717c (diff) | |
parent | 6bb92fcf7d2fea2314d616e5e2391a8bf2b0fdfa (diff) |
Subtree merge tag 'v6.9-dts' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Tested-by: Heiko Stuebner <heiko@sntech.de> # rk3588-rock5b, rk3588-jaguar,
# rk3588-tiger (pending patch)
Diffstat (limited to 'dts/upstream/src/riscv/microchip/mpfs.dtsi')
-rw-r--r-- | dts/upstream/src/riscv/microchip/mpfs.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dts/upstream/src/riscv/microchip/mpfs.dtsi b/dts/upstream/src/riscv/microchip/mpfs.dtsi index 59fd2d4ea52..9883ca3554c 100644 --- a/dts/upstream/src/riscv/microchip/mpfs.dtsi +++ b/dts/upstream/src/riscv/microchip/mpfs.dtsi @@ -243,7 +243,7 @@ }; pdma: dma-controller@3000000 { - compatible = "sifive,fu540-c000-pdma", "sifive,pdma0"; + compatible = "microchip,mpfs-pdma", "sifive,pdma0"; reg = <0x0 0x3000000 0x0 0x8000>; interrupt-parent = <&plic>; interrupts = <5 6>, <7 8>, <9 10>, <11 12>; @@ -422,7 +422,7 @@ can0: can@2010c000 { compatible = "microchip,mpfs-can"; reg = <0x0 0x2010c000 0x0 0x1000>; - clocks = <&clkcfg CLK_CAN0>; + clocks = <&clkcfg CLK_CAN0>, <&clkcfg CLK_MSSPLL3>; interrupt-parent = <&plic>; interrupts = <56>; status = "disabled"; @@ -431,7 +431,7 @@ can1: can@2010d000 { compatible = "microchip,mpfs-can"; reg = <0x0 0x2010d000 0x0 0x1000>; - clocks = <&clkcfg CLK_CAN1>; + clocks = <&clkcfg CLK_CAN1>, <&clkcfg CLK_MSSPLL3>; interrupt-parent = <&plic>; interrupts = <57>; status = "disabled"; |