diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-22 20:48:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-22 20:48:28 -0400 |
| commit | fd41c8f7a3b00ffcdcfab6d78b006a9e2a5c1873 (patch) | |
| tree | 82a4f97577a1211386b162b61370e5eff437de6f /doc | |
| parent | 2996b6405e9522082b53ded0392438830ad6c43a (diff) | |
| parent | 1fc45d6483d77b9fbe84e546f4e6afe665ba827a (diff) | |
| download | u-boot-fd41c8f7a3b00ffcdcfab6d78b006a9e2a5c1873.zip u-boot-fd41c8f7a3b00ffcdcfab6d78b006a9e2a5c1873.tar.gz u-boot-fd41c8f7a3b00ffcdcfab6d78b006a9e2a5c1873.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- octeontx_wdt: Add MIPS Octeon support (Stefan)
- watchdog: add amlogic watchdog support (Philippe)
- watchdog: add pulse support to gpio watchdog driver (Paul)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/board/amlogic/index.rst | 2 | ||||
| -rw-r--r-- | doc/device-tree-bindings/watchdog/gpio-wdt.txt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst index 9c7fadf..cc2ba50 100644 --- a/doc/board/amlogic/index.rst +++ b/doc/board/amlogic/index.rst @@ -73,6 +73,8 @@ This matrix concerns the actual source code version. +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ | PCIe (+NVMe) | *N/A* | *N/A* | *N/A* | **Yes** | **Yes** | **Yes** | **Yes** | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +| Watchdog | *N/A* | **Yes** | *N/A* | *N/A* | *N/A* | *N/A* | *N/A* | ++-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ Boot Documentation ------------------ diff --git a/doc/device-tree-bindings/watchdog/gpio-wdt.txt b/doc/device-tree-bindings/watchdog/gpio-wdt.txt index c9a8559..746c2c0 100644 --- a/doc/device-tree-bindings/watchdog/gpio-wdt.txt +++ b/doc/device-tree-bindings/watchdog/gpio-wdt.txt @@ -5,7 +5,12 @@ Describes a simple watchdog timer which is reset by toggling a gpio. Required properties: - compatible: Must be "linux,wdt-gpio". -- gpios: gpio to toggle when wdt driver reset method is called. +- gpios: From common gpio binding; gpio connection to WDT reset pin. +- hw_algo: The algorithm used by the driver. Should be one of the + following values: + - toggle: Toggle from high-to-low or low-to-high when resetting the watchdog. + - level: Maintain a constant high/low level, and trigger a short pulse when + resetting the watchdog. Active level is determined by the GPIO flags. - always-running: Boolean property indicating that the watchdog cannot be disabled. At present, U-Boot only supports this kind of GPIO watchdog. @@ -15,5 +20,6 @@ Example: gpio-wdt { gpios = <&gpio0 1 0>; compatible = "linux,wdt-gpio"; + hw_algo = "toggle"; always-running; }; |