summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-pxa/system.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-05-08 17:50:39 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-05-08 19:04:02 +0200
commitdc38e2ad53ca27968919dea6d7fa60575782d5a6 (patch)
treec7311b540e910ee4e001197ace16470d94e51806 /include/asm-arm/arch-pxa/system.h
parent[ARM] lubbock: fix compilation (diff)
downloadlinux-dc38e2ad53ca27968919dea6d7fa60575782d5a6.tar.xz
linux-dc38e2ad53ca27968919dea6d7fa60575782d5a6.zip
[ARM] pxa: Fix RCSR handling
Related to d3930614e68bdf83a120d904c039a64e9f75dba1. RCSR is only present on PXA2xx CPUs, not on PXA3xx CPUs. Therefore, we should not be unconditionally writing to RCSR from generic code. Since we now clear the RCSR status from the SoC specific PXA PM code and before reset in the arch_reset() function, the duplication in the corgi, poodle, spitz and tosa code can be removed. Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-pxa/system.h')
-rw-r--r--include/asm-arm/arch-pxa/system.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/system.h b/include/asm-arm/arch-pxa/system.h
index a758a719180f..9aa6c2e939e8 100644
--- a/include/asm-arm/arch-pxa/system.h
+++ b/include/asm-arm/arch-pxa/system.h
@@ -22,7 +22,8 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode)
{
- RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
+ if (cpu_is_pxa2xx())
+ RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
if (mode == 's') {
/* Jump into ROM at address 0 */