linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	tomoharu.fukawa.eb@renesas.com,
	"Kieran Bingham" <kieran.bingham@ideasonboard.com>,
	"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
	"Rob Herring" <robh+dt@kernel.org>,
	devicetree@vger.kernel.org
Subject: [PATCH v8 01/28] rcar-vin: add Gen3 devicetree bindings documentation
Date: Wed, 29 Nov 2017 20:43:15 +0100	[thread overview]
Message-ID: <20171129194342.26239-2-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se>

Document the devicetree bindings for the CSI-2 inputs available on Gen3.

There is a need to add a custom property 'renesas,id' and to define
which CSI-2 input is described in which endpoint under the port@1 node.
This information is needed since there are a set of predefined routes
between each VIN and CSI-2 block. This routing table will be kept
inside the driver but in order for it to act on it it must know which
VIN and CSI-2 is which.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Rob Herring <robh@kernel.org>
---
 .../devicetree/bindings/media/rcar_vin.txt         | 116 ++++++++++++++++++---
 1 file changed, 104 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index ff9697ed81396e64..5a95d9668d2c7dfd 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -2,8 +2,12 @@ Renesas R-Car Video Input driver (rcar_vin)
 -------------------------------------------
 
 The rcar_vin device provides video input capabilities for the Renesas R-Car
-family of devices. The current blocks are always slaves and suppot one input
-channel which can be either RGB, YUYV or BT656.
+family of devices.
+
+Each VIN instance has a single parallel input that supports RGB and YUV video,
+with both external synchronization and BT.656 synchronization for the latter.
+Depending on the instance the VIN input is connected to external SoC pins, or
+on Gen3 to a CSI-2 receiver.
 
  - compatible: Must be one or more of the following
    - "renesas,vin-r8a7743" for the R8A7743 device
@@ -31,21 +35,38 @@ channel which can be either RGB, YUYV or BT656.
 Additionally, an alias named vinX will need to be created to specify
 which video input device this is.
 
-The per-board settings:
+The per-board settings Gen2:
  - port sub-node describing a single endpoint connected to the vin
    as described in video-interfaces.txt[1]. Only the first one will
    be considered as each vin interface has one input port.
 
-   These settings are used to work out video input format and widths
-   into the system.
+The per-board settings Gen3:
+
+Gen3 can support both a single connected parallel input source from
+external SoC pins (port0) and/or multiple parallel input sources from
+local SoC CSI-2 receivers (port1) depending on SoC.
 
+- renesas,id - ID number of the VIN, VINx in the documentation.
+- ports
+    - port0 - sub-node describing a single endpoint connected to the VIN
+      from external SoC pins described in video-interfaces.txt[1]. Only
+      the first one will be considered as each VIN interface has at most
+      one set of SoC external input pins.
+    - port1 - sub-nodes describing one or more endpoints connected to
+      the VIN from local SoC CSI-2 receivers. The endpoint numbers must
+      use the following schema.
 
-Device node example
--------------------
+        - Endpoint 0 - sub-node describing the endpoint which is CSI20
+        - Endpoint 1 - sub-node describing the endpoint which is CSI21
+        - Endpoint 2 - sub-node describing the endpoint which is CSI40
+        - Endpoint 3 - sub-node describing the endpoint which is CSI41
 
-	aliases {
-	       vin0 = &vin0;
-	};
+Device node example Gen2
+------------------------
+
+        aliases {
+                vin0 = &vin0;
+        };
 
         vin0: vin@0xe6ef0000 {
                 compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
@@ -55,8 +76,8 @@ Device node example
                 status = "disabled";
         };
 
-Board setup example (vin1 composite video input)
-------------------------------------------------
+Board setup example Gen2 (vin1 composite video input)
+-----------------------------------------------------
 
 &i2c2   {
         status = "ok";
@@ -95,6 +116,77 @@ Board setup example (vin1 composite video input)
         };
 };
 
