summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-12-04 23:33:16 -0800
committerOlof Johansson <olof@lixom.net>2014-12-04 23:33:16 -0800
commitfb3268b0081e4a9a8baa369b8e882874dcd5f955 (patch)
treefc576514c1a4e2c520986aaf010c4b09c1d23f15 /Documentation
parent83b63c699b53050a00a3ffb6c43663c4647dac30 (diff)
parent65b5732d241b8b39e07653794eefffd0d8028cbb (diff)
Merge branch 'clocksource/physical-timers' into next/dt
These are a pre-req to get rk3288 SMP to work with some firmwares, so merge it in here as well as in next/drivers. * clocksource/physical-timers: clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers clocksource: arch_timer: Fix code to use physical timers when requested
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/arch_timer.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index 37b2cafa4e52..256b4d8bab7b 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -22,6 +22,14 @@ to deliver its interrupts via SPIs.
- always-on : a boolean property. If present, the timer is powered through an
always-on power domain, therefore it never loses context.
+** Optional properties:
+
+- arm,cpu-registers-not-fw-configured : Firmware does not initialize
+ any of the generic timer CPU registers, which contain their
+ architecturally-defined reset values. Only supported for 32-bit
+ systems which follow the ARMv7 architected reset values.
+
+
Example:
timer {