diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 0894f1077be7..195208b30024 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -279,11 +279,6 @@ static struct at91_gpio_bank at91sam9260_gpio[] = { | |||
279 | } | 279 | } |
280 | }; | 280 | }; |
281 | 281 | ||
282 | static void at91sam9260_reset(void) | ||
283 | { | ||
284 | at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); | ||
285 | } | ||
286 | |||
287 | static void at91sam9260_poweroff(void) | 282 | static void at91sam9260_poweroff(void) |
288 | { | 283 | { |
289 | at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW); | 284 | at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW); |
@@ -327,7 +322,7 @@ void __init at91sam9260_initialize(unsigned long main_clock) | |||
327 | else | 322 | else |
328 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); | 323 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); |
329 | 324 | ||
330 | at91_arch_reset = at91sam9260_reset; | 325 | at91_arch_reset = at91sam9_alt_reset; |
331 | pm_power_off = at91sam9260_poweroff; | 326 | pm_power_off = at91sam9260_poweroff; |
332 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) | 327 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) |
333 | | (1 << AT91SAM9260_ID_IRQ2); | 328 | | (1 << AT91SAM9260_ID_IRQ2); |