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/at91sam9260.c | |
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/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 0d20677fbef0..e76cd49ebc9e 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -327,7 +327,7 @@ static void __init at91sam9260_map_io(void) | |||
327 | 327 | ||
328 | static void __init at91sam9260_initialize(void) | 328 | static void __init at91sam9260_initialize(void) |
329 | { | 329 | { |
330 | at91_arch_reset = at91sam9_alt_reset; | 330 | arm_pm_restart = at91sam9_alt_restart; |
331 | pm_power_off = at91sam9260_poweroff; | 331 | pm_power_off = at91sam9260_poweroff; |
332 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) | 332 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) |
333 | | (1 << AT91SAM9260_ID_IRQ2); | 333 | | (1 << AT91SAM9260_ID_IRQ2); |