diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 11:45:57 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:17 -0500 |
commit | a1c1cee9adac4d2ab2d989cf83ada063cbd426d0 (patch) | |
tree | 61aa2e644ff332edf6ba3bd62962958a0835dbcc /arch/arm/mach-pnx4008 | |
parent | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (diff) |
ARM: restart: pnx4008: 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-pnx4008')
-rw-r--r-- | arch/arm/mach-pnx4008/core.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-pnx4008/include/mach/system.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-pnx4008/core.c b/arch/arm/mach-pnx4008/core.c index cdb95e726f5c..4cfb40b2ec19 100644 --- a/arch/arm/mach-pnx4008/core.c +++ b/arch/arm/mach-pnx4008/core.c | |||
@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void) | |||
260 | iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc)); | 260 | iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc)); |
261 | } | 261 | } |
262 | 262 | ||
263 | static void pnx4008_restart(char mode, const char *cmd) | ||
264 | { | ||
265 | soft_restart(0); | ||
266 | } | ||
267 | |||
263 | extern struct sys_timer pnx4008_timer; | 268 | extern struct sys_timer pnx4008_timer; |
264 | 269 | ||
265 | MACHINE_START(PNX4008, "Philips PNX4008") | 270 | MACHINE_START(PNX4008, "Philips PNX4008") |
@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008") | |||
269 | .init_irq = pnx4008_init_irq, | 274 | .init_irq = pnx4008_init_irq, |
270 | .init_machine = pnx4008_init, | 275 | .init_machine = pnx4008_init, |
271 | .timer = &pnx4008_timer, | 276 | .timer = &pnx4008_timer, |
277 | .restart = pnx4008_restart, | ||
272 | MACHINE_END | 278 | MACHINE_END |
diff --git a/arch/arm/mach-pnx4008/include/mach/system.h b/arch/arm/mach-pnx4008/include/mach/system.h index 5d6384a6128c..6710ed347325 100644 --- a/arch/arm/mach-pnx4008/include/mach/system.h +++ b/arch/arm/mach-pnx4008/include/mach/system.h | |||
@@ -21,10 +21,6 @@ | |||
21 | #ifndef __ASM_ARCH_SYSTEM_H | 21 | #ifndef __ASM_ARCH_SYSTEM_H |
22 | #define __ASM_ARCH_SYSTEM_H | 22 | #define __ASM_ARCH_SYSTEM_H |
23 | 23 | ||
24 | #include <linux/io.h> | ||
25 | #include <mach/hardware.h> | ||
26 | #include <mach/platform.h> | ||
27 | |||
28 | static void arch_idle(void) | 24 | static void arch_idle(void) |
29 | { | 25 | { |
30 | cpu_do_idle(); | 26 | cpu_do_idle(); |
@@ -32,7 +28,6 @@ static void arch_idle(void) | |||
32 | 28 | ||
33 | static inline void arch_reset(char mode, const char *cmd) | 29 | static inline void arch_reset(char mode, const char *cmd) |
34 | { | 30 | { |
35 | soft_restart(0); | ||
36 | } | 31 | } |
37 | 32 | ||
38 | #endif | 33 | #endif |