diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-26 07:45:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-26 07:45:55 -0400 |
| commit | c2c485db455696850f17a874f8b5a11d13b31b5c (patch) | |
| tree | 291e7cd1007f6cdf6e514c21edd5c2e5fa9a0a2e /doc | |
| parent | f9d16f2c0daf68dcb963c08c927f5f0a07cf75e4 (diff) | |
| parent | 5e112c7ca8ee45860e27f23059d9a319ba8eb6d3 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- nuvoton: add expire function for generic reset (Jim)
- handle watchdogs during keyed autoboot (Rasmus)
- cyclic: Don't disable cylic function upon exceeding CPU time (Stefan)
- ulp wdog: Updates to support iMX93 and DM (Alice)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/device-tree-bindings/watchdog/common.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/device-tree-bindings/watchdog/common.txt b/doc/device-tree-bindings/watchdog/common.txt index 9db6dd61465..d041fea2347 100644 --- a/doc/device-tree-bindings/watchdog/common.txt +++ b/doc/device-tree-bindings/watchdog/common.txt @@ -6,7 +6,8 @@ Optional properties: be used instead. - hw_margin_ms : Period used to reset the watchdog in ms If this period is not defined, the default value is 1000. -- u-boot,noautostart : Specify that this watchdog should not autostart - When the config option WATCHDOG_AUTOSTART is set, all enabled - watchdogs are started. This property allows specifying that this - watchdog should NOT be started. +- u-boot,noautostart : +- u-boot,autostart : These (mutually exclusive) boolean properties can be used to control + whether the watchdog is automatically started when probed. If neither + are present, the behaviour is determined by the config option + WATCHDOG_AUTOSTART. |