[PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear
From: Ezequiel Garcia <hidden>
Date: 2014-01-21 09:12:32
Also in:
linux-devicetree, linux-watchdog
Subsystem:
the rest, watchdog device drivers · Maintainers:
Linus Torvalds, Wim Van Sebroeck, Guenter Roeck
Possibly related (same subject, not in this thread)
- 2014-01-23 · Re: [PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear · Sebastian Hesselbarth <hidden>
- 2014-01-23 · Re: [PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear · Ezequiel Garcia <hidden>
- 2014-01-23 · Re: [PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear · Ezequiel Garcia <hidden>
- 2014-01-23 · Re: [PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear · Ezequiel Garcia <hidden>
- 2014-01-23 · Re: [PATCH v2 06/15] watchdog: orion: Remove unneeded BRIDGE_CAUSE clear · Sebastian Hesselbarth <hidden>
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. Signed-off-by: Ezequiel Garcia <redacted> --- drivers/watchdog/orion_wdt.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 9c7d695..33e323d 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c@@ -25,7 +25,6 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/of.h> -#include <mach/bridge-regs.h> /* * Watchdog timer block registers.
@@ -39,7 +38,6 @@ #define WDT_OK_TO_CLOSE 1 #define WDT_RESET_OUT_EN BIT(1) -#define WDT_INT_REQ BIT(3) static bool nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = -1; /* module parameter (seconds) */
@@ -68,9 +66,6 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) /* Set watchdog duration */ writel(wdt_tclk * wdt_dev->timeout, wdt_reg + WDT_VAL); - /* Clear watchdog timer interrupt */ - writel(~WDT_INT_REQ, BRIDGE_CAUSE); - /* Enable watchdog timer */ atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN);
--
1.8.1.5