diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-03 05:53:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:08 -0500 |
commit | 1b2073e7789429e6554e69b307d857d8f46a2e22 (patch) | |
tree | e23f81117bd5ec98b705c9fdd15fce1801a72c88 /arch/arm/mach-at91/generic.h | |
parent | 8390918874324360335370fbcc2c3c9884476884 (diff) |
ARM: restart: at91: use new restart hook
Rather than using a private function pointer, use the existing
arm_pm_restart function pointer instead. We no longer need to enable
the I-cache in at91sam9_alt_reset() as the caches will now be on when
this function is called.
Update the function names to use the 'restart' terminology rather than
the 'reboot' terminology.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
-rw-r--r-- | arch/arm/mach-at91/generic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 938b34f57741..7f4503bc4cbb 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
@@ -57,7 +57,7 @@ extern void at91_irq_suspend(void); | |||
57 | extern void at91_irq_resume(void); | 57 | extern void at91_irq_resume(void); |
58 | 58 | ||
59 | /* reset */ | 59 | /* reset */ |
60 | extern void at91sam9_alt_reset(void); | 60 | extern void at91sam9_alt_restart(char, const char *); |
61 | 61 | ||
62 | /* GPIO */ | 62 | /* GPIO */ |
63 | #define AT91RM9200_PQFP 3 /* AT91RM9200 PQFP package has 3 banks */ | 63 | #define AT91RM9200_PQFP 3 /* AT91RM9200 PQFP package has 3 banks */ |
@@ -71,5 +71,4 @@ struct at91_gpio_bank { | |||
71 | extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks); | 71 | extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks); |
72 | extern void __init at91_gpio_irq_setup(void); | 72 | extern void __init at91_gpio_irq_setup(void); |
73 | 73 | ||
74 | extern void (*at91_arch_reset)(void); | ||
75 | extern int at91_extern_irq; | 74 | extern int at91_extern_irq; |