From patchwork Fri Jun 14 19:32:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2724301 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 8BC2E9F8E4 for ; Fri, 14 Jun 2013 20:45:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A40DC20304 for ; Fri, 14 Jun 2013 20:45:43 +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 518AE20303 for ; Fri, 14 Jun 2013 20:45:42 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZuJ-0004Uu-2T; Fri, 14 Jun 2013 19:43:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnZod-0007gC-Pw; Fri, 14 Jun 2013 19:37:43 +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 1UnZlj-0007JW-Dm for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 19:34:45 +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:28 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-c7-51bb7008c591 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id B7.59.13793.8007BB15; Fri, 14 Jun 2013 20:33:28 +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:28 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 23/28] ARM: SAMSUNG: Make legacy MFC support code depend on SAMSUNG_ATAGS Date: Fri, 14 Jun 2013 21:32:59 +0200 Message-id: <1371238384-1504-24-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+NgFuplluLIzCtJLcpLzFFi42I5/e/4FV2Ogt2BBi+eaFj8nXSM3eLH6wts Fr0LrrJZnG16w26x6fE1VosZ5/cxWaw9cpfd4tT1z2wWh9+0s1qsn/GaxeLYjCWMDtwev39N YvS4c20Pm8fmJfUeV040sXr0bVnF6PF5k1wAWxSXTUpqTmZZapG+XQJXxob+LtaCRv6K2Z3O DYzHeLoYOTgkBEwkZrwz7GLkBDLFJC7cW8/WxcjFISSwlFHiwfINzBBOH5PEtEczmUCq2ATU JD43PGIDsUUEVCU+ty1gByliFuhjlrh99C5YQlggWmLOvvmMIDYLUNHZI61gNq+Ak8SZd2uZ INYpSBzfvg0szgkUP7t+C1ivkICjxPTGJSwTGHkXMDKsYhRNLU0uKE5KzzXUK07MLS7NS9dL zs/dxAgJwi87GBcfszrEKMDBqMTDO1Ftd6AQa2JZcWXuIUYJDmYlEd67qkAh3pTEyqrUovz4 otKc1OJDjEwcnFINjHPv9VwXt+28EKm3ah+T0SS+d4Xd82J4C3P7fC+kBs5ZbHf8wrTw/nMf ZaZPqjr0VeZevTyXP8dlv5QZu6dK3xC68fXf9jjNZYxpK4oLVqacFrucEPrt86VNQo0LVQQm aE058u2W55Fs1z1vg8KfqUXyXPi0fmrm44CgNVPXx587MllcLeauwAklluKMREMt5qLiRADT eMvGIAIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_153443_620910_7E999912 X-CRM114-Status: GOOD ( 11.60 ) X-Spam-Score: -7.2 (-------) Cc: Kamil Debski , 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 allows to bypass compilation of static platform device and resource definitions that require interrupts and base addresses to be defined statically. Cc: Kamil Debski Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/plat-samsung/s5p-dev-mfc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/plat-samsung/s5p-dev-mfc.c index a93fb6f..ad51f85 100644 --- a/arch/arm/plat-samsung/s5p-dev-mfc.c +++ b/arch/arm/plat-samsung/s5p-dev-mfc.c @@ -17,10 +17,12 @@ #include #include +#include + +#ifdef CONFIG_SAMSUNG_ATAGS #include #include #include -#include static struct resource s5p_mfc_resource[] = { [0] = DEFINE_RES_MEM(S5P_PA_MFC, SZ_64K), @@ -61,6 +63,10 @@ struct platform_device s5p_device_mfc_r = { .coherent_dma_mask = DMA_BIT_MASK(32), }, }; +#else +static struct platform_device s5p_device_mfc_l; +static struct platform_device s5p_device_mfc_r; +#endif struct s5p_mfc_reserved_mem { phys_addr_t base; @@ -70,6 +76,7 @@ struct s5p_mfc_reserved_mem { static struct s5p_mfc_reserved_mem s5p_mfc_mem[2] __initdata; + void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize, phys_addr_t lbase, unsigned int lsize) { @@ -93,6 +100,7 @@ void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize, } } +#ifdef CONFIG_SAMSUNG_ATAGS static int __init s5p_mfc_memory_init(void) { int i; @@ -111,6 +119,7 @@ static int __init s5p_mfc_memory_init(void) return 0; } device_initcall(s5p_mfc_memory_init); +#endif #ifdef CONFIG_OF int __init s5p_fdt_find_mfc_mem(unsigned long node, const char *uname,