Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40edc981 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

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: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Tested-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 868eb616

drivers/watchdog/orion_wdt.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/of.h>

#include <mach/bridge-regs.h>





/* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */

/* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */

#define ORION_RSTOUT_MASK_OFFSET	0x20108

#define ORION_RSTOUT_MASK_OFFSET	0x20108
@@ -42,7 +41,6 @@ 
#define WDT_MAX_CYCLE_COUNT	0xffffffff

#define WDT_MAX_CYCLE_COUNT	0xffffffff





#define WDT_RESET_OUT_EN	BIT(1)

#define WDT_RESET_OUT_EN	BIT(1)

#define WDT_INT_REQ		BIT(3)





static bool nowayout = WATCHDOG_NOWAYOUT;

static bool nowayout = WATCHDOG_NOWAYOUT;

static int heartbeat = -1;		/* module parameter (seconds) */

static int heartbeat = -1;		/* module parameter (seconds) */
@@ -64,9 +62,6 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev) 
	/* Set watchdog duration */

	/* Set watchdog duration */

	writel(wdt_tclk * wdt_dev->timeout, wdt_reg + WDT_VAL);

	writel(wdt_tclk * wdt_dev->timeout, wdt_reg + WDT_VAL);





	/* Clear watchdog timer interrupt */

	writel(~WDT_INT_REQ, BRIDGE_CAUSE);



	/* Enable watchdog timer */

	/* Enable watchdog timer */

	atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN);

	atomic_io_modify(wdt_reg + TIMER_CTRL, WDT_EN, WDT_EN);