The TIMER_CTRL register allows to control timer and watchdog counters, so it's a register shared between the clocksource and the watchdog drivers. In order to prevent race-conditions the clocksource driver exposed a thread-safe API. Use the API. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> --- drivers/watchdog/orion_wdt.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index da57798..c0597f4 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -25,12 +25,12 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/of.h> +#include <linux/time-orion.h> #include <mach/bridge-regs.h> /* * Watchdog timer block registers. */ -#define TIMER_CTRL 0x0000 #define WDT_EN 0x0010 #define WDT_VAL 0x0024 @@ -72,9 +72,7 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) writel(reg, BRIDGE_CAUSE); /* Enable watchdog timer */ - reg = readl(wdt_reg + TIMER_CTRL); - reg |= WDT_EN; - writel(reg, wdt_reg + TIMER_CTRL); + orion_timer_ctrl_clrset(0, WDT_EN); /* Enable reset on watchdog */ reg = readl(RSTOUTn_MASK); @@ -97,9 +95,7 @@ static int orion_wdt_stop(struct watchdog_device *wdt_dev) writel(reg, RSTOUTn_MASK); /* Disable watchdog timer */ - reg = readl(wdt_reg + TIMER_CTRL); - reg &= ~WDT_EN; - writel(reg, wdt_reg + TIMER_CTRL); + orion_timer_ctrl_clrset(WDT_EN, 0); spin_unlock(&wdt_lock); return 0; -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
