diff options
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
-rw-r--r-- | arch/arm/mach-pxa/reset.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 9d39dea57ce2..9996c612c3d6 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c | |||
@@ -10,8 +10,11 @@ | |||
10 | #include <asm/io.h> | 10 | #include <asm/io.h> |
11 | #include <asm/proc-fns.h> | 11 | #include <asm/proc-fns.h> |
12 | 12 | ||
13 | #include <asm/arch/pxa-regs.h> | 13 | #include <mach/pxa-regs.h> |
14 | #include <asm/arch/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': |