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

Commit 9635f9cd authored by Russell King's avatar Russell King
Browse files

ARM: restart: mv78xx0: 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 9854a38e

arch/arm/mach-mv78xx0/buffalo-wxl-setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -151,4 +151,5 @@ MACHINE_START(TERASTATION_WXL, "Buffalo Nas WXL") 
	.init_early	= mv78xx0_init_early,

	.init_early	= mv78xx0_init_early,

	.init_irq	= mv78xx0_init_irq,

	.init_irq	= mv78xx0_init_irq,

	.timer		= &mv78xx0_timer,

	.timer		= &mv78xx0_timer,

	.restart	= mv78xx0_restart,

MACHINE_END
 
MACHINE_END

arch/arm/mach-mv78xx0/common.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -401,3 +401,19 @@ void __init mv78xx0_init(void) 
	feroceon_l2_init(is_l2_writethrough());

	feroceon_l2_init(is_l2_writethrough());

#endif

#endif

}

}



void mv78xx0_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-mv78xx0/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ void mv78xx0_uart1_init(void); 
void mv78xx0_uart2_init(void);

void mv78xx0_uart2_init(void);

void mv78xx0_uart3_init(void);

void mv78xx0_uart3_init(void);

void mv78xx0_i2c_init(void);

void mv78xx0_i2c_init(void);

void mv78xx0_restart(char, const char *);





extern struct sys_timer mv78xx0_timer;

extern struct sys_timer mv78xx0_timer;

arch/arm/mach-mv78xx0/db78x00-bp-setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,4 +99,5 @@ MACHINE_START(DB78X00_BP, "Marvell DB-78x00-BP Development Board") 
	.init_early	= mv78xx0_init_early,

	.init_early	= mv78xx0_init_early,

	.init_irq	= mv78xx0_init_irq,

	.init_irq	= mv78xx0_init_irq,

	.timer		= &mv78xx0_timer,

	.timer		= &mv78xx0_timer,

	.restart	= mv78xx0_restart,

MACHINE_END
 
MACHINE_END

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

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

#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H





#include <mach/bridge-regs.h>



static inline void arch_idle(void)

static inline void arch_idle(void)

{

{

	cpu_do_idle();

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




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

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)

		;

}

}