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

Commit 6338b66f authored by Russell King's avatar Russell King
Browse files

ARM: restart: integrator: use new restart hook 



Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 00e9967e

arch/arm/mach-integrator/common.h

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

void integrator_reserve(void);

void integrator_restart(char, const char *);

arch/arm/mach-integrator/core.c

+8 −0
Original line number Diff line number Diff line
@@ -238,3 +238,11 @@ void __init integrator_reserve(void) 
{

	memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET);

}



/*

 * To reset, we hit the on-board reset register in the system FPGA

 */

void integrator_restart(char mode, const char *cmd)

{

	cm_control(CM_CTRL_RESET, CM_CTRL_RESET);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



#include <mach/cm.h>



static inline void arch_idle(void)

{

	/*
@@ -34,11 +32,6 @@ static inline void arch_idle(void) 


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

{

	/*

	 * To reset, we hit the on-board reset register

	 * in the system FPGA

	 */

	cm_control(CM_CTRL_RESET, CM_CTRL_RESET);

}



#endif

arch/arm/mach-integrator/integrator_ap.c

+1 −0
Original line number Diff line number Diff line
@@ -472,4 +472,5 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator") 
	.init_irq	= ap_init_irq,

	.timer		= &ap_timer,

	.init_machine	= ap_init,

	.restart	= integrator_restart,

MACHINE_END

arch/arm/mach-integrator/integrator_cp.c

+1 −0
Original line number Diff line number Diff line
@@ -499,4 +499,5 @@ MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") 
	.init_irq	= intcp_init_irq,

	.timer		= &cp_timer,

	.init_machine	= intcp_init,

	.restart	= integrator_restart,

MACHINE_END