From 9300ab4a9a991d4f36141507d2641946b456dd53 Mon Sep 17 00:00:00 2001
From: "Mark F. Brown" <mark.brown314@gmail.com>
Date: Thu, 26 Aug 2010 05:07:29 -0400
Subject: [PATCH] --- yaml --- r: 211065 b: refs/heads/master c:
 32c4dad8f872fadb0ae3caa15d26e73934982217 h: refs/heads/master i:   211063:
 55cf950cbf87137a246f54c087383e6fcc191a68 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-mmp/include/mach/system.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f8b07b3a67c..b57168abf002 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf625368d3ad664c7c9ae89974599bbfe9947511
+refs/heads/master: 32c4dad8f872fadb0ae3caa15d26e73934982217
diff --git a/trunk/arch/arm/mach-mmp/include/mach/system.h b/trunk/arch/arm/mach-mmp/include/mach/system.h
index 4f5b0e0ce6cf..1a8a25edb1b4 100644
--- a/trunk/arch/arm/mach-mmp/include/mach/system.h
+++ b/trunk/arch/arm/mach-mmp/include/mach/system.h
@@ -9,6 +9,8 @@
 #ifndef __ASM_MACH_SYSTEM_H
 #define __ASM_MACH_SYSTEM_H
 
+#include <mach/cputype.h>
+
 static inline void arch_idle(void)
 {
 	cpu_do_idle();
@@ -16,6 +18,9 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	if (cpu_is_pxa168())
+		cpu_reset(0xffff0000);
+	else
+		cpu_reset(0);
 }
 #endif /* __ASM_MACH_SYSTEM_H */