From cd3d4be695cceb03b178ab94c5d61bad49a394b7 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 11 Nov 2011 15:12:17 +0000
Subject: [PATCH] --- yaml --- r: 279971 b: refs/heads/master c:
 8fb06b124288bf11d9fc2406864ef419c0ebce85 h: refs/heads/master i:   279969:
 e0fe51f8e82b2701e6b724b1b2eaa7c3cc815f26   279967:
 4935e7aae1cc9cb7e3d32e15c6c49509ef7ba111 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/arm/mach-netx/generic.c             | 5 +++++
 trunk/arch/arm/mach-netx/generic.h             | 1 +
 trunk/arch/arm/mach-netx/include/mach/system.h | 6 ------
 trunk/arch/arm/mach-netx/nxdb500.c             | 1 +
 trunk/arch/arm/mach-netx/nxdkn.c               | 1 +
 trunk/arch/arm/mach-netx/nxeb500hmi.c          | 1 +
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2018e0e96acb..81348814fc9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f91c5a46cf8f083e9316ce238d1aadb629f41dc
+refs/heads/master: 8fb06b124288bf11d9fc2406864ef419c0ebce85
diff --git a/trunk/arch/arm/mach-netx/generic.c b/trunk/arch/arm/mach-netx/generic.c
index 00023b5cf12b..59e67979f197 100644
--- a/trunk/arch/arm/mach-netx/generic.c
+++ b/trunk/arch/arm/mach-netx/generic.c
@@ -187,3 +187,8 @@ static int __init netx_init(void)
 
 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);
+}
diff --git a/trunk/arch/arm/mach-netx/generic.h b/trunk/arch/arm/mach-netx/generic.h
index ede2d35341c3..9b915119b8d6 100644
--- a/trunk/arch/arm/mach-netx/generic.h
+++ b/trunk/arch/arm/mach-netx/generic.h
@@ -19,6 +19,7 @@
 
 extern void __init netx_map_io(void);
 extern void __init netx_init_irq(void);
+extern void netx_restart(char, const char *);
 
 struct sys_timer;
 extern struct sys_timer netx_timer;
diff --git a/trunk/arch/arm/mach-netx/include/mach/system.h b/trunk/arch/arm/mach-netx/include/mach/system.h
index dc7b4bc003c5..83ae2b13a954 100644
--- a/trunk/arch/arm/mach-netx/include/mach/system.h
+++ b/trunk/arch/arm/mach-netx/include/mach/system.h
@@ -19,10 +19,6 @@
 #ifndef __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)
 {
 	cpu_do_idle();
@@ -30,8 +26,6 @@ static inline void arch_idle(void)
 
 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
diff --git a/trunk/arch/arm/mach-netx/nxdb500.c b/trunk/arch/arm/mach-netx/nxdb500.c
index 90903dd44cbc..5384b5a78f68 100644
--- a/trunk/arch/arm/mach-netx/nxdb500.c
+++ b/trunk/arch/arm/mach-netx/nxdb500.c
@@ -205,4 +205,5 @@ MACHINE_START(NXDB500, "Hilscher nxdb500")
 	.init_irq	= netx_init_irq,
 	.timer		= &netx_timer,
 	.init_machine	= nxdb500_init,
+	.restart	= netx_restart,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-netx/nxdkn.c b/trunk/arch/arm/mach-netx/nxdkn.c
index c63384aba500..2df3783ef459 100644
--- a/trunk/arch/arm/mach-netx/nxdkn.c
+++ b/trunk/arch/arm/mach-netx/nxdkn.c
@@ -98,4 +98,5 @@ MACHINE_START(NXDKN, "Hilscher nxdkn")
 	.init_irq	= netx_init_irq,
 	.timer		= &netx_timer,
 	.init_machine	= nxdkn_init,
+	.restart	= netx_restart,
 MACHINE_END
diff --git a/trunk/arch/arm/mach-netx/nxeb500hmi.c b/trunk/arch/arm/mach-netx/nxeb500hmi.c
index 8f548ec83ad2..26255b2ce473 100644
--- a/trunk/arch/arm/mach-netx/nxeb500hmi.c
+++ b/trunk/arch/arm/mach-netx/nxeb500hmi.c
@@ -182,4 +182,5 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")
 	.init_irq	= netx_init_irq,
 	.timer		= &netx_timer,
 	.init_machine	= nxeb500hmi_init,
+	.restart	= netx_restart,
 MACHINE_END