From patchwork Mon Jun 17 16:34:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2736181 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 13B0FC0AB1 for ; Mon, 17 Jun 2013 17:41:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6112B204EC for ; Mon, 17 Jun 2013 17:41:16 +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 C6865204E3 for ; Mon, 17 Jun 2013 17:41:14 +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 1UocTk-0002bt-O6; Mon, 17 Jun 2013 16:40:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocRX-0006PU-Qw; Mon, 17 Jun 2013 16:38:11 +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 1UocP1-00061S-81 for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 16:35:39 +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 <0MOJ0085OQ1L6450@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 17:34:52 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-b6-51bf3aac8829 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 16.85.13793.CAA3FB15; Mon, 17 Jun 2013 17:34:52 +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:52 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 25/38] ARM: SAMSUNG: Make legacy MFC support code depend on SAMSUNG_ATAGS Date: Mon, 17 Jun 2013 18:34:10 +0200 Message-id: <1371486863-12398-26-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+NgFprELMWRmVeSWpSXmKPExsVy+t/xq7prrPYHGrxfymfxd9Ixdosja68y Wfx4fYHNonfBVTaLs01v2C02Pb7GajHj/D4mi7VH7rJbnLr+mc3i8Jt2Vov1M16zWBybsYTR gcfj969JjB53ru1h89i8pN7jyokmVo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DKuLtUuGA1 f8XkNaINjK95uhg5OSQETCRuNExihLDFJC7cW8/WxcjFISSwlFHi9ZMz7BBOH5PEo7VvmECq 2ATUJD43PGIDsUUEVCU+ty0AK2IW2MYssWHnV7BRwgJxEu9+/GcGsVmAis6+O88CYvMKOEvs PH6JHWKdgsTx7dvA6jmB4ov7boHVCwk4SeyeeYl1AiPvAkaGVYyiqaXJBcVJ6bmGesWJucWl eel6yfm5mxgh4fhlB+PiY1aHGAU4GJV4eBPE9gcKsSaWFVfmHmKU4GBWEuGNnbgvUIg3JbGy KrUoP76oNCe1+BAjEwenVAMjz+vLjcbTy8+t/yfr2h1azPb7tP2LfywsEvLeazmbZRwEVU5P kLG6xHRk3hqJoIeN3Ct//VDOi9ouy5GqIy4eXK0tdHJL+88VNZuXrfn9tOL/8s29aU37Lh0M //zOQn7JxLaJ1m1ZcqHzd2yesMxXyExVV3OVUv3JxPMr+V5oFQSdDWq9wpOtxFKckWioxVxU nAgAQW/Y6yUCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_123535_430808_31CA7FDB X-CRM114-Status: GOOD ( 11.89 ) X-Spam-Score: -8.0 (--------) Cc: Kamil Debski , Kukjin Kim , Arnd Bergmann , Tomasz Figa , Jeongtae Park , 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 This allows to bypass compilation of static platform device and resource definitions that require interrupts and base addresses to be defined statically. Cc: Jeongtae Park 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,