Skip to content

Commit 61f4c3e

Browse files
committed
Merge tag 'linux-watchdog-6.8-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - Add Mediatek MT7988 watchdog - Add IT8659 watchdog - watchdog: set cdev owner before adding - hpwdt: Only claim UNKNOWN NMI if from iLO - Various other fixes and improvements * tag 'linux-watchdog-6.8-rc1' of git://www.linux-watchdog.org/linux-watchdog: (30 commits) watchdog: mlx_wdt: fix all kernel-doc warnings dt-bindings: watchdog: qcom,pm8916-wdt: add parent spmi node to example dt-bindings: watchdog: nxp,pnx4008-wdt: convert txt to yaml dt-bindings: watchdog: qca,ar7130-wdt: convert txt to yaml dt-bindings: watchdog: intel,keembay: reference common watchdog schema dt-bindings: watchdog: re-order entries to match coding convention watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786 watchdog: it87_wdt: Add IT8659 ID watchdog: it87_wdt: Remove redundant max_units setting watchdog: it87_wdt: add blank line after variable declaration dt-bindings: wdt: Add ts72xx dt-bindings: watchdog: dlg,da9062-watchdog: Document DA9063 watchdog dt-bindings: watchdog: dlg,da9062-watchdog: Add fallback for DA9061 watchdog watchdog: rti_wdt: Drop runtime pm reference count when watchdog is unused watchdog: starfive: add lock annotations to fix context imbalances watchdog: mediatek: mt7988: add wdt support dt-bindings: watchdog: mediatek,mtk-wdt: add MT7988 watchdog and toprgu dt-bindings: watchdog: realtek,rtd1295-watchdog: convert txt to yaml watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling watchdog/hpwdt: Remove unused variable ...
2 parents 5dfec3c + 9546b21 commit 61f4c3e

31 files changed

+307
-137
lines changed

Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Allwinner A10 Watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Chen-Yu Tsai <[email protected]>
1411
- Maxime Ripard <[email protected]>
1512

13+
allOf:
14+
- $ref: watchdog.yaml#
15+
1616
properties:
1717
compatible:
1818
oneOf:

Documentation/devicetree/bindings/watchdog/alphascale,asm9260-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Alphascale asm9260 Watchdog timer
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Oleksij Rempel <[email protected]>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
const: alphascale,asm9260-wdt

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Apple SoC Watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Sven Peter <[email protected]>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
items:

Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: ARM Secure Monitor Call based watchdog
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Julius Werner <[email protected]>
1411

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1515
properties:
1616
compatible:
1717
enum:

Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: BCM63xx and BCM7038 watchdog timer
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
129
maintainers:
1310
- Florian Fainelli <[email protected]>
1411
- Justin Chen <[email protected]>
1512
- Rafał Miłecki <[email protected]>
1613

14+
allOf:
15+
- $ref: watchdog.yaml#
16+
1717
properties:
1818
compatible:
1919
enum:
@@ -29,11 +29,11 @@ properties:
2929
The clock running the watchdog. If no clock is found the driver will
3030
default to 27000000 Hz.
3131
32-
unevaluatedProperties: false
33-
3432
required:
3533
- reg
3634

35+
unevaluatedProperties: false
36+
3737
examples:
3838
- |
3939
watchdog@f040a7e8 {

Documentation/devicetree/bindings/watchdog/cnxt,cx92755-wdt.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ description: |
1212
timer counters. The first timer (called "Timer A") is the only one that can be
1313
used as watchdog.
1414
15-
allOf:
16-
- $ref: watchdog.yaml#
17-
1815
maintainers:
1916
- Baruch Siach <[email protected]>
2017

18+
allOf:
19+
- $ref: watchdog.yaml#
20+
2121
properties:
2222
compatible:
2323
const: cnxt,cx92755-wdt

Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/watchdog/dlg,da9062-watchdog.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Dialog Semiconductor DA9062/61 Watchdog Timer
7+
title: Dialog Semiconductor DA906{1,2,3} Watchdog Timer
88

99
maintainers:
1010
- Steve Twiss <[email protected]>
@@ -14,9 +14,13 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- dlg,da9061-watchdog
19-
- dlg,da9062-watchdog
17+
oneOf:
18+
- enum:
19+
- dlg,da9062-watchdog
20+
- dlg,da9063-watchdog
21+
- items:
22+
- const: dlg,da9061-watchdog
23+
- const: dlg,da9062-watchdog
2024

2125
dlg,use-sw-pm:
2226
type: boolean

Documentation/devicetree/bindings/watchdog/intel,keembay-wdt.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Intel Keem Bay SoC non-secure Watchdog Timer
99
maintainers:
1010
- Wan Ahmad Zainie <[email protected]>
1111

12+
allOf:
13+
- $ref: watchdog.yaml#
14+
1215
properties:
1316
compatible:
1417
enum:
@@ -37,7 +40,7 @@ required:
3740
- interrupt-names
3841
- clocks
3942

40-
additionalProperties: false
43+
unevaluatedProperties: false
4144

4245
examples:
4346
- |

Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Maxim 63xx Watchdog Timers
88

9-
allOf:
10-
- $ref: watchdog.yaml#
11-
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#
12-
139
maintainers:
1410
- Marc Zyngier <[email protected]>
1511
- Linus Walleij <[email protected]>
1612

13+
allOf:
14+
- $ref: watchdog.yaml#
15+
- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml#
16+
1717
properties:
1818
compatible:
1919
enum:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- mediatek,mt6735-wdt
2626
- mediatek,mt6795-wdt
2727
- mediatek,mt7986-wdt
28+
- mediatek,mt7988-wdt
2829
- mediatek,mt8183-wdt
2930
- mediatek,mt8186-wdt
3031
- mediatek,mt8188-wdt

0 commit comments

Comments
 (0)