diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-04-29 13:26:58 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-04-29 13:26:58 -0400 |
| commit | fb0095da19a2e905dfa3141a7704d9614f64992c (patch) | |
| tree | 2d2c0269ee183afae555ae2df3c185e97d96f9e4 /Documentation/devicetree | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
| parent | 9afa27ce9414c92e271b0d7eec937bd9f5565da5 (diff) | |
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/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arch_timer.txt | 3 |
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. | |||
| 19 | 19 | ||
| 20 | - clock-frequency : The frequency of the main counter, in Hz. Optional. | 20 | - clock-frequency : The frequency of the main counter, in Hz. Optional. |
| 21 | 21 | ||
| 22 | - always-on : a boolean property. If present, the timer is powered through an | ||
| 23 | always-on power domain, therefore it never loses context. | ||
| 24 | |||
| 22 | Example: | 25 | Example: |
| 23 | 26 | ||
| 24 | timer { | 27 | timer { |