From: alan@signal11.us (Alan Ott)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: at91: Use proper __iomem annotations
Date: Sat, 10 Mar 2012 13:44:55 -0500 [thread overview]
Message-ID: <1331405095-3299-1-git-send-email-alan@signal11.us> (raw)
In-Reply-To: <1331405049-3186-1-git-send-email-alan@signal11.us>
From: Arnd Bergmann <arnd@arndb.de>
MMIO addresses should be of type 'void __iomem *', not integer,
in order to make the build-time type system of the kernel work.
This changes some of the locations in the at91 platform that
I noticed, but there may be more, since I have not yet built
every configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 ++++
arch/arm/mach-at91/setup.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 99c3174..239b657 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -27,7 +27,7 @@
static struct map_desc at91rm9200_io_desc[] __initdata = {
{
- .virtual = AT91_VA_BASE_EMAC,
+ .virtual = (unsigned long)AT91_VA_BASE_EMAC,
.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
.length = SZ_16K,
.type = MT_DEVICE,
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 2d0e4e9..91375e2 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -75,8 +75,12 @@
* to 0xFEF78000 .. 0xFF000000. (544Kb)
*/
#define AT91_IO_PHYS_BASE 0xFFF78000
+#ifdef __ASSEMBLER__
#define AT91_IO_VIRT_BASE (0xFF000000 - AT91_IO_SIZE)
#else
+#define AT91_IO_VIRT_BASE (void __iomem *)(0xFF000000 - AT91_IO_SIZE)
+#endif
+#else
/*
* Identity mapping for the non MMU case.
*/
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 69d3fc4..809da35 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -57,7 +57,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
{
struct map_desc *desc = &sram_desc[bank];
- desc->virtual = AT91_IO_VIRT_BASE - length;
+ desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;
if (bank > 0)
desc->virtual -= sram_desc[bank - 1].length;
@@ -72,7 +72,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
}
static struct map_desc at91_io_desc __initdata = {
- .virtual = AT91_VA_BASE_SYS,
+ .virtual = (unsigned long)AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
--
1.7.0.4
next prev parent reply other threads:[~2012-03-10 18:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-10 18:44 [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
2012-03-10 19:24 ` Arnd Bergmann
2012-03-10 20:06 ` Alan Ott
2012-03-10 18:44 ` Alan Ott [this message]
2012-03-12 2:02 ` [PATCH 2/2] ARM: at91: Use proper __iomem annotations Olof Johansson
2012-03-10 23:14 ` [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 23:15 ` [PATCH v2 1/1] ARM: at91: Use proper __iomem annotations Alan Ott
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=1331405095-3299-1-git-send-email-alan@signal11.us \
--to=alan@signal11.us \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).