From: "Andreas Bießmann" <biessmann@corscience.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/2] [RFC] drivers:atmel-related: fixup include to hardware.h
Date: Wed, 3 Nov 2010 11:20:54 +0100 [thread overview]
Message-ID: <1288779654-32567-2-git-send-email-biessmann@corscience.de> (raw)
In-Reply-To: <4CD01BF4.7040403@emk-elektronik.de>
- 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"
--
1.7.2.3
next prev parent reply other threads:[~2010-11-03 10:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-01 8:29 [U-Boot] various at91 patches to make some boards compilable again Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 01/11] at91sam9260: Replace PHYS_SDRAM with CONFIG_SYS_SDRAM_BASE Alexander Stein
2010-11-01 9:33 ` Wolfgang Denk
2010-11-01 8:29 ` [U-Boot] [PATCH 02/11] at91: Add USART & DBGU base address defines Alexander Stein
2010-11-01 10:57 ` Andreas Bießmann
2010-11-01 11:05 ` Alexander Stein
2010-11-01 11:26 ` Andreas Bießmann
2010-11-01 12:17 ` Reinhard Meyer
2010-11-02 10:42 ` Reinhard Meyer
2010-11-02 14:11 ` [U-Boot] [RFC] AT91 cleanup, was: " Reinhard Meyer
2010-11-03 7:18 ` Alexander Stein
2010-11-03 9:17 ` Reinhard Meyer
2010-11-03 9:29 ` Andreas Bießmann
2010-11-03 10:03 ` Reinhard Meyer
2010-11-03 10:25 ` Andreas Bießmann
2010-11-03 10:20 ` [U-Boot] [PATCH 1/2] [RFC] AVR32: move memory-map.h to hardware.h Andreas Bießmann
2010-11-03 15:02 ` Reinhard Meyer
2010-11-03 15:37 ` Reinhard Meyer
2010-11-05 9:15 ` [U-Boot] [PATCH v2 0/2] adopt avr32 to latest changes in u-boot-atmel/at91cleanup-rework Andreas Bießmann
2010-11-05 9:15 ` [U-Boot] [PATCH v2 1/2] avr32: rename memory-map.h -> hardware.h Andreas Bießmann
2011-04-11 8:55 ` Reinhard Meyer
2010-11-05 9:15 ` [U-Boot] [PATCH v2 2/2] avr32: fixup definitions to ATMEL_BASE_xxx Andreas Bießmann
2010-11-05 10:34 ` Reinhard Meyer
2011-04-11 8:58 ` Reinhard Meyer
2010-11-03 10:20 ` Andreas Bießmann [this message]
2010-11-03 15:04 ` [U-Boot] [PATCH 2/2] [RFC] drivers:atmel-related: fixup include to hardware.h Reinhard Meyer
2010-11-01 8:29 ` [U-Boot] [PATCH 03/11] at91: Use AT91_USART0_BASE instead of AT91_USART0 Alexander Stein
2010-11-01 10:56 ` Andreas Bießmann
2010-11-01 8:29 ` [U-Boot] [PATCH 04/11] at91sam9260ek: Convert to SoC Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 05/11] at91: Fix pdc register names and add some defines Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 06/11] at91: Add defines for spi SoC access Alexander Stein
2010-11-01 8:43 ` Reinhard Meyer
2010-11-01 8:52 ` Alexander Stein
2010-11-01 9:36 ` Wolfgang Denk
2010-11-01 12:31 ` Reinhard Meyer
2010-11-01 13:34 ` Alexander Stein
2010-11-04 16:07 ` Thomas Petazzoni
2010-11-01 8:29 ` [U-Boot] [PATCH 07/11] at91: Add spi base addresses Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 08/11] atmel_dataflash: Update to SoC access Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 09/11] at91sam9261ek: make compilable again Alexander Stein
2010-11-01 8:29 ` [U-Boot] [PATCH 10/11] at91sam9263ek: " Alexander Stein
2010-11-01 9:39 ` Wolfgang Denk
2010-11-01 8:29 ` [U-Boot] [PATCH 11/11] at91cap9adk: " Alexander Stein
2010-11-01 8:40 ` [U-Boot] various at91 patches to make some boards " Reinhard Meyer
2010-11-01 8:50 ` Alexander Stein
2010-11-01 9:30 ` Wolfgang Denk
2010-11-01 11:09 ` Andreas Bießmann
2011-01-27 19:18 ` Remy Bohmer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288779654-32567-2-git-send-email-biessmann@corscience.de \
--to=biessmann@corscience.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox