* [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header
@ 2010-03-09 16:07 Mike Frysinger
2010-05-21 8:23 ` Mike Frysinger
0 siblings, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2010-03-09 16:07 UTC (permalink / raw)
To: linux-kernel, Wim Van Sebroeck; +Cc: uclinux-dist-devel
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
note: this can be merged for 2.6.34 or 2.6.35
drivers/watchdog/bfin_wdt.c | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 2159e66..3546a46 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -25,6 +25,7 @@
#include <linux/interrupt.h>
#include <linux/uaccess.h>
#include <asm/blackfin.h>
+#include <asm/bfin_watchdog.h>
#define stamp(fmt, args...) \
pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
@@ -51,24 +52,6 @@
# define bfin_write_WDOG_STAT(x) bfin_write_WDOGA_STAT(x)
#endif
-/* Bit in SWRST that indicates boot caused by watchdog */
-#define SWRST_RESET_WDOG 0x4000
-
-/* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */
-#define WDOG_EXPIRED 0x8000
-
-/* Masks for WDEV field in WDOG_CTL register */
-#define ICTL_RESET 0x0
-#define ICTL_NMI 0x2
-#define ICTL_GPI 0x4
-#define ICTL_NONE 0x6
-#define ICTL_MASK 0x6
-
-/* Masks for WDEN field in WDOG_CTL register */
-#define WDEN_MASK 0x0FF0
-#define WDEN_ENABLE 0x0000
-#define WDEN_DISABLE 0x0AD0
-
/* some defaults */
#define WATCHDOG_TIMEOUT 20
--
1.7.0.2
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header
2010-03-09 16:07 [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header Mike Frysinger
@ 2010-05-21 8:23 ` Mike Frysinger
2010-05-21 8:49 ` Wim Van Sebroeck
0 siblings, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2010-05-21 8:23 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Wim Van Sebroeck, uclinux-dist-devel
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Andrew: could you pick this up ? it was posted a few months ago ...
drivers/watchdog/bfin_wdt.c | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 9c7ccd1..9042a95 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/uaccess.h>
#include <asm/blackfin.h>
+#include <asm/bfin_watchdog.h>
#define stamp(fmt, args...) \
pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
@@ -49,24 +50,6 @@
# define bfin_write_WDOG_STAT(x) bfin_write_WDOGA_STAT(x)
#endif
-/* Bit in SWRST that indicates boot caused by watchdog */
-#define SWRST_RESET_WDOG 0x4000
-
-/* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */
-#define WDOG_EXPIRED 0x8000
-
-/* Masks for WDEV field in WDOG_CTL register */
-#define ICTL_RESET 0x0
-#define ICTL_NMI 0x2
-#define ICTL_GPI 0x4
-#define ICTL_NONE 0x6
-#define ICTL_MASK 0x6
-
-/* Masks for WDEN field in WDOG_CTL register */
-#define WDEN_MASK 0x0FF0
-#define WDEN_ENABLE 0x0000
-#define WDEN_DISABLE 0x0AD0
-
/* some defaults */
#define WATCHDOG_TIMEOUT 20
--
1.7.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header
2010-05-21 8:23 ` Mike Frysinger
@ 2010-05-21 8:49 ` Wim Van Sebroeck
2010-05-21 8:55 ` [Uclinux-dist-devel] " Mike Frysinger
0 siblings, 1 reply; 4+ messages in thread
From: Wim Van Sebroeck @ 2010-05-21 8:49 UTC (permalink / raw)
To: Mike Frysinger; +Cc: Andrew Morton, linux-kernel, uclinux-dist-devel
Hi Mike,
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> Andrew: could you pick this up ? it was posted a few months ago ...
This is allready in the linux-2.6-watchdog tree. I'm reviewing a last driver
and will then sent a pull request to Linus.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Uclinux-dist-devel] [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header
2010-05-21 8:49 ` Wim Van Sebroeck
@ 2010-05-21 8:55 ` Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2010-05-21 8:55 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: uclinux-dist-devel, Andrew Morton, linux-kernel
On Fri, May 21, 2010 at 04:49, Wim Van Sebroeck wrote:
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>> ---
>> Andrew: could you pick this up ? it was posted a few months ago ...
>
> This is allready in the linux-2.6-watchdog tree. I'm reviewing a last driver
> and will then sent a pull request to Linus.
thanks
-mike
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-21 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-09 16:07 [PATCH] [WATCHDOG] bfin: use new common Blackfin watchdog header Mike Frysinger
2010-05-21 8:23 ` Mike Frysinger
2010-05-21 8:49 ` Wim Van Sebroeck
2010-05-21 8:55 ` [Uclinux-dist-devel] " Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®