diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/asm-arm/arch-sa1100/system.h | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'include/asm-arm/arch-sa1100/system.h')
| -rw-r--r-- | include/asm-arm/arch-sa1100/system.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-arm/arch-sa1100/system.h b/include/asm-arm/arch-sa1100/system.h index ca8e6330a..984a5dc0f 100644 --- a/include/asm-arm/arch-sa1100/system.h +++ b/include/asm-arm/arch-sa1100/system.h @@ -24,13 +24,9 @@ extern inline void arch_reset(char mode) /* Jump into ROM at address 0 */ cpu_reset(0); } else { - /* Activate SA1100 watchdog and wait for the trigger... */ - OSMR3 = OSCR + 3686400/2; /* in 1/2 sec */ - OWER |= OWER_WME; - OIER |= OIER_E3; + /* Use on-chip reset capability */ + RSRR = RSRR_SWR; } } -#define arch_power_off() do { } while (0) - #endif |