Signed-off-by: Andreas Bießmann biessm...@corscience.de
---
changes since v1:
- only rename definitions to ATMEL_BASE_xx schema in this patch
- rename of memeory-map.h - hardweare.h is required before
arch/avr32/cpu/at32ap700x/sm.h|4 +-
arch/avr32/cpu/hsdramc1.h |4 +-
arch/avr32/cpu/hsmc3.h|4 +-
arch/avr32/cpu/interrupts.c |2 +-
arch/avr32/include/asm/arch-at32ap700x/gpio.h | 10 ++--
arch/avr32/include/asm/arch-at32ap700x/hardware.h | 76 ++--
arch/avr32/include/asm/arch-at32ap700x/portmux.h | 10 ++--
arch/avr32/include/asm/hmatrix-common.h |2 +-
board/atmel/atngw100/atngw100.c |4 +-
board/atmel/atstk1000/atstk1000.c |4 +-
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c |2 +-
board/mimc/mimc200/mimc200.c |4 +-
board/miromico/hammerhead/hammerhead.c|2 +-
drivers/mmc/atmel_mci.h |4 +-
include/configs/atngw100.h|4 +-
include/configs/atstk1002.h |6 +-
include/configs/atstk1003.h |6 +-
include/configs/atstk1004.h |6 +-
include/configs/atstk1006.h |6 +-
include/configs/favr-32-ezkit.h |6 +-
include/configs/hammerhead.h |3 +-
include/configs/mimc200.h |4 +-
22 files changed, 83 insertions(+), 90 deletions(-)
diff --git a/arch/avr32/cpu/at32ap700x/sm.h b/arch/avr32/cpu/at32ap700x/sm.h
index b6e4409..9a3804e 100644
--- a/arch/avr32/cpu/at32ap700x/sm.h
+++ b/arch/avr32/cpu/at32ap700x/sm.h
@@ -197,8 +197,8 @@
/* Register access macros */
#define sm_readl(reg) \
- readl((void *)SM_BASE + SM_##reg)
+ readl((void *)ATMEL_BASE_SM + SM_##reg)
#define sm_writel(reg,value) \
- writel((value), (void *)SM_BASE + SM_##reg)
+ writel((value), (void *)ATMEL_BASE_SM + SM_##reg)
#endif /* __CPU_AT32AP_SM_H__ */
diff --git a/arch/avr32/cpu/hsdramc1.h b/arch/avr32/cpu/hsdramc1.h
index 305d2cb..e18e074 100644
--- a/arch/avr32/cpu/hsdramc1.h
+++ b/arch/avr32/cpu/hsdramc1.h
@@ -136,8 +136,8 @@
/* Register access macros */
#define hsdramc1_readl(reg)\
- readl((void *)HSDRAMC_BASE + HSDRAMC1_##reg)
+ readl((void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)
#define hsdramc1_writel(reg,value) \
- writel((value), (void *)HSDRAMC_BASE + HSDRAMC1_##reg)
+ writel((value), (void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)
#endif /* __ASM_AVR32_HSDRAMC1_H__ */
diff --git a/arch/avr32/cpu/hsmc3.h b/arch/avr32/cpu/hsmc3.h
index ca533b9..ac47295 100644
--- a/arch/avr32/cpu/hsmc3.h
+++ b/arch/avr32/cpu/hsmc3.h
@@ -119,8 +119,8 @@
/* Register access macros */
#define hsmc3_readl(reg) \
- readl((void *)HSMC_BASE + HSMC3_##reg)
+ readl((void *)ATMEL_BASE_HSMC + HSMC3_##reg)
#define hsmc3_writel(reg,value)\
- writel((value), (void *)HSMC_BASE + HSMC3_##reg)
+ writel((value), (void *)ATMEL_BASE_HSMC + HSMC3_##reg)
#endif /* __CPU_AT32AP_HSMC3_H__ */
diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c
index c751981..c6ea435 100644
--- a/arch/avr32/cpu/interrupts.c
+++ b/arch/avr32/cpu/interrupts.c
@@ -125,7 +125,7 @@ static int set_interrupt_handler(unsigned int nr, void
(*handler)(void),
intpr = (handler_addr HANDLER_MASK);
intpr |= (priority INTLEV_MASK) INTLEV_SHIFT;
- writel(intpr, (void *)INTC_BASE + 4 * nr);
+ writel(intpr, (void *)ATMEL_BASE_INTC + 4 * nr);
return 0;
}
diff --git a/arch/avr32/include/asm/arch-at32ap700x/gpio.h
b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
index b0254f2..4322eac 100644
--- a/arch/avr32/include/asm/arch-at32ap700x/gpio.h
+++ b/arch/avr32/include/asm/arch-at32ap700x/gpio.h
@@ -45,15 +45,15 @@ static inline void *pio_pin_to_port(unsigned int pin)
{
switch (pin 5) {
case 0:
- return (void *)PIOA_BASE;
+ return (void *)ATMEL_BASE_PIOA;
case 1:
- return (void *)PIOB_BASE;
+ return (void *)ATMEL_BASE_PIOB;
case 2:
- return (void *)PIOC_BASE;
+ return (void *)ATMEL_BASE_PIOC;
case 3:
- return (void *)PIOD_BASE;
+ return (void *)ATMEL_BASE_PIOD;
case 4:
- return (void *)PIOE_BASE;
+ return (void *)ATMEL_BASE_PIOE;
default:
return NULL;
}
diff --git a/arch/avr32/include/asm/arch-at32ap700x/hardware.h
b/arch/avr32/include/asm/arch-at32ap700x/hardware.h
index
