summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/lsmini-setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 11:13:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 13:57:16 +0100
commit764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch)
tree32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/lsmini-setup.c
parentARM: restart: omap: use new restart hook (diff)
downloadlinux-764cbcc2e3fa444c205b20b3d7908b06b60716ab.tar.xz
linux-764cbcc2e3fa444c205b20b3d7908b06b60716ab.zip
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: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-orion5x/lsmini-setup.c')
-rw-r--r--arch/arm/mach-orion5x/lsmini-setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index 743f7f1db181..09c73659f467 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data lsmini_sata_data = {
static void lsmini_power_off(void)
{
- arm_machine_restart('h', NULL);
+ orion5x_restart('h', NULL);
}
@@ -274,5 +274,6 @@ MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")
.init_irq = orion5x_init_irq,
.timer = &orion5x_timer,
.fixup = tag_fixup_mem32,
+ .restart = orion5x_restart,
MACHINE_END
#endif