From patchwork Mon Aug 22 13:10:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Tuckley X-Patchwork-Id: 1085282 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7MDDXEY022969 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 22 Aug 2011 13:13:54 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QvUJ7-0002a1-QO; Mon, 22 Aug 2011 13:12:50 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvUJ2-0006SC-0D; Mon, 22 Aug 2011 13:12:44 +0000 Received: from service88.mimecast.com ([195.130.217.12]) by canuck.infradead.org with smtp (Exim 4.76 #1 (Red Hat Linux)) id 1QvUI1-00069l-WD for linux-arm-kernel@lists.infradead.org; Mon, 22 Aug 2011 13:11:43 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Mon, 22 Aug 2011 14:10:26 +0100 Received: from e102602-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Mon, 22 Aug 2011 14:10:24 +0100 From: Colin Tuckley Subject: [PATCH 3/3 v3] RM Realview PCIX board file changes To: linux-arm-kernel@lists.infradead.org Date: Mon, 22 Aug 2011 14:10:23 +0100 Message-ID: <20110822131014.23830.47467.stgit@e102602-lin.cambridge.arm.com> In-Reply-To: <20110822130507.23830.26191.stgit@e102602-lin.cambridge.arm.com> References: <20110822130507.23830.26191.stgit@e102602-lin.cambridge.arm.com> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 X-OriginalArrivalTime: 22 Aug 2011 13:10:24.0237 (UTC) FILETIME=[DA80C9D0:01CC60CC] X-MC-Unique: 111082214102605401 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110822_091142_331944_B282EC93 X-CRM114-Status: UNSURE ( 6.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [195.130.217.12 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 22 Aug 2011 13:13:54 +0000 (UTC) This patch adds the PCI support to the board files for the Realview Northbridge boards. Signed-off-by: Colin Tuckley Acked-by: Catalin Marinas --- 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