Skip to content

Commit 96752be

Browse files
torvaldstorvalds
committed
Merge tag 'linux-watchdog-5.19-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add MediaTek MT8186 support - Add Mediatek MT7986 reset-controller support - Add i.MX93 support - Add watchdog driver for Sunplus SP7021 - Add SC8180X and SC8280XP compatibles - Add Renesas RZ/N1 Watchdog driver and support for RZ/N1 - rzg2l_wdt improvements and fixes - Several other improvements and fixes * tag 'linux-watchdog-5.19-rc1' of git://www.linux-watchdog.org/linux-watchdog: (38 commits) watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe dt-bindings: watchdog: renesas,wdt: R-Car V3U is R-Car Gen4 watchdog: Add Renesas RZ/N1 Watchdog driver dt-bindings: watchdog: renesas,wdt: Add support for RZ/N1 watchdog: wdat_wdt: Stop watchdog when uninstalling module watchdog: wdat_wdt: Stop watchdog when rebooting the system watchdog: wdat_wdt: Using the existing function to check parameter timeout dt-bindings: watchdog: da9062: add watchdog timeout mode dt-bindings: watchdog: renesas,wdt: Document RZ/G2UL SoC watchdog: iTCO_wdt: Using existing macro define covers more scenarios watchdog: rti-wdt: Fix pm_runtime_get_sync() error checking dt-bindings: watchdog: Add SC8180X and SC8280XP compatibles watchdog: rti_wdt: Fix calculation and evaluation of preset heartbeat dt-bindings: watchdog: uniphier: Use unevaluatedProperties watchdog: sp805: disable watchdog on remove watchdog: da9063: optionally disable watchdog during suspend dt-bindings: mfd: da9063: watchdog: add suspend disable option dt-bindings: watchdog: sunxi: clarify clock support dt-bindings: watchdog: sunxi: fix F1C100s compatible watchdog: Add watchdog driver for Sunplus SP7021 ...
2 parents 1768821 + 5d24df3 commit 96752be

26 files changed

+822
-100
lines changed

‎Documentation/devicetree/bindings/mfd/da9063.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,13 @@ Sub-nodes:
6464
and KEY_SLEEP.
6565

6666
- watchdog : This node defines settings for the Watchdog timer associated
67-
with the DA9063 and DA9063L. There are currently no entries in this
68-
binding, however compatible = "dlg,da9063-watchdog" should be added
69-
if a node is created.
67+
with the DA9063 and DA9063L. The node should contain the compatible property
68+
with the value "dlg,da9063-watchdog".
7069

70+
Optional watchdog properties:
71+
- dlg,use-sw-pm: Add this property to disable the watchdog during suspend.
72+
Only use this option if you can't use the watchdog automatic suspend
73+
function during a suspend (see register CONTROL_B).
7174

7275
Example:
7376

‎Documentation/devicetree/bindings/watchdog/da9062-wdt.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ Optional properties:
1010
- dlg,use-sw-pm: Add this property to disable the watchdog during suspend.
1111
Only use this option if you can't use the watchdog automatic suspend
1212
function during a suspend (see register CONTROL_B).
13+
- dlg,wdt-sd: Set what happens on watchdog timeout. If this bit is set the
14+
watchdog timeout triggers SHUTDOWN, if cleared the watchdog triggers
15+
POWERDOWN. Can be 0 or 1. Only use this option if you want to change the
16+
default chip's OTP setting for WATCHDOG_SD bit. If this property is NOT
17+
set the WATCHDOG_SD bit and on timeout watchdog behavior will match the
18+
chip's OTP settings.
1319

1420
Example: DA9062
1521

‎Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt

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

‎Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/faraday,ftwdt010.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Faraday Technology FTWDT010 watchdog
8+
9+
maintainers:
10+
- Linus Walleij <linus.walleij@linaro.org>
11+
- Corentin Labbe <clabbe@baylibre.com>
12+
13+
description: |
14+
This is an IP part from Faraday Technology found in the Gemini
15+
SoCs and others.
16+
17+
allOf:
18+
- $ref: "watchdog.yaml#"
19+
20+
properties:
21+
compatible:
22+
oneOf:
23+
- const: faraday,ftwdt010
24+
- items:
25+
- enum:
26+
- cortina,gemini-watchdog
27+
- moxa,moxart-watchdog
28+
- const: faraday,ftwdt010
29+
30+
reg:
31+
maxItems: 1
32+
33+
resets:
34+
maxItems: 1
35+
36+
clocks:
37+
maxItems: 1
38+
39+
clock-names:
40+
const: PCLK
41+
42+
interrupts:
43+
maxItems: 1
44+
45+
required:
46+
- compatible
47+
- reg
48+
49+
unevaluatedProperties: false
50+
51+
examples:
52+
- |
53+
#include <dt-bindings/interrupt-controller/irq.h>
54+
watchdog@41000000 {
55+
compatible = "faraday,ftwdt010";
56+
reg = <0x41000000 0x1000>;
57+
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
58+
timeout-secs = <5>;
59+
};
60+
- |
61+
watchdog: watchdog@98500000 {
62+
compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
63+
reg = <0x98500000 0x10>;
64+
clocks = <&clk_apb>;
65+
clock-names = "PCLK";
66+
};
67+
...

‎Documentation/devicetree/bindings/watchdog/fsl-imx7ulp-wdt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- items:
2020
- const: fsl,imx8ulp-wdt
2121
- const: fsl,imx7ulp-wdt
22+
- const: fsl,imx93-wdt
2223

2324
reg:
2425
maxItems: 1

‎Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Required properties:
1616
"mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629
1717
"mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986
1818
"mediatek,mt8183-wdt": for MT8183
19+
"mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186
1920
"mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516
2021
"mediatek,mt8192-wdt": for MT8192
2122
"mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195

‎Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,29 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- qcom,apss-wdt-qcs404
19-
- qcom,apss-wdt-sc7180
20-
- qcom,apss-wdt-sc7280
21-
- qcom,apss-wdt-sdm845
22-
- qcom,apss-wdt-sdx55
23-
- qcom,apss-wdt-sm6350
24-
- qcom,apss-wdt-sm8150
25-
- qcom,apss-wdt-sm8250
26-
- qcom,kpss-timer
27-
- qcom,kpss-wdt
28-
- qcom,kpss-wdt-apq8064
29-
- qcom,kpss-wdt-ipq4019
30-
- qcom,kpss-wdt-ipq8064
31-
- qcom,kpss-wdt-msm8960
32-
- qcom,scss-timer
17+
oneOf:
18+
- items:
19+
- enum:
20+
- qcom,apss-wdt-qcs404
21+
- qcom,apss-wdt-sc7180
22+
- qcom,apss-wdt-sc7280
23+
- qcom,apss-wdt-sc8180x
24+
- qcom,apss-wdt-sc8280xp
25+
- qcom,apss-wdt-sdm845
26+
- qcom,apss-wdt-sdx55
27+
- qcom,apss-wdt-sm6350
28+
- qcom,apss-wdt-sm8150
29+
- qcom,apss-wdt-sm8250
30+
- const: qcom,kpss-wdt
31+
- items:
32+
- enum:
33+
- qcom,kpss-wdt
34+
- qcom,kpss-timer
35+
- qcom,kpss-wdt-apq8064
36+
- qcom,kpss-wdt-ipq4019
37+
- qcom,kpss-wdt-ipq8064
38+
- qcom,kpss-wdt-msm8960
39+
- qcom,scss-timer
3340

3441
reg:
3542
maxItems: 1

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@ properties:
2121

2222
- items:
2323
- enum:
24+
- renesas,r9a06g032-wdt # RZ/N1D
25+
- const: renesas,rzn1-wdt # RZ/N1
26+
27+
- items:
28+
- enum:
29+
- renesas,r9a07g043-wdt # RZ/G2UL
2430
- renesas,r9a07g044-wdt # RZ/G2{L,LC}
25-
- const: renesas,rzg2l-wdt # RZ/G2L
31+
- renesas,r9a07g054-wdt # RZ/V2L
32+
- const: renesas,rzg2l-wdt
2633

2734
- items:
2835
- enum:
@@ -52,11 +59,11 @@ properties:
5259
- renesas,r8a77980-wdt # R-Car V3H
5360
- renesas,r8a77990-wdt # R-Car E3
5461
- renesas,r8a77995-wdt # R-Car D3
55-
- renesas,r8a779a0-wdt # R-Car V3U
5662
- const: renesas,rcar-gen3-wdt # R-Car Gen3 and RZ/G2
5763

5864
- items:
5965
- enum:
66+
- renesas,r8a779a0-wdt # R-Car V3U
6067
- renesas,r8a779f0-wdt # R-Car S4-8
6168
- const: renesas,rcar-gen4-wdt # R-Car Gen4
6269

@@ -94,6 +101,7 @@ allOf:
94101
contains:
95102
enum:
96103
- renesas,rza-wdt
104+
- renesas,rzn1-wdt
97105
then:
98106
required:
99107
- power-domains

‎Documentation/devicetree/bindings/watchdog/socionext,uniphier-wdt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ properties:
1919
required:
2020
- compatible
2121

22-
additionalProperties: false
22+
unevaluatedProperties: false
2323

2424
examples:
2525
- |

‎Documentation/devicetree/bindings/watchdog/sunplus,sp7021-wdt.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) Sunplus Co., Ltd. 2021
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/watchdog/sunplus,sp7021-wdt.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Sunplus SoCs Watchdog
9+
10+
maintainers:
11+
- XianTao Hu <xt.hu@cqplus1.com>
12+
13+
allOf:
14+
- $ref: watchdog.yaml#
15+
16+
properties:
17+
compatible:
18+
const: sunplus,sp7021-wdt
19+
20+
reg:
21+
items:
22+
- description: watchdog registers regions
23+
- description: miscellaneous control registers regions
24+
25+
clocks:
26+
maxItems: 1
27+
28+
resets:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- clocks
35+
- resets
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
watchdog: watchdog@9c000630 {
42+
compatible = "sunplus,sp7021-wdt";
43+
reg = <0x9c000630 0x08>, <0x9c000274 0x04>;
44+
clocks = <&clkc 0x24>;
45+
resets = <&rstc 0x14>;
46+
};
47+
...

0 commit comments

Comments
 (0)