diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-02-05 07:25:32 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-17 11:54:05 -0500 |
commit | 0d78171672a30e8ec8084f54a557e9948260356d (patch) | |
tree | 68d9406fbd277896eed3a8b0447f0729dd0b979c /arch/arm/mach-at91/at91sam9261.c | |
parent | 11a25ea7e4f870a37093258f577e11cec703e37e (diff) |
ARM: at91: factorise duplicated at91sam9 idle
Remove duplicated at91sam9xxxx_idle() functions introduced
by commit c9dfafb "ARM: mach-at91: move special idle code out of line".
Replace by a generic at91sam9_idle() function in setup.c common
location.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index ab76868f01f5..d7f51d6f957d 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
@@ -287,15 +287,9 @@ static void __init at91sam9261_ioremap_registers(void) | |||
287 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); | 287 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); |
288 | } | 288 | } |
289 | 289 | ||
290 | static void at91sam9261_idle(void) | ||
291 | { | ||
292 | at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); | ||
293 | cpu_do_idle(); | ||
294 | } | ||
295 | |||
296 | static void __init at91sam9261_initialize(void) | 290 | static void __init at91sam9261_initialize(void) |
297 | { | 291 | { |
298 | arm_pm_idle = at91sam9261_idle; | 292 | arm_pm_idle = at91sam9_idle; |
299 | arm_pm_restart = at91sam9_alt_restart; | 293 | arm_pm_restart = at91sam9_alt_restart; |
300 | at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) | 294 | at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) |
301 | | (1 << AT91SAM9261_ID_IRQ2); | 295 | | (1 << AT91SAM9261_ID_IRQ2); |