diff options
| author | wdenk <wdenk> | 2003-09-14 19:08:39 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-09-14 19:08:39 +0000 |
| commit | 35656de72996bb737d60ae0813f0b8dd4ad366c6 (patch) | |
| tree | 302181223450b0dd525f27165454ed7e899894e8 /cpu/mpc824x | |
| parent | 200f8c7a4c450f3374c87b5f3a2d29d35c895758 (diff) | |
| download | blackbird-obmc-uboot-35656de72996bb737d60ae0813f0b8dd4ad366c6.tar.gz blackbird-obmc-uboot-35656de72996bb737d60ae0813f0b8dd4ad366c6.zip | |
* Patch by Gleb Natapov, 14 Sep 2003:
enable watchdog support for all MPC824x boards that have a watchdog
* On MPC5200, restrict FEC to a maximum of 10 Mbps to work around the
"Non-octet Aligned Frame" errors we see at 100 Mbps
* Patch by Sharad Gupta, 14 Sep 2003:
fix SPR numbers for upper BAT register ([ID]BAT[4-7][UL])
Diffstat (limited to 'cpu/mpc824x')
| -rw-r--r-- | cpu/mpc824x/interrupts.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpu/mpc824x/interrupts.c b/cpu/mpc824x/interrupts.c index 753575f868..825857b054 100644 --- a/cpu/mpc824x/interrupts.c +++ b/cpu/mpc824x/interrupts.c @@ -27,6 +27,7 @@ #include <asm/processor.h> #include <asm/pci_io.h> #include <commproc.h> +#include <watchdog.h> #include "drivers/epic.h" /****************************************************************************/ @@ -149,15 +150,9 @@ void timer_interrupt (struct pt_regs *regs) timestamp++; -#if defined(CONFIG_WATCHDOG) +#if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG) if ((timestamp % (CFG_HZ / 2)) == 0) { -#if defined(CONFIG_OXC) - { - extern void oxc_wdt_reset (void); - - oxc_wdt_reset (); - } -#endif + WATCHDOG_RESET (); } #endif /* CONFIG_WATCHDOG */ #if defined(CONFIG_SHOW_ACTIVITY) && defined(CONFIG_OXC) |
