diff options
| author | Olof Johansson <olof@lixom.net> | 2014-12-05 10:32:16 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-12-05 10:32:16 +0300 |
| commit | 6b34df9e30c8b596f9d0173ca17714076474458e (patch) | |
| tree | a47b26e4ebb4d0aea10b3abbb620efa2a004ba8c /Documentation | |
| parent | e58e501a9b3e0db722263b02d6c06f1656a5dee7 (diff) | |
| parent | 65b5732d241b8b39e07653794eefffd0d8028cbb (diff) | |
| download | linux-6b34df9e30c8b596f9d0173ca17714076474458e.tar.xz | |
Merge branch 'clocksource/physical-timers' into next/drivers
* clocksource/physical-timers:
clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers
clocksource: arch_timer: Fix code to use physical timers when requested
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arch_timer.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt index 37b2cafa4e52..256b4d8bab7b 100644 --- a/Documentation/devicetree/bindings/arm/arch_timer.txt +++ b/Documentation/devicetree/bindings/arm/arch_timer.txt @@ -22,6 +22,14 @@ to deliver its interrupts via SPIs. - always-on : a boolean property. If present, the timer is powered through an always-on power domain, therefore it never loses context. +** Optional properties: + +- arm,cpu-registers-not-fw-configured : Firmware does not initialize + any of the generic timer CPU registers, which contain their + architecturally-defined reset values. Only supported for 32-bit + systems which follow the ARMv7 architected reset values. + + Example: timer { |