diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-11-02 13:12:50 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-11-28 09:50:39 -0500 |
commit | be6d4321720cd56623c1d5be311bde65c2c91229 (patch) | |
tree | f524ffb7fd13186f15925749e5b647c2787b30ff /arch/arm/mach-at91/pm.c | |
parent | 13079a733313c00ca92fc6716383dd126caa7276 (diff) |
ARM: at91: make aic soc independent
on all at91 have the Advanced Interrupt Controller starts at address
0xfffff000
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/pm.c')
-rw-r--r-- | arch/arm/mach-at91/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 3a5b7b4279e7..62ad95556c36 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -218,7 +218,7 @@ static int at91_pm_enter(suspend_state_t state) | |||
218 | | (1 << AT91_ID_FIQ) | 218 | | (1 << AT91_ID_FIQ) |
219 | | (1 << AT91_ID_SYS) | 219 | | (1 << AT91_ID_SYS) |
220 | | (at91_extern_irq)) | 220 | | (at91_extern_irq)) |
221 | & at91_sys_read(AT91_AIC_IMR), | 221 | & at91_aic_read(AT91_AIC_IMR), |
222 | state); | 222 | state); |
223 | 223 | ||
224 | switch (state) { | 224 | switch (state) { |
@@ -286,7 +286,7 @@ static int at91_pm_enter(suspend_state_t state) | |||
286 | } | 286 | } |
287 | 287 | ||
288 | pr_debug("AT91: PM - wakeup %08x\n", | 288 | pr_debug("AT91: PM - wakeup %08x\n", |
289 | at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR)); | 289 | at91_aic_read(AT91_AIC_IPR) & at91_aic_read(AT91_AIC_IMR)); |
290 | 290 | ||
291 | error: | 291 | error: |
292 | target_state = PM_SUSPEND_ON; | 292 | target_state = PM_SUSPEND_ON; |