Skip to content

Commit fbff949

Browse files
committed
Merge tag 'linux-watchdog-6.19-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add watchdog support for: - Renesas WWDT - AST2700 platform - MediaTek MT8189 SoC - Loongson-2k0300 watchdog - Qualcomm Kaanapali watchdog - RK3506 compatible - Airoha AN7583 SoC - DT Schema conversions: - lantiq,wdt - TI OMAP - marvell,orion-wdt - Several other fixes and improvements * tag 'linux-watchdog-6.19-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits) watchdog: starfive: Fix resource leak in probe error path dt-bindings: watchdog: airoha: Add support for Airoha AN7583 SoC dt-bindings: watchdog: lantiq,wdt: convert bindings to dtschema dt-bindings: watchdog: Add RK3506 compatible dt-bindings: watchdog: Document Qualcomm Kaanapali watchdog watchdog: wdat_wdt: Fix ACPI table leak in probe function watchdog: loongson1: Add Loongson-2k0300 watchdog support dt-bindings: watchdog: loongson,ls1x-wdt: Add ls2k0300-wdt compatible watchdog: loongson1: Drop CONFIG_OF watchdog: loongson1: Simplify ls1x_wdt_probe code watchdog: loongson1: Add missing MODULE_PARM_DESC watchdog/diag288: Fix module comment typos dt-bindings: watchdog: Support MediaTek MT8189 wdt dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT8189 SoC dt-bindings: mfd: rohm,bd96801-pmic: Correct timeout-sec length and reference watchdog schema dt-bindings: watchdog: Allow node names named 'pmic' dt-bindings: watchdog: Restrict timeout-sec to one number watchdog: renesas_wwdt: add driver dt-bindings: watchdog: Add Renesas WWDT dt-bindings: watchdog: Convert marvell,orion-wdt to DT schema ...
2 parents 973ec55 + 5bcc578 commit fbff949

30 files changed

Lines changed: 1113 additions & 290 deletions

Documentation/devicetree/bindings/mfd/rohm,bd96801-pmic.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ properties:
5757
- prstb
5858
- intb-only
5959

60-
timeout-sec:
61-
maxItems: 2
60+
timeout-sec: true
6261

6362
regulators:
6463
$ref: /schemas/regulator/rohm,bd96801-regulator.yaml
@@ -72,7 +71,10 @@ required:
7271
- interrupt-names
7372
- regulators
7473

75-
additionalProperties: false
74+
allOf:
75+
- $ref: /schemas/watchdog/watchdog.yaml
76+
77+
unevaluatedProperties: false
7678

7779
examples:
7880
- |

Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
const: airoha,en7581-wdt
17+
oneOf:
18+
- items:
19+
- const: airoha,an7583-wdt
20+
- const: airoha,en7581-wdt
21+
- const: airoha,en7581-wdt
1822

1923
reg:
2024
maxItems: 1

Documentation/devicetree/bindings/watchdog/aspeed,ast2400-wdt.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ properties:
1515
- aspeed,ast2400-wdt
1616
- aspeed,ast2500-wdt
1717
- aspeed,ast2600-wdt
18+
- aspeed,ast2700-wdt
1819

1920
reg:
2021
maxItems: 1
@@ -87,13 +88,15 @@ properties:
8788
aspeed,reset-mask:
8889
$ref: /schemas/types.yaml#/definitions/uint32-array
8990
minItems: 1
90-
maxItems: 2
91+
maxItems: 5
9192
description: >
9293
A bitmask indicating which peripherals will be reset if the watchdog
9394
timer expires. On AST2500 SoCs this should be a single word defined using
9495
the AST2500_WDT_RESET_* macros; on AST2600 SoCs this should be a two-word
9596
array with the first word defined using the AST2600_WDT_RESET1_* macros,
96-
and the second word defined using the AST2600_WDT_RESET2_* macros.
97+
and the second word defined using the AST2600_WDT_RESET2_* macros; on
98+
AST2700 SoCs, this should be five-word array from AST2700_WDT_RESET1_*
99+
macros to AST2700_WDT_RESET5_* macros.
97100
98101
required:
99102
- compatible
@@ -114,6 +117,7 @@ allOf:
114117
enum:
115118
- aspeed,ast2500-wdt
116119
- aspeed,ast2600-wdt
120+
- aspeed,ast2700-wdt
117121
- if:
118122
required:
119123
- aspeed,ext-active-high
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/lantiq,wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Lantiq WTD watchdog
8+
9+
maintainers:
10+
- Hauke Mehrtens <hauke@hauke-m.de>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- lantiq,falcon-wdt
17+
- lantiq,wdt
18+
- lantiq,xrx100-wdt
19+
- items:
20+
- enum:
21+
- lantiq,xrx200-wdt
22+
- const: lantiq,xrx100-wdt
23+
24+
reg:
25+
maxItems: 1
26+
27+
lantiq,rcu:
28+
$ref: /schemas/types.yaml#/definitions/phandle
29+
description: Phandle to the RCU syscon node
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
allOf:
36+
- $ref: watchdog.yaml#
37+
- if:
38+
properties:
39+
compatible:
40+
contains:
41+
enum:
42+
- lantiq,xrx100-wdt
43+
- lantiq,falcon-wdt
44+
then:
45+
required:
46+
- lantiq,rcu
47+
48+
unevaluatedProperties: false
49+
50+
examples:
51+
- |
52+
watchdog@803f0 {
53+
compatible = "lantiq,xrx200-wdt", "lantiq,xrx100-wdt";
54+
reg = <0x803f0 0x10>;
55+
56+
lantiq,rcu = <&rcu0>;
57+
};

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

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

