From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp-4.sys.kth.se ([130.237.48.193]:54606 "EHLO smtp-4.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752728AbdK2ToP (ORCPT ); Wed, 29 Nov 2017 14:44:15 -0500 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: Laurent Pinchart , Hans Verkuil , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, tomoharu.fukawa.eb@renesas.com, Kieran Bingham , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v8 26/28] rcar-vin: enable support for r8a7795 Date: Wed, 29 Nov 2017 20:43:40 +0100 Message-Id: <20171129194342.26239-27-niklas.soderlund+renesas@ragnatech.se> In-Reply-To: <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se> References: <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: Add the SoC specific information for Renesas r8a7795 ES1.x and ES2.0. Signed-off-by: Niklas Söderlund Reviewed-by: Hans Verkuil --- drivers/media/platform/rcar-vin/Kconfig | 2 +- drivers/media/platform/rcar-vin/rcar-core.c | 150 ++++++++++++++++++++++++++++ 2 files changed, 151 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 456f93d60b40fb80..9da5aff33fd224f2 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -956,6 +957,134 @@ static const struct rvin_info rcar_info_gen2 = { .max_height = 2048, }; +static const struct rvin_info rcar_info_r8a7795 = { + .chip = RCAR_GEN3, + .use_mc = true, + .max_width = 4096, + .max_height = 4096, + + .num_chsels = 5, + .chsels = { + { + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + }, { + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, { + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + }, { + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI41, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, + }, +}; + +static const struct rvin_info rcar_info_r8a7795es1 = { + .chip = RCAR_GEN3, + .use_mc = true, + .max_width = 4096, + .max_height = 4096, + + .num_chsels = 6, + .chsels = { + { + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI21, .chan = 1 }, + }, { + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + { .csi = RVIN_CSI21, .chan = 2 }, + }, { + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI21, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + { .csi = RVIN_CSI21, .chan = 3 }, + }, { + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI21, .chan = 1 }, + }, { + { .csi = RVIN_CSI21, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI41, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + { .csi = RVIN_CSI21, .chan = 2 }, + }, { + { .csi = RVIN_CSI41, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_CSI21, .chan = 1 }, + { .csi = RVIN_CSI41, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + { .csi = RVIN_CSI21, .chan = 3 }, + }, + }, +}; + static const struct of_device_id rvin_of_id_table[] = { { .compatible = "renesas,vin-r8a7778", @@ -985,12 +1114,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, + }, { }, }; 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; @@ -1002,6 +1144,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.15.0