diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 06:13:41 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:16 -0500 |
commit | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch) | |
tree | 32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/ls_hgl-setup.c | |
parent | baa9588344d35d751d6e2b1677ec67e7b32d2878 (diff) |
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/ls_hgl-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/ls_hgl-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c index ed6d772f4a24..9a8697b97dd7 100644 --- a/arch/arm/mach-orion5x/ls_hgl-setup.c +++ b/arch/arm/mach-orion5x/ls_hgl-setup.c | |||
@@ -186,7 +186,7 @@ static struct mv_sata_platform_data ls_hgl_sata_data = { | |||
186 | 186 | ||
187 | static void ls_hgl_power_off(void) | 187 | static void ls_hgl_power_off(void) |
188 | { | 188 | { |
189 | arm_machine_restart('h', NULL); | 189 | orion5x_restart('h', NULL); |
190 | } | 190 | } |
191 | 191 | ||
192 | 192 | ||
@@ -272,4 +272,5 @@ MACHINE_START(LINKSTATION_LS_HGL, "Buffalo Linkstation LS-HGL") | |||
272 | .init_irq = orion5x_init_irq, | 272 | .init_irq = orion5x_init_irq, |
273 | .timer = &orion5x_timer, | 273 | .timer = &orion5x_timer, |
274 | .fixup = tag_fixup_mem32, | 274 | .fixup = tag_fixup_mem32, |
275 | .restart = orion5x_restart, | ||
275 | MACHINE_END | 276 | MACHINE_END |