From patchwork Mon Jun 17 16:34:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2737361 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 43868C0AB1 for ; Mon, 17 Jun 2013 19:36:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D3B0B20198 for ; Mon, 17 Jun 2013 19:36:02 +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 3B41B20192 for ; Mon, 17 Jun 2013 19:36:01 +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 1UocVu-00041C-4Z; Mon, 17 Jun 2013 16:42:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocVJ-0006e7-Hf; Mon, 17 Jun 2013 16:42:05 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocPi-00061T-9p for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 16:36:24 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOJ00MBNQ1N6260@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 17:34:58 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-5a-51bf3ab2db91 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 72.5B.07878.2BA3FB15; Mon, 17 Jun 2013 17:34:58 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOJ002RHQ1OMHC0@eusync3.samsung.com>; Mon, 17 Jun 2013 17:34:58 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 36/38] ARM: EXYNOS: Use exynos_init_io() as map_io callback Date: Mon, 17 Jun 2013 18:34:21 +0200 Message-id: <1371486863-12398-37-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371486863-12398-1-git-send-email-t.figa@samsung.com> References: <1371486863-12398-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkluLIzCtJLcpLzFFi42I5/e/4Vd1NVvsDDebuZbH4O+kYu0Xvgqts Fmeb3rBbbHp8jdVixvl9TBZrj9xltzh1/TObxeE37awW62e8ZrE4NmMJowOXx+9fkxg97lzb w+axeUm9x5UTTawefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAlfF1czNjwSvpiiObXzM1MF4U 72Lk5JAQMJF42XiQDcIWk7hwbz2QzcUhJLCUUeLr3wlQTh+TxP7Pc1lBqtgE1CQ+NzwC6xAR UJX43LaAHaSIWeAlk8TdxgdADgeHsICfxI+eMJAaFqCa5hmfmUBsXgFniRm7GlggtilIHN++ jRHE5gSKL+67xQxiCwk4SeyeeYl1AiPvAkaGVYyiqaXJBcVJ6blGesWJucWleel6yfm5mxgh wfd1B+PSY1aHGAU4GJV4eBPF9gcKsSaWFVfmHmKU4GBWEuGNnbgvUIg3JbGyKrUoP76oNCe1 +BAjEwenVAOj+TdvqVd3VbrWfVCd7tjOJXI1+Yjkoh2bFFeW/YyY9S565uTJj6y+LtxTMV9A VIZzlvaC3ysFzxrPYS537YvZJjRB8Nox/rIXd20cdx2XM1/v5almefjwK7XjBT6/t/5c9lb5 jb/h2aVPdpt8s9Hyc2+LODI14lru/Rcb3uaskGOqFv6altvmqMRSnJFoqMVcVJwIAKAP1akc AgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_123618_504231_2748C120 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -8.0 (--------) 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=-5.3 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 Since there is no board specific mapping needed on Exynos, exynos_init_io() can be simplified and used as map_io callback for both Exynos4 and Exynos5. Signed-off-by: Arnd Bergmann Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 5 +---- arch/arm/mach-exynos/common.h | 2 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 7 +------ arch/arm/mach-exynos/mach-exynos5-dt.c | 7 +------ 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 91d457f..561890f 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -351,15 +351,12 @@ int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, * register the standard cpu IO areas */ -void __init exynos_init_io(struct map_desc *mach_desc, int size) +void __init exynos_init_io(void) { debug_ll_io_init(); of_scan_flat_dt(exynos_fdt_map_chipid, NULL); - if (mach_desc) - iotable_init(mach_desc, size); - /* detect cpu id and rev. */ s5p_init_cpu(S5P_VA_CHIPID); diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 1c83f95..38d45fd 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -19,7 +19,7 @@ void exynos_init_time(void); extern unsigned long xxti_f, xusbxti_f; struct map_desc; -void exynos_init_io(struct map_desc *mach_desc, int size); +void exynos_init_io(void); void exynos4_restart(char mode, const char *cmd); void exynos5_restart(char mode, const char *cmd); void exynos_init_late(void); diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index df15726..0099c6c 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -23,11 +23,6 @@ #include "common.h" -static void __init exynos4_dt_map_io(void) -{ - exynos_init_io(NULL, 0); -} - static void __init exynos4_dt_machine_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -55,7 +50,7 @@ static void __init exynos4_reserve(void) DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") /* Maintainer: Thomas Abraham */ .smp = smp_ops(exynos_smp_ops), - .map_io = exynos4_dt_map_io, + .map_io = exynos_init_io, .init_early = exynos_firmware_init, .init_machine = exynos4_dt_machine_init, .init_late = exynos_init_late, diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 8777310..ab54770 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -27,11 +27,6 @@ static u64 dma_mask64 = DMA_BIT_MASK(64); static u64 dma_mask32 = DMA_BIT_MASK(32); -static void __init exynos5_dt_map_io(void) -{ - exynos_init_io(NULL, 0); -} - static int exynos5440_platform_notifier(struct notifier_block *nb, unsigned long event, void *__dev) { @@ -105,7 +100,7 @@ static void __init exynos5_reserve(void) DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") /* Maintainer: Kukjin Kim */ .smp = smp_ops(exynos_smp_ops), - .map_io = exynos5_dt_map_io, + .map_io = exynos_init_io, .init_machine = exynos5_dt_machine_init, .init_late = exynos_init_late, .init_time = exynos_init_time,