diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-21 10:17:10 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-21 10:18:12 +0530 |
| commit | adf8e216a6072cf4b1a4bb3fe4a3e047a16a3303 (patch) | |
| tree | 77ec68689c9375d524e952fcab94c4332435b78c /Documentation/devicetree | |
| parent | 9edeaa7b227ac3a4d38a8a41914a44d2d8173170 (diff) | |
| parent | e3b1d3dc90cbf0602a69687f48cc1a07574a266e (diff) | |
Merge remote-tracking branch 'maz/local_timers-v3.3-rc4' into android-t114-3.4-rebased
Conflicts:
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
arch/arm/mach-msm/timer.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/smp-r8a7779.c
arch/arm/mach-shmobile/smp-sh73a0.c
arch/arm/mach-shmobile/timer.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/timer.c
arch/arm/mach-ux500/timer.c
arch/arm/mach-vexpress/ct-ca9x4.c
Change-Id: Id65fd2a5994e4b22cd682952b8f71f8b33b73823
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arch_timer.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt new file mode 100644 index 000000000000..eb3986eaf2b0 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/arch_timer.txt @@ -0,0 +1,23 @@ +* ARM architected timer + +ARM Cortex-A7 and Cortex-A15 have a per-core architected timer, which +provides a per-cpu local timer. + +The timer is attached to a GIC to deliver its two per-processor +interrupts (one for the secure mode, one for the non-secure mode). + +** Timer node properties: + +- compatible : Should be "arm,armv7-timer" + +- interrupts : One or two interrupts for secure and non-secure mode + +- clock-frequency : The frequency of the main counter, in Hz. Optional. + +Example: + + timer { + compatible = "arm,armv7-timer""; + interrupts = <1 13 0xf08 1 14 0xf08>; + clock-frequency = <100000000>; + }; |