Skip to content

Commit

Permalink
Blackfin: split watchdog definitions into a dedicated header file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Graf Yang authored and Mike Frysinger committed Mar 9, 2010
1 parent 4ab069e commit 64b33a0
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 15 deletions.
30 changes: 30 additions & 0 deletions arch/blackfin/include/asm/bfin_watchdog.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* bfin_watchdog.h - Blackfin watchdog definitions
*
* Copyright 2006-2010 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/

#ifndef _BFIN_WATCHDOG_H
#define _BFIN_WATCHDOG_H

/* 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

#endif
16 changes: 1 addition & 15 deletions arch/blackfin/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,7 @@
#include <asm/blackfin.h>
#include <asm/atomic.h>
#include <asm/cacheflush.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
#include <asm/bfin_watchdog.h>

#define DRV_NAME "nmi-wdt"

Expand Down

0 comments on commit 64b33a0

Please sign in to comment.