diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 06:05:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 06:06:47 -0400 |
| commit | afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch) | |
| tree | 6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/reset.c | |
| parent | 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 (diff) | |
| parent | 214c6a7ed13e01cab2addeef56124067e4d20147 (diff) | |
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 @@ | |||
| 11 | #include <asm/proc-fns.h> | 11 | #include <asm/proc-fns.h> |
| 12 | 12 | ||
| 13 | #include <mach/pxa-regs.h> | 13 | #include <mach/pxa-regs.h> |
| 14 | #include <mach/pxa2xx-regs.h> | 14 | #include <mach/reset.h> |
| 15 | |||
| 16 | unsigned int reset_status; | ||
| 17 | EXPORT_SYMBOL(reset_status); | ||
| 15 | 18 | ||
| 16 | static void do_hw_reset(void); | 19 | static void do_hw_reset(void); |
| 17 | 20 | ||
| @@ -77,8 +80,7 @@ static void do_hw_reset(void) | |||
| 77 | 80 | ||
| 78 | void arch_reset(char mode) | 81 | void arch_reset(char mode) |
| 79 | { | 82 | { |
| 80 | if (cpu_is_pxa2xx()) | 83 | clear_reset_status(RESET_STATUS_ALL); |
| 81 | RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; | ||
| 82 | 84 | ||
| 83 | switch (mode) { | 85 | switch (mode) { |
| 84 | case 's': | 86 | case 's': |