From patchwork Mon Jun 20 16:20:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9188179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCDC860871 for ; Mon, 20 Jun 2016 16:27:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA0AD26861 for ; Mon, 20 Jun 2016 16:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEAAD276AE; Mon, 20 Jun 2016 16:27:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7011726861 for ; Mon, 20 Jun 2016 16:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755962AbcFTQ0S (ORCPT ); Mon, 20 Jun 2016 12:26:18 -0400 Received: from mga11.intel.com ([192.55.52.93]:36468 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754596AbcFTQZM (ORCPT ); Mon, 20 Jun 2016 12:25:12 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 20 Jun 2016 09:23:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,499,1459839600"; d="scan'208,217";a="1001670125" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by orsmga002.jf.intel.com with ESMTP; 20 Jun 2016 09:23:51 -0700 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id C6AE120A03; Mon, 20 Jun 2016 19:23:48 +0300 (EEST) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id 2E316200C4; Mon, 20 Jun 2016 19:20:13 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, Jouni Ukkonen Subject: [PATCH v2 5/7] media: Add 1X14 14-bit raw bayer media bus code definitions Date: Mon, 20 Jun 2016 19:20:06 +0300 Message-Id: <1466439608-22890-6-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466439608-22890-1-git-send-email-sakari.ailus@linux.intel.com> References: <1466439608-22890-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jouni Ukkonen The codes will be called: MEDIA_BUS_FMT_SBGGR14_1X14 MEDIA_BUS_FMT_SGBRG14_1X14 MEDIA_BUS_FMT_SGRBG14_1X14 MEDIA_BUS_FMT_SRGGB14_1X14 Signed-off-by: Jouni Ukkonen Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil --- Documentation/DocBook/media/v4l/subdev-formats.xml | 162 +++++++++++++++++++-- include/uapi/linux/media-bus-format.h | 6 +- 2 files changed, 154 insertions(+), 14 deletions(-) diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index 199c84e..6d45dc8 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -1098,22 +1098,24 @@ see . Bayer Formats - + - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -1126,6 +1128,8 @@ see . Bit + 13 + 12 11 10 9 @@ -1149,6 +1153,8 @@ see . - - - + - + - b7 b6 b5 @@ -1166,6 +1172,8 @@ see . - - - + - + - g7 g6 g5 @@ -1183,6 +1191,8 @@ see . - - - + - + - g7 g6 g5 @@ -1200,6 +1210,8 @@ see . - - - + - + - r7 r6 r5 @@ -1217,6 +1229,8 @@ see . - - - + - + - b7 b6 b5 @@ -1234,6 +1248,8 @@ see . - - - + - + - g7 g6 g5 @@ -1251,6 +1267,8 @@ see . - - - + - + - g7 g6 g5 @@ -1268,6 +1286,8 @@ see . - - - + - + - r7 r6 r5 @@ -1285,6 +1305,8 @@ see . - - - + - + - b7 b6 b5 @@ -1302,6 +1324,8 @@ see . - - - + - + - g7 g6 g5 @@ -1319,6 +1343,8 @@ see . - - - + - + - g7 g6 g5 @@ -1336,6 +1362,8 @@ see . - - - + - + - r7 r6 r5 @@ -1353,6 +1381,8 @@ see . - - - + - + - 0 0 0 @@ -1370,6 +1400,8 @@ see . - - - + - + - b7 b6 b5 @@ -1387,6 +1419,8 @@ see . - - - + - + - b7 b6 b5 @@ -1404,6 +1438,8 @@ see . - - - + - + - 0 0 0 @@ -1421,6 +1457,8 @@ see . - - - + - + - b9 b8 b7 @@ -1438,6 +1476,8 @@ see . - - - + - + - b1 b0 0 @@ -1455,6 +1495,8 @@ see . - - - + - + - b1 b0 0 @@ -1472,6 +1514,8 @@ see . - - - + - + - b9 b8 b7 @@ -1487,6 +1531,8 @@ see . - - + - + - b9 b8 b7 @@ -1504,6 +1550,8 @@ see . - - + - + - g9 g8 g7 @@ -1521,6 +1569,8 @@ see . - - + - + - g9 g8 g7 @@ -1538,6 +1588,8 @@ see . - - + - + - r9 r8 r7 @@ -1553,6 +1605,8 @@ see . MEDIA_BUS_FMT_SBGGR12_1X12 0x3008 + - + - b11 b10 b9 @@ -1570,6 +1624,8 @@ see . MEDIA_BUS_FMT_SGBRG12_1X12 0x3010 + - + - g11 g10 g9 @@ -1587,6 +1643,8 @@ see . MEDIA_BUS_FMT_SGRBG12_1X12 0x3011 + - + - g11 g10 g9 @@ -1604,6 +1662,84 @@ see . MEDIA_BUS_FMT_SRGGB12_1X12 0x3012 + - + - + r11 + r10 + r9 + r8 + r7 + r6 + r5 + r4 + r3 + r2 + r1 + r0 + + + MEDIA_BUS_FMT_SBGGR14_1X14 + 0x3019 + + b13 + b12 + b11 + b10 + b9 + b8 + b7 + b6 + b5 + b4 + b3 + b2 + b1 + b0 + + + MEDIA_BUS_FMT_SGBRG14_1X14 + 0x301a + + g13 + g12 + g11 + g10 + g9 + g8 + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + + + MEDIA_BUS_FMT_SGRBG14_1X14 + 0x301b + + g13 + g12 + g11 + g10 + g9 + g8 + g7 + g6 + g5 + g4 + g3 + g2 + g1 + g0 + + + MEDIA_BUS_FMT_SRGGB14_1X14 + 0x301c + + r13 + r12 r11 r10 r9 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h index 190d491..1dff459 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -97,7 +97,7 @@ #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 -/* Bayer - next is 0x3019 */ +/* Bayer - next is 0x301d */ #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 #define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013 #define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002 @@ -122,6 +122,10 @@ #define MEDIA_BUS_FMT_SGBRG12_1X12 0x3010 #define MEDIA_BUS_FMT_SGRBG12_1X12 0x3011 #define MEDIA_BUS_FMT_SRGGB12_1X12 0x3012 +#define MEDIA_BUS_FMT_SBGGR14_1X14 0x3019 +#define MEDIA_BUS_FMT_SGBRG14_1X14 0x301a +#define MEDIA_BUS_FMT_SGRBG14_1X14 0x301b +#define MEDIA_BUS_FMT_SRGGB14_1X14 0x301c /* JPEG compressed formats - next is 0x4002 */ #define MEDIA_BUS_FMT_JPEG_1X8 0x4001