Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt
index de11eb4c121fff77e119e7ec251707f69badecc5..97223fddb7bdd69ed28c3ec40ea0c2986fa0cf3c 100644 (file)
--- a/Documentation/devicetree/bindings/watchdog/marvel.txt
+++ b/Documentation/devicetree/bindings/watchdog/marvel.txt
@@ -5,11 +5,18 @@ Required Properties:
 - Compatibility : "marvell,orion-wdt"
                  "marvell,armada-370-wdt"
                  "marvell,armada-xp-wdt"
+                 "marvell,armada-375-wdt"
+                 "marvell,armada-380-wdt"
 
 - reg          : Should contain two entries: first one with the
                  timer control address, second one with the
                  rstout enable address.
 
+For "marvell,armada-375-wdt" and "marvell,armada-380-wdt":
+
+- reg          : A third entry is mandatory and should contain the
+                  shared mask/unmask RSTOUT address.
+
 Optional properties:
 
 - interrupts   : Contains the IRQ for watchdog expiration