diff options
| author | Jean-Christophe PLAGNIOL-VILLARD | 2012-02-05 13:25:32 +0100 |
|---|---|---|
| committer | Nicolas Ferre | 2012-02-17 17:54:05 +0100 |
| commit | 0d78171672a30e8ec8084f54a557e9948260356d (patch) | |
| tree | 68d9406fbd277896eed3a8b0447f0729dd0b979c /arch/arm/mach-at91/at91sam9263.c | |
| parent | Merge remote-tracking branch 'armsoc/at91/9x5' into at91-3.4-base2 (diff) | |
| download | kernel-qcow2-linux-0d78171672a30e8ec8084f54a557e9948260356d.tar.gz kernel-qcow2-linux-0d78171672a30e8ec8084f54a557e9948260356d.tar.xz kernel-qcow2-linux-0d78171672a30e8ec8084f54a557e9948260356d.zip | |
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/at91sam9263.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 247ab633abcc..8bdba2a04b16 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -308,15 +308,9 @@ static void __init at91sam9263_ioremap_registers(void) at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); } -static void at91sam9263_idle(void) -{ - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); - cpu_do_idle(); -} - static void __init at91sam9263_initialize(void) { - arm_pm_idle = at91sam9263_idle; + arm_pm_idle = at91sam9_idle; arm_pm_restart = at91sam9_alt_restart; at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1); |