diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/board/amlogic/index.rst | 2 | ||||
| -rw-r--r-- | doc/build/gcc.rst | 2 | ||||
| -rw-r--r-- | doc/develop/codingstyle.rst | 2 | ||||
| -rw-r--r-- | doc/device-tree-bindings/watchdog/gpio-wdt.txt | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst index 9c7fadf2c02..cc2ba508892 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/build/gcc.rst b/doc/build/gcc.rst index 682051abeb2..ee544ad87ee 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -30,7 +30,7 @@ Depending on the build targets further packages maybe needed pkg-config python3 python3-asteval python3-coverage \ python3-pkg-resources python3-pycryptodome python3-pyelftools \ python3-pytest python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme \ - python3-subunit python3-testtools python3-virtualenv swig + python3-subunit python3-testtools python3-virtualenv swig uuid-dev SUSE based ~~~~~~~~~~ diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst index 2b13818a8ce..a6bc37bbb44 100644 --- a/doc/develop/codingstyle.rst +++ b/doc/develop/codingstyle.rst @@ -41,7 +41,7 @@ The following rules apply: * The exception here is Python which requires 4 spaces instead. - * All source files need to be in "Unix" and not "DOS" or "Windows" formatted, + * All source files need to be in "Unix" and not "DOS" or "Windows" format, with respect to line ends. * Do not add more than 2 consecutive empty lines to source files diff --git a/doc/device-tree-bindings/watchdog/gpio-wdt.txt b/doc/device-tree-bindings/watchdog/gpio-wdt.txt index c9a8559a3ef..746c2c081ea 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; }; |