From patchwork Fri Jul 4 12:43:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4481041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 718FC9F26C for ; Fri, 4 Jul 2014 12:47:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B612920295 for ; Fri, 4 Jul 2014 12:47:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 D8CBB20416 for ; Fri, 4 Jul 2014 12:47:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X32s8-00065e-Jq; Fri, 04 Jul 2014 12:45:48 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X32s5-00063U-G2 for linux-arm-kernel@lists.infradead.org; Fri, 04 Jul 2014 12:45:47 +0000 Received: by mail-pa0-f47.google.com with SMTP id kq14so1967453pab.20 for ; Fri, 04 Jul 2014 05:45:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=epBS3GhjZ/DcZxov3HHJIcdre77xu14l9zI9r+0NrlE=; b=KGLP87cMqY/0bkWQDrTWk20GEbGr+D8CBpQ06MsdA8m/Kj8gl8AensV5k4MNHmACNq PkolyHR07H65c2e6HsVKOZ7rbdEIO2dB/E4S8r0S6C8x2A2irTV7IEypvR9vE6hnP2Rc LjKYoi/O723bEArVkJdmCkP/WW66cmnZ72yEYJBjFEocGhkL+s93Hn4r+5Tb3A5pSfMp vl68pSRLLwgA86fzBE2ys2M+cM4dm5kX2ZZmgKa5AECcLb/UCxen8X+y73irzkBeGizc DLXBcfmrp/CGPrXXIqXvGAVwheIH7fPGq3grH9ZqO8Iig8/vntz2CoTdRinGouLXoX6Z Q0Ww== X-Gm-Message-State: ALoCoQm5CwAaC1iZrwhX12oRpbuYoZS97aVkioclDt4KdklazwRnR5/AEpjVIKaT23sTS6dvcYYF X-Received: by 10.68.235.6 with SMTP id ui6mr10566341pbc.45.1404477924230; Fri, 04 Jul 2014 05:45:24 -0700 (PDT) Received: from localhost.localdomain ([174.139.74.226]) by mx.google.com with ESMTPSA id ir10sm44131046pbc.59.2014.07.04.05.45.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jul 2014 05:45:23 -0700 (PDT) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org Subject: [PATCH] ARM: pxa: remove unnecessary pxa3xx io mapping Date: Fri, 4 Jul 2014 20:43:14 +0800 Message-Id: <1404477794-14927-1-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140704_054545_550173_1E45093B X-CRM114-Status: GOOD ( 11.77 ) X-Spam-Score: -2.8 (--) Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-1.9 required=5.0 tests=BAYES_00, T_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 [ 0.000000] BUG: mapping for 0x00000000 at 0xff000000 out of vmalloc space UNCACHED PHYS io mapping is redundant of PXA3xx (PXA930). So remove it from pxa3xx/pxa93x series. Signed-off-by: Haojian Zhuang --- arch/arm/mach-pxa/generic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 94f49c2..b52f8f2 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -83,7 +83,11 @@ static struct map_desc common_io_desc[] __initdata = { .pfn = __phys_to_pfn(0x40000000), .length = 0x02000000, .type = MT_DEVICE - }, { /* UNCACHED_PHYS_0 */ + } +}; + +static struct map_desc pxa2xx_io_desc[] __initdata = { + { /* UNCACHED_PHYS_0 */ .virtual = 0xff000000, .pfn = __phys_to_pfn(0x00000000), .length = 0x00100000, @@ -95,4 +99,6 @@ void __init pxa_map_io(void) { debug_ll_io_init(); iotable_init(ARRAY_AND_SIZE(common_io_desc)); + if (cpu_is_pxa2xx()) + iotable_init(ARRAY_AND_SIZE(pxa2xx_io_desc)); }