diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:59:23 +0200 |
commit | cfb6d656d569510ac9239583ce09e4c92ad54719 (patch) | |
tree | f80d4526a5a293d69a0262b04890ba296c8874ab /Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | |
parent | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (diff) | |
parent | 220069945b298d3998c6598b081c466dca259929 (diff) | |
download | op-kernel-dev-cfb6d656d569510ac9239583ce09e4c92ad54719.zip op-kernel-dev-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.gz |
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core
* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates
Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt')
-rw-r--r-- | Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt index 77c4cfa..da2d510 100644 --- a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt +++ b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt @@ -2,10 +2,10 @@ MOXA ART timer Required properties: -- compatible : Should be "moxa,moxart-timer" +- compatible : Must be "moxa,moxart-timer" - reg : Should contain registers location and length - interrupts : Should contain the timer interrupt number -- clocks : Should contain phandle for APB clock "clkapb" +- clocks : Should contain phandle for the clock that drives the counter Example: @@ -13,5 +13,5 @@ Example: compatible = "moxa,moxart-timer"; reg = <0x98400000 0x42>; interrupts = <19 1>; - clocks = <&clkapb>; + clocks = <&coreclk>; }; |