diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-13 00:32:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-13 00:32:30 +0300 |
| commit | 61f4c3e6711477b8a347ca5fe89e5e6613e0a147 (patch) | |
| tree | ca318abb0ad8cb84c2246f0dac97d69c4dafc60b /Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml | |
| parent | 5dfec3cf3efbd897d774e3b5c08c2f0deaf9b5ad (diff) | |
| parent | 9546b21ea672aa961d5a89ea754214afed013f02 (diff) | |
| download | linux-61f4c3e6711477b8a347ca5fe89e5e6613e0a147.tar.xz | |
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
...
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml index 1a6490c43d89..442c21f12a3b 100644 --- a/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml +++ b/Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml @@ -6,14 +6,14 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Maxim 63xx Watchdog Timers -allOf: - - $ref: watchdog.yaml# - - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml# - maintainers: - Marc Zyngier <maz@kernel.org> - Linus Walleij <linus.walleij@linaro.org> +allOf: + - $ref: watchdog.yaml# + - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml# + properties: compatible: enum: |