Commit 6ca6ff97 authored by Russell King's avatar Russell King
Browse files

ARM: restart: dove: use new restart hook 



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

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c6121ddd

arch/arm/mach-dove/cm-a510.c

+1 −0
Original line number Diff line number Diff line
@@ -93,4 +93,5 @@ MACHINE_START(CM_A510, "Compulab CM-A510 Board") 
	.init_early	= dove_init_early,

	.init_irq	= dove_init_irq,

	.timer		= &dove_timer,

	.restart	= dove_restart,

MACHINE_END

arch/arm/mach-dove/common.c

+16 −0
Original line number Diff line number Diff line
@@ -292,3 +292,19 @@ void __init dove_init(void) 
	dove_xor0_init();

	dove_xor1_init();

}



void dove_restart(char mode, const char *cmd)

{

	/*

	 * Enable soft reset to assert RSTOUTn.

	 */

	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);



	/*

	 * Assert soft reset.

	 */

	writel(SOFT_RESET, SYSTEM_SOFT_RESET);



	while (1)

		;

}

arch/arm/mach-dove/common.h

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ void dove_spi1_init(void); 
void dove_i2c_init(void);

void dove_sdio0_init(void);

void dove_sdio1_init(void);

void dove_restart(char, const char *);



#endif

arch/arm/mach-dove/dove-db-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -100,4 +100,5 @@ MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") 
	.init_early	= dove_init_early,

	.init_irq	= dove_init_irq,

	.timer		= &dove_timer,

	.restart	= dove_restart,

MACHINE_END

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

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

#define __ASM_ARCH_SYSTEM_H



#include <mach/bridge-regs.h>



static inline void arch_idle(void)

{

	cpu_do_idle();
@@ -18,18 +16,6 @@ static inline void arch_idle(void) 


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

{

	/*

	 * Enable soft reset to assert RSTOUTn.

	 */

	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);



	/*

	 * Assert soft reset.

	 */

	writel(SOFT_RESET, SYSTEM_SOFT_RESET);



	while (1)

		;

}