All of lore.kernel.org
 help / color / mirror / Atom feed
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] arm: bcm2835: properly use IOMEM() to define virtual address constants
Date: Sun, 28 Oct 2012 11:24:13 +0100	[thread overview]
Message-ID: <1351419853-25146-2-git-send-email-thomas.petazzoni@free-electrons.com> (raw)
In-Reply-To: <1351419853-25146-1-git-send-email-thomas.petazzoni@free-electrons.com>

Like we now do for all ARM platforms, use IOMEM() to define virtual
address constants, so that they get typed as 'void __iomem *'
pointers. It for now requires a cast when defining the map_desc entry,
but that cast should disappear once we switch map_desc to the usage of
'void __iomem *' pointers.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/mach-bcm2835/bcm2835.c |    2 +-
 arch/arm/mach-bcm2835/bcm2835.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index cb2f963..9366c8f 100644
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -24,7 +24,7 @@
 #include "bcm2835.h"
 
 static struct map_desc io_map __initdata = {
-	.virtual = BCM2835_PERIPH_VIRT,
+	.virtual = (unsigned long) BCM2835_PERIPH_VIRT,
 	.pfn = __phys_to_pfn(BCM2835_PERIPH_PHYS),
 	.length = BCM2835_PERIPH_SIZE,
 	.type = MT_DEVICE
diff --git a/arch/arm/mach-bcm2835/bcm2835.h b/arch/arm/mach-bcm2835/bcm2835.h
index 8fbad3a..db9d51e 100644
--- a/arch/arm/mach-bcm2835/bcm2835.h
+++ b/arch/arm/mach-bcm2835/bcm2835.h
@@ -21,7 +21,7 @@
 #include <asm/sizes.h>
 
 #define BCM2835_PERIPH_PHYS	0x20000000
-#define BCM2835_PERIPH_VIRT	0xf0000000
+#define BCM2835_PERIPH_VIRT	IOMEM(0xf0000000)
 #define BCM2835_PERIPH_SIZE	SZ_16M
 
 #endif
-- 
1.7.9.5

  reply	other threads:[~2012-10-28 10:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-28 10:24 [PATCH 1/2] arm: bcm2835: move to the multiplatform support Thomas Petazzoni
2012-10-28 10:24 ` Thomas Petazzoni [this message]
2012-10-30  2:32   ` [PATCH 2/2] arm: bcm2835: properly use IOMEM() to define virtual address constants Stephen Warren
2012-10-30  2:31 ` [PATCH 1/2] arm: bcm2835: move to the multiplatform support Stephen Warren
2012-10-30  8:20   ` Thomas Petazzoni
2012-10-30 16:53     ` Stephen Warren
2012-11-09  3:03 ` Stephen Warren
2012-11-09  8:05   ` Thomas Petazzoni

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=1351419853-25146-2-git-send-email-thomas.petazzoni@free-electrons.com \
    --to=thomas.petazzoni@free-electrons.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.