summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/arm/arch_timer.txt
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-09-14 11:40:04 +0100
committerJon Medhurst <tixy@linaro.org>2015-09-14 11:40:04 +0100
commit1922cf16f580e0057947add2d6e8fde75cf36c65 (patch)
treec5cf664b6de4870f9140e3899e3d6313b183ce4e /Documentation/devicetree/bindings/arm/arch_timer.txt
parent6ae196a24d5d8a8c1da069fedea6c434a9514ccd (diff)
parentfa38c3ce0619c889c4530037b352787c54cbfd79 (diff)
Merge branch 'lsk-3.18-armlt-juno-cpuidle' into integration-lsk-3.18-armlt-android
Diffstat (limited to 'Documentation/devicetree/bindings/arm/arch_timer.txt')
-rw-r--r--Documentation/devicetree/bindings/arm/arch_timer.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index 37b2cafa4e5..271483595a1 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -42,6 +42,9 @@ Example:
- reg : The control frame base address.
+- arm,cnttidr : The value of the CNTTIDR register if not accessible from
+ the level the kernel is running at. To be used only in extreme cases.
+
Note that #address-cells, #size-cells, and ranges shall be present to ensure
the CPU can address a frame's registers.