Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / watchdog / pnx4008-wdt.txt

diff --git a/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
index 7c7f6887c796a6c4ff367252a21674b28339ddd0..556d06c17c92beb8a40e889679c150163722596c 100644 (file)
--- a/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt
@@ -5,9 +5,13 @@ Required properties:
 - reg: physical base address of the controller and length of memory mapped
   region.
 
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
 Example:
 
        watchdog@4003C000 {
                compatible = "nxp,pnx4008-wdt";
                reg = <0x4003C000 0x1000>;
+               timeout-sec = <10>;
        };