diff options
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index e7d0fcd9b43f..d58c3e906a93 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <asm/arch/pxa-regs.h> | 38 | #include <asm/arch/pxa-regs.h> |
39 | #include <asm/arch/pxa2xx-regs.h> | 39 | #include <asm/arch/pxa2xx-regs.h> |
40 | #include <asm/arch/pxa2xx-gpio.h> | 40 | #include <asm/arch/pxa2xx-gpio.h> |
41 | #include <asm/arch/pxa27x-udc.h> | ||
41 | #include <asm/arch/irda.h> | 42 | #include <asm/arch/irda.h> |
42 | #include <asm/arch/mmc.h> | 43 | #include <asm/arch/mmc.h> |
43 | #include <asm/arch/ohci.h> | 44 | #include <asm/arch/ohci.h> |
@@ -529,11 +530,7 @@ static struct platform_device *devices[] __initdata = { | |||
529 | 530 | ||
530 | static void spitz_poweroff(void) | 531 | static void spitz_poweroff(void) |
531 | { | 532 | { |
532 | pxa_gpio_mode(SPITZ_GPIO_ON_RESET | GPIO_OUT); | 533 | arm_machine_restart('g'); |
533 | GPSR(SPITZ_GPIO_ON_RESET) = GPIO_bit(SPITZ_GPIO_ON_RESET); | ||
534 | |||
535 | mdelay(1000); | ||
536 | arm_machine_restart('h'); | ||
537 | } | 534 | } |
538 | 535 | ||
539 | static void spitz_restart(char mode) | 536 | static void spitz_restart(char mode) |
@@ -547,6 +544,7 @@ static void spitz_restart(char mode) | |||
547 | 544 | ||
548 | static void __init common_init(void) | 545 | static void __init common_init(void) |
549 | { | 546 | { |
547 | init_gpio_reset(SPITZ_GPIO_ON_RESET); | ||
550 | pm_power_off = spitz_poweroff; | 548 | pm_power_off = spitz_poweroff; |
551 | arm_pm_restart = spitz_restart; | 549 | arm_pm_restart = spitz_restart; |
552 | 550 | ||