git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-at91rm9200
/
system.h
diff --git
a/include/asm-arm/arch-at91rm9200/system.h
b/include/asm-arm/arch-at91rm9200/system.h
index
29c4265
..
9c67130
100644
(file)
--- a/
include/asm-arm/arch-at91rm9200/system.h
+++ b/
include/asm-arm/arch-at91rm9200/system.h
@@
-21,7
+21,9
@@
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
+#include <asm/arch/at91_st.h>
+#include <asm/arch/at91_dbgu.h>
static inline void arch_idle(void)
{
static inline void arch_idle(void)
{
@@
-39,13
+41,13
@@
static inline void arch_idle(void)
cpu_do_idle();
}
cpu_do_idle();
}
+void (*at91_arch_reset)(void);
+
static inline void arch_reset(char mode)
{
static inline void arch_reset(char mode)
{
- /*
- * Perform a hardware reset with the use of the Watchdog timer.
- */
- at91_sys_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1);
- at91_sys_write(AT91_ST_CR, AT91_ST_WDRST);
+ /* call the CPU-specific reset function */
+ if (at91_arch_reset)
+ (at91_arch_reset)();
}
#endif
}
#endif