Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into for-arm-soc/arch-timers

2013-02-01 10:28:36 +00:00
parent 5b91ab0abc 8266891e25
commit 9e02e394c7
15 changed files with 751 additions and 858 deletions
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -1,13 +1,14 @@
 * ARM architected timer

-ARM Cortex-A7 and Cortex-A15 have a per-core architected timer, which
-provides per-cpu timers.
+ARM cores may have a per-core architected timer, which provides per-cpu timers.

 The timer is attached to a GIC to deliver its per-processor interrupts.

 ** Timer node properties:

- compatible : Should at least contain "arm,armv7-timer".
+- compatible : Should at least contain one of
+	"arm,armv7-timer"
+	"arm,armv8-timer"

 - interrupts : Interrupt list for secure, non-secure, virtual and
  hypervisor timers, in that order.