* [PATCH v8 01/28] rcar-vin: add Gen3 devicetree bindings documentation [not found] <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se> @ 2017-11-29 19:43 ` Niklas Söderlund [not found] ` <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2017-11-29 19:43 ` [PATCH v8 28/28] rcar-vin: enable support for r8a77970 Niklas Söderlund 2 siblings, 0 replies; 8+ messages in thread From: Niklas Söderlund @ 2017-11-29 19:43 UTC (permalink / raw) To: Laurent Pinchart, Hans Verkuil, linux-media Cc: linux-renesas-soc, tomoharu.fukawa.eb, Kieran Bingham, Niklas Söderlund, Rob Herring, devicetree 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>]
* [PATCH v8 26/28] rcar-vin: enable support for r8a7795 [not found] ` <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> @ 2017-11-29 19:43 ` Niklas Söderlund 2017-11-29 19:43 ` [PATCH v8 27/28] rcar-vin: enable support for r8a7796 Niklas Söderlund 1 sibling, 0 replies; 8+ messages in thread From: Niklas Söderlund @ 2017-11-29 19:43 UTC (permalink / raw) To: Laurent Pinchart, Hans Verkuil, linux-media-u79uwXL29TY76Z2rM5mHXA Cc: linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, tomoharu.fukawa.eb-zM6kxYcvzFBBDgjK7y7TUQ, Kieran Bingham, Niklas Söderlund, Rob Herring, devicetree-u79uwXL29TY76Z2rM5mHXA Add the SoC specific information for Renesas r8a7795 ES1.x and ES2.0. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> Reviewed-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org> --- 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 <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> @@ -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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v8 27/28] rcar-vin: enable support for r8a7796 [not found] ` <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2017-11-29 19:43 ` [PATCH v8 26/28] rcar-vin: enable support for r8a7795 Niklas Söderlund @ 2017-11-29 19:43 ` Niklas Söderlund [not found] ` <20171129194342.26239-28-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 1 sibling, 1 reply; 8+ messages in thread From: Niklas Söderlund @ 2017-11-29 19:43 UTC (permalink / raw) To: Laurent Pinchart, Hans Verkuil, linux-media-u79uwXL29TY76Z2rM5mHXA Cc: linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, tomoharu.fukawa.eb-zM6kxYcvzFBBDgjK7y7TUQ, Kieran Bingham, Niklas Söderlund, Rob Herring, devicetree-u79uwXL29TY76Z2rM5mHXA Add the SoC specific information for Renesas r8a7796. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> Reviewed-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org> --- .../devicetree/bindings/media/rcar_vin.txt | 1 + drivers/media/platform/rcar-vin/rcar-core.c | 64 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt index 5a95d9668d2c7dfd..314743532bbb4523 100644 --- a/Documentation/devicetree/bindings/media/rcar_vin.txt +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt @@ -20,6 +20,7 @@ on Gen3 to a CSI-2 receiver. - "renesas,vin-r8a7793" for the R8A7793 device - "renesas,vin-r8a7794" for the R8A7794 device - "renesas,vin-r8a7795" for the R8A7795 device + - "renesas,vin-r8a7796" for the R8A7796 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 9da5aff33fd224f2..62eb89b36fbb2ee1 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -1085,6 +1085,66 @@ static const struct rvin_info rcar_info_r8a7795es1 = { }, }; +static const struct rvin_info rcar_info_r8a7796 = { + .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_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_NC, .chan = 0 }, + { .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_NC, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, { + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_NC, .chan = 0 }, + { .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_NC, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, + }, +}; + static const struct of_device_id rvin_of_id_table[] = { { .compatible = "renesas,vin-r8a7778", @@ -1118,6 +1178,10 @@ static const struct of_device_id rvin_of_id_table[] = { .compatible = "renesas,vin-r8a7795", .data = &rcar_info_r8a7795, }, + { + .compatible = "renesas,vin-r8a7796", + .data = &rcar_info_r8a7796, + }, { }, }; MODULE_DEVICE_TABLE(of, rvin_of_id_table); -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <20171129194342.26239-28-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>]
* Re: [PATCH v8 27/28] rcar-vin: enable support for r8a7796 [not found] ` <20171129194342.26239-28-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> @ 2017-12-01 2:17 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2017-12-01 2:17 UTC (permalink / raw) To: Niklas Söderlund Cc: Laurent Pinchart, Hans Verkuil, linux-media-u79uwXL29TY76Z2rM5mHXA, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, tomoharu.fukawa.eb-zM6kxYcvzFBBDgjK7y7TUQ, Kieran Bingham, devicetree-u79uwXL29TY76Z2rM5mHXA On Wed, Nov 29, 2017 at 08:43:41PM +0100, Niklas Söderlund wrote: > Add the SoC specific information for Renesas r8a7796. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> > Reviewed-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org> > --- > .../devicetree/bindings/media/rcar_vin.txt | 1 + Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > drivers/media/platform/rcar-vin/rcar-core.c | 64 ++++++++++++++++++++++ > 2 files changed, 65 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v8 28/28] rcar-vin: enable support for r8a77970 [not found] <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se> 2017-11-29 19:43 ` [PATCH v8 01/28] rcar-vin: add Gen3 devicetree bindings documentation Niklas Söderlund [not found] ` <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> @ 2017-11-29 19:43 ` Niklas Söderlund 2017-11-30 18:06 ` Kieran Bingham [not found] ` <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2 siblings, 2 replies; 8+ messages in thread From: Niklas Söderlund @ 2017-11-29 19:43 UTC (permalink / raw) To: Laurent Pinchart, Hans Verkuil, linux-media Cc: linux-renesas-soc, tomoharu.fukawa.eb, Kieran Bingham, Niklas Söderlund, Rob Herring, devicetree 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v8 28/28] rcar-vin: enable support for r8a77970 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 [not found] ` <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 1 sibling, 0 replies; 8+ messages in thread From: Kieran Bingham @ 2017-11-30 18:06 UTC (permalink / raw) To: Niklas Söderlund, Laurent Pinchart, Hans Verkuil, linux-media Cc: linux-renesas-soc, tomoharu.fukawa.eb, Kieran Bingham, Rob Herring, devicetree Hi Niklas, On 29/11/17 19:43, Niklas Söderlund wrote: > Add the SoC specific information for Renesas r8a77970. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Not going through the details on this one, as I don't know where to start yet other than the cursory chip, width, and height all look correct ... but as this has helped me capture video this evening this patch can at least have: Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > .../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); > ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>]
* Re: [PATCH v8 28/28] rcar-vin: enable support for r8a77970 [not found] ` <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> @ 2017-12-01 2:18 ` Rob Herring 2017-12-04 9:48 ` Hans Verkuil 1 sibling, 0 replies; 8+ messages in thread From: Rob Herring @ 2017-12-01 2:18 UTC (permalink / raw) To: Niklas Söderlund Cc: Laurent Pinchart, Hans Verkuil, linux-media-u79uwXL29TY76Z2rM5mHXA, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, tomoharu.fukawa.eb-zM6kxYcvzFBBDgjK7y7TUQ, Kieran Bingham, devicetree-u79uwXL29TY76Z2rM5mHXA On Wed, Nov 29, 2017 at 08:43:42PM +0100, Niklas Söderlund wrote: > Add the SoC specific information for Renesas r8a77970. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> > --- > .../devicetree/bindings/media/rcar_vin.txt | 1 + Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > drivers/media/platform/rcar-vin/rcar-core.c | 40 ++++++++++++++++++++++ > 2 files changed, 41 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v8 28/28] rcar-vin: enable support for r8a77970 [not found] ` <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2017-12-01 2:18 ` Rob Herring @ 2017-12-04 9:48 ` Hans Verkuil 1 sibling, 0 replies; 8+ messages in thread From: Hans Verkuil @ 2017-12-04 9:48 UTC (permalink / raw) To: Niklas Söderlund, Laurent Pinchart, linux-media-u79uwXL29TY76Z2rM5mHXA Cc: linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, tomoharu.fukawa.eb-zM6kxYcvzFBBDgjK7y7TUQ, Kieran Bingham, Rob Herring, devicetree-u79uwXL29TY76Z2rM5mHXA On 11/29/2017 08:43 PM, Niklas Söderlund wrote: > Add the SoC specific information for Renesas r8a77970. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> Reviewed-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org> Regards, Hans > --- > .../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); > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-12-04 9:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20171129194342.26239-1-niklas.soderlund+renesas@ragnatech.se>
2017-11-29 19:43 ` [PATCH v8 01/28] rcar-vin: add Gen3 devicetree bindings documentation Niklas Söderlund
[not found] ` <20171129194342.26239-1-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
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
[not found] ` <20171129194342.26239-28-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
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
[not found] ` <20171129194342.26239-29-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2017-12-01 2:18 ` Rob Herring
2017-12-04 9:48 ` Hans Verkuil
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).