From patchwork Fri Apr 24 01:34:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 210069 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52806C2BA19 for ; Fri, 24 Apr 2020 01:34:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 057BB20704 for ; Fri, 24 Apr 2020 01:34:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="V/tWtr/Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726060AbgDXBew (ORCPT ); Thu, 23 Apr 2020 21:34:52 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:56640 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725884AbgDXBew (ORCPT ); Thu, 23 Apr 2020 21:34:52 -0400 Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3E19B528; Fri, 24 Apr 2020 03:34:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1587692090; bh=kpMzRlNYHmFNrI0qa2iGgS11CSFwXHF5EpH4SwtFMfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/tWtr/QwvgSJPRkx/QEOJuDsE4J+ErViZE1CR6nQpFwgykGyslLtL2aMNcPZVl3t 5Ca2cP9yCJDJz3pjHS/khFe4c/GeegZbTN2gPFv/uZJHAVHfWQTN5qAJUYjKWav1Iu Xbmn7e31UuZQYlRzPRoJCPaRmGbGwkRCuSMuUVms= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Dave Stevenson , Naushir Patuck Subject: [PATCH 1/5] media: i2c: imx219: Set V4L2_SUBDEV_FL_HAS_EVENTS flag Date: Fri, 24 Apr 2020 04:34:15 +0300 Message-Id: <20200424013419.12954-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> References: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The imx219 subdev can generate control events, set the V4L2_SUBDEV_FL_HAS_EVENTS flag. Signed-off-by: Laurent Pinchart --- drivers/media/i2c/imx219.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index cb03bdec1f9c..6e585c39a46a 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1396,7 +1396,8 @@ static int imx219_probe(struct i2c_client *client) /* Initialize subdev */ imx219->sd.internal_ops = &imx219_internal_ops; - imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + imx219->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE + | V4L2_SUBDEV_FL_HAS_EVENTS; imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; /* Initialize source pad */ From patchwork Fri Apr 24 01:34:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 210068 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45CF4C2BA19 for ; Fri, 24 Apr 2020 01:34:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24C6320704 for ; Fri, 24 Apr 2020 01:34:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="a71vT+YY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726144AbgDXBey (ORCPT ); Thu, 23 Apr 2020 21:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725884AbgDXBey (ORCPT ); Thu, 23 Apr 2020 21:34:54 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2069C09B042 for ; Thu, 23 Apr 2020 18:34:53 -0700 (PDT) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A9F96A43; Fri, 24 Apr 2020 03:34:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1587692090; bh=OCIMooeZ0RGXlcgPRdjTxKPthxAq74qkmawbKsM920c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a71vT+YYN+++p3doFpCFyN+EMpzXtl+AbJVs5GvNv4ztKNWq2xjpgY6+9GOlMdhpI s3h2EsqvTDpClB7bTgHQDz2kV8ePV3s7j2QyU42GjQGwNPnU4GTw3EQ4sJ2X8Dm2js H9eF4UZd1s33MtmNVebunZy68wNQLld4/selyF5s= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Dave Stevenson , Naushir Patuck Subject: [PATCH 2/5] media: uapi: v4l2-core: Add sensor ancillary data V4L2 fourcc type Date: Fri, 24 Apr 2020 04:34:16 +0300 Message-Id: <20200424013419.12954-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> References: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Naushir Patuck Add V4L2_META_FMT_SENSOR_DATA format 4CC. This new format will be used by the BCM2835 Unicam device to return out camera sensor embedded data. Signed-off-by: Naushir Patuck --- Documentation/media/uapi/v4l/meta-formats.rst | 1 + .../uapi/v4l/pixfmt-meta-sensor-data.rst | 32 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 4 files changed, 35 insertions(+) create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst index 74c8659ee9d6..5474086ef6f0 100644 --- a/Documentation/media/uapi/v4l/meta-formats.rst +++ b/Documentation/media/uapi/v4l/meta-formats.rst @@ -21,6 +21,7 @@ These formats are used for the :ref:`metadata` interface only. pixfmt-meta-d4xx pixfmt-meta-intel-ipu3 + pixfmt-meta-sensor-data pixfmt-meta-uvc pixfmt-meta-vsp1-hgo pixfmt-meta-vsp1-hgt diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst new file mode 100644 index 000000000000..4a67e204d08a --- /dev/null +++ b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst @@ -0,0 +1,32 @@ +.. Permission is granted to copy, distribute and/or modify this +.. document under the terms of the GNU Free Documentation License, +.. Version 1.1 or any later version published by the Free Software +.. Foundation, with no Invariant Sections, no Front-Cover Texts +.. and no Back-Cover Texts. A copy of the license is included at +.. Documentation/media/uapi/fdl-appendix.rst. +.. +.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections + +.. _v4l2-meta-fmt-sensor-data: + +*********************************** +V4L2_META_FMT_SENSOR_DATA ('SENS') +*********************************** + +Sensor Ancillary Metadata + +Description +=========== + +This format describes ancillary data generated by a camera sensor and +transmitted over a stream on the camera bus. Sensor vendors generally have their +own custom format for this ancillary data. Some vendors follow a generic +CSI-2/SMIA embedded data format as described in the `CSI-2 specification. +`_ + +The size of the embedded buffer is defined as a single line with a pixel width +width specified in bytes. This is obtained by a call to the +:c:type:`VIDIOC_SUBDEV_G_FMT` ioctl on the sensor subdevice where the ``pad`` +field in :c:type:`v4l2_subdev_format` is set to 1. Note that this size is fixed +and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`. + diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index b2ef8e60ea7d..faf5a0f5eb6b 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1346,6 +1346,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr = "Vivid Metadata"; break; + case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break; default: /* Compressed formats */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 9817b7e2c968..a96146223843 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -766,6 +766,7 @@ struct v4l2_pix_format { #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */ +#define V4L2_META_FMT_SENSOR_DATA v4l2_fourcc('S', 'E', 'N', 'S') /* Sensor Ancillary metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe From patchwork Fri Apr 24 01:34:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 210067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BB95C55193 for ; Fri, 24 Apr 2020 01:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CF2C20704 for ; Fri, 24 Apr 2020 01:34:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="R2aPi2Za" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726152AbgDXBez (ORCPT ); Thu, 23 Apr 2020 21:34:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726127AbgDXBez (ORCPT ); Thu, 23 Apr 2020 21:34:55 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10DFDC09B042 for ; Thu, 23 Apr 2020 18:34:55 -0700 (PDT) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 966B2134B; Fri, 24 Apr 2020 03:34:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1587692091; bh=dkYtlCRVNSZRWandxSnugeev2fN87AO1Q4xcgIhzCU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R2aPi2Za+sTA5t7feZwFmSE8oMQVJvI39jb281O8Vs+FicX0NrC/eV/25Uu+8J8ZQ oEh8QC6L4IeIr00jKZJ9uKfX7Tg8nSxjIXtrV2ETlvABdWDcXmzPBAAG7269WjDLVB rdLNI1as2yPpdT1sBdXID3AnzHB3YXq8RddYzwdg= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: Dave Stevenson , Naushir Patuck Subject: [PATCH 4/5] dt-bindings: media: Document BCM283x CSI2/CCP2 receiver Date: Fri, 24 Apr 2020 04:34:18 +0300 Message-Id: <20200424013419.12954-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> References: <20200424013419.12954-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Dave Stevenson Document the DT bindings for the CSI2/CCP2 receiver peripheral (known as Unicam) on BCM283x SoCs. Signed-off-by: Dave Stevenson Signed-off-by: Laurent Pinchart --- .../bindings/media/brcm,bcm2835-unicam.yaml | 155 ++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml diff --git a/Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml b/Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml new file mode 100644 index 000000000000..6ffc900e8ae8 --- /dev/null +++ b/Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml @@ -0,0 +1,155 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2020 Raspberry Pi (Trading) Ltd. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/brcm,bcm2835-unicam.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom BCM283x Camera Interface (Unicam) + +maintainers: + - Dave Stevenson + - Raspberry Pi kernel list + +description: + The Unicam block on BCM283x SoCs is the receiver for either CSI-2 or CCP2 + data from image sensors or similar devices. + + The main platform using this SoC is the Raspberry Pi family of boards. On the + Pi the VideoCore firmware can also control this hardware block, and driving + it from two different processors will cause issues. To avoid this, the + firmware checks the device tree configuration during boot. If it finds device + tree nodes whose name starts with "csi" then it will stop the firmware + accessing the block, and it can then safely be used via the device tree + binding. + +properties: + compatible: + const: brcm,bcm2835-unicam + + reg: + items: + - description: Main registers block + - description: Clock registers block + + interrupts: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 2 + + clock-names: + minItems: 1 + items: + - const: lp + - const: core + + power-domains: + maxItems: 1 + + brcm,num-data-lanes: + description: + The number of data lanes supported by this Unicam instance. It may be + larger than the number of data lanes routed on the board, as described by + the data-lanes property of the endpoint. + allOf: + - $ref: "/schemas/types.yaml#/definitions/uint32" + - enum: [1, 2, 4] + + port: + type: object + description: + Input port node, as described in video-interfaces.txt. + + properties: + endpoint: + type: object + + properties: + clock-lanes: + items: + - const: 0 + + data-lanes: + description: + Lane reordering is not supported, items shall be in order, + starting at 1. + allOf: + - $ref: "/schemas/types.yaml#/definitions/uint32-array" + - maxItems: 1 + items: + minItems: 1 + maxItems: 4 + items: + - const: 1 + - const: 2 + - const: 3 + - const: 4 + + lane-polarities: + description: + Lane inversion is not supported. If the property is specified, it + shall contain all 0's. + allOf: + - $ref: "/schemas/types.yaml#/definitions/uint32-array" + - maxItems: 1 + items: + minItems: 2 + maxItems: 5 + items: + - const: 0 + - const: 0 + - const: 0 + - const: 0 + - const: 0 + + remote-endpoint: true + + required: + - data-lanes + - remote-endpoint + + additionalProperties: false + + required: + - endpoint + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - power-domains + - brcm,num-data-lanes + - port + +additionalProperties: false + +examples: + - | + #include + #include + #include + + csi@7e801000 { + compatible = "brcm,bcm2835-unicam"; + reg = <0x7e801000 0x800>, + <0x7e802004 0x4>; + interrupts = <2 7>; + clocks = <&clocks BCM2835_CLOCK_CAM1>; + clock-names = "lp"; + power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>; + brcm,num-data-lanes = <4>; + + port { + csi1_ep: endpoint { + remote-endpoint = <&imx219_0>; + data-lanes = <1 2>; + }; + }; + }; +...