summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/reset.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-07-29 06:26:00 (GMT)
committerEric Miao <eric.miao@marvell.com>2008-08-05 01:26:02 (GMT)
commit04fef228fb00dd79475a2313f4ba73b4fbfe2faa (patch)
treefee94286fb6b53562e1f9a3c2d6f7f20f8014346 /arch/arm/mach-pxa/reset.c
parentab277121426edca2ee0601fc6318c9467350771e (diff)
downloadlinux-04fef228fb00dd79475a2313f4ba73b4fbfe2faa.tar.xz
[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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c
index d610a12..56f60d9 100644
--- a/arch/arm/mach-pxa/reset.c
+++ b/arch/arm/mach-pxa/reset.c
@@ -11,9 +11,11 @@
#include <asm/proc-fns.h>
#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/reset.h>
+unsigned int reset_status;
+EXPORT_SYMBOL(reset_status);
+
static void do_hw_reset(void);
static int reset_gpio = -1;
@@ -78,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':