[PATCH v2 03/15] watchdog: orion: Use atomic access for shared registers
From: Ezequiel Garcia <hidden>
Date: 2014-01-21 09:12:29
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-21 · Re: [PATCH v2 03/15] watchdog: orion: Use atomic access for shared registers · Andrew Lunn <hidden>
- 2014-01-21 · Re: [PATCH v2 03/15] watchdog: orion: Use atomic access for shared registers · Arnd Bergmann <hidden>
- 2014-01-21 · Re: [PATCH v2 03/15] watchdog: orion: Use atomic access for shared registers · Ezequiel Garcia <hidden>
- 2014-01-21 · Re: [PATCH v2 03/15] watchdog: orion: Use atomic access for shared registers · Fabio Estevam <hidden>
Since the timer control register is shared with the clocksource driver, use the recently introduced atomic_io_clear_set() to access such register. Signed-off-by: Ezequiel Garcia <redacted> --- drivers/watchdog/orion_wdt.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index f7722a4..cf64510 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c@@ -61,8 +61,6 @@ static int orion_wdt_ping(struct watchdog_device *wdt_dev) static int orion_wdt_start(struct watchdog_device *wdt_dev) { - u32 reg; - spin_lock(&wdt_lock); /* Set watchdog duration */
@@ -72,14 +70,10 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) writel(~WDT_INT_REQ, BRIDGE_CAUSE); /* Enable watchdog timer */ - reg = readl(wdt_reg + TIMER_CTRL); - reg |= WDT_EN; - writel(reg, wdt_reg + TIMER_CTRL); + atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN); /* Enable reset on watchdog */ - reg = readl(RSTOUTn_MASK); - reg |= WDT_RESET_OUT_EN; - writel(reg, RSTOUTn_MASK); + atomic_io_modify(RSTOUTn_MASK, WDT_RESET_OUT_EN, WDT_RESET_OUT_EN); spin_unlock(&wdt_lock); return 0;
@@ -87,19 +81,13 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) static int orion_wdt_stop(struct watchdog_device *wdt_dev) { - u32 reg; - spin_lock(&wdt_lock); /* Disable reset on watchdog */ - reg = readl(RSTOUTn_MASK); - reg &= ~WDT_RESET_OUT_EN; - writel(reg, RSTOUTn_MASK); + atomic_io_modify(RSTOUTn_MASK, WDT_RESET_OUT_EN, 0); /* Disable watchdog timer */ - reg = readl(wdt_reg + TIMER_CTRL); - reg &= ~WDT_EN; - writel(reg, wdt_reg + TIMER_CTRL); + atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, 0); spin_unlock(&wdt_lock); return 0;
--
1.8.1.5