diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-02-10 18:00:26 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-21 22:43:36 -0500 |
commit | 40edc9813b9bc5d7628b821f1dad7fc87e101066 (patch) | |
tree | b1039e4f5752789370f65d369c116d0ad63021cb | |
parent | 868eb61602d9c020fc9e21b42f3ccd301b36b94d (diff) |
watchdog: orion: Remove unneeded BRIDGE_CAUSE clear
After adding the IRQ request, the BRIDGE_CAUSE bit should be cleared by the
bridge interrupt controller. There's no longer a need to do it in the watchdog
driver, so we can simply remove it.
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>
-rw-r--r-- | drivers/watchdog/orion_wdt.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 6061b838d396..65aa65560730 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
26 | #include <linux/of.h> | 26 | #include <linux/of.h> |
27 | #include <mach/bridge-regs.h> | ||
28 | 27 | ||
29 | /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */ | 28 | /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */ |
30 | #define ORION_RSTOUT_MASK_OFFSET 0x20108 | 29 | #define ORION_RSTOUT_MASK_OFFSET 0x20108 |
@@ -42,7 +41,6 @@ | |||
42 | #define WDT_MAX_CYCLE_COUNT 0xffffffff | 41 | #define WDT_MAX_CYCLE_COUNT 0xffffffff |
43 | 42 | ||
44 | #define WDT_RESET_OUT_EN BIT(1) | 43 | #define WDT_RESET_OUT_EN BIT(1) |
45 | #define WDT_INT_REQ BIT(3) | ||
46 | 44 | ||
47 | static bool nowayout = WATCHDOG_NOWAYOUT; | 45 | static bool nowayout = WATCHDOG_NOWAYOUT; |
48 | static int heartbeat = -1; /* module parameter (seconds) */ | 46 | static int heartbeat = -1; /* module parameter (seconds) */ |
@@ -64,9 +62,6 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) | |||
64 | /* Set watchdog duration */ | 62 | /* Set watchdog duration */ |
65 | writel(wdt_tclk * wdt_dev->timeout, wdt_reg + WDT_VAL); | 63 | writel(wdt_tclk * wdt_dev->timeout, wdt_reg + WDT_VAL); |
66 | 64 | ||
67 | /* Clear watchdog timer interrupt */ | ||
68 | writel(~WDT_INT_REQ, BRIDGE_CAUSE); | ||
69 | |||
70 | /* Enable watchdog timer */ | 65 | /* Enable watchdog timer */ |
71 | atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN); | 66 | atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN); |
72 | 67 | ||