mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
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>
This commit is contained in:
parent
edb10ace4d
commit
6c266971d5
@ -1,55 +0,0 @@
|
||||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: GPIO controlled watchdog
|
||||
|
||||
maintainers:
|
||||
- Robert Marko <robert.marko@sartura.hr>
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
const: linux,wdt-gpio
|
||||
|
||||
gpios:
|
||||
maxItems: 1
|
||||
description: GPIO connected to the WDT reset pin
|
||||
|
||||
hw_algo:
|
||||
$ref: /schemas/types.yaml#/definitions/string
|
||||
description: Algorithm used by the driver
|
||||
oneOf:
|
||||
- description:
|
||||
Either a high-to-low or a low-to-high transition clears the WDT counter.
|
||||
The watchdog timer is disabled when GPIO is left floating or connected
|
||||
to a three-state buffer.
|
||||
const: toggle
|
||||
- description:
|
||||
Low or high level starts counting WDT timeout, the opposite level
|
||||
disables the WDT.
|
||||
Active level is determined by the GPIO flags.
|
||||
const: level
|
||||
|
||||
hw_margin_ms:
|
||||
$ref: /schemas/types.yaml#/definitions/uint32
|
||||
description: Maximum time to reset watchdog circuit (in milliseconds)
|
||||
minimum: 2
|
||||
maximum: 65535
|
||||
|
||||
always-running:
|
||||
type: boolean
|
||||
description:
|
||||
If the watchdog timer cannot be disabled, add this flag to have the driver
|
||||
keep toggling the signal without a client.
|
||||
It will only cease to toggle the signal when the device is open and the
|
||||
timeout elapsed.
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- gpios
|
||||
- hw_algo
|
||||
- hw_margin_ms
|
||||
|
||||
unevaluatedProperties: false
|
@ -8,6 +8,7 @@ title: GPIO-controlled Watchdog
|
||||
|
||||
maintainers:
|
||||
- Guenter Roeck <linux@roeck-us.net>
|
||||
- Robert Marko <robert.marko@sartura.hr>
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
@ -19,11 +20,23 @@ properties:
|
||||
|
||||
hw_algo:
|
||||
description: The algorithm used by the driver.
|
||||
enum: [ level, toggle ]
|
||||
oneOf:
|
||||
- description:
|
||||
Either a high-to-low or a low-to-high transition clears the WDT counter.
|
||||
The watchdog timer is disabled when GPIO is left floating or connected
|
||||
to a three-state buffer.
|
||||
const: toggle
|
||||
- description:
|
||||
Low or high level starts counting WDT timeout, the opposite level
|
||||
disables the WDT.
|
||||
Active level is determined by the GPIO flags.
|
||||
const: level
|
||||
|
||||
hw_margin_ms:
|
||||
description: Maximum time to reset watchdog circuit (milliseconds).
|
||||
$ref: /schemas/types.yaml#/definitions/uint32
|
||||
minimum: 2
|
||||
maximum: 65535
|
||||
|
||||
always-running:
|
||||
type: boolean
|
||||
@ -42,7 +55,7 @@ required:
|
||||
allOf:
|
||||
- $ref: watchdog.yaml#
|
||||
|
||||
additionalProperties: false
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
|
Loading…
Reference in New Issue
Block a user