From patchwork Tue Jun 5 14:06:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 11580 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SbuP3-0008AS-5T for patchwork@linuxtv.org; Tue, 05 Jun 2012 16:06:33 +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-2) with esmtp for id 1SbuP2-0005tL-Gz; Tue, 05 Jun 2012 16:06:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227Ab2FEOG0 (ORCPT ); Tue, 5 Jun 2012 10:06:26 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:63390 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753031Ab2FEOGY (ORCPT ); Tue, 5 Jun 2012 10:06:24 -0400 Received: by weyu7 with SMTP id u7so3598291wey.19 for ; Tue, 05 Jun 2012 07:06:23 -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:x-gm-message-state; bh=RXRHEuPaaiEmEWi247+8oHGH83/Llj4BwgHuSPtFlHo=; b=pohlSRdnV3AQKHwhzRt94DPvLYKdv14W9JL0XhfVAMzup9TaBrKKbzrHrel9N2FVOB qbQLJcNwGVd1ggTDonE4UV6gdDFqDDtx2O1MAA+qqm6wdXLqkdiJj0Sj29vTR1IpvWET /z7/cDe4ykjzFiRGN+mOoBMTJFo4eXxtCgaOZ6japDJOhOQKS9ZQgTI/UAk82RQ3efUl kAxFpQnx0KtAasLq7ZBhzovJKL651yhhilGCn/zegSBKUYnPSWBDFFJXRaOwC7p1/gCJ 1kxwUv/LPw/avnX4NecCY/AaK85YE+nu+fvbnOCANbxWMaLXrHvW4oXuN9YpVOuJDlR9 H93w== Received: by 10.216.141.164 with SMTP id g36mr2415019wej.119.1338905183364; Tue, 05 Jun 2012 07:06:23 -0700 (PDT) Received: from localhost.localdomain (96.252.106.212.dynamic.jazztel.es. [212.106.252.96]) by mx.google.com with ESMTPS id k8sm6357958wia.6.2012.06.05.07.06.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 07:06:21 -0700 (PDT) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, fabio.estevam@freescale.com, mchehab@infradead.org, Javier Martin Subject: [PATCH] media: mx2_camera: Add YUYV output format. Date: Tue, 5 Jun 2012 16:06:13 +0200 Message-Id: <1338905173-5968-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQkv9leo6gYedlO5EuIvu5mhkJ408vt/OxvzG5s09p91fDmvO56Teyv70S6/C6ZSrtIRsnr5 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.6.5.135414 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_1700_1799 0, BODY_SIZE_2000_LESS 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_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __LINES_OF_YELLING 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 ' While YUYV format can be handled using generic pass-through mode, in order to allow resizing the eMMa-PrP has to know exactly what format it is dealing with to process data accordingly. Signed-off-by: Javier Martin --- drivers/media/video/mx2_camera.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index b30ebe5..c8fa457 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -332,6 +332,32 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = { } }, { + .in_fmt = V4L2_MBUS_FMT_UYVY8_2X8, + .out_fmt = V4L2_PIX_FMT_YUYV, + .cfg = { + .channel = 1, + .in_fmt = PRP_CNTL_DATA_IN_YUV422, + .out_fmt = PRP_CNTL_CH1_OUT_YUV422, + .src_pixel = 0x22000888, /* YUV422 (YUYV) */ + .ch1_pixel = 0x62000888, /* YUV422 (YUYV) */ + .irq_flags = PRP_INTR_RDERR | PRP_INTR_CH1WERR | + PRP_INTR_CH1FC | PRP_INTR_LBOVF, + } + }, + { + .in_fmt = V4L2_MBUS_FMT_YUYV8_2X8, + .out_fmt = V4L2_PIX_FMT_YUYV, + .cfg = { + .channel = 1, + .in_fmt = PRP_CNTL_DATA_IN_YUV422, + .out_fmt = PRP_CNTL_CH1_OUT_YUV422, + .src_pixel = 0x22000888, /* YUV422 (YUYV) */ + .ch1_pixel = 0x62000888, /* YUV422 (YUYV) */ + .irq_flags = PRP_INTR_RDERR | PRP_INTR_CH1WERR | + PRP_INTR_CH1FC | PRP_INTR_LBOVF, + } + }, + { .in_fmt = V4L2_MBUS_FMT_YUYV8_2X8, .out_fmt = V4L2_PIX_FMT_YUV420, .cfg = {