diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 14:13:41 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 16:57:16 +0400 |
| commit | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch) | |
| tree | 32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/ls-chl-setup.c | |
| parent | baa9588344d35d751d6e2b1677ec67e7b32d2878 (diff) | |
| download | linux-764cbcc2e3fa444c205b20b3d7908b06b60716ab.tar.xz | |
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-chl-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/ls-chl-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c index 9503fff404e3..527213169db0 100644 --- a/arch/arm/mach-orion5x/ls-chl-setup.c +++ b/arch/arm/mach-orion5x/ls-chl-setup.c @@ -140,7 +140,7 @@ static struct mv_sata_platform_data lschl_sata_data = { static void lschl_power_off(void) { - arm_machine_restart('h', NULL); + orion5x_restart('h', NULL); } /***************************************************************************** @@ -325,4 +325,5 @@ MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)") .init_irq = orion5x_init_irq, .timer = &orion5x_timer, .fixup = tag_fixup_mem32, + .restart = orion5x_restart, MACHINE_END |