+Device node example Gen3
+------------------------
+
+        vin0: video@e6ef0000 {
+                compatible = "renesas,vin-r8a7795";
+                reg = <0 0xe6ef0000 0 0x1000>;
+                interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg CPG_MOD 811>;
+                power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                resets = <&cpg 811>;
+                renesas,id = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@1 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                reg = <1>;
+
+                                vin0csi20: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint= <&csi20vin0>;
+                                };
+                                vin0csi21: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint= <&csi21vin0>;
+                                };
+                                vin0csi40: endpoint@2 {
+                                        reg = <2>;
+                                        remote-endpoint= <&csi40vin0>;
+                                };
+                        };
+                };
+        };
+
+        csi20: csi2@fea80000 {
+                compatible = "renesas,r8a7795-csi2";
+                reg = <0 0xfea80000 0 0x10000>;
+                interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg CPG_MOD 714>;
+                power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                resets = <&cpg 714>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                csi20_in: endpoint {
+                                        clock-lanes = <0>;
+                                        data-lanes = <1>;
+                                        remote-endpoint = <&adv7482_txb>;
+                                };
+                        };
+
+                        port@1 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
+                                reg = <1>;
+
+                                csi20vin0: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&vin0csi20>;
+                                };
+                        };
+                };
+        };
 
 [1] video-interfaces.txt common video media interface
-- 
2.15.0

  reply	other threads:[~2017-11-29 19:44 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-29 19:43 [PATCH v8 00/28] rcar-vin: Add Gen3 with media controller Niklas Söderlund
2017-11-29 19:43 ` Niklas Söderlund [this message]
2017-11-29 19:43 ` [PATCH v8 02/28] rcar-vin: rename poorly named initialize and cleanup functions Niklas Söderlund
2017-11-30 17:55   ` Kieran Bingham
2017-12-04  9:45   ` Hans Verkuil
2017-11-29 19:43 ` [PATCH v8 03/28] rcar-vin: unregister video device on driver removal Niklas Söderlund
2017-11-30 18:01   ` Kieran Bingham
2017-12-04  9:45   ` Hans Verkuil
2017-11-29 19:43 ` [PATCH v8 04/28] rcar-vin: move subdevice handling to async callbacks Niklas Söderlund
2017-12-04  9:47   ` Hans Verkuil
2017-11-29 19:43 ` [PATCH v8 05/28] rcar-vin: move chip information to own struct Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 06/28] rcar-vin: move max width and height information to chip information Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 07/28] rcar-vin: change name of video device Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 08/28] rcar-vin: move functions regarding scaling Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 09/28] rcar-vin: all Gen2 boards can scale simplify logic Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 10/28] rcar-vin: do not reset crop and compose when setting format Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 11/28] rcar-vin: do not allow changing scaling and composing while streaming Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 12/28] rcar-vin: read subdevice format for crop only when needed Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 13/28] rcar-vin: fix handling of single field frames (top, bottom and alternate fields) Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 14/28] rcar-vin: move media bus configuration to struct rvin_info Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 15/28] rcar-vin: enable Gen3 hardware configuration Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 16/28] rcar-vin: add function to manipulate Gen3 chsel value Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 17/28] rcar-vin: add flag to switch to media controller mode Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 18/28] rcar-vin: break out format alignment and checking Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 19/28] rcar-vin: use different v4l2 operations in media controller mode Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 20/28] rcar-vin: prepare for media controller mode initialization Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 21/28] rcar-vin: add group allocator functions Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 22/28] rcar-vin: add chsel information to rvin_info Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 23/28] rcar-vin: parse Gen3 OF and setup media graph Niklas Söderlund
2017-11-30 15:58   ` Niklas Söderlund
2017-12-04  9:54   ` Hans Verkuil
2017-11-29 19:43 ` [PATCH v8 24/28] rcar-vin: add link notify for Gen3 Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 25/28] rcar-vin: extend {start,stop}_streaming to work with media controller Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 26/28] rcar-vin: enable support for r8a7795 Niklas Söderlund
2017-11-29 19:43 ` [PATCH v8 27/28] rcar-vin: enable support for r8a7796 Niklas Söderlund
2017-12-01  2:17   ` Rob Herring
2017-11-29 19:43 ` [PATCH v8 28/28] rcar-vin: enable support for r8a77970 Niklas Söderlund
2017-11-30 18:06   ` Kieran Bingham
2017-12-01  2:18   ` Rob Herring
2017-12-04  9:48   ` Hans Verkuil

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171129194342.26239-2-niklas.soderlund+renesas@ragnatech.se \
    --to=niklas.soderlund+renesas@ragnatech.se \
    --cc=devicetree@vger.kernel.org \
    --cc=hverkuil@xs4all.nl \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=tomoharu.fukawa.eb@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).