diff options
author | Linus Torvalds | 2020-10-20 09:09:44 -0700 |
---|---|---|
committer | Linus Torvalds | 2020-10-20 09:09:44 -0700 |
commit | b32649b863623d89fec83aa27d19c28715c4fae3 (patch) | |
tree | e0cd36e0766c55063e1c4eef93523e2395536a54 /arch/arc/boot/dts/axc001.dtsi | |
parent | 270315b8235e3d10c2e360cff56c2f9e0915a252 (diff) | |
parent | 6364d1b41cc382db3b03cf33c57b6007ee8f09cf (diff) |
Merge tag 'arc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC updates from Vineet Gupta:
"The bulk of ARC pull request is removal of EZChip NPS platform which
was suffering from constant bitrot. In recent years EZChip has gone
though multiple successive acquisitions and I guess things and people
move on. I would like to take this opportunity to recognize and thank
all those good folks (Gilad, Noam, Ofer...) for contributing major
bits to ARC port (SMP, Big Endian).
Summary:
- drop support for EZChip NPS platform
- misc other fixes"
* tag 'arc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
arc: include/asm: fix typos of "themselves"
ARC: SMP: fix typo and use "come up" instead of "comeup"
ARC: [dts] fix the errors detected by dtbs_check
arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER
ARC: [plat-eznps]: Drop support for EZChip NPS platform
Diffstat (limited to 'arch/arc/boot/dts/axc001.dtsi')
-rw-r--r-- | arch/arc/boot/dts/axc001.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/axc001.dtsi b/arch/arc/boot/dts/axc001.dtsi index 79ec27c043c1..2a151607b080 100644 --- a/arch/arc/boot/dts/axc001.dtsi +++ b/arch/arc/boot/dts/axc001.dtsi @@ -91,7 +91,7 @@ * avoid duplicating the MB dtsi file given that IRQ from * this intc to cpu intc are different for axs101 and axs103 */ - mb_intc: dw-apb-ictl@e0012000 { + mb_intc: interrupt-controller@e0012000 { #interrupt-cells = <1>; compatible = "snps,dw-apb-ictl"; reg = < 0x0 0xe0012000 0x0 0x200 >; |