diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-11 15:12:17 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:16 +0000 |
| commit | 8fb06b124288bf11d9fc2406864ef419c0ebce85 (patch) | |
| tree | 9dc079761e5333f0ab133dc920a3a26df3340288 /arch/arm/mach-netx | |
| parent | 6f91c5a46cf8f083e9316ce238d1aadb629f41dc (diff) | |
| download | linux-3.10-8fb06b124288bf11d9fc2406864ef419c0ebce85.tar.gz linux-3.10-8fb06b124288bf11d9fc2406864ef419c0ebce85.tar.bz2 linux-3.10-8fb06b124288bf11d9fc2406864ef419c0ebce85.zip | |
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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-netx')
| -rw-r--r-- | arch/arm/mach-netx/generic.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-netx/generic.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-netx/include/mach/system.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-netx/nxeb500hmi.c | 1 |
6 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 00023b5cf12..59e67979f19 100644 --- a/arch/arm/mach-netx/generic.c +++ b/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/arch/arm/mach-netx/generic.h b/arch/arm/mach-netx/generic.h index ede2d35341c..9b915119b8d 100644 --- a/arch/arm/mach-netx/generic.h +++ b/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/arch/arm/mach-netx/include/mach/system.h b/arch/arm/mach-netx/include/mach/system.h index dc7b4bc003c..83ae2b13a95 100644 --- a/arch/arm/mach-netx/include/mach/system.h +++ b/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/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 90903dd44cb..5384b5a78f6 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/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/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index c63384aba50..2df3783ef45 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/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/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index 8f548ec83ad..26255b2ce47 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/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 |