Skip to content

Commit 6c26697

Browse files
krzkWim Van Sebroeck
authored andcommitted
dt-bindings: watchdog: drop duplicated GPIO watchdog bindings
Two conversions to DT schema of GPIO watchdog binding happened and came through different trees. Merge them into one: 1. Combine maintainers, 2. Use more descriptive property descriptions and constraints from gpio-wdt.yaml, 3. Switch to unevaluatedProperties:false, to allow generic watchdog properties. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230415095112.51257-1-krzysztof.kozlowski@linaro.org Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent edb10ac commit 6c26697

2 files changed

Lines changed: 15 additions & 57 deletions

File tree

Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml

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

Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog
88

99
maintainers:
1010
- Guenter Roeck <linux@roeck-us.net>
11+
- Robert Marko <robert.marko@sartura.hr>
1112

1213
properties:
1314
compatible:
@@ -19,11 +20,23 @@ properties:
1920

2021
hw_algo:
2122
description: The algorithm used by the driver.
22-
enum: [ level, toggle ]
23+
oneOf:
24+
- description:
25+
Either a high-to-low or a low-to-high transition clears the WDT counter.
26+
The watchdog timer is disabled when GPIO is left floating or connected
27+
to a three-state buffer.
28+
const: toggle
29+
- description:
30+
Low or high level starts counting WDT timeout, the opposite level
31+
disables the WDT.
32+
Active level is determined by the GPIO flags.
33+
const: level
2334

2435
hw_margin_ms:
2536
description: Maximum time to reset watchdog circuit (milliseconds).
2637
$ref: /schemas/types.yaml#/definitions/uint32
38+
minimum: 2
39+
maximum: 65535
2740

2841
always-running:
2942
type: boolean
@@ -42,7 +55,7 @@ required:
4255
allOf:
4356
- $ref: watchdog.yaml#
4457

45-
additionalProperties: false
58+
unevaluatedProperties: false
4659

4760
examples:
4861
- |

0 commit comments

Comments
 (0)