git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-w90x900
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-w90x900/include/mach/system.h
b/arch/arm/mach-w90x900/include/mach/system.h
index 940640066857c9d9c5244aced58c830fa5616edd..ce228bdc66dd64ca3cf10d410138d68c6b25edc5 100644
(file)
--- a/
arch/arm/mach-w90x900/include/mach/system.h
+++ b/
arch/arm/mach-w90x900/include/mach/system.h
@@
-15,7
+15,15
@@
*
*/
*
*/
+#include <linux/io.h>
#include <asm/proc-fns.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_idle(void)
{
@@
-23,6
+31,11
@@
static void arch_idle(void)
static void arch_reset(char mode, const char *cmd)
{
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);
+ }
}
}