From patchwork Wed Apr 9 18:08:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3957021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2B080BFF02 for ; Wed, 9 Apr 2014 18:10:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AADE206AB for ; Wed, 9 Apr 2014 18:10:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 456AE206A9 for ; Wed, 9 Apr 2014 18:10:23 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXwuv-0001ms-Bf; Wed, 09 Apr 2014 18:08:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXwuS-0007Fh-HF; Wed, 09 Apr 2014 18:07:40 +0000 Received: from perceval.ideasonboard.com ([95.142.166.194]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXwu1-0007A5-4B for linux-arm-kernel@lists.infradead.org; Wed, 09 Apr 2014 18:07:14 +0000 Received: from avalon.ideasonboard.com (unknown [91.178.230.94]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 28DBA359FC; Wed, 9 Apr 2014 20:04:18 +0200 (CEST) From: Laurent Pinchart To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/4] ARM: pxa: Move UNCACHED_PHYS_0 mapping from generic.c to pxa2[57]x.c Date: Wed, 9 Apr 2014 20:08:15 +0200 Message-Id: <1397066897-31826-3-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397066897-31826-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1397066897-31826-1-git-send-email-laurent.pinchart@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140409_140713_751782_C3466F02 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -2.2 (--) Cc: Nicolas Pitre , Russell King - ARM Linux , Haojian Zhuang , David Heidelberger , Ezequiel Garcia , Eric Miao X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The UNCACHED_PHYS_0 mapping is only needed on PXA25x and PXA27x platforms. Move it to pxa25x.c and pxa27x.c to avoid wasting vmalloc space on PXA3xx. Signed-off-by: Laurent Pinchart --- arch/arm/mach-pxa/generic.c | 5 ----- arch/arm/mach-pxa/pxa25x.c | 5 +++++ arch/arm/mach-pxa/pxa27x.c | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 4bc0a2c..6bd7f36 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -83,11 +83,6 @@ static struct map_desc common_io_desc[] __initdata = { .pfn = __phys_to_pfn(PERIPH_PHYS), .length = PERIPH_SIZE, .type = MT_DEVICE - }, { /* UNCACHED_PHYS_0 */ - .virtual = UNCACHED_PHYS_0, - .pfn = __phys_to_pfn(0x00000000), - .length = UNCACHED_PHYS_0_SIZE, - .type = MT_DEVICE } }; diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 926c506..66e4a2b 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -333,6 +333,11 @@ static struct map_desc pxa25x_io_desc[] __initdata = { .pfn = __phys_to_pfn(PXA2XX_SMEMC_BASE), .length = SMEMC_SIZE, .type = MT_DEVICE + }, { /* UNCACHED_PHYS_0 */ + .virtual = UNCACHED_PHYS_0, + .pfn = __phys_to_pfn(0x00000000), + .length = UNCACHED_PHYS_0_SIZE, + .type = MT_DEVICE }, }; diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 4405644..6cc0f46 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -409,6 +409,11 @@ static struct map_desc pxa27x_io_desc[] __initdata = { .pfn = __phys_to_pfn(IMEMC_PHYS), .length = IMEMC_SIZE, .type = MT_DEVICE + }, { /* UNCACHED_PHYS_0 */ + .virtual = UNCACHED_PHYS_0, + .pfn = __phys_to_pfn(0x00000000), + .length = UNCACHED_PHYS_0_SIZE, + .type = MT_DEVICE }, };