Skip to content

Commit 3d33e6d

Browse files
committed
Merge tag 'linux-watchdog-6.1-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - new driver for Exar/MaxLinear XR28V38x - support for exynosautov9 SoC - support for Renesas R-Car V5H (R8A779G0) and RZ/V2M (r9a09g011) SoC - support for imx93 - several other fixes and improvements * tag 'linux-watchdog-6.1-rc1' of git://www.linux-watchdog.org/linux-watchdog: (36 commits) watchdog: twl4030_wdt: add missing mod_devicetable.h include dt-bindings: watchdog: migrate mt7621 text bindings to YAML watchdog: sp5100_tco: Add "action" module parameter watchdog: imx93: add watchdog timer on imx93 watchdog: imx7ulp_wdt: init wdog when it was active watchdog: imx7ulp_wdt: Handle wdog reconfigure failure watchdog: imx7ulp_wdt: Fix RCS timeout issue watchdog: imx7ulp_wdt: Check CMD32EN in wdog init watchdog: imx7ulp: Add explict memory barrier for unlock sequence watchdog: imx7ulp: Move suspend/resume to noirq phase watchdog: rti-wdt:using the pm_runtime_resume_and_get to simplify the code dt-bindings: watchdog: rockchip: add rockchip,rk3128-wdt watchdog: s3c2410_wdt: support exynosautov9 watchdog dt-bindings: watchdog: add exynosautov9 compatible watchdog: npcm: Enable clock if provided watchdog: meson: keep running if already active watchdog: dt-bindings: atmel,at91sam9-wdt: convert to json-schema watchdog: armada_37xx_wdt: Fix .set_timeout callback watchdog: sa1100: make variable sa1100dog_driver static watchdog: w83977f_wdt: Fix comment typo ...
2 parents 524d0c6 + 099d387 commit 3d33e6d

32 files changed

+1097
-223
lines changed
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/watchdog/atmel,at91sam9-wdt.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Atmel Watchdog Timers
9+
10+
maintainers:
11+
- Eugen Hristev <[email protected]>
12+
13+
properties:
14+
compatible:
15+
const: atmel,at91sam9260-wdt
16+
17+
reg:
18+
maxItems: 1
19+
20+
clocks:
21+
maxItems: 1
22+
23+
interrupts:
24+
maxItems: 1
25+
26+
atmel,max-heartbeat-sec:
27+
description:
28+
Should contain the maximum heartbeat value in seconds. This value
29+
should be less or equal to 16. It is used to compute the WDV field.
30+
maximum: 16
31+
32+
atmel,min-heartbeat-sec:
33+
description:
34+
Should contain the minimum heartbeat value in seconds. This value
35+
must be smaller than the max-heartbeat-sec value. It is used to
36+
compute the WDD field.
37+
maximum: 16
38+
39+
atmel,watchdog-type:
40+
$ref: /schemas/types.yaml#/definitions/string
41+
description: |
42+
Should be hardware or software.
43+
oneOf:
44+
- description:
45+
Hardware watchdog uses the at91 watchdog reset.
46+
const: hardware
47+
- description: |
48+
Software watchdog uses the watchdog interrupt
49+
to trigger a software reset.
50+
const: software
51+
default: hardware
52+
53+
atmel,reset-type:
54+
$ref: /schemas/types.yaml#/definitions/string
55+
description: |
56+
Should be proc or all. This is valid only when using hardware watchdog.
57+
oneOf:
58+
- description:
59+
Assert peripherals and processor reset signals.
60+
const: all
61+
- description:
62+
Assert the processor reset signal.
63+
const: proc
64+
default: all
65+
66+
atmel,disable:
67+
$ref: /schemas/types.yaml#/definitions/flag
68+
description:
69+
Should be present if you want to stop the watchdog.
70+
71+
atmel,idle-halt:
72+
$ref: /schemas/types.yaml#/definitions/flag
73+
description: |
74+
Should be present if you want to stop the watchdog when
75+
entering idle state.
76+
CAUTION: This property should be used with care, it actually makes the
77+
watchdog not counting when the CPU is in idle state, therefore the
78+
watchdog reset time depends on mean CPU usage and will not reset at all
79+
if the CPU stops working while it is in idle state, which is probably
80+
not what you want.
81+
82+
atmel,dbg-halt:
83+
$ref: /schemas/types.yaml#/definitions/flag
84+
description: |
85+
Should be present if you want to stop the watchdog when
86+
entering debug state.
87+
88+
required:
89+
- compatible
90+
- reg
91+
- clocks
92+
93+
allOf:
94+
- $ref: watchdog.yaml#
95+
- if:
96+
properties:
97+
atmel,reset-type:
98+
enum:
99+
- all
100+
- proc
101+
then:
102+
properties:
103+
atmel,watchdog-type:
104+
const: hardware
105+
106+
dependencies:
107+
atmel,reset-type: ['atmel,watchdog-type']
108+
109+
unevaluatedProperties: false
110+
111+
examples:
112+
- |
113+
#include <dt-bindings/interrupt-controller/irq.h>
114+
115+
watchdog@fffffd40 {
116+
compatible = "atmel,at91sam9260-wdt";
117+
reg = <0xfffffd40 0x10>;
118+
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
119+
clocks = <&clk32k>;
120+
timeout-sec = <15>;
121+
atmel,watchdog-type = "hardware";
122+
atmel,reset-type = "all";
123+
atmel,dbg-halt;
124+
atmel,idle-halt;
125+
atmel,max-heartbeat-sec = <16>;
126+
atmel,min-heartbeat-sec = <0>;
127+
};

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/mediatek,mt7621-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ralink Watchdog Timers
8+
9+
maintainers:
10+
- Sergio Paracuellos <[email protected]>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
const: mediatek,mt7621-wdt
18+
19+
reg:
20+
maxItems: 1
21+
22+
required:
23+
- compatible
24+
- reg
25+
26+
additionalProperties: false
27+
28+
examples:
29+
- |
30+
watchdog@100 {
31+
compatible = "mediatek,mt7621-wdt";
32+
reg = <0x100 0x100>;
33+
};

Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt

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

Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt

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

Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ properties:
3131
- renesas,r9a07g054-wdt # RZ/V2L
3232
- const: renesas,rzg2l-wdt
3333

