diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 15:45:57 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:17 +0000 |
| commit | a1c1cee9adac4d2ab2d989cf83ada063cbd426d0 (patch) | |
| tree | 61aa2e644ff332edf6ba3bd62962958a0835dbcc | |
| parent | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (diff) | |
| download | blackbird-op-linux-a1c1cee9adac4d2ab2d989cf83ada063cbd426d0.tar.gz blackbird-op-linux-a1c1cee9adac4d2ab2d989cf83ada063cbd426d0.zip | |
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>
| -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) iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc)); } +static void pnx4008_restart(char mode, const char *cmd) +{ + soft_restart(0); +} + extern struct sys_timer pnx4008_timer; MACHINE_START(PNX4008, "Philips PNX4008") @@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008") .init_irq = pnx4008_init_irq, .init_machine = pnx4008_init, .timer = &pnx4008_timer, + .restart = pnx4008_restart, 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 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <linux/io.h> -#include <mach/hardware.h> -#include <mach/platform.h> - static void arch_idle(void) { cpu_do_idle(); @@ -32,7 +28,6 @@ static void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - soft_restart(0); } #endif |
