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 28/28] rcar-vin: enable support for r8a77970
Date: Wed, 29 Nov 2017 20:43:42 +0100	[thread overview]
Message-ID: <20171129194342.26239-29-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se>

Add the SoC specific information for Renesas r8a77970.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 .../devicetree/bindings/media/rcar_vin.txt         |  1 +
 drivers/media/platform/rcar-vin/rcar-core.c        | 40 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index 314743532bbb4523..6b98f8a3398fa493 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -21,6 +21,7 @@ on Gen3 to a CSI-2 receiver.
    - "renesas,vin-r8a7794" for the R8A7794 device
    - "renesas,vin-r8a7795" for the R8A7795 device
    - "renesas,vin-r8a7796" for the R8A7796 device
+   - "renesas,vin-r8a77970" for the R8A77970 device
    - "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible
      device.
    - "renesas,rcar-gen3-vin" for a generic R-Car Gen3 compatible device.
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 62eb89b36fbb2ee1..bbdf36b5c3c8178d 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -1145,6 +1145,42 @@ static const struct rvin_info rcar_info_r8a7796 = {
 	},
 };
 
+static const struct rvin_info rcar_info_r8a77970 = {
+	.chip = RCAR_GEN3,
+	.use_mc = true,
+	.max_width = 4096,
+	.max_height = 4096,
+
+	.num_chsels = 5,
+	.chsels = {
+		{
+			{ .csi = RVIN_CSI40, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+		}, {
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 1 },
+			{ .csi = RVIN_NC, .chan = 0 },
+		}, {
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 2 },
+			{ .csi = RVIN_NC, .chan = 0 },
+		}, {
+			{ .csi = RVIN_CSI40, .chan = 1 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_NC, .chan = 0 },
+			{ .csi = RVIN_CSI40, .chan = 3 },
+			{ .csi = RVIN_NC, .chan = 0 },
+		},
+	},
+};
+
 static const struct of_device_id rvin_of_id_table[] = {
 	{
 		.compatible = "renesas,vin-r8a7778",
@@ -1182,6 +1218,10 @@ static const struct of_device_id rvin_of_id_table[] = {
 		.compatible = "renesas,vin-r8a7796",
 		.data = &rcar_info_r8a7796,
 	},
+	{
+		.compatible = "renesas,vin-r8a77970",
+		.data = &rcar_info_r8a77970,
+	},
 	{ },
 };
 MODULE_DEVICE_TABLE(of, rvin_of_id_table);
-- 
2.15.0

  parent 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 ` [PATCH v8 01/28] rcar-vin: add Gen3 devicetree bindings documentation Niklas Söderlund
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 ` Niklas Söderlund [this message]
2017-11-30 18:06   ` [PATCH v8 28/28] rcar-vin: enable support for r8a77970 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-29-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).