From patchwork Tue Aug 28 10:53:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 1380671 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 20645DFB34 for ; Tue, 28 Aug 2012 10:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751747Ab2H1Kyg (ORCPT ); Tue, 28 Aug 2012 06:54:36 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:48346 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557Ab2H1KyL (ORCPT ); Tue, 28 Aug 2012 06:54:11 -0400 Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1T6JQs-0003Df-Vl; Tue, 28 Aug 2012 12:54:07 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Javier Martin , Mauro Carvalho Chehab , Richard Zhao , Laurent Pinchart , Sylwester Nawrocki , Kyungmin Park , Hans Verkuil , kernel@pengutronix.de, Philipp Zabel Subject: [PATCH v2 02/14] media: coda: add i.MX53 / CODA7541 platform support Date: Tue, 28 Aug 2012 12:53:49 +0200 Message-Id: <1346151241-10449-3-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1346151241-10449-1-git-send-email-p.zabel@pengutronix.de> References: <1346151241-10449-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Philipp Zabel --- Changes since v1: - Removed JPEG from the coda7_formats. --- drivers/media/video/coda.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/media/video/coda.c b/drivers/media/video/coda.c index 86dae17..6ae5f0f 100644 --- a/drivers/media/video/coda.c +++ b/drivers/media/video/coda.c @@ -84,6 +84,7 @@ enum coda_inst_type { enum coda_product { CODA_DX6 = 0xf001, + CODA_7541 = 0xf012, }; struct coda_fmt { @@ -261,6 +262,24 @@ static struct coda_fmt codadx6_formats[] = { }, }; +static struct coda_fmt coda7_formats[] = { + { + .name = "YUV 4:2:0 Planar", + .fourcc = V4L2_PIX_FMT_YUV420, + .type = CODA_FMT_RAW, + }, + { + .name = "H264 Encoded Stream", + .fourcc = V4L2_PIX_FMT_H264, + .type = CODA_FMT_ENC, + }, + { + .name = "MPEG4 Encoded Stream", + .fourcc = V4L2_PIX_FMT_MPEG4, + .type = CODA_FMT_ENC, + }, +}; + static struct coda_fmt *find_format(struct coda_dev *dev, struct v4l2_format *f) { struct coda_fmt *formats = dev->devtype->formats; @@ -1485,6 +1504,7 @@ static irqreturn_t coda_irq_handler(int irq, void *data) static u32 coda_supported_firmwares[] = { CODA_FIRMWARE_VERNUM(CODA_DX6, 2, 2, 5), + CODA_FIRMWARE_VERNUM(CODA_7541, 13, 4, 29), }; static bool coda_firmware_supported(u32 vernum) @@ -1504,6 +1524,8 @@ static char *coda_product_name(int product) switch (product) { case CODA_DX6: return "CodaDx6"; + case CODA_7541: + return "CODA7541"; default: snprintf(buf, sizeof(buf), "(0x%04x)", product); return buf; @@ -1695,6 +1717,7 @@ static int coda_firmware_request(struct coda_dev *dev) enum coda_platform { CODA_IMX27, + CODA_IMX53, }; static struct coda_devtype coda_devdata[] = { @@ -1704,10 +1727,17 @@ static struct coda_devtype coda_devdata[] = { .formats = codadx6_formats, .num_formats = ARRAY_SIZE(codadx6_formats), }, + [CODA_IMX53] = { + .firmware = "v4l-coda7541-imx53.bin", + .product = CODA_7541, + .formats = coda7_formats, + .num_formats = ARRAY_SIZE(coda7_formats), + }, }; static struct platform_device_id coda_platform_ids[] = { { .name = "coda-imx27", .driver_data = CODA_IMX27 }, + { .name = "coda-imx53", .driver_data = CODA_7541 }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(platform, coda_platform_ids); @@ -1715,6 +1745,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids); #ifdef CONFIG_OF static const struct of_device_id coda_dt_ids[] = { { .compatible = "fsl,imx27-vpu", .data = &coda_platform_ids[CODA_IMX27] }, + { .compatible = "fsl,imx53-vpu", .data = &coda_devdata[CODA_IMX53] }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, coda_dt_ids);