diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 11:05:25 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 11:06:47 +0100 |
| commit | afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch) | |
| tree | 6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/reset.c | |
| parent | [ARM] 5185/1: Fix spi num_chipselect for lubbock (diff) | |
| parent | [ARM] sa1100_wdt: use reset_status to remember watchdog reset status (diff) | |
| download | linux-dev-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.tar.xz linux-dev-afd2fc02ab7bae6062671c5ca80dd34c34a63fb7.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Conflicts:
arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa2xx.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/reset.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/tosa.c
drivers/watchdog/sa1100_wdt.c
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
| -rw-r--r-- | arch/arm/mach-pxa/reset.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index fabead71d681..9996c612c3d6 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c @@ -11,7 +11,10 @@ #include <asm/proc-fns.h> #include <mach/pxa-regs.h> -#include <mach/pxa2xx-regs.h> +#include <mach/reset.h> + +unsigned int reset_status; +EXPORT_SYMBOL(reset_status); static void do_hw_reset(void); @@ -77,8 +80,7 @@ static void do_hw_reset(void) void arch_reset(char mode) { - if (cpu_is_pxa2xx()) - RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; + clear_reset_status(RESET_STATUS_ALL); switch (mode) { case 's': |