UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCYquhFQAKCRB4tDGHoIJi
 0vdLAP0TlxTgiweNIuj8NLw0eQ1W+NfFApEYx4ZXy9/Gtz1/PAEAibIcaOY9eWmy
 W7TBJ/JAlhx+7AKm7WhiY2rE5vxo2g0=
 =7SX0
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEKzw3R0RoQ7JKlDp6LhMZ81+7GIkFAmKrqvoTHHBhbG1lckBk
 YWJiZWx0LmNvbQAKCRAuExnzX7sYia6JEACfZ4eyEw6aiLhcXLMHys6fmDf6BaOV
 pad7JI7nYrG+fRRPMBum3/6319m0x7rMacuvqlZ6lxHQDykAvhdn+0P39Muz6JpP
 5Rv1+F+kzdu9w2zq869zVOFa4ECroCGDWolgQYIPIi7rgbIEG4qiGbNAGsbLhbH5
 DQWru8QicFGEgBpIT+DeEiCKM4wK8cT0cUKQYsvrzoNJlUfkoBQanQHKfegGTEjS
 K/g0NeVOKkk8yZIKmtBuoYVi4OVcHArgt4yFvh0BLEC5LOtIpbkPxn1YbDhal4Lg
 jJVHyIzTKbtADv8M1bvhGbac+FoUtqvQUnrRXcX4/itAewZCiONSVrcgdERyisbx
 gsz958/rlgI4hXhLYrFd1s4mIrEKWQuWpFlMXr3JFVnLGdvvx9V9t9iF3BOUISNM
 fukmQkixOxng49W1dNqFUN/oA/a6rUi7K9QtWqu+pn3PJAaV1vm37iJ04WqKC4n4
 +nT2cQC0bs4xzRsXrv8xS8NWl+xZ7u8cnGc+JScF+vHNPtPFD2ic1Qu7cqJzje8e
 fmmxoO0QphAL5a2BJAuq2N9DZt9w1YK1ZkAgbVQsq8tJ65SWcmR8ncbFZduF0+bd
 dwby92veo+LbiFL9Cpma/xVO0BLvps4wIlYT6yXqh5BtLQHl8quJsQPKnGWEccPY
 lJ5rTggHTJeN+w==
 =xLlB
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Palmer Dabbelt 2022-06-16 15:13:10 -07:00
parent f2906aa863 5e757deddd
commit a7c1c97fb1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/riscv/boot/dts/microchip/mpfs.dtsi
View File

@ -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>;