Skip to content

Commit 29857e6

Browse files
committed
Merge tag 'timers-v6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux into timers/drivers
- Add the System Timer Module driver for the S32G NXP platforms (Daniel Lezcano) - Convert the remaining text formatted DT bindings in schemas (Rob Herring) - Fix a Kconfig dependency on the atmel TCB driver to prevent a compilation warning when CONFIG_OF is disabled (Arnd Bergmann) - Fix self-pinging and support gettimeleft in the watchdog part of the tegra186 timer (Pohsun Su) - Add the Sophgo SG2044 ACLINT timer binding (Inochi Amaoto) - Add the EcoNet Timer HPT driver along with the DT bindings (Caleb James DeLisle) - Add the Renesas R9A09G056 compatible string bindings and enable reprobe support on the Renesas OSTM (Lab Prabhakar) Link: https://lore.kernel.org/all/aCy43_obHEdIpwWg@mai.linaro.org
2 parents 0af2f6b + d204e39 commit 29857e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1886
-549
lines changed

Documentation/devicetree/bindings/timer/altr,timer-1.0.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/altr,timer-1.0.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Altera Timer
8+
9+
maintainers:
10+
- Dinh Nguyen <dinguyen@kernel.org>
11+
12+
properties:
13+
compatible:
14+
const: altr,timer-1.0
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
clock-frequency:
23+
description: Frequency of the clock that drives the counter, in Hz.
24+
25+
required:
26+
- compatible
27+
- reg
28+
- interrupts
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
timer@400000 {
35+
compatible = "altr,timer-1.0";
36+
reg = <0x00400000 0x00000020>;
37+
interrupts = <11>;
38+
clock-frequency = <125000000>;
39+
};

Documentation/devicetree/bindings/timer/arm,mps2-timer.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm,mps2-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ARM MPS2 timer
8+
9+
maintainers:
10+
- Vladimir Murzin <vladimir.murzin@arm.com>
11+
12+
description:
13+
The MPS2 platform has simple general-purpose 32 bits timers.
14+
15+
properties:
16+
compatible:
17+
const: arm,mps2-timer
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
clocks:
26+
maxItems: 1
27+
28+
clock-frequency:
29+
description: Rate in Hz of the timer input clock
30+
31+
oneOf:
32+
- required: [clocks]
33+
- required: [clock-frequency]
34+
35+
required:
36+
- compatible
37+
- reg
38+
- interrupts
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
timer@40000000 {
45+
compatible = "arm,mps2-timer";
46+
reg = <0x40000000 0x1000>;
47+
interrupts = <8>;
48+
clocks = <&sysclk>;
49+
};

Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/timer/cirrus,clps711x-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic CLPS711X Timer Counter
8+
9+
maintainers:
10+
- Alexander Shiyan <shc_work@mail.ru>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- cirrus,ep7312-timer
18+
- const: cirrus,ep7209-timer
19+
- const: cirrus,ep7209-timer
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
required:
31+
- compatible
32+
- reg
33+
- clocks
34+
- interrupts
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
timer@80000300 {
41+
compatible = "cirrus,ep7312-timer", "cirrus,ep7209-timer";
42+
reg = <0x80000300 0x4>;
43+
interrupts = <8>;
44+
clocks = <&clks 5>;
45+
};
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/cnxt,cx92755-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Conexant Digicolor SoCs Timer Controller
8+
9+
maintainers:
10+
- Baruch Siach <baruch@tkos.co.il>
11+
12+
properties:
13+
compatible:
14+
const: cnxt,cx92755-timer
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
description: Contains 8 interrupts, one for each timer
21+
items:
22+
- description: interrupt for timer 0
23+
- description: interrupt for timer 1
24+
- description: interrupt for timer 2
25+
- description: interrupt for timer 3
26+
- description: interrupt for timer 4
27+
- description: interrupt for timer 5
28+
- description: interrupt for timer 6
29+
- description: interrupt for timer 7
30+
31+
clocks:
32+
maxItems: 1
33+
34+
required:
35+
- compatible
36+
- reg
37+
- interrupts
38+
- clocks
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
timer@f0000fc0 {
45+
compatible = "cnxt,cx92755-timer";
46+
reg = <0xf0000fc0 0x40>;
47+
interrupts = <19>, <31>, <34>, <35>, <52>, <53>, <54>, <55>;
48+
clocks = <&main_clk>;
49+
};

Documentation/devicetree/bindings/timer/csky,gx6605s-timer.txt

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/timer/csky,gx6605s-timer.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: gx6605s SOC Timer
8+
9+
maintainers:
10+
- Guo Ren <guoren@kernel.org>
11+
12+
properties:
13+
compatible:
14+
const: csky,gx6605s-timer
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
required:
26+
- compatible
27+
- reg
28+
- clocks
29+
- interrupts
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
timer@20a000 {
36+
compatible = "csky,gx6605s-timer";
37+
reg = <0x0020a000 0x400>;
38+
clocks = <&dummy_apb_clk>;
39+
interrupts = <10>;
40+
};

Documentation/devicetree/bindings/timer/csky,mptimer.txt

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)