Merge tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux...

From Pawel Moll:
Versatile Express related fixes for 3.9
* Correct interrupt definitions for WDT node in
  V2P-CA15 and V2P-CA15_A7 Device Trees

* tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux:
  ARM: vexpress: Fix wdt interrupt in ca15{-tc1,_a7} dts

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index a3d37ec2655d80efccae49ee9f85ca9c9b1213b1..73187173117c5a942b6b1201f9a22703cd1e979a 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -70,7 +70,7 @@
                compatible = "arm,sp805", "arm,primecell";
                status = "disabled";
                reg = <0 0x2b060000 0 0x1000>;
-               interrupts = <98>;
+               interrupts = <0 98 4>;
                clocks = <&oscclk7>;
                clock-names = "apb_pclk";
        };

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index cf8071ad22d5fb5acfd1382f82d16e606c28e068..dfe371ec2749843cef7726f5fb5e75d55e670456 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -72,7 +72,7 @@
        wdt@2a490000 {
                compatible = "arm,sp805", "arm,primecell";
                reg = <0 0x2a490000 0 0x1000>;
-               interrupts = <98>;
+               interrupts = <0 98 4>;
                clocks = <&oscclk6a>, <&oscclk6a>;
                clock-names = "wdogclk", "apb_pclk";
        };