Commit 35b47a40 authored by Russell King's avatar Russell King
Browse files

ARM: restart: nomadik: use new restart hook 



Hook the Nomadik NHK platform restart code into the new restart hook.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8fb06b12

arch/arm/mach-nomadik/board-nhk8815.c

+1 −0
Original line number Diff line number Diff line
@@ -284,4 +284,5 @@ MACHINE_START(NOMADIK, "NHK8815") 
	.init_irq	= cpu8815_init_irq,

	.timer		= &nomadik_timer,

	.init_machine	= nhk8815_platform_init,

	.restart	= cpu8815_restart,

MACHINE_END

arch/arm/mach-nomadik/cpu-8815.c

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/device.h>

#include <linux/amba/bus.h>

#include <linux/platform_device.h>

#include <linux/io.h>



#include <plat/gpio-nomadik.h>

#include <mach/hardware.h>
@@ -165,3 +166,13 @@ void __init cpu8815_init_irq(void) 
#endif

	 return;

}



void cpu8815_restart(char mode, const char *cmd)

{

	void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);



	/* FIXME: use egpio when implemented */



	/* Write anything to Reset status register */

	writel(1, src_rstsr);

}

arch/arm/mach-nomadik/cpu-8815.h

+1 −0
Original line number Diff line number Diff line 
extern void cpu8815_map_io(void);

extern void cpu8815_platform_init(void);

extern void cpu8815_init_irq(void);

extern void cpu8815_restart(char, const char *);

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

+0 −9
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



#include <linux/io.h>

#include <mach/hardware.h>



static inline void arch_idle(void)

{

	/*
@@ -34,12 +31,6 @@ static inline void arch_idle(void) 


static inline void arch_reset(char mode, const char *cmd)

{

	void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);



	/* FIXME: use egpio when implemented */



	/* Write anything to Reset status register */

	writel(1, src_rstsr);

}



#endif