diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-02-10 20:00:31 -0300 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 03:44:19 +0000 |
commit | 463f96e0cdacce5be9bfdd4cc81e7225347cdc31 (patch) | |
tree | 31a4ddb92b5dfb79faa0bcf3041b4465a58f3773 /Documentation/devicetree/bindings/watchdog/marvel.txt | |
parent | 490d8e3cbf60cc4ad874caa8c07e67e14c25a1af (diff) | |
download | linux-463f96e0cdacce5be9bfdd4cc81e7225347cdc31.tar.gz linux-463f96e0cdacce5be9bfdd4cc81e7225347cdc31.tar.bz2 linux-463f96e0cdacce5be9bfdd4cc81e7225347cdc31.zip |
watchdog: orion: Add support for Armada 370 and Armada XP SoC
Using the added infrastructure for handling SoC differences,
this commit adds support for the watchdog controller available
in Armada 370 and Armada XP SoCs.
Also, and because the AXP clock initialization uses of_clk_get_by_name,
this commit changes the orion clock initialization to use clk_get() and
adds a proper clk_put() on the common exit/error paths.
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Tested-By: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog/marvel.txt')
-rw-r--r-- | Documentation/devicetree/bindings/watchdog/marvel.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt index 1544fe991d24..de11eb4c121f 100644 --- a/Documentation/devicetree/bindings/watchdog/marvel.txt +++ b/Documentation/devicetree/bindings/watchdog/marvel.txt @@ -3,6 +3,9 @@ Required Properties: - Compatibility : "marvell,orion-wdt" + "marvell,armada-370-wdt" + "marvell,armada-xp-wdt" + - reg : Should contain two entries: first one with the timer control address, second one with the rstout enable address. |