[ARM] 3865/1: AT91RM9200 header updates

This is more preparation for adding support for the new Atmel AT91SAM9
processors.

Changes include:
- Replace AT91_BASE_* with AT91RM9200_BASE_*
- Replace AT91_ID_* with AT91RM9200_ID_*
- ROM, SRAM and UHP address definitions moved to at91rm9200.h.
- The raw AT91_P[ABCD]_* definitions are now depreciated in favour of
the GPIO API.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c
index 47e5480feb7e..32c95d8eaacf 100644
--- a/arch/arm/mach-at91rm9200/pm.c
+++ b/arch/arm/mach-at91rm9200/pm.c
@@ -123,13 +123,13 @@ static int at91_pm_enter(suspend_state_t state)
                         (at91_sys_read(AT91_PMC_PCSR)
                                         | (1 << AT91_ID_FIQ)
                                         | (1 << AT91_ID_SYS)
-                                        | (1 << AT91_ID_IRQ0)
-                                        | (1 << AT91_ID_IRQ1)
-                                        | (1 << AT91_ID_IRQ2)
-                                        | (1 << AT91_ID_IRQ3)
-                                        | (1 << AT91_ID_IRQ4)
-                                        | (1 << AT91_ID_IRQ5)
-                                        | (1 << AT91_ID_IRQ6))
+                                        | (1 << AT91RM9200_ID_IRQ0)
+                                        | (1 << AT91RM9200_ID_IRQ1)
+                                        | (1 << AT91RM9200_ID_IRQ2)
+                                        | (1 << AT91RM9200_ID_IRQ3)
+                                        | (1 << AT91RM9200_ID_IRQ4)
+                                        | (1 << AT91RM9200_ID_IRQ5)
+                                        | (1 << AT91RM9200_ID_IRQ6))
                                 & at91_sys_read(AT91_AIC_IMR),
                         state);