Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc

[karo-tx-linux.git] / arch / arm / boot / dts / armada-370.dtsi

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 648e5303446e6f49dc813e229450288e470fafae..e134d7a90c9ab9a5d24bfb500ed9206875f8f033 100644 (file)
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -136,7 +136,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
 
@@ -147,7 +147,7 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>, <90>;
                        };
 
@@ -158,10 +158,15 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <91>;
                        };
 
+                       timer@20300 {
+                               compatible = "marvell,armada-370-timer";
+                               clocks = <&coreclk 2>;
+                       };
+
                        coreclk: mvebu-sar@18230 {
                                compatible = "marvell,armada-370-core-clock";
                                reg = <0x18230 0x08>;