Title: [8225] trunk: Seperate watchdog definitions from C files to a new head file.
- Revision
- 8225
- Author
- gyang
- Date
- 2010-01-24 22:47:43 -0500 (Sun, 24 Jan 2010)
Log Message
Seperate watchdog definitions from C files to a new head file.
Modified Paths
Added Paths
Diff
Added: trunk/arch/blackfin/include/asm/bfin_watchdog.h (0 => 8225)
--- trunk/arch/blackfin/include/asm/bfin_watchdog.h (rev 0)
+++ trunk/arch/blackfin/include/asm/bfin_watchdog.h 2010-01-25 03:47:43 UTC (rev 8225)
@@ -0,0 +1,25 @@
+/*
+ * bfin_wdt.h - Blackfin watchdog definitions
+ *
+ * Copyright 2010-2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+/* 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
Property changes on: trunk/arch/blackfin/include/asm/bfin_watchdog.h
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/arch/blackfin/kernel/nmi.c (8224 => 8225)
--- trunk/arch/blackfin/kernel/nmi.c 2010-01-23 00:18:31 UTC (rev 8224)
+++ trunk/arch/blackfin/kernel/nmi.c 2010-01-25 03:47:43 UTC (rev 8225)
@@ -19,22 +19,8 @@
#include <asm/bitops.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
+#include <asm/bfin_watchdog.h>
-/* 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
-
#define DRV_NAME "nmi-wdt"
#define NMI_WDT_TIMEOUT 5 /* 5 seconds */
Modified: trunk/drivers/watchdog/bfin_wdt.c (8224 => 8225)
--- trunk/drivers/watchdog/bfin_wdt.c 2010-01-23 00:18:31 UTC (rev 8224)
+++ trunk/drivers/watchdog/bfin_wdt.c 2010-01-25 03:47:43 UTC (rev 8225)
@@ -26,6 +26,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)
@@ -52,24 +53,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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
