diff options
author | Fabio Porcedda <fabio.porcedda@gmail.com> | 2013-02-14 03:14:25 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-03-01 06:53:45 -0500 |
commit | c1fd5f6402050b2463d0610b94f050fedf1b5019 (patch) | |
tree | 7ff33e78c2a4f40b3465d163c03382db0d4d500f /Documentation | |
parent | 490ac7af8b71069ba0c733052c5f448ac070c947 (diff) |
watchdog: add timeout-sec property binding
this patchset add the timeout-sec property to the following drivers:
orion_wdt, pnx4008_wdt, s3c2410_wdt and at91sam9_wdt.
The at91sam9_wdt is tested on evk-pr3,
the other drivers are compile tested only.
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Masanari Iida <standby24x7@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'Documentation')
4 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt index 2957ebb5aa71..fcdd48f7dcff 100644 --- a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | |||
@@ -7,9 +7,13 @@ Required properties: | |||
7 | - reg: physical base address of the controller and length of memory mapped | 7 | - reg: physical base address of the controller and length of memory mapped |
8 | region. | 8 | region. |
9 | 9 | ||
10 | Optional properties: | ||
11 | - timeout-sec: contains the watchdog timeout in seconds. | ||
12 | |||
10 | Example: | 13 | Example: |
11 | 14 | ||
12 | watchdog@fffffd40 { | 15 | watchdog@fffffd40 { |
13 | compatible = "atmel,at91sam9260-wdt"; | 16 | compatible = "atmel,at91sam9260-wdt"; |
14 | reg = <0xfffffd40 0x10>; | 17 | reg = <0xfffffd40 0x10>; |
18 | timeout-sec = <10>; | ||
15 | }; | 19 | }; |
diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt index 0b2503ab0a05..5dc8d30061ce 100644 --- a/Documentation/devicetree/bindings/watchdog/marvel.txt +++ b/Documentation/devicetree/bindings/watchdog/marvel.txt | |||
@@ -5,10 +5,15 @@ Required Properties: | |||
5 | - Compatibility : "marvell,orion-wdt" | 5 | - Compatibility : "marvell,orion-wdt" |
6 | - reg : Address of the timer registers | 6 | - reg : Address of the timer registers |
7 | 7 | ||
8 | Optional properties: | ||
9 | |||
10 | - timeout-sec : Contains the watchdog timeout in seconds | ||
11 | |||
8 | Example: | 12 | Example: |
9 | 13 | ||
10 | wdt@20300 { | 14 | wdt@20300 { |
11 | compatible = "marvell,orion-wdt"; | 15 | compatible = "marvell,orion-wdt"; |
12 | reg = <0x20300 0x28>; | 16 | reg = <0x20300 0x28>; |
17 | timeout-sec = <10>; | ||
13 | status = "okay"; | 18 | status = "okay"; |
14 | }; | 19 | }; |
diff --git a/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt index 7c7f6887c796..556d06c17c92 100644 --- a/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt | |||
@@ -5,9 +5,13 @@ Required properties: | |||
5 | - reg: physical base address of the controller and length of memory mapped | 5 | - reg: physical base address of the controller and length of memory mapped |
6 | region. | 6 | region. |
7 | 7 | ||
8 | Optional properties: | ||
9 | - timeout-sec: contains the watchdog timeout in seconds. | ||
10 | |||
8 | Example: | 11 | Example: |
9 | 12 | ||
10 | watchdog@4003C000 { | 13 | watchdog@4003C000 { |
11 | compatible = "nxp,pnx4008-wdt"; | 14 | compatible = "nxp,pnx4008-wdt"; |
12 | reg = <0x4003C000 0x1000>; | 15 | reg = <0x4003C000 0x1000>; |
16 | timeout-sec = <10>; | ||
13 | }; | 17 | }; |
diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt index ce0d8e78ed8f..2aa486cc1ff6 100644 --- a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt | |||
@@ -9,3 +9,6 @@ Required properties: | |||
9 | - reg : base physical address of the controller and length of memory mapped | 9 | - reg : base physical address of the controller and length of memory mapped |
10 | region. | 10 | region. |
11 | - interrupts : interrupt number to the cpu. | 11 | - interrupts : interrupt number to the cpu. |
12 | |||
13 | Optional properties: | ||
14 | - timeout-sec : contains the watchdog timeout in seconds. | ||