From patchwork Tue Oct 14 06:22:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 5077961 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 748B6C11AC for ; Tue, 14 Oct 2014 06:22:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AEB320148 for ; Tue, 14 Oct 2014 06:22:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82CE920121 for ; Tue, 14 Oct 2014 06:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652AbaJNGW1 (ORCPT ); Tue, 14 Oct 2014 02:22:27 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:36598 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754241AbaJNGW0 (ORCPT ); Tue, 14 Oct 2014 02:22:26 -0400 Received: by mail-pa0-f45.google.com with SMTP id rd3so7242613pab.18 for ; Mon, 13 Oct 2014 23:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=LJH2sBZ8bA01QrzcdT6rZa1uorYJTOP6Ue+OkVUoSk4=; b=HI1Flx6NiN4KABim9OyBR1TsPGmG4ZdkO1W9/jSPuTkAddPN0OCMOYk8bBO1w/bJz7 5T+mtLicOnWDsh/WU0rXBxroebdtYufqAHAOhL+QmS4FNTcYtHpe4PBe43pimGiikYkv mij3OvBWTBfJRcElr27iajXxAmSZsUvWBVSDMdUZivRYTJia1Owj+kX9KlWOYDUV4DBg wDrUk6YSWDNrMsNzJ5svXERM3vX5w+BkD0iUlzh705EKmXmW4G8GnuNDeQ4FEtbsow9f +Lz96/gGTPAxN2u3dAYfuU7g9uG23GxGGUWTksTnYo3yN6aw5j64OOnD9+UfcfTsdSDE UhaA== X-Received: by 10.66.252.8 with SMTP id zo8mr3380824pac.12.1413267745723; Mon, 13 Oct 2014 23:22:25 -0700 (PDT) Received: from localhost.localdomain (p5095-ipngn6701marunouchi.tokyo.ocn.ne.jp. [153.174.4.95]) by mx.google.com with ESMTPSA id ra4sm13134702pab.33.2014.10.13.23.22.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Oct 2014 23:22:25 -0700 (PDT) From: Yoshihiro Kaneko To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Date: Tue, 14 Oct 2014 15:22:10 +0900 Message-Id: <1413267730-8172-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Koji Matsuoka Signed-off-by: Koji Matsuoka Signed-off-by: Yoshihiro Kaneko Acked-by: Simon Horman --- This patch is against master branch of linuxtv.org/media_tree.git. drivers/media/platform/soc_camera/rcar_vin.c | 10 ++++++++++ include/linux/platform_data/camera-rcar.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 20defcb..7eb4f1e 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -74,6 +74,8 @@ #define VNMC_INF_YUV10_BT656 (2 << 16) #define VNMC_INF_YUV10_BT601 (3 << 16) #define VNMC_INF_YUV16 (5 << 16) +#define VNMC_INF_RGB888 (6 << 16) +#define VNMC_INF_RGB_MASK (6 << 16) #define VNMC_VUP (1 << 10) #define VNMC_IM_ODD (0 << 3) #define VNMC_IM_ODD_EVEN (1 << 3) @@ -272,6 +274,10 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) /* input interface */ switch (icd->current_fmt->code) { + case V4L2_MBUS_FMT_RGB888_1X24: + /* BT.601/BT.709 24-bit RGB-888 */ + vnmc |= VNMC_INF_RGB888; + break; case V4L2_MBUS_FMT_YUYV8_1X16: /* BT.601/BT.1358 16bit YCbCr422 */ vnmc |= VNMC_INF_YUV16; @@ -331,6 +337,9 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) if (output_is_yuv) vnmc |= VNMC_BPS; + if (vnmc & VNMC_INF_RGB_MASK) + vnmc ^= VNMC_BPS; + /* progressive or interlaced mode */ interrupts = progressive ? VNIE_FIE | VNIE_EFE : VNIE_EFE; @@ -1013,6 +1022,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx, case V4L2_MBUS_FMT_YUYV8_1X16: case V4L2_MBUS_FMT_YUYV8_2X8: case V4L2_MBUS_FMT_YUYV10_2X10: + case V4L2_MBUS_FMT_RGB888_1X24: if (cam->extra_fmt) break; diff --git a/include/linux/platform_data/camera-rcar.h b/include/linux/platform_data/camera-rcar.h index dfc83c5..03a9df6 100644 --- a/include/linux/platform_data/camera-rcar.h +++ b/include/linux/platform_data/camera-rcar.h @@ -17,6 +17,7 @@ #define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1) #define RCAR_VIN_BT601 (1 << 2) #define RCAR_VIN_BT656 (1 << 3) +#define RCAR_VIN_BT709 (1 << 4) struct rcar_vin_platform_data { unsigned int flags;