aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-18 12:19:32 -0400
committerWim Van Sebroeck <wim@iguana.be>2013-07-11 16:17:56 -0400
commitfa142ff5b3f67fab01f3d02a501b041b4266afdd (patch)
tree349eefb8a6b56714b8ff898c8d179980736d96d9 /drivers/watchdog
parent938d0a840d0f97b627111fd038a735f3924fd987 (diff)
Watchdog: allow orion_wdt to be built for Dove
The watchdog infrastructure in Dove is no different from that in Orion5x or Kirkwood, so let's enable it for Dove. The only things missing are a few register settings in Dove's bridge-regs.h. Rather than duplicating the same register bit masks for the RSTOUTn_MASK and BRIDGE_CAUSE registers, move the definitions into the watchdog driver itself. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Jason Cooper <jason@lakedaemon.net> Tested-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig2
-rw-r--r--drivers/watchdog/orion_wdt.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f17ffdb75bb0..b69e4821d668 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG
282 282
283config ORION_WATCHDOG 283config ORION_WATCHDOG
284 tristate "Orion watchdog" 284 tristate "Orion watchdog"
285 depends on ARCH_ORION5X || ARCH_KIRKWOOD 285 depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE
286 select WATCHDOG_CORE 286 select WATCHDOG_CORE
287 help 287 help
288 Say Y here if to include support for the watchdog timer 288 Say Y here if to include support for the watchdog timer
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index da577980d390..4074244c7183 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -38,6 +38,9 @@
38#define WDT_IN_USE 0 38#define WDT_IN_USE 0
39#define WDT_OK_TO_CLOSE 1 39#define WDT_OK_TO_CLOSE 1
40 40
41#define WDT_RESET_OUT_EN BIT(1)
42#define WDT_INT_REQ BIT(3)
43
41static bool nowayout = WATCHDOG_NOWAYOUT; 44static bool nowayout = WATCHDOG_NOWAYOUT;
42static int heartbeat = -1; /* module parameter (seconds) */ 45static int heartbeat = -1; /* module parameter (seconds) */
43static unsigned int wdt_max_duration; /* (seconds) */ 46static unsigned int wdt_max_duration; /* (seconds) */