dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Russell King 2011-11-11 15:12:17 +00:00
parent 6f91c5a46c
commit 8fb06b1242
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-netx/generic.c
View File

@ -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);
}

1
arch/arm/mach-netx/generic.h
View File

@ -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;

6
arch/arm/mach-netx/include/mach/system.h
View File

@ -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

1
arch/arm/mach-netx/nxdb500.c
View File

@ -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

1
arch/arm/mach-netx/nxdkn.c
View File

@ -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

1
arch/arm/mach-netx/nxeb500hmi.c
View File

@ -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