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

Commit 764cbcc2 authored by Russell King's avatar Russell King
Browse files

ARM: restart: orion5x: use new restart hook 



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

In addition, convert calls to arm_machine_restart() to orion5x_restart()
to ensure that they continue to work as intended.

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

arch/arm/mach-orion5x/common.c

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/mbus.h>

#include <linux/mv643xx_i2c.h>

#include <linux/ata_platform.h>

#include <linux/delay.h>

#include <net/dsa.h>

#include <asm/page.h>

#include <asm/setup.h>
@@ -304,6 +305,17 @@ void __init orion5x_init(void) 
	orion5x_wdt_init();

}



void orion5x_restart(char mode, const char *cmd)

{

	/*

	 * Enable and issue soft reset

	 */

	orion5x_setbits(RSTOUTn_MASK, (1 << 2));

	orion5x_setbits(CPU_SOFT_RESET, 1);

	mdelay(200);

	orion5x_clrbits(CPU_SOFT_RESET, 1);

}



/*

 * Many orion-based systems have buggy bootloader implementations.

 * This is a common fixup for bogus memory tags.

arch/arm/mach-orion5x/common.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void orion5x_spi_init(void); 
void orion5x_uart0_init(void);

void orion5x_uart1_init(void);

void orion5x_xor_init(void);

void orion5x_restart(char, const char *);



/*

 * PCIe/PCI functions.

arch/arm/mach-orion5x/d2net-setup.c

+2 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ MACHINE_START(D2NET, "LaCie d2 Network") 
	.init_irq	= orion5x_init_irq,

	.timer		= &orion5x_timer,

	.fixup		= tag_fixup_mem32,

	.restart	= orion5x_restart,

MACHINE_END

#endif
@@ -355,6 +356,7 @@ MACHINE_START(BIGDISK, "LaCie Big Disk Network") 
	.init_irq	= orion5x_init_irq,

	.timer		= &orion5x_timer,

	.fixup		= tag_fixup_mem32,

	.restart	= orion5x_restart,

MACHINE_END

#endif

arch/arm/mach-orion5x/db88f5281-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -364,4 +364,5 @@ MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") 
	.init_early	= orion5x_init_early,

	.init_irq	= orion5x_init_irq,

	.timer		= &orion5x_timer,

	.restart	= orion5x_restart,

MACHINE_END

arch/arm/mach-orion5x/dns323-setup.c

+1 −0
Original line number Diff line number Diff line
@@ -736,4 +736,5 @@ MACHINE_START(DNS323, "D-Link DNS-323") 
	.init_irq	= orion5x_init_irq,

	.timer		= &orion5x_timer,

	.fixup		= tag_fixup_mem32,

	.restart	= orion5x_restart,

MACHINE_END