diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 05:54:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:10 -0500 |
commit | 3275166e0355131aa2349bf614a32591cfe1e118 (patch) | |
tree | 0d33648897ce20c0f0a73317ea94e8f86d00091f /arch/arm/mach-ep93xx/include/mach | |
parent | da908260f21225d6f19ab29cfa401e550000eeae (diff) |
ARM: restart: ep93xx: use new restart hook
Hook these platforms restart code into the new restart hook rather than
using arch_reset().
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/platform.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/system.h | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 50660455b1d8..d4c934931f9d 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h | |||
@@ -66,4 +66,6 @@ void ep93xx_register_ac97(void); | |||
66 | void ep93xx_init_devices(void); | 66 | void ep93xx_init_devices(void); |
67 | extern struct sys_timer ep93xx_timer; | 67 | extern struct sys_timer ep93xx_timer; |
68 | 68 | ||
69 | void ep93xx_restart(char, const char *); | ||
70 | |||
69 | #endif | 71 | #endif |
diff --git a/arch/arm/mach-ep93xx/include/mach/system.h b/arch/arm/mach-ep93xx/include/mach/system.h index bdf6c4f1feef..b27a6546eb41 100644 --- a/arch/arm/mach-ep93xx/include/mach/system.h +++ b/arch/arm/mach-ep93xx/include/mach/system.h | |||
@@ -1,9 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-ep93xx/include/mach/system.h | 2 | * arch/arm/mach-ep93xx/include/mach/system.h |
3 | */ | 3 | */ |
4 | |||
5 | #include <mach/hardware.h> | ||
6 | |||
7 | static inline void arch_idle(void) | 4 | static inline void arch_idle(void) |
8 | { | 5 | { |
9 | cpu_do_idle(); | 6 | cpu_do_idle(); |
@@ -11,12 +8,4 @@ static inline void arch_idle(void) | |||
11 | 8 | ||
12 | static inline void arch_reset(char mode, const char *cmd) | 9 | static inline void arch_reset(char mode, const char *cmd) |
13 | { | 10 | { |
14 | /* | ||
15 | * Set then clear the SWRST bit to initiate a software reset | ||
16 | */ | ||
17 | ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_SWRST); | ||
18 | ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_SWRST); | ||
19 | |||
20 | while (1) | ||
21 | ; | ||
22 | } | 11 | } |