Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / Documentation / devicetree / bindings / watchdog / of-xilinx-wdt.txt

diff --git a/Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt b/Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt
index 6d63782..c6ae9c9 100644 (file)
--- a/Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/of-xilinx-wdt.txt
@@ -7,6 +7,8 @@ Required properties:
 - reg                  : Physical base address and size
 
 Optional properties:
+- clocks               : Input clock specifier. Refer to common clock
+                         bindings.
 - clock-frequency      : Frequency of clock in Hz
 - xlnx,wdt-enable-once : 0 - Watchdog can be restarted
                          1 - Watchdog can be enabled just once
@@ -17,6 +19,7 @@ Example:
 axi-timebase-wdt@40100000 {
        clock-frequency = <50000000>;
        compatible = "xlnx,xps-timebase-wdt-1.00.a";
+       clocks = <&clkc 15>;
        reg = <0x40100000 0x10000>;
        xlnx,wdt-enable-once = <0x0>;
        xlnx,wdt-interval = <0x1b>;