- change includes from memory-map.h to hardware.h - fixup mmci_writel()/mmci_readl()
Signed-off-by: Andreas Bießmann biessmann@corscience.de --- drivers/mmc/atmel_mci.c | 2 +- drivers/mmc/atmel_mci.h | 4 ++-- drivers/mmc/gen_atmel_mci.c | 2 +- drivers/serial/atmel_usart.c | 2 +- drivers/spi/atmel_spi.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c index 3946ffe..0af8d42 100644 --- a/drivers/mmc/atmel_mci.c +++ b/drivers/mmc/atmel_mci.c @@ -28,7 +28,7 @@ #include <asm/errno.h> #include <asm/byteorder.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h>
#include "atmel_mci.h"
diff --git a/drivers/mmc/atmel_mci.h b/drivers/mmc/atmel_mci.h index 823a77d..90ab6a8 100644 --- a/drivers/mmc/atmel_mci.h +++ b/drivers/mmc/atmel_mci.h @@ -238,8 +238,8 @@ typedef struct atmel_mci { * Register access macros */ #define mmci_readl(reg) \ - readl((void *)MMCI_BASE + MMCI_##reg) + readl((void *)ATMEL_BASE_MMCI + MMCI_##reg) #define mmci_writel(reg,value) \ - writel((value), (void *)MMCI_BASE + MMCI_##reg) + writel((value), (void *)ATMEL_BASE_MMCI + MMCI_##reg)
#endif /* __CPU_AT32AP_ATMEL_MCI_H__ */ diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index fa4df99..5463250 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -33,7 +33,7 @@ #include <asm/errno.h> #include <asm/byteorder.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h> #include "atmel_mci.h"
#ifndef CONFIG_SYS_MMC_CLK_OD diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index fb5375d..cb45fa2 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -23,7 +23,7 @@
#include <asm/io.h> #include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h>
#include "atmel_usart.h"
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 99470c7..33e38b6 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -26,7 +26,7 @@ #include <asm/io.h>
#include <asm/arch/clk.h> -#include <asm/arch/memory-map.h> +#include <asm/arch/hardware.h>
#include "atmel_spi.h"