projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
versatile-ab.dts
diff --git
a/arch/arm/boot/dts/versatile-ab.dts
b/arch/arm/boot/dts/versatile-ab.dts
index
37bd41f
..
151c022
100644
(file)
--- a/
arch/arm/boot/dts/versatile-ab.dts
+++ b/
arch/arm/boot/dts/versatile-ab.dts
@@
-195,16
+195,15
@@
#size-cells = <1>;
ranges;
#size-cells = <1>;
ranges;
- vic: int
c
@10140000 {
+ vic: int
errupt-controller
@10140000 {
compatible = "arm,versatile-vic";
interrupt-controller;
#interrupt-cells = <1>;
reg = <0x10140000 0x1000>;
compatible = "arm,versatile-vic";
interrupt-controller;
#interrupt-cells = <1>;
reg = <0x10140000 0x1000>;
- clear-mask = <0xffffffff>;
valid-mask = <0xffffffff>;
};
valid-mask = <0xffffffff>;
};
- sic: int
c
@10003000 {
+ sic: int
errupt-controller
@10003000 {
compatible = "arm,versatile-sic";
interrupt-controller;
#interrupt-cells = <1>;
compatible = "arm,versatile-sic";
interrupt-controller;
#interrupt-cells = <1>;