diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 07:10:22 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 07:10:22 +0100 |
| commit | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (patch) | |
| tree | fdde7380d2584d0297898373831f26cd5208cabd /Documentation | |
| parent | powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallo... (diff) | |
| parent | mpc52xx/wdt: remove obsolete old WDT implementation (diff) | |
| download | linux-8c82da5e2495589b7b70a43789e7cbd61a486ed0.tar.xz linux-8c82da5e2495589b7b70a43789e7cbd61a486ed0.zip | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt index 8447fd7090d0..ddd5ee32ea63 100644 --- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt +++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt @@ -103,7 +103,22 @@ fsl,mpc5200-gpt nodes --------------------- On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board design supports the internal wdt, then the device node for GPT0 should -include the empty property 'fsl,has-wdt'. +include the empty property 'fsl,has-wdt'. Note that this does not activate +the watchdog. The timer will function as a GPT if the timer api is used, and +it will function as watchdog if the watchdog device is used. The watchdog +mode has priority over the gpt mode, i.e. if the watchdog is activated, any +gpt api call to this timer will fail with -EBUSY. + +If you add the property + fsl,wdt-on-boot = <n>; +GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to it. +If n>0, the watchdog is started with a timeout of n seconds. If n=0, the +configuration of the watchdog is not touched. This is useful in two cases: +- just mark GPT0 as watchdog, blocking gpt accesses, and configure it later; +- do not touch a configuration assigned by the boot loader which supervises + the boot process itself. + +The watchdog will respect the CONFIG_WATCHDOG_NOWAYOUT option. An mpc5200-gpt can be used as a single line GPIO controller. To do so, add the following properties to the gpt node: |