---

yaml --- r: 178801 b: refs/heads/master c: 58b2e0a h: refs/heads/master i: 178799: f9eaa1b v: v3
git-mirror · Jan 5, 2010 · a8305f0 · a8305f0
1 parent 1fea3cf
commit a8305f0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1368c51c501978e5c4148322b7c77d4f49549557
+refs/heads/master: 58b2e0a2dd8e460d3b7d7f8ec5d3042253b9e08a
diff --git a/trunk/arch/arm/mach-w90x900/include/mach/system.h b/trunk/arch/arm/mach-w90x900/include/mach/system.h
@@ -15,14 +15,27 @@
  *
  */
 
+#include <linux/io.h>
 #include <asm/proc-fns.h>
+#include <mach/map.h>
+#include <mach/regs-timer.h>
+
+#define	WTCR	(TMR_BA + 0x1C)
+#define	WTCLK	(1 << 10)
+#define	WTE	(1 << 7)
+#define	WTRE	(1 << 1)
 
 static void arch_idle(void)
 {
 }
 
 static void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	if (mode == 's') {
+		/* Jump into ROM at address 0 */
+		cpu_reset(0);
+	} else {
+		__raw_writel(WTE | WTRE | WTCLK, WTCR);
+	}
 }