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>
Subject: [PATCH v11 30/32] rcar-vin: enable support for r8a7795
Date: Fri, 2 Mar 2018 02:57:49 +0100 [thread overview]
Message-ID: <20180302015751.25596-31-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20180302015751.25596-1-niklas.soderlund+renesas@ragnatech.se>
Add the SoC specific information for Renesas r8a7795 ES1.x and ES2.0.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/platform/rcar-vin/Kconfig | 2 +-
drivers/media/platform/rcar-vin/rcar-core.c | 120 ++++++++++++++++++++++++++++
2 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig
index af4c98b44d2e22cb..8fa7ee468c63afb9 100644
--- a/drivers/media/platform/rcar-vin/Kconfig
+++ b/drivers/media/platform/rcar-vin/Kconfig
@@ -6,7 +6,7 @@ config VIDEO_RCAR_VIN
select V4L2_FWNODE
---help---
Support for Renesas R-Car Video Input (VIN) driver.
- Supports R-Car Gen2 SoCs.
+ Supports R-Car Gen2 and Gen3 SoCs.
To compile this driver as a module, choose M here: the
module will be called rcar-vin.
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index c015f3c284439285..8017d386fc9bc545 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -21,6 +21,7 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h>
+#include <linux/sys_soc.h>
#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
@@ -832,6 +833,104 @@ static const struct rvin_info rcar_info_gen2 = {
.max_height = 2048,
};
+static const struct rvin_group_route rcar_info_r8a7795_routes[] = {
+ { .vin = 0, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(0) | BIT(3) },
+ { .vin = 0, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
+ { .vin = 0, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(2) },
+ { .vin = 1, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+ { .vin = 1, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(1) | BIT(3) },
+ { .vin = 1, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(2) },
+ { .vin = 1, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
+ { .vin = 2, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(0) },
+ { .vin = 2, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(1) },
+ { .vin = 2, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
+ { .vin = 2, .csi = RVIN_CSI40, .chan = 2, .mask = BIT(3) },
+ { .vin = 2, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
+ { .vin = 3, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(0) },
+ { .vin = 3, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) | BIT(2) },
+ { .vin = 3, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
+ { .vin = 3, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+ { .vin = 4, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(0) | BIT(3) },
+ { .vin = 4, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
+ { .vin = 4, .csi = RVIN_CSI41, .chan = 1, .mask = BIT(2) },
+ { .vin = 5, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+ { .vin = 5, .csi = RVIN_CSI41, .chan = 1, .mask = BIT(1) | BIT(3) },
+ { .vin = 5, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(2) },
+ { .vin = 5, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
+ { .vin = 6, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(0) },
+ { .vin = 6, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(1) },
+ { .vin = 6, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
+ { .vin = 6, .csi = RVIN_CSI41, .chan = 2, .mask = BIT(3) },
+ { .vin = 6, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
+ { .vin = 7, .csi = RVIN_CSI41, .chan = 1, .mask = BIT(0) },
+ { .vin = 7, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) | BIT(2) },
+ { .vin = 7, .csi = RVIN_CSI41, .chan = 3, .mask = BIT(3) },
+ { .vin = 7, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+ { /* Sentinel */ }
+};
+
+static const struct rvin_info rcar_info_r8a7795 = {
+ .model = RCAR_GEN3,
+ .use_mc = true,
+ .max_width = 4096,
+ .max_height = 4096,
+ .routes = rcar_info_r8a7795_routes,
+};
+
+static const struct rvin_group_route rcar_info_r8a7795es1_routes[] = {
+ { .vin = 0, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(0) | BIT(3) },
+ { .vin = 0, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
+ { .vin = 0, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(2) | BIT(5) },
+ { .vin = 1, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+ { .vin = 1, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(1) },
+ { .vin = 1, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(2) },
+ { .vin = 1, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(3) },
+ { .vin = 1, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
+ { .vin = 1, .csi = RVIN_CSI21, .chan = 1, .mask = BIT(5) },
+ { .vin = 2, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(0) },
+ { .vin = 2, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(1) },
+ { .vin = 2, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
+ { .vin = 2, .csi = RVIN_CSI40, .chan = 2, .mask = BIT(3) },
+ { .vin = 2, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
+ { .vin = 2, .csi = RVIN_CSI21, .chan = 2, .mask = BIT(5) },
+ { .vin = 3, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(0) },
+ { .vin = 3, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) },
+ { .vin = 3, .csi = RVIN_CSI21, .chan = 1, .mask = BIT(2) },
+ { .vin = 3, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
+ { .vin = 3, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+ { .vin = 3, .csi = RVIN_CSI21, .chan = 3, .mask = BIT(5) },
+ { .vin = 4, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(0) | BIT(3) },
+ { .vin = 4, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
+ { .vin = 4, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(2) | BIT(5) },
+ { .vin = 5, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+ { .vin = 5, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(1) },
+ { .vin = 5, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(2) },
+ { .vin = 5, .csi = RVIN_CSI41, .chan = 1, .mask = BIT(3) },
+ { .vin = 5, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
+ { .vin = 5, .csi = RVIN_CSI21, .chan = 1, .mask = BIT(5) },
+ { .vin = 6, .csi = RVIN_CSI21, .chan = 0, .mask = BIT(0) },
+ { .vin = 6, .csi = RVIN_CSI41, .chan = 0, .mask = BIT(1) },
+ { .vin = 6, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
+ { .vin = 6, .csi = RVIN_CSI41, .chan = 2, .mask = BIT(3) },
+ { .vin = 6, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
+ { .vin = 6, .csi = RVIN_CSI21, .chan = 2, .mask = BIT(5) },
+ { .vin = 7, .csi = RVIN_CSI41, .chan = 1, .mask = BIT(0) },
+ { .vin = 7, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) },
+ { .vin = 7, .csi = RVIN_CSI21, .chan = 1, .mask = BIT(2) },
+ { .vin = 7, .csi = RVIN_CSI41, .chan = 3, .mask = BIT(3) },
+ { .vin = 7, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+ { .vin = 7, .csi = RVIN_CSI21, .chan = 3, .mask = BIT(5) },
+ { /* Sentinel */ }
+};
+
+static const struct rvin_info rcar_info_r8a7795es1 = {
+ .model = RCAR_GEN3,
+ .use_mc = true,
+ .max_width = 4096,
+ .max_height = 4096,
+ .routes = rcar_info_r8a7795es1_routes,
+};
+
static const struct of_device_id rvin_of_id_table[] = {
{
.compatible = "renesas,vin-r8a7778",
@@ -861,12 +960,25 @@ static const struct of_device_id rvin_of_id_table[] = {
.compatible = "renesas,rcar-gen2-vin",
.data = &rcar_info_gen2,
},
+ {
+ .compatible = "renesas,vin-r8a7795",
+ .data = &rcar_info_r8a7795,
+ },
{ /* Sentinel */ },
};
MODULE_DEVICE_TABLE(of, rvin_of_id_table);
+static const struct soc_device_attribute r8a7795es1[] = {
+ {
+ .soc_id = "r8a7795", .revision = "ES1.*",
+ .data = &rcar_info_r8a7795es1,
+ },
+ { /* Sentinel */ }
+};
+
static int rcar_vin_probe(struct platform_device *pdev)
{
+ const struct soc_device_attribute *attr;
struct rvin_dev *vin;
struct resource *mem;
int irq, ret;
@@ -878,6 +990,14 @@ static int rcar_vin_probe(struct platform_device *pdev)
vin->dev = &pdev->dev;
vin->info = of_device_get_match_data(&pdev->dev);
+ /*
+ * Special care is needed on r8a7795 ES1.x since it
+ * uses different routing than r8a7795 ES2.0.
+ */
+ attr = soc_device_match(r8a7795es1);
+ if (attr)
+ vin->info = attr->data;
+
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (mem == NULL)
return -EINVAL;
--
2.16.2
next prev parent reply other threads:[~2018-03-02 1:59 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 1:57 [PATCH v11 00/32] rcar-vin: Add Gen3 with media controller Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 01/32] dt-bindings: media: rcar_vin: Reverse SoC part number list Niklas Söderlund
2018-03-02 9:27 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 02/32] dt-bindings: media: rcar_vin: add device tree support for r8a774[35] Niklas Söderlund
2018-03-02 9:27 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 03/32] rcar-vin: add Gen3 devicetree bindings documentation Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 04/32] rcar-vin: rename poorly named initialize and cleanup functions Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 05/32] rcar-vin: unregister video device on driver removal Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 06/32] rcar-vin: move subdevice handling to async callbacks Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 07/32] rcar-vin: move model information to own struct Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 08/32] rcar-vin: move max width and height information to chip information Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 09/32] rcar-vin: move functions regarding scaling Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 10/32] rcar-vin: all Gen2 boards can scale simplify logic Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 11/32] rcar-vin: set a default field to fallback on Niklas Söderlund
2018-03-02 9:29 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 12/32] rcar-vin: fix handling of single field frames (top, bottom and alternate fields) Niklas Söderlund
2018-03-02 10:48 ` Laurent Pinchart
2018-03-03 16:23 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 13/32] rcar-vin: update bytesperline and sizeimage calculation Niklas Söderlund
2018-03-02 9:44 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 14/32] rcar-vin: align pixelformat check Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 15/32] rcar-vin: break out format alignment and checking Niklas Söderlund
2018-03-02 9:53 ` Laurent Pinchart
2018-03-03 16:11 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 16/32] rcar-vin: read subdevice format for crop only when needed Niklas Söderlund
2018-03-02 11:06 ` Laurent Pinchart
2018-03-03 17:04 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 17/32] rcar-vin: move media bus configuration to struct rvin_info Niklas Söderlund
2018-03-02 11:26 ` Laurent Pinchart
2018-03-03 13:57 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 18/32] rcar-vin: enable Gen3 hardware configuration Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 19/32] rcar-vin: add function to manipulate Gen3 chsel value Niklas Söderlund
2018-03-02 11:31 ` Laurent Pinchart
2018-03-03 14:03 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 20/32] rcar-vin: add flag to switch to media controller mode Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 21/32] rcar-vin: use different v4l2 operations in " Niklas Söderlund
2018-03-02 11:39 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 22/32] rcar-vin: force default colorspace for media centric mode Niklas Söderlund
2018-03-02 9:59 ` Laurent Pinchart
2018-03-03 15:19 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 23/32] rcar-vin: prepare for media controller mode initialization Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 24/32] rcar-vin: add group allocator functions Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 25/32] rcar-vin: change name of video device Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 26/32] rcar-vin: add chsel information to rvin_info Niklas Söderlund
2018-03-02 11:43 ` Laurent Pinchart
2018-03-02 1:57 ` [PATCH v11 27/32] rcar-vin: parse Gen3 OF and setup media graph Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 28/32] rcar-vin: add link notify for Gen3 Niklas Söderlund
2018-03-02 12:00 ` Laurent Pinchart
2018-03-03 15:49 ` Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 29/32] rcar-vin: extend {start,stop}_streaming to work with media controller Niklas Söderlund
2018-03-02 1:57 ` Niklas Söderlund [this message]
2018-03-02 1:57 ` [PATCH v11 31/32] rcar-vin: enable support for r8a7796 Niklas Söderlund
2018-03-02 1:57 ` [PATCH v11 32/32] rcar-vin: enable support for r8a77970 Niklas Söderlund
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=20180302015751.25596-31-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--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=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