diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2023-08-31 04:21:22 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2023-08-31 04:21:22 +0300 |
commit | 5146e1f589ccb04cf987b45296aa27f90a2407dc (patch) | |
tree | e83124418a7b67a001b50b128face860586932d5 /Documentation | |
parent | d2b32be7debd6c0deeae95844997bd89fbe4769d (diff) | |
parent | 0a8b07c77ea09602a152d3604e599f95726306d0 (diff) | |
download | linux-5146e1f589ccb04cf987b45296aa27f90a2407dc.tar.xz |
Merge tag 'timers-v6.6-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/clockdevice updates from Daniel Lezcano:
- Remove oxnas the 0x810 and the 0x820 timer drivers, the platform
being no longer maintained and removed (Neil Armstrong)
- Disable the timer before programming the CVAL as there is no
guarantee of atomicity on the ARM architected timer (Walter Chang)
- Set variable ls1x_timer_lock static on the Loongson1 (Tom Rix)
- Remove duplication of code and data by factoring out the structures
into a single one and convert to the platform driver on the sun5i
(Mans Rullgard)
- Explicitly include correct DT includes (Rob Herring)
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt b/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt deleted file mode 100644 index d191612539e8..000000000000 --- a/Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt +++ /dev/null @@ -1,17 +0,0 @@ -Oxford Semiconductor OXNAS SoCs Family RPS Timer -================================================ - -Required properties: -- compatible: Should be "oxsemi,ox810se-rps-timer" or "oxsemi,ox820-rps-timer" -- reg : Specifies base physical address and size of the registers. -- interrupts : The interrupts of the two timers -- clocks : The phandle of the timer clock source - -example: - -timer0: timer@200 { - compatible = "oxsemi,ox810se-rps-timer"; - reg = <0x200 0x40>; - clocks = <&rpsclk>; - interrupts = <4 5>; -}; |