Documentation/devicetree/bindings/watchdog/loongson,ls1x-wdt.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/watchdog/loongson,ls1x-wdt.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Loongson-1 Watchdog Timer
7+
title: Loongson Watchdog Timer
88

99
maintainers:
1010
- Keguang Zhang <keguang.zhang@gmail.com>
@@ -17,6 +17,7 @@ properties:
1717
enum:
1818
- loongson,ls1b-wdt
1919
- loongson,ls1c-wdt
20+
- loongson,ls2k0300-wdt
2021

2122
reg:
2223
maxItems: 1

Documentation/devicetree/bindings/watchdog/marvel.txt

Lines changed: 0 additions & 45 deletions
This file was deleted.
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/marvell,orion-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell Orion Watchdog Timer
8+
9+
maintainers:
10+
- Andrew Lunn <andrew@lunn.ch>
11+
- Gregory Clement <gregory.clement@bootlin.com>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- marvell,orion-wdt
17+
- marvell,armada-370-wdt
18+
- marvell,armada-xp-wdt
19+
- marvell,armada-375-wdt
20+
- marvell,armada-380-wdt
21+
22+
reg:
23+
minItems: 2
24+
items:
25+
- description: Timer control register address
26+
- description: RSTOUT enable register address
27+
- description: Shared mask/unmask RSTOUT register address
28+
29+
clocks:
30+
minItems: 1
31+
items:
32+
- description: L2/coherency fabric clock input
33+
- description: Reference 25 MHz fixed-clock supply
34+
35+
clock-names:
36+
minItems: 1
37+
items:
38+
- const: nbclk
39+
- const: fixed
40+
41+
interrupts:
42+
minItems: 1
43+
items:
44+
- description: timeout
45+
- description: pre-timeout
46+
47+
allOf:
48+
- $ref: watchdog.yaml#
49+
- if:
50+
properties:
51+
compatible:
52+
contains:
53+
enum:
54+
- marvell,armada-375-wdt
55+
- marvell,armada-380-wdt
56+
then:
57+
properties:
58+
reg:
59+
minItems: 3
60+
else:
61+
properties:
62+
reg:
63+
maxItems: 2
64+
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- marvell,armada-xp-wdt
71+
- marvell,armada-375-wdt
72+
- marvell,armada-380-wdt
73+
then:
74+
properties:
75+
clocks:
76+
minItems: 2
77+
clock-names:
78+
minItems: 2
79+
interrupts:
80+
minItems: 2
81+
82+
required:
83+
- clock-names
84+
85+
required:
86+
- compatible
87+
- reg
88+
- clocks
89+
90+
unevaluatedProperties: false
91+
92+
examples:
93+
- |
94+
watchdog@20300 {
95+
compatible = "marvell,orion-wdt";
96+
reg = <0x20300 0x28>, <0x20108 0x4>;
97+
interrupts = <3>;
98+
timeout-sec = <10>;
99+
clocks = <&gate_clk 7>;
100+
};

Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ properties:
4141
- mediatek,mt7623-wdt
4242
- mediatek,mt7629-wdt
4343
- mediatek,mt8173-wdt
44+
- mediatek,mt8188-wdt
45+
- mediatek,mt8189-wdt
4446
- mediatek,mt8365-wdt
4547
- mediatek,mt8516-wdt
4648
- const: mediatek,mt6589-wdt

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

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

0 commit comments

Comments
 (0)