summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-04-29 19:26:58 +0200
committerThomas Gleixner <tglx@linutronix.de>2014-04-29 19:26:58 +0200
commitfb0095da19a2e905dfa3141a7704d9614f64992c (patch)
tree2d2c0269ee183afae555ae2df3c185e97d96f9e4 /Documentation
parentd1db0eea852497762cab43b905b879dfcd3b8987 (diff)
parent9afa27ce9414c92e271b0d7eec937bd9f5565da5 (diff)
downloadblackbird-obmc-linux-fb0095da19a2e905dfa3141a7704d9614f64992c.tar.gz
blackbird-obmc-linux-fb0095da19a2e905dfa3141a7704d9614f64992c.zip
Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
clockevent fixes for 3.15 from Daniel Lezcano: * Lorenzo Pieralizi fixed an issue with the arch_arm_timer where the C3STOP flag for all the arch can cause some trouble by setting the flag only if the power domain is not always on * Alexander Shiyan fixed a compilation by changing the init function to the right prototype
Diffstat (limited to 'Documentation')
-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 06fc7602593a..37b2cafa4e52 100644
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs.
- clock-frequency : The frequency of the main counter, in Hz. Optional.
+- always-on : a boolean property. If present, the timer is powered through an
+ always-on power domain, therefore it never loses context.
+
Example:
timer {
OpenPOWER on IntegriCloud