From patchwork Wed May 2 15:15:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 10969 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SPbIB-0004D6-Cv for patchwork@linuxtv.org; Wed, 02 May 2012 17:16:35 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SPbIA-0004qS-Bm; Wed, 02 May 2012 17:16:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755477Ab2EBPQb (ORCPT ); Wed, 2 May 2012 11:16:31 -0400 Received: from na3sys009aog130.obsmtp.com ([74.125.149.143]:36168 "EHLO na3sys009aog130.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755478Ab2EBPQ3 (ORCPT ); Wed, 2 May 2012 11:16:29 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]) (using TLSv1) by na3sys009aob130.postini.com ([74.125.148.12]) with SMTP ID DSNKT6FPzM1thho/F5RlXQuM5fJZb4Ytgdyh@postini.com; Wed, 02 May 2012 08:16:29 PDT Received: by qcsc20 with SMTP id c20so626001qcs.18 for ; Wed, 02 May 2012 08:16:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=H54i/yE3ZPzOJjQUFR/G4pls6ElWypWbhwkmtKqKTqc=; b=AJUvJPqrreTp4gD2H+nXmOjN5rIU28tESFio1XhfyrdT1LMASB/HdJhFdabtSWgZGj p0fGJyzELYweVowI205ZozuHt7lxOvYa8Quow0rQgjDlFjA2jcJCpWPD1rcteAcPlrh9 SnZpxAeppo0vmz3f24xbpe0X8g2DND0yk26DhZhBnrYMpnOmq9hFb14i7l+JhGviSiCT hgW9I0DxZQws20GdhFotdx//c/k2Qc700we8DPaeyqcNODxl8ZSn0ioWeYlkPT5sPzVw gIXRz4LoSJallCtA3U2CObt+P4edYAXeXoi8s4FdeVBjhfpnQOhttZ2ObpMZ5b7w7bpB 2H2w== Received: by 10.60.170.145 with SMTP id am17mr2950659oec.73.1335971788111; Wed, 02 May 2012 08:16:28 -0700 (PDT) Received: from localhost.localdomain (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id bd10sm2259391obb.15.2012.05.02.08.16.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 May 2012 08:16:27 -0700 (PDT) From: Sergio Aguirre To: linux-media@vger.kernel.org Cc: linux-omap@vger.kernel.org, Sergio Aguirre Subject: [PATCH v3 10/10] arm: Add support for CMA for omap4iss driver Date: Wed, 2 May 2012 10:15:49 -0500 Message-Id: <1335971749-21258-11-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335971749-21258-1-git-send-email-saaguirre@ti.com> References: <1335971749-21258-1-git-send-email-saaguirre@ti.com> X-Gm-Message-State: ALoCoQlpKBXQ7BSo7tH6cvFzfG/v/dRsnXjCwEaHcUpatFYD2ay9+5JHiVKPxmQGQWMw/4uZ9IHo Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.2.150327 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DATE_TZ_NEG_0500 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Sergio Aguirre --- arch/arm/mach-omap2/devices.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 2b8cf73..5259691 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -18,6 +18,9 @@ #include #include #include +#ifdef CONFIG_CMA +#include +#endif #include @@ -265,6 +268,11 @@ int omap4_init_camera(struct iss_platform_data *pdata, struct omap_board_data *b oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt); +#ifdef CONFIG_CMA + /* Create private 32MiB contiguous memory area for omap4iss device */ + dma_declare_contiguous(&pdev->dev, 32*SZ_1M, 0, 0); +#endif + return 0; }