From patchwork Mon Nov 19 14:07:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 200010 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D6C22C00F3 for ; Tue, 20 Nov 2012 01:09:58 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaS0m-0008GD-MT; Mon, 19 Nov 2012 14:07:44 +0000 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11] helo=tx2outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TaS0O-0008Az-Gh for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 14:07:22 +0000 Received: from mail225-tx2-R.bigfish.com (10.9.14.244) by TX2EHSOBE009.bigfish.com (10.9.40.29) with Microsoft SMTP Server id 14.1.225.23; Mon, 19 Nov 2012 14:07:18 +0000 Received: from mail225-tx2 (localhost [127.0.0.1]) by mail225-tx2-R.bigfish.com (Postfix) with ESMTP id A48E2A0014A; Mon, 19 Nov 2012 14:07:18 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VS1(z551bizzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1155h) Received: from mail225-tx2 (localhost.localdomain [127.0.0.1]) by mail225-tx2 (MessageSwitch) id 135333403759302_31913; Mon, 19 Nov 2012 14:07:17 +0000 (UTC) Received: from TX2EHSMHS008.bigfish.com (unknown [10.9.14.246]) by mail225-tx2.bigfish.com (Postfix) with ESMTP id 0A5A59000A0; Mon, 19 Nov 2012 14:07:17 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS008.bigfish.com (10.9.99.108) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 19 Nov 2012 14:07:15 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 19 Nov 2012 14:07:14 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.240.140]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qAJE79iE019739; Mon, 19 Nov 2012 07:07:10 -0700 From: Fabio Estevam To: Subject: [PATCH v3 1/3] ARM: imx27_visstrim_m10: Do not reserve VPU DMA pool on board file Date: Mon, 19 Nov 2012 12:07:05 -0200 Message-ID: <1353334027-30009-1-git-send-email-fabio.estevam@freescale.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_090720_785605_C5A498B3 X-CRM114-Status: GOOD ( 12.72 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [65.55.88.11 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , javier.martin@vista-silicon.com, linux-arm-kernel@lists.infradead.org, eric@eukrea.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Do not reserve VPU DMA pool on board file as this can be done via CMA. The motivation for doing this is to allow to register the VPU driver via a common SoC file instead of per board. Signed-off-by: Fabio Estevam --- Changes since v2: - No changes. Newly introduced on this series arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index b744226..801b797 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -264,7 +264,7 @@ static void __init visstrim_camera_init(void) static void __init visstrim_reserve(void) { /* reserve 4 MiB for mx2-camera */ - mx2_camera_base = arm_memblock_steal(3 * MX2_CAMERA_BUF_SIZE, + mx2_camera_base = arm_memblock_steal(2 * MX2_CAMERA_BUF_SIZE, MX2_CAMERA_BUF_SIZE); } @@ -434,23 +434,6 @@ static const struct imx_ssi_platform_data visstrim_m10_ssi_pdata __initconst = { .flags = IMX_SSI_DMA | IMX_SSI_SYN, }; -/* coda */ - -static void __init visstrim_coda_init(void) -{ - struct platform_device *pdev; - int dma; - - pdev = imx27_add_coda(); - dma = dma_declare_coherent_memory(&pdev->dev, - mx2_camera_base + MX2_CAMERA_BUF_SIZE, - mx2_camera_base + MX2_CAMERA_BUF_SIZE, - MX2_CAMERA_BUF_SIZE, - DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE); - if (!(dma & DMA_MEMORY_MAP)) - return; -} - /* DMA deinterlace */ static struct platform_device visstrim_deinterlace = { .name = "m2m-deinterlace", @@ -548,7 +531,7 @@ static void __init visstrim_m10_board_init(void) gpio_led_register_device(0, &visstrim_m10_led_data); visstrim_deinterlace_init(); visstrim_camera_init(); - visstrim_coda_init(); + imx27_add_coda(); } static void __init visstrim_m10_timer_init(void)