Commit a1c1cee9 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 764cbcc2
...@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void) ...@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void)
iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc)); 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; extern struct sys_timer pnx4008_timer;
MACHINE_START(PNX4008, "Philips PNX4008") MACHINE_START(PNX4008, "Philips PNX4008")
...@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008") ...@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008")
.init_irq = pnx4008_init_irq, .init_irq = pnx4008_init_irq,
.init_machine = pnx4008_init, .init_machine = pnx4008_init,
.timer = &pnx4008_timer, .timer = &pnx4008_timer,
.restart = pnx4008_restart,
MACHINE_END MACHINE_END
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __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) static void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
...@@ -32,7 +28,6 @@ static void arch_idle(void) ...@@ -32,7 +28,6 @@ static void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
soft_restart(0);
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment