From patchwork Wed Nov 14 18:20:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 198967 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 E78CF2C007A for ; Thu, 15 Nov 2012 05:23:08 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYha1-0006S0-Cn; Wed, 14 Nov 2012 18:20:53 +0000 Received: from co9ehsobe002.messaging.microsoft.com ([207.46.163.25] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TYhZy-0006RB-CH for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 18:20:51 +0000 Received: from mail85-co9-R.bigfish.com (10.236.132.232) by CO9EHSOBE019.bigfish.com (10.236.130.82) with Microsoft SMTP Server id 14.1.225.23; Wed, 14 Nov 2012 18:20:48 +0000 Received: from mail85-co9 (localhost [127.0.0.1]) by mail85-co9-R.bigfish.com (Postfix) with ESMTP id 55AA9460147; Wed, 14 Nov 2012 18:20:48 +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: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h1155h) Received: from mail85-co9 (localhost.localdomain [127.0.0.1]) by mail85-co9 (MessageSwitch) id 1352917245378785_8193; Wed, 14 Nov 2012 18:20:45 +0000 (UTC) Received: from CO9EHSMHS026.bigfish.com (unknown [10.236.132.228]) by mail85-co9.bigfish.com (Postfix) with ESMTP id 4FF8D1400D1; Wed, 14 Nov 2012 18:20:45 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS026.bigfish.com (10.236.130.36) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 14 Nov 2012 18:20:44 +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; Wed, 14 Nov 2012 18:20:43 +0000 Received: from fabio-Latitude-E6410.am.freescale.net ([10.29.240.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id qAEIKegu009054; Wed, 14 Nov 2012 11:20:41 -0700 From: Fabio Estevam To: Subject: [PATCH v2 1/2] ARM: mx27: Add VPU support Date: Wed, 14 Nov 2012 16:20:36 -0200 Message-ID: <1352917238-29694-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-20121114_132050_636230_1B1670D3 X-CRM114-Status: GOOD ( 14.78 ) 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 [207.46.163.25 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 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 mx27 has a VPU (Video Processing Unit) block that allows doing H264/MPEG4 decoding and encoding in hardware. Add support for it in a common SoC file instead of per board file. Signed-off-by: Fabio Estevam --- Javier, I removed dma_declare_coherent_memory call, as per Sascha's suggestion on my first submission of adding mx27pdk VPU support. Hope this is ok with you. Changes since v1: - Call imx27_add_coda() on a common mx27 location instead of per board. arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 18 ------------------ arch/arm/mach-imx/mm-imx27.c | 3 ++- 2 files 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..ee9cbff 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -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,6 @@ 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(); } static void __init visstrim_m10_timer_init(void) diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index 4f1be65..fddadb1 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -25,9 +25,9 @@ #include #include "common.h" -#include "devices/devices-common.h" #include "hardware.h" #include "iomux-v1.h" +#include "devices-imx27.h" /* MX27 memory map definition */ static struct map_desc imx27_io_desc[] __initdata = { @@ -98,4 +98,5 @@ void __init imx27_soc_init(void) /* imx27 has the imx21 type audmux */ platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res, ARRAY_SIZE(imx27_audmux_res)); + imx27_add_coda(); }