Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-netx/generic.c

+5 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-netx/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-netx/include/mach/system.h

+0 −6
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-netx/nxdb500.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-netx/nxdkn.c

+1 −0
Original line number Diff line number Diff line
@@ -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