diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-05-22 11:21:48 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-07 08:21:54 -0400 |
commit | 86159a98adbb33682a4658c9b1eae95d9c9e25ed (patch) | |
tree | 53b4655ec9187644383b47fce11ce8d4ada602cc /arch/arm/mach-pxa | |
parent | 4d1fe075e5a84aaae00614cb23096336fda6374f (diff) |
[ARM] 5048/2: Clean up tosa and spitz resetting
Use new reset_gpio to reset tosa and spitz PDAs.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index dace3820f1ee..d58c3e906a93 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -530,11 +530,7 @@ static struct platform_device *devices[] __initdata = { | |||
530 | 530 | ||
531 | static void spitz_poweroff(void) | 531 | static void spitz_poweroff(void) |
532 | { | 532 | { |
533 | pxa_gpio_mode(SPITZ_GPIO_ON_RESET | GPIO_OUT); | 533 | arm_machine_restart('g'); |
534 | GPSR(SPITZ_GPIO_ON_RESET) = GPIO_bit(SPITZ_GPIO_ON_RESET); | ||
535 | |||
536 | mdelay(1000); | ||
537 | arm_machine_restart('h'); | ||
538 | } | 534 | } |
539 | 535 | ||
540 | static void spitz_restart(char mode) | 536 | static void spitz_restart(char mode) |
@@ -548,6 +544,7 @@ static void spitz_restart(char mode) | |||
548 | 544 | ||
549 | static void __init common_init(void) | 545 | static void __init common_init(void) |
550 | { | 546 | { |
547 | init_gpio_reset(SPITZ_GPIO_ON_RESET); | ||
551 | pm_power_off = spitz_poweroff; | 548 | pm_power_off = spitz_poweroff; |
552 | arm_pm_restart = spitz_restart; | 549 | arm_pm_restart = spitz_restart; |
553 | 550 | ||
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index c2cbd66db814..9ae2271f93c4 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/gpio_keys.h> | 24 | #include <linux/gpio_keys.h> |
25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
26 | #include <linux/gpio.h> | 26 | #include <linux/gpio.h> |
27 | #include <linux/reboot.h> | ||
27 | 28 | ||
28 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
29 | #include <asm/memory.h> | 30 | #include <asm/memory.h> |
@@ -467,11 +468,7 @@ static struct platform_device *devices[] __initdata = { | |||
467 | 468 | ||
468 | static void tosa_poweroff(void) | 469 | static void tosa_poweroff(void) |
469 | { | 470 | { |
470 | pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT); | 471 | arm_machine_restart('g'); |
471 | GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); | ||
472 | |||
473 | mdelay(1000); | ||
474 | arm_machine_restart('h'); | ||
475 | } | 472 | } |
476 | 473 | ||
477 | static void tosa_restart(char mode) | 474 | static void tosa_restart(char mode) |
@@ -489,6 +486,8 @@ static void __init tosa_init(void) | |||
489 | gpio_set_wake(MFP_PIN_GPIO1, 1); | 486 | gpio_set_wake(MFP_PIN_GPIO1, 1); |
490 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ | 487 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ |
491 | 488 | ||
489 | init_gpio_reset(TOSA_GPIO_ON_RESET); | ||
490 | |||
492 | pm_power_off = tosa_poweroff; | 491 | pm_power_off = tosa_poweroff; |
493 | arm_pm_restart = tosa_restart; | 492 | arm_pm_restart = tosa_restart; |
494 | 493 | ||