Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc

A few device tree updates and an include file fix for versatile.

* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
  ARM: vexpress: Remove twice included header files
  ARM: vexpress: Device Tree updates
  + update to 3.4

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

3 files changed, 28 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 941b161ab78c..7e1091d91af8 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -73,7 +73,10 @@
                 #address-cells = <0>;
                 interrupt-controller;
                 reg = <0x2c001000 0x1000>,
-                      <0x2c002000 0x100>;
+                      <0x2c002000 0x1000>,
+                      <0x2c004000 0x2000>,
+                      <0x2c006000 0x2000>;
+                interrupts = <1 9 0xf04>;
         };
 
         memory-controller@7ffd0000 {
@@ -93,6 +96,14 @@
                              <0 91 4>;
         };
 
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts = <1 13 0xf08>,
+                             <1 14 0xf08>,
+                             <1 11 0xf08>,
+                             <1 10 0xf08>;
+        };
+
         pmu {
                 compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
                 interrupts = <0 68 4>,
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index 6905e66d4748..18917a0f8604 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -77,13 +77,18 @@
 
         timer@2c000600 {
                 compatible = "arm,cortex-a5-twd-timer";
-                reg = <0x2c000600 0x38>;
-                interrupts = <1 2 0x304>,
-                             <1 3 0x304>;
+                reg = <0x2c000600 0x20>;
+                interrupts = <1 13 0x304>;
+        };
+
+        watchdog@2c000620 {
+                compatible = "arm,cortex-a5-twd-wdt";
+                reg = <0x2c000620 0x20>;
+                interrupts = <1 14 0x304>;
         };
 
         gic: interrupt-controller@2c001000 {
-                compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic";
+                compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
                 #address-cells = <0>;
                 interrupt-controller;
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index da778693be54..3f0c736d31d6 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -105,8 +105,13 @@
         timer@1e000600 {
                 compatible = "arm,cortex-a9-twd-timer";
                 reg = <0x1e000600 0x20>;
-                interrupts = <1 2 0xf04>,
-                             <1 3 0xf04>;
+                interrupts = <1 13 0xf04>;
+        };
+
+        watchdog@1e000620 {
+                compatible = "arm,cortex-a9-twd-wdt";
+                reg = <0x1e000620 0x20>;
+                interrupts = <1 14 0xf04>;
         };
 
         gic: interrupt-controller@1e001000 {