diff options
| author | Thomas Gleixner | 2019-05-17 15:48:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-05-17 15:48:06 +0200 |
| commit | ea7a5f90f103591f1f38dede52e731ec95ef3c55 (patch) | |
| tree | 3f11930376131fd86fe5390ab7e32c38ca5658f6 /Documentation | |
| parent | 13e792a19d4e3a1c64e94197ba357685fd584ded (diff) | |
| parent | 8c9374068ef6dc3fdf244484b4711a6e10c84d1a (diff) | |
Merge tag 'timers-v5.2' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Add compatible string for suniv for sun4i (Mesih Kilinc)
- Add COMPILE_TEST option for sp804 (David Abdurachmanov)
- Replace the compensation time when suspend happens on tegra with the one
provided by the generic framework (Joseph Lo)
- Cleanup, shutdown and oneshot mode fix on milbeaut timer (Sugaya Taichi)
- Atmel TCB rework to fix boot failure on boards without PIT or misfunction
on system using a preempt-rt kernel (Alexandre Belloni)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt index 5c2e23574ca0..3da9d515c03a 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt @@ -2,7 +2,9 @@ Allwinner A1X SoCs Timer Controller Required properties: -- compatible : should be "allwinner,sun4i-a10-timer" +- compatible : should be one of the following: + "allwinner,sun4i-a10-timer" + "allwinner,suniv-f1c100s-timer" - reg : Specifies base physical address and size of the registers. - interrupts : The interrupt of the first timer - clocks: phandle to the source clock (usually a 24 MHz fixed clock) |