diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-07-29 02:26:00 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2008-08-04 21:26:02 -0400 |
commit | 04fef228fb00dd79475a2313f4ba73b4fbfe2faa (patch) | |
tree | fee94286fb6b53562e1f9a3c2d6f7f20f8014346 /arch/arm/mach-pxa/reset.c | |
parent | ab277121426edca2ee0601fc6318c9467350771e (diff) |
[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
Due to the problem of reset status bits being handled by different
registers between pxa2xx and pxa3xx, introduce a global reset_status
variable, initialized by SoC-specific code and later being used by
other drivers.
And also introduce clear_reset_status(), which is used to clear the
corresponding status bits. Pass RESET_STATUS_ALL to clear all bits.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/reset.c')
-rw-r--r-- | arch/arm/mach-pxa/reset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index d610a1244abb..56f60d923a9d 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c | |||
@@ -11,9 +11,11 @@ | |||
11 | #include <asm/proc-fns.h> | 11 | #include <asm/proc-fns.h> |
12 | 12 | ||
13 | #include <asm/arch/pxa-regs.h> | 13 | #include <asm/arch/pxa-regs.h> |
14 | #include <asm/arch/pxa2xx-regs.h> | ||
15 | #include <asm/arch/reset.h> | 14 | #include <asm/arch/reset.h> |
16 | 15 | ||
16 | unsigned int reset_status; | ||
17 | EXPORT_SYMBOL(reset_status); | ||
18 | |||
17 | static void do_hw_reset(void); | 19 | static void do_hw_reset(void); |
18 | 20 | ||
19 | static int reset_gpio = -1; | 21 | static int reset_gpio = -1; |
@@ -78,8 +80,7 @@ static void do_hw_reset(void) | |||
78 | 80 | ||
79 | void arch_reset(char mode) | 81 | void arch_reset(char mode) |
80 | { | 82 | { |
81 | if (cpu_is_pxa2xx()) | 83 | clear_reset_status(RESET_STATUS_ALL); |
82 | RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR; | ||
83 | 84 | ||
84 | switch (mode) { | 85 | switch (mode) { |
85 | case 's': | 86 | case 's': |