---

yaml --- r: 359948 b: refs/heads/master c: 37dd395 h: refs/heads/master v: v3
git-mirror · Feb 28, 2013 · afef897 · afef897
1 parent 19c2e54
commit afef897
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1dd464901080ecf7ebd3fd27dfc5735719055f4
+refs/heads/master: 37dd39513c33d518ccd8ea39ebe43d0f117590da
diff --git a/...tree/bindings/arm/armada-370-xp-timer.txt → ...ngs/timer/marvell,armada-370-xp-timer.txt b/...tree/bindings/arm/armada-370-xp-timer.txt → ...ngs/timer/marvell,armada-370-xp-timer.txt
@@ -1,10 +1,13 @@
-Marvell Armada 370 and Armada XP Global Timers
-----------------------------------------------
+Marvell Armada 370 and Armada XP Timers
+---------------------------------------
 
 Required properties:
 - compatible: Should be "marvell,armada-370-xp-timer"
-- interrupts: Should contain the list of Global Timer interrupts
-- reg: Should contain the base address of the Global Timer registers
+- interrupts: Should contain the list of Global Timer interrupts and
+  then local timer interrupts
+- reg: Should contain location and length for timers register. First
+  pair for the Global Timer registers, second pair for the
+  local/private timers.
 - clocks: clock driving the timer hardware
 
 Optional properties: