From patchwork Mon Nov 5 15:59:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 15352 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TVP63-0004O6-QU for patchwork@linuxtv.org; Mon, 05 Nov 2012 17:00:19 +0100 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 1TVP62-0007Uv-Ct; Mon, 05 Nov 2012 17:00:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751767Ab2KEQAR (ORCPT ); Mon, 5 Nov 2012 11:00:17 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:35046 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505Ab2KEQAO (ORCPT ); Mon, 5 Nov 2012 11:00:14 -0500 Received: by mail-wg0-f44.google.com with SMTP id dr13so4061968wgb.1 for ; Mon, 05 Nov 2012 08:00:14 -0800 (PST) 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=hF9/ZatNKyFMCkC7ihFm38Bs7cY1m1R0HHrkWhWQZI4=; b=HReSS/OGA5ypIdDLbLxoTO6o5+AR2YYiLnV79cTR5rtw5WOKmy1QGbUJ5ZAPO0CJ8K kGgW749hz5DNue6/SAollWXhwL1BFVXxk3TDY9jDrI9Ljx8whM0xStwsTJGXoYnI+54E 4kIhp+dTiV5iYLUqgB1D3OnA3gGR2EJK6GgOHY2tVop5o+6dGv2LTo4R5h0QfoKyAjHi qpkP8ecQqGmeQTIqyMUy0U8SazD36lrkLN+b1mltQXOELvnNFKj+XhS6ZZVF2RoY0EiJ viZbzxlrPfVU6F3ZzsUXHBeSUkfnYexjZYOcdTBiHMFHu1Wx6Wj/33K8UjY97Acd4C/o 1Zaw== Received: by 10.181.13.194 with SMTP id fa2mr14043233wid.10.1352131214085; Mon, 05 Nov 2012 08:00:14 -0800 (PST) Received: from piscis.vsilicon.net (149.93.18.95.dynamic.jazztel.es. [95.18.93.149]) by mx.google.com with ESMTPS id j8sm10915175wiy.9.2012.11.05.08.00.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 08:00:13 -0800 (PST) From: Javier Martin To: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, p.zabel@pengutronix.de, s.nawrocki@samsung.com, mchehab@infradead.org, kernel@pengutronix.de, Javier Martin Subject: [PATCH 2/2] media: coda: Use iram_alloc() for codadx6 too. Date: Mon, 5 Nov 2012 16:59:45 +0100 Message-Id: <1352131185-12079-2-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352131185-12079-1-git-send-email-javier.martin@vista-silicon.com> References: <1352131185-12079-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQnDoy+vYDXsO7nRPurYf7CgWds1nRcTY9kE60x8FvQj2WhFz3nG2GrhEBfZ13Yu2YCNf4UX 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.11.5.155118 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_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 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, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Use this helper function instead of hardcoding the physical address of the IRAM in the i.MX27. Signed-off-by: Javier Martin --- drivers/media/video/Kconfig | 2 +- drivers/media/video/coda.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index ecab6ef..0b5f785 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -1229,7 +1229,7 @@ config VIDEO_CODA depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV - select IRAM_ALLOC if SOC_IMX53 + select IRAM_ALLOC ---help--- Coda is a range of video codec IPs that supports H.264, MPEG-4, and other video formats. diff --git a/drivers/media/video/coda.c b/drivers/media/video/coda.c index 7febcd9..96ecb3f 100644 --- a/drivers/media/video/coda.c +++ b/drivers/media/video/coda.c @@ -43,6 +43,7 @@ #define CODA_PARA_BUF_SIZE (10 * 1024) #define CODA_ISRAM_SIZE (2048 * 2) #define CODA7_IRAM_SIZE 0x14000 /* 81920 bytes */ +#define CODADX6_IRAM_SIZE 45056 #define CODA_MAX_FRAMEBUFFERS 2 @@ -1919,6 +1920,8 @@ static int __devinit coda_probe(struct platform_device *pdev) const struct of_device_id *of_id = of_match_device(of_match_ptr(coda_dt_ids), &pdev->dev); const struct platform_device_id *pdev_id; + void __iomem *iram_vaddr; + unsigned long iram_size; struct coda_dev *dev; struct resource *res; int ret, irq; @@ -2016,16 +2019,15 @@ static int __devinit coda_probe(struct platform_device *pdev) } if (dev->devtype->product == CODA_DX6) { - dev->iram_paddr = 0xffff4c00; + iram_size = CODADX6_IRAM_SIZE; } else { - void __iomem *iram_vaddr; + iram_size = CODA7_IRAM_SIZE; + } - iram_vaddr = iram_alloc(CODA7_IRAM_SIZE, - &dev->iram_paddr); - if (!iram_vaddr) { - dev_err(&pdev->dev, "unable to alloc iram\n"); - return -ENOMEM; - } + iram_vaddr = iram_alloc(iram_size, &dev->iram_paddr); + if (!iram_vaddr) { + dev_err(&pdev->dev, "unable to alloc iram\n"); + return -ENOMEM; } platform_set_drvdata(pdev, dev);