summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-10-28 16:50:11 -0700
committerGrant Likely <grant.likely@linaro.org>2013-10-28 16:50:11 -0700
commit0976c946a610d06e907335b7a3afa6db046f8e1b (patch)
treebaf715945ef9a17add0fcd273ce0032fa53eea0b
parent79d9701559a9f3e9b2021fbd292f5e70ad75f686 (diff)
downloadlinux-stable-0976c946a610d06e907335b7a3afa6db046f8e1b.tar.gz
linux-stable-0976c946a610d06e907335b7a3afa6db046f8e1b.tar.bz2
linux-stable-0976c946a610d06e907335b7a3afa6db046f8e1b.zip
arm/versatile: Fix versatile irq specifications.
Two of the versatile irq definitions are incorrect, mostly because two devices have connections to more than one interrupt controller. Fix them by using the new interrupts-extended property to fan out without using an awful interrupt-map nexus node. Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r--arch/arm/boot/dts/versatile-ab.dts2
-rw-r--r--arch/arm/boot/dts/versatile-pb.dts2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index dde75ae8b4b1..e01e5a081def 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -185,7 +185,7 @@
mmc@5000 {
compatible = "arm,primecell";
reg = < 0x5000 0x1000>;
- interrupts = <22 34>;
+ interrupts-extended = <&vic 22 &sic 2>;
};
kmi@6000 {
compatible = "arm,pl050", "arm,primecell";
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 7e8175269064..f43907c40c93 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -41,7 +41,7 @@
mmc@b000 {
compatible = "arm,primecell";
reg = <0xb000 0x1000>;
- interrupts = <23 34>;
+ interrupts-extended = <&vic 23 &sic 2>;
};
};
};