diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-01-16 22:24:54 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-01-16 22:24:54 +0100 |
| commit | a67ca893ae0a228bed889ede27ed65fd46aa469c (patch) | |
| tree | dec6683f2ae27772f133d35358d808a31a3067ac /Documentation | |
| parent | lib/vdso: Only read hrtimer_res when needed in __cvdso_clock_getres() (diff) | |
| parent | clocksource/drivers/hyper-v: Set TSC clocksource as default w/ InvariantTSC (diff) | |
Merge tag 'timers-v5.5-rc6' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/events driver updates from Daniel Lezcano
- Add suspend/resume for Hyper-V clocksource (Dexuan Cui)
- Fix Kconfig indentation (Krzysztof Kozlowski)
- Add SoC specific bindings for RZ/G2N (r8a774b1) (Biju Das)
- Add Microchip PIT64B support (Claudiu Beznea)
- Convert the cadence ttc driver to a platform driver to initialize
later (Rajan Vaja)
- Fix a memory leak when the initialization fails on bcm2835 (Colin
Ian King)
- Use the combo devm_platform_ioremap_resource() function for em-sti,
ti-dm and switch to platform_get_irq (Yangtao Li)
- Fix Exynos naming in the driver (Krzysztof Kozlowski)
- Fix an uninitialized pointer access in ti-dm timer (Tony Lindgren)
- Fix a sparse warning in microchip-pit64b (Claudiu Beznea)
- Code reorg without functional changes for Hyper-V clocksource
(Andrea Parri)
- Decrease the Hyper-V clocksource rating in order to let the stable
TSC to be selected instead (Andrea Parri)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 6 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,cmt.txt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt index 9fbde401a090..e003a553b986 100644 --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt @@ -10,6 +10,12 @@ PIT Timer required properties: - interrupts: Should contain interrupt for the PIT which is the IRQ line shared across all System Controller members. +PIT64B Timer required properties: +- compatible: Should be "microchip,sam9x60-pit64b" +- reg: Should contain registers location and length +- interrupts: Should contain interrupt for PIT64B timer +- clocks: Should contain the available clock sources for PIT64B timer. + System Timer (ST) required properties: - compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd" - reg: Should contain registers location and length diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt b/Documentation/devicetree/bindings/timer/renesas,cmt.txt index a444cfc5852a..a747fabab7d3 100644 --- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt +++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt @@ -29,6 +29,8 @@ Required Properties: - "renesas,r8a77470-cmt1" for the 48-bit CMT1 device included in r8a77470. - "renesas,r8a774a1-cmt0" for the 32-bit CMT0 device included in r8a774a1. - "renesas,r8a774a1-cmt1" for the 48-bit CMT devices included in r8a774a1. + - "renesas,r8a774b1-cmt0" for the 32-bit CMT0 device included in r8a774b1. + - "renesas,r8a774b1-cmt1" for the 48-bit CMT devices included in r8a774b1. - "renesas,r8a774c0-cmt0" for the 32-bit CMT0 device included in r8a774c0. - "renesas,r8a774c0-cmt1" for the 48-bit CMT devices included in r8a774c0. - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790. |