diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 17:19:32 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2013-07-11 22:17:56 +0200 |
| commit | fa142ff5b3f67fab01f3d02a501b041b4266afdd (patch) | |
| tree | 349eefb8a6b56714b8ff898c8d179980736d96d9 /arch/arm/mach-orion5x/include | |
| parent | 938d0a840d0f97b627111fd038a735f3924fd987 (diff) | |
| download | linux-fa142ff5b3f67fab01f3d02a501b041b4266afdd.tar.gz linux-fa142ff5b3f67fab01f3d02a501b041b4266afdd.tar.bz2 linux-fa142ff5b3f67fab01f3d02a501b041b4266afdd.zip | |
Watchdog: allow orion_wdt to be built for Dove
The watchdog infrastructure in Dove is no different from that in
Orion5x or Kirkwood, so let's enable it for Dove. The only things
missing are a few register settings in Dove's bridge-regs.h.
Rather than duplicating the same register bit masks for the RSTOUTn_MASK
and BRIDGE_CAUSE registers, move the definitions into the watchdog
driver itself.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'arch/arm/mach-orion5x/include')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/bridge-regs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/bridge-regs.h b/arch/arm/mach-orion5x/include/mach/bridge-regs.h index 461fd69a10ae..f727d03f1688 100644 --- a/arch/arm/mach-orion5x/include/mach/bridge-regs.h +++ b/arch/arm/mach-orion5x/include/mach/bridge-regs.h @@ -18,7 +18,6 @@ #define CPU_CTRL (ORION5X_BRIDGE_VIRT_BASE + 0x104) #define RSTOUTn_MASK (ORION5X_BRIDGE_VIRT_BASE + 0x108) -#define WDT_RESET_OUT_EN 0x0002 #define CPU_SOFT_RESET (ORION5X_BRIDGE_VIRT_BASE + 0x10c) @@ -26,8 +25,6 @@ #define POWER_MNG_CTRL_REG (ORION5X_BRIDGE_VIRT_BASE + 0x11C) -#define WDT_INT_REQ 0x0008 - #define BRIDGE_INT_TIMER1_CLR (~0x0004) #define MAIN_IRQ_CAUSE (ORION5X_BRIDGE_VIRT_BASE + 0x200) |