Commit 8fb06b12 authored by Russell King's avatar Russell King

ARM: restart: netx: 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 6f91c5a4
...@@ -187,3 +187,8 @@ static int __init netx_init(void) ...@@ -187,3 +187,8 @@ static int __init netx_init(void)
subsys_initcall(netx_init); subsys_initcall(netx_init);
void netx_restart(char mode, const char *cmd)
{
writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES,
NETX_SYSTEM_RES_CR);
}
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
extern void __init netx_map_io(void); extern void __init netx_map_io(void);
extern void __init netx_init_irq(void); extern void __init netx_init_irq(void);
extern void netx_restart(char, const char *);
struct sys_timer; struct sys_timer;
extern struct sys_timer netx_timer; extern struct sys_timer netx_timer;
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,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 "netx-regs.h"
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
cpu_do_idle(); cpu_do_idle();
...@@ -30,8 +26,6 @@ static inline void arch_idle(void) ...@@ -30,8 +26,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES,
NETX_SYSTEM_RES_CR);
} }
#endif #endif
......
...@@ -205,4 +205,5 @@ MACHINE_START(NXDB500, "Hilscher nxdb500") ...@@ -205,4 +205,5 @@ MACHINE_START(NXDB500, "Hilscher nxdb500")
.init_irq = netx_init_irq, .init_irq = netx_init_irq,
.timer = &netx_timer, .timer = &netx_timer,
.init_machine = nxdb500_init, .init_machine = nxdb500_init,
.restart = netx_restart,
MACHINE_END MACHINE_END
...@@ -98,4 +98,5 @@ MACHINE_START(NXDKN, "Hilscher nxdkn") ...@@ -98,4 +98,5 @@ MACHINE_START(NXDKN, "Hilscher nxdkn")
.init_irq = netx_init_irq, .init_irq = netx_init_irq,
.timer = &netx_timer, .timer = &netx_timer,
.init_machine = nxdkn_init, .init_machine = nxdkn_init,
.restart = netx_restart,
MACHINE_END MACHINE_END
...@@ -182,4 +182,5 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi") ...@@ -182,4 +182,5 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")
.init_irq = netx_init_irq, .init_irq = netx_init_irq,
.timer = &netx_timer, .timer = &netx_timer,
.init_machine = nxeb500hmi_init, .init_machine = nxeb500hmi_init,
.restart = netx_restart,
MACHINE_END MACHINE_END
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