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/at91sam9g45.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/at91sam9g45.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 5b12192e52ec..5d2ff90ca85f 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
@@ -317,12 +317,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = { | |||
317 | } | 317 | } |
318 | }; | 318 | }; |
319 | 319 | ||
320 | static void at91sam9g45_idle(void) | ||
321 | { | ||
322 | at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); | ||
323 | cpu_do_idle(); | ||
324 | } | ||
325 | |||
326 | /* -------------------------------------------------------------------- | 320 | /* -------------------------------------------------------------------- |
327 | * AT91SAM9G45 processor initialization | 321 | * AT91SAM9G45 processor initialization |
328 | * -------------------------------------------------------------------- */ | 322 | * -------------------------------------------------------------------- */ |
@@ -343,7 +337,7 @@ static void __init at91sam9g45_ioremap_registers(void) | |||
343 | 337 | ||
344 | static void __init at91sam9g45_initialize(void) | 338 | static void __init at91sam9g45_initialize(void) |
345 | { | 339 | { |
346 | arm_pm_idle = at91sam9g45_idle; | 340 | arm_pm_idle = at91sam9_idle; |
347 | arm_pm_restart = at91sam9g45_restart; | 341 | arm_pm_restart = at91sam9g45_restart; |
348 | at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0); | 342 | at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0); |
349 | 343 | ||