---

yaml --- r: 359947 b: refs/heads/master c: e1dd464 h: refs/heads/master i: 359945: 22561a5 359943: 395b692 v: v3
git-mirror · Feb 28, 2013 · 19c2e54 · 19c2e54
1 parent 87ee1af
commit 19c2e54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1abcd7c2339088a6628381fa13239d89d639961
+refs/heads/master: e1dd464901080ecf7ebd3fd27dfc5735719055f4
diff --git a/trunk/arch/arm/boot/dts/armada-370-xp.dtsi b/trunk/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -68,8 +68,9 @@
 
 		timer@d0020300 {
 			       compatible = "marvell,armada-370-xp-timer";
-			       reg = <0xd0020300 0x30>;
-			       interrupts = <37>, <38>, <39>, <40>;
+			       reg = <0xd0020300 0x30>,
+			       <0xd0021040 0x30>;
+			       interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
 			       clocks = <&coreclk 2>;
 		};