34+
- items:
35+
- enum:
36+
- renesas,r9a09g011-wdt # RZ/V2M
37+
- const: renesas,rzv2m-wdt # RZ/V2M
38+
3439
- items:
3540
- enum:
3641
- renesas,r8a7742-wdt # RZ/G1H
@@ -65,18 +70,35 @@ properties:
6570
- enum:
6671
- renesas,r8a779a0-wdt # R-Car V3U
6772
- renesas,r8a779f0-wdt # R-Car S4-8
73+
- renesas,r8a779g0-wdt # R-Car V4H
6874
- const: renesas,rcar-gen4-wdt # R-Car Gen4
6975

7076
reg:
7177
maxItems: 1
7278

73-
interrupts: true
74-
75-
interrupt-names: true
76-
77-
clocks: true
78-
79-
clock-names: true
79+
interrupts:
80+
minItems: 1
81+
items:
82+
- description: Timeout
83+
- description: Parity error
84+
85+
interrupt-names:
86+
minItems: 1
87+
items:
88+
- const: wdt
89+
- const: perrout
90+
91+
clocks:
92+
minItems: 1
93+
items:
94+
- description: Register access clock
95+
- description: Main clock
96+
97+
clock-names:
98+
minItems: 1
99+
items:
100+
- const: pclk
101+
- const: oscclk
80102

81103
power-domains:
82104
maxItems: 1
@@ -89,6 +111,7 @@ properties:
89111
required:
90112
- compatible
91113
- reg
114+
- interrupts
92115
- clocks
93116

94117
allOf:
@@ -113,41 +136,50 @@ allOf:
113136
contains:
114137
enum:
115138
- renesas,rzg2l-wdt
139+
- renesas,rzv2m-wdt
116140
then:
117141
properties:
118-
interrupts:
119-
maxItems: 2
120-
interrupt-names:
121-
items:
122-
- const: wdt
123-
- const: perrout
124142
clocks:
125-
items:
126-
- description: Register access clock
127-
- description: Main clock
143+
minItems: 2
128144
clock-names:
129-
items:
130-
- const: pclk
131-
- const: oscclk
145+
minItems: 2
132146
required:
133147
- clock-names
148+
else:
149+
properties:
150+
clocks:
151+
maxItems: 1
152+
153+
- if:
154+
properties:
155+
compatible:
156+
contains:
157+
enum:
158+
- renesas,rzg2l-wdt
159+
then:
160+
properties:
161+
interrupts:
162+
minItems: 2
163+
interrupt-names:
164+
minItems: 2
165+
required:
134166
- interrupt-names
135167
else:
136168
properties:
137169
interrupts:
138170
maxItems: 1
139-
clocks:
140-
maxItems: 1
141171

142172
additionalProperties: false
143173

144174
examples:
145175
- |
146176
#include <dt-bindings/clock/r8a7795-cpg-mssr.h>
147177
#include <dt-bindings/power/r8a7795-sysc.h>
178+
#include <dt-bindings/interrupt-controller/arm-gic.h>
148179
wdt0: watchdog@e6020000 {
149180
compatible = "renesas,r8a7795-wdt", "renesas,rcar-gen3-wdt";
150181
reg = <0xe6020000 0x0c>;
182+
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
151183
clocks = <&cpg CPG_MOD 402>;
152184
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
153185
resets = <&cpg 402>;

0 commit comments

Comments
 (0)