tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Krzysztof Kozlowski and committed by
Wim Van Sebroeck 6c266971 edb10ace

+15 -57
-55
Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
··· 1 - # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 - %YAML 1.2 3 - --- 4 - $id: http://devicetree.org/schemas/watchdog/gpio-wdt.yaml# 5 - $schema: http://devicetree.org/meta-schemas/core.yaml# 6 - 7 - title: GPIO controlled watchdog 8 - 9 - maintainers: 10 - - Robert Marko <robert.marko@sartura.hr> 11 - 12 - properties: 13 - compatible: 14 - const: linux,wdt-gpio 15 - 16 - gpios: 17 - maxItems: 1 18 - description: GPIO connected to the WDT reset pin 19 - 20 - hw_algo: 21 - $ref: /schemas/types.yaml#/definitions/string 22 - description: Algorithm used by the driver 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 34 - 35 - hw_margin_ms: 36 - $ref: /schemas/types.yaml#/definitions/uint32 37 - description: Maximum time to reset watchdog circuit (in milliseconds) 38 - minimum: 2 39 - maximum: 65535 40 - 41 - always-running: 42 - type: boolean 43 - description: 44 - If the watchdog timer cannot be disabled, add this flag to have the driver 45 - keep toggling the signal without a client. 46 - It will only cease to toggle the signal when the device is open and the 47 - timeout elapsed. 48 - 49 - required: 50 - - compatible 51 - - gpios 52 - - hw_algo 53 - - hw_margin_ms 54 - 55 - unevaluatedProperties: false
+15 -2
Documentation/devicetree/bindings/watchdog/linux,wdt-gpio.yaml
··· 8 8 9 9 maintainers: 10 10 - Guenter Roeck <linux@roeck-us.net> 11 + - Robert Marko <robert.marko@sartura.hr> 11 12 12 13 properties: 13 14 compatible: ··· 20 19 21 20 hw_algo: 22 21 description: The algorithm used by the driver. 23 - enum: [ level, toggle ] 22 + oneOf: 23 + - description: 24 + Either a high-to-low or a low-to-high transition clears the WDT counter. 25 + The watchdog timer is disabled when GPIO is left floating or connected 26 + to a three-state buffer. 27 + const: toggle 28 + - description: 29 + Low or high level starts counting WDT timeout, the opposite level 30 + disables the WDT. 31 + Active level is determined by the GPIO flags. 32 + const: level 24 33 25 34 hw_margin_ms: 26 35 description: Maximum time to reset watchdog circuit (milliseconds). 27 36 $ref: /schemas/types.yaml#/definitions/uint32 37 + minimum: 2 38 + maximum: 65535 28 39 29 40 always-running: 30 41 type: boolean ··· 55 42 allOf: 56 43 - $ref: watchdog.yaml# 57 44 58 - additionalProperties: false 45 + unevaluatedProperties: false 59 46 60 47 examples: 61 48 - |