aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 06:28:50 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:19 -0500
commitd9ca5839fd4b0c820c19401b72962a1d099cb99e (patch)
treeffd831fe686668036a730c59b567301c7a51c898 /arch/arm/mach-sa1100/include
parent1f34f0e2fb862b0399b4221a2be8589a4bfb194b (diff)
ARM: restart: sa1100: use new restart hook
Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/include')
-rw-r--r--arch/arm/mach-sa1100/include/mach/system.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/system.h b/arch/arm/mach-sa1100/include/mach/system.h
index 345d35b7450c..3c3e8426b405 100644
--- a/arch/arm/mach-sa1100/include/mach/system.h
+++ b/arch/arm/mach-sa1100/include/mach/system.h
@@ -3,8 +3,6 @@
3 * 3 *
4 * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net> 4 * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
5 */ 5 */
6#include <mach/hardware.h>
7
8static inline void arch_idle(void) 6static inline void arch_idle(void)
9{ 7{
10 cpu_do_idle(); 8 cpu_do_idle();
@@ -12,11 +10,4 @@ static inline void arch_idle(void)
12 10
13static inline void arch_reset(char mode, const char *cmd) 11static inline void arch_reset(char mode, const char *cmd)
14{ 12{
15 if (mode == 's') {
16 /* Jump into ROM at address 0 */
17 soft_restart(0);
18 } else {
19 /* Use on-chip reset capability */
20 RSRR = RSRR_SWR;
21 }
22} 13}