diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 10:15:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:17 -0500 |
commit | 271a74fc875210d3dfcc03d557fb5d86d3990a0f (patch) | |
tree | f428c434f573180885c4c2404b706f4bf4c550bb /arch/arm/mach-pxa/mioa701.c | |
parent | 125c4033f0187d7264f08d7cf1474252df4f4c17 (diff) |
ARM: restart: pxa: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/mioa701.c')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 4f47a760398f..924a3b5f8da6 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -696,13 +696,13 @@ static void mioa701_machine_exit(void); | |||
696 | static void mioa701_poweroff(void) | 696 | static void mioa701_poweroff(void) |
697 | { | 697 | { |
698 | mioa701_machine_exit(); | 698 | mioa701_machine_exit(); |
699 | arm_machine_restart('s', NULL); | 699 | pxa_restart('s', NULL); |
700 | } | 700 | } |
701 | 701 | ||
702 | static void mioa701_restart(char c, const char *cmd) | 702 | static void mioa701_restart(char c, const char *cmd) |
703 | { | 703 | { |
704 | mioa701_machine_exit(); | 704 | mioa701_machine_exit(); |
705 | arm_machine_restart('s', cmd); | 705 | pxa_restart('s', cmd); |
706 | } | 706 | } |
707 | 707 | ||
708 | static struct gpio global_gpios[] = { | 708 | static struct gpio global_gpios[] = { |
@@ -734,7 +734,6 @@ static void __init mioa701_machine_init(void) | |||
734 | pxa_set_udc_info(&mioa701_udc_info); | 734 | pxa_set_udc_info(&mioa701_udc_info); |
735 | pxa_set_ac97_info(&mioa701_ac97_info); | 735 | pxa_set_ac97_info(&mioa701_ac97_info); |
736 | pm_power_off = mioa701_poweroff; | 736 | pm_power_off = mioa701_poweroff; |
737 | arm_pm_restart = mioa701_restart; | ||
738 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 737 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
739 | gsm_init(); | 738 | gsm_init(); |
740 | 739 | ||
@@ -758,4 +757,5 @@ MACHINE_START(MIOA701, "MIO A701") | |||
758 | .handle_irq = &pxa27x_handle_irq, | 757 | .handle_irq = &pxa27x_handle_irq, |
759 | .init_machine = mioa701_machine_init, | 758 | .init_machine = mioa701_machine_init, |
760 | .timer = &pxa_timer, | 759 | .timer = &pxa_timer, |
760 | .restart = mioa701_restart, | ||
761 | MACHINE_END | 761 | MACHINE_END |