Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Blackfin: split watchdog definitions into a dedicated header file

This allows things to be shared between the different watchdog sources.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

authored by

Graf Yang and committed by
Mike Frysinger
64b33a00 4ab069e5

+31 -15
+30
arch/blackfin/include/asm/bfin_watchdog.h
··· 1 + /* 2 + * bfin_watchdog.h - Blackfin watchdog definitions 3 + * 4 + * Copyright 2006-2010 Analog Devices Inc. 5 + * 6 + * Licensed under the GPL-2 or later. 7 + */ 8 + 9 + #ifndef _BFIN_WATCHDOG_H 10 + #define _BFIN_WATCHDOG_H 11 + 12 + /* Bit in SWRST that indicates boot caused by watchdog */ 13 + #define SWRST_RESET_WDOG 0x4000 14 + 15 + /* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */ 16 + #define WDOG_EXPIRED 0x8000 17 + 18 + /* Masks for WDEV field in WDOG_CTL register */ 19 + #define ICTL_RESET 0x0 20 + #define ICTL_NMI 0x2 21 + #define ICTL_GPI 0x4 22 + #define ICTL_NONE 0x6 23 + #define ICTL_MASK 0x6 24 + 25 + /* Masks for WDEN field in WDOG_CTL register */ 26 + #define WDEN_MASK 0x0FF0 27 + #define WDEN_ENABLE 0x0000 28 + #define WDEN_DISABLE 0x0AD0 29 + 30 + #endif
+1 -15
arch/blackfin/kernel/nmi.c
··· 20 20 #include <asm/blackfin.h> 21 21 #include <asm/atomic.h> 22 22 #include <asm/cacheflush.h> 23 - 24 - /* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */ 25 - #define WDOG_EXPIRED 0x8000 26 - 27 - /* Masks for WDEV field in WDOG_CTL register */ 28 - #define ICTL_RESET 0x0 29 - #define ICTL_NMI 0x2 30 - #define ICTL_GPI 0x4 31 - #define ICTL_NONE 0x6 32 - #define ICTL_MASK 0x6 33 - 34 - /* Masks for WDEN field in WDOG_CTL register */ 35 - #define WDEN_MASK 0x0FF0 36 - #define WDEN_ENABLE 0x0000 37 - #define WDEN_DISABLE 0x0AD0 23 + #include <asm/bfin_watchdog.h> 38 24 39 25 #define DRV_NAME "nmi-wdt" 40 26