From patchwork Fri Jun 14 19:32:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2724161 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 E225B9F472 for ; Fri, 14 Jun 2013 20:23:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 033F920279 for ; Fri, 14 Jun 2013 20:23:42 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D8AA2025F for ; Fri, 14 Jun 2013 20:23:40 +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 1UnZov-0001Cj-Oi; Fri, 14 Jun 2013 19:38:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZnB-0007a9-Lc; Fri, 14 Jun 2013 19:36:13 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZlW-0007JW-Dc for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 19:34:32 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOE00FZSE9PI770@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 20:33:22 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-b7-51bb70025c74 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 62.59.13793.2007BB15; Fri, 14 Jun 2013 20:33:22 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOE00FXFEBEW970@eusync2.samsung.com>; Fri, 14 Jun 2013 20:33:22 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 11/28] ARM: EXYNOS: common: Remove legacy mapping of chip ID block Date: Fri, 14 Jun 2013 21:32:47 +0200 Message-id: <1371238384-1504-12-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371238384-1504-1-git-send-email-t.figa@samsung.com> References: <1371238384-1504-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupiluLIzCtJLcpLzFFi42I5/e/4FV2mgt2BBidfalv8nXSM3aJ3wVU2 i7NNb9gtNj2+xmox4/w+Jou1R+6yW5y6/pnN4vCbdlaL9TNes1gcm7GE0YHL4/evSYwed67t YfPYvKTe48qJJlaPvi2rGD0+b5ILYIvisklJzcksSy3St0vgytjZeJq1YAdXRVvzPMYGxisc XYycHBICJhKXFixkhLDFJC7cW8/WxcjFISSwlFHixoMNUE4fk8S+V/9YQKrYBNQkPjc8YgOx RQRUJT63LWAHKWIWeMkkcbfxATtIQlggRKJ9cicziM0CVLTh6imwZl4BJ4lXa3qZIdYpSBzf vg1sNSdQ/Oz6LWBDhQQcJaY3LmGZwMi7gJFhFaNoamlyQXFSeq6hXnFibnFpXrpecn7uJkZI +H3Zwbj4mNUhRgEORiUe3olquwOFWBPLiitzDzFKcDArifDeVQUK8aYkVlalFuXHF5XmpBYf YmTi4JRqYFxef+hW07nMztUvo/dt23hCJ1ye4/3ls43GzCXvDt4vnDtlpVR/zazIvbe2OzME 16epsB1O/Dn7Q+bOKqkFn/+nXt25dPe/xynaLkppj2ZMSJvLI5awcsk27sfWP6+VCdw5oVnE //x/6xWn5dfD7DT223jquB+psTG5sDlSecV+wQx1powDVycpsRRnJBpqMRcVJwIA3H/PnB0C AAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_153430_618954_484AB53D X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.2 (-------) Cc: Kukjin Kim , Arnd Bergmann , Tomasz Figa , Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , Olof Johansson , linux-arm-kernel@lists.infradead.org, Marek Szyprowski 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 This patch removes static mapping of chip ID block that was used when booting with ATAGS, which is not supported on Exynos any more. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 2c8527c..f81aa22 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -99,15 +99,6 @@ static struct cpu_table cpu_ids[] __initdata = { /* Initial IO mappings */ -static struct map_desc exynos_iodesc[] __initdata = { - { - .virtual = (unsigned long)S5P_VA_CHIPID, - .pfn = __phys_to_pfn(EXYNOS_PA_CHIPID), - .length = SZ_4K, - .type = MT_DEVICE, - }, -}; - static struct map_desc exynos4_iodesc[] __initdata = { { .virtual = (unsigned long)S3C_VA_SYS, @@ -365,10 +356,7 @@ void __init exynos_init_io(struct map_desc *mach_desc, int size) { debug_ll_io_init(); - if (initial_boot_params) - of_scan_flat_dt(exynos_fdt_map_chipid, NULL); - else - iotable_init(exynos_iodesc, ARRAY_SIZE(exynos_iodesc)); + of_scan_flat_dt(exynos_fdt_map_chipid, NULL); if (mach_desc) iotable_init(mach_desc, size);