diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-26 11:26:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-26 11:26:27 -0700 |
commit | 012bd7e859df9d6aa0a8ab4484c00aeded108071 (patch) | |
tree | 830820ba3d8a903d91968da410f012331125a2fd /arch/riscv/boot/dts/microchip/mpfs.dtsi | |
parent | c23f864dc7ef37655021c43beae98321436cbd9a (diff) | |
parent | 1709c70c31e05e6e87b2ffa0a2b4cc0da4b2c513 (diff) | |
download | linux-012bd7e859df9d6aa0a8ab4484c00aeded108071.tar.bz2 |
Merge tag 'riscv-for-linus-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- A handful of fixes for the Microchip device trees
- A pair of fixes to eliminate build warnings
* tag 'riscv-for-linus-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
riscv: dts: microchip: mpfs: remove pci axi address translation property
riscv: dts: microchip: mpfs: remove bogus card-detect-delay
riscv: dts: microchip: mpfs: remove ti,fifo-depth property
riscv: dts: microchip: mpfs: fix incorrect pcie child node name
riscv: traps: add missing prototype
riscv: signal: fix missing prototype warning
riscv: dts: microchip: correct L2 cache interrupts
Diffstat (limited to 'arch/riscv/boot/dts/microchip/mpfs.dtsi')
-rw-r--r-- | arch/riscv/boot/dts/microchip/mpfs.dtsi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi index 499c2e63ad35..74493344ea41 100644 --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi @@ -193,7 +193,7 @@ cache-size = <2097152>; cache-unified; interrupt-parent = <&plic>; - interrupts = <1>, <2>, <3>; + interrupts = <1>, <3>, <4>, <2>; }; clint: clint@2000000 { @@ -485,9 +485,8 @@ ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>; msi-parent = <&pcie>; msi-controller; - microchip,axi-m-atr0 = <0x10 0x0>; status = "disabled"; - pcie_intc: legacy-interrupt-controller { + pcie_intc: interrupt-controller { #address-cells = <0>; #interrupt-cells = <1>; interrupt-controller; |