From: colin.tuckley@arm.com (Colin Tuckley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3 v3] RM Realview PCIX board file changes
Date: Mon, 22 Aug 2011 14:10:23 +0100 [thread overview]
Message-ID: <20110822131014.23830.47467.stgit@e102602-lin.cambridge.arm.com> (raw)
In-Reply-To: <20110822130507.23830.26191.stgit@e102602-lin.cambridge.arm.com>
This patch adds the PCI support to the board files
for the Realview Northbridge boards.
Signed-off-by: Colin Tuckley <colin.tuckley@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm/mach-realview/realview_pb11mp.c | 18 ++++++++++++++++++
arch/arm/mach-realview/realview_pba8.c | 18 ++++++++++++++----
arch/arm/mach-realview/realview_pbx.c | 16 +++++++++++++---
3 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index b43644b..17a3340 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -95,6 +95,24 @@ static struct map_desc realview_pb11mp_io_desc[] __initdata = {
.length = SZ_8K,
.type = MT_DEVICE,
},
+#ifdef CONFIG_PCI
+ {
+ .virtual = (unsigned long)PCIX_UNIT_BASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_BASE),
+ .length = REALVIEW_PB_PCI_BASE_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)REALVIEW_PCI_IO_VBASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_IO_BASE),
+ .length = REALVIEW_PB_PCI_IO_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = IO_ADDRESS(REALVIEW_ISSP_REG_BASE),
+ .pfn = __phys_to_pfn(REALVIEW_ISSP_REG_BASE),
+ .length = SZ_4K,
+ .type = MT_DEVICE,
+ },
+#endif
#ifdef CONFIG_DEBUG_LL
{
.virtual = IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE),
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 763e8f3..1ed9dd8 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -79,10 +79,20 @@ static struct map_desc realview_pba8_io_desc[] __initdata = {
},
#ifdef CONFIG_PCI
{
- .virtual = PCIX_UNIT_BASE,
- .pfn = __phys_to_pfn(REALVIEW_PBA8_PCI_BASE),
- .length = REALVIEW_PBA8_PCI_BASE_SIZE,
- .type = MT_DEVICE
+ .virtual = (unsigned long)PCIX_UNIT_BASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_BASE),
+ .length = REALVIEW_PB_PCI_BASE_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)REALVIEW_PCI_IO_VBASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_IO_BASE),
+ .length = REALVIEW_PB_PCI_IO_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = IO_ADDRESS(REALVIEW_ISSP_REG_BASE),
+ .pfn = __phys_to_pfn(REALVIEW_ISSP_REG_BASE),
+ .length = SZ_4K,
+ .type = MT_DEVICE,
},
#endif
#ifdef CONFIG_DEBUG_LL
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 363b0ab..1d7d191 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -80,9 +80,19 @@ static struct map_desc realview_pbx_io_desc[] __initdata = {
},
#ifdef CONFIG_PCI
{
- .virtual = PCIX_UNIT_BASE,
- .pfn = __phys_to_pfn(REALVIEW_PBX_PCI_BASE),
- .length = REALVIEW_PBX_PCI_BASE_SIZE,
+ .virtual = (unsigned long)PCIX_UNIT_BASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_BASE),
+ .length = REALVIEW_PB_PCI_BASE_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = (unsigned long)REALVIEW_PCI_IO_VBASE,
+ .pfn = __phys_to_pfn(REALVIEW_PB_PCI_IO_BASE),
+ .length = REALVIEW_PB_PCI_IO_SIZE,
+ .type = MT_DEVICE,
+ }, {
+ .virtual = IO_ADDRESS(REALVIEW_ISSP_REG_BASE),
+ .pfn = __phys_to_pfn(REALVIEW_ISSP_REG_BASE),
+ .length = SZ_4K,
.type = MT_DEVICE,
},
#endif
prev parent reply other threads:[~2011-08-22 13:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 13:09 [PATCH 0/3 v3] ARM Realview PCIX preparation Colin Tuckley
2011-08-22 13:09 ` [PATCH 1/3 v3] ARM Realview PCIX map include file changes Colin Tuckley
2011-09-05 14:35 ` Arnd Bergmann
2011-09-05 15:06 ` Arnd Bergmann
2011-09-08 9:09 ` Russell King - ARM Linux
2011-09-08 10:06 ` Colin Tuckley
2011-10-06 14:00 ` Colin Tuckley
2011-10-06 14:23 ` Russell King - ARM Linux
2011-10-06 14:50 ` Colin Tuckley
2011-10-06 15:57 ` Arnd Bergmann
2011-10-07 11:25 ` Catalin Marinas
2011-10-07 12:26 ` Arnd Bergmann
2011-08-22 13:10 ` [PATCH 2/3 v3] ARM Realview PCIX IRQ " Colin Tuckley
2011-08-22 13:10 ` Colin Tuckley [this message]
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=20110822131014.23830.47467.stgit@e102602-lin.cambridge.arm.com \
--to=colin.tuckley@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox