-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'timers-v5.4' of https://git.linaro.org/people/daniel.lezca…
…no/linux into timers/core Pull clocksource/events updates from Daniel Lezcano: - Remove dev_err() when used with platform_get_irq (Stephen Boyd) - Add DT binding and new compatible for Allwinner sun4i (Maxime Ripard) - Register the Atmel tcb clocksource for delays (Alexandre Belloni) - Add a clock divider for the Freescale imx platforms and new timer node in the DT (Anson Huang) - Use DIV_ROUND_CLOSEST macro for the Renesas OSTM (Geert Uytterhoeven) - Fix GENMASK and timer operation for the npcm timer (Avi Fishman) - Fix timer-of showing an error message when EPROBE_DEFER is returned (Jon Hunter) - Add new SoC DT binding and match for Renesas timers (Magnus Damm)
- Loading branch information
Showing
18 changed files
with
275 additions
and
85 deletions.
There are no files selected for viewing
102 changes: 102 additions & 0 deletions
102
Documentation/devicetree/bindings/timer/allwinner,sun4i-a10-timer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/timer/allwinner,sun4i-a10-timer.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Allwinner A10 Timer Device Tree Bindings | ||
|
|
||
| maintainers: | ||
| - Chen-Yu Tsai <wens@csie.org> | ||
| - Maxime Ripard <maxime.ripard@bootlin.com> | ||
|
|
||
| properties: | ||
| compatible: | ||
| enum: | ||
| - allwinner,sun4i-a10-timer | ||
| - allwinner,sun8i-a23-timer | ||
| - allwinner,sun8i-v3s-timer | ||
| - allwinner,suniv-f1c100s-timer | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| interrupts: | ||
| description: | ||
| List of timers interrupts | ||
|
|
||
| clocks: | ||
| maxItems: 1 | ||
|
|
||
| allOf: | ||
| - if: | ||
| properties: | ||
| compatible: | ||
| items: | ||
| const: allwinner,sun4i-a10-timer | ||
|
|
||
| then: | ||
| properties: | ||
| interrupts: | ||
| minItems: 6 | ||
| maxItems: 6 | ||
|
|
||
| - if: | ||
| properties: | ||
| compatible: | ||
| items: | ||
| const: allwinner,sun8i-a23-timer | ||
|
|
||
| then: | ||
| properties: | ||
| interrupts: | ||
| minItems: 2 | ||
| maxItems: 2 | ||
|
|
||
| - if: | ||
| properties: | ||
| compatible: | ||
| items: | ||
| const: allwinner,sun8i-v3s-timer | ||
|
|
||
| then: | ||
| properties: | ||
| interrupts: | ||
| minItems: 3 | ||
| maxItems: 3 | ||
|
|
||
| - if: | ||
| properties: | ||
| compatible: | ||
| items: | ||
| const: allwinner,suniv-f1c100s-timer | ||
|
|
||
| then: | ||
| properties: | ||
| interrupts: | ||
| minItems: 3 | ||
| maxItems: 3 | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - interrupts | ||
| - clocks | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| timer { | ||
| compatible = "allwinner,sun4i-a10-timer"; | ||
| reg = <0x01c20c00 0x400>; | ||
| interrupts = <22>, | ||
| <23>, | ||
| <24>, | ||
| <25>, | ||
| <67>, | ||
| <68>; | ||
| clocks = <&osc>; | ||
| }; | ||
| ... |
19 changes: 0 additions & 19 deletions
19
Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
This file was deleted.
Oops, something went wrong.
79 changes: 79 additions & 0 deletions
79
Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/timer/allwinner,sun5i-a13-hstimer.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Allwinner A13 High-Speed Timer Device Tree Bindings | ||
|
|
||
| maintainers: | ||
| - Chen-Yu Tsai <wens@csie.org> | ||
| - Maxime Ripard <maxime.ripard@bootlin.com> | ||
|
|
||
| properties: | ||
| compatible: | ||
| oneOf: | ||
| - const: allwinner,sun5i-a13-hstimer | ||
| - const: allwinner,sun7i-a20-hstimer | ||
| - items: | ||
| - const: allwinner,sun6i-a31-hstimer | ||
| - const: allwinner,sun7i-a20-hstimer | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| interrupts: | ||
| minItems: 2 | ||
| maxItems: 4 | ||
| items: | ||
| - description: Timer 0 Interrupt | ||
| - description: Timer 1 Interrupt | ||
| - description: Timer 2 Interrupt | ||
| - description: Timer 3 Interrupt | ||
|
|
||
| clocks: | ||
| maxItems: 1 | ||
|
|
||
| resets: | ||
| maxItems: 1 | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - interrupts | ||
| - clocks | ||
|
|
||
| if: | ||
| properties: | ||
| compatible: | ||
| items: | ||
| const: allwinner,sun5i-a13-hstimer | ||
|
|
||
| then: | ||
| properties: | ||
| interrupts: | ||
| minItems: 2 | ||
| maxItems: 2 | ||
|
|
||
| else: | ||
| properties: | ||
| interrupts: | ||
| minItems: 4 | ||
| maxItems: 4 | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| timer@1c60000 { | ||
| compatible = "allwinner,sun7i-a20-hstimer"; | ||
| reg = <0x01c60000 0x1000>; | ||
| interrupts = <0 51 1>, | ||
| <0 52 1>, | ||
| <0 53 1>, | ||
| <0 54 1>; | ||
| clocks = <&ahb1_gates 19>; | ||
| resets = <&ahb1rst 19>; | ||
| }; | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.