* [PATCH] rcar-vin: add R8A77980 support
@ 2018-08-06 17:45 Sergei Shtylyov
2018-08-06 18:10 ` Niklas Söderlund
0 siblings, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2018-08-06 17:45 UTC (permalink / raw)
To: Mauro Carvalho Chehab, linux-media, linux-renesas-soc,
Niklas Söderlund, Rob Herring, devicetree
Cc: Mark Rutland
Add the R8A77980 SoC support to the R-Car VIN driver.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
This patch is against the 'media_tree.git' repo's 'master' branch.
Documentation/devicetree/bindings/media/rcar_vin.txt | 1
drivers/media/platform/rcar-vin/rcar-core.c | 32 +++++++++++++++++++
2 files changed, 33 insertions(+)
Index: media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
===================================================================
--- media_tree.orig/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -23,6 +23,7 @@ on Gen3 platforms to a CSI-2 receiver.
- "renesas,vin-r8a7796" for the R8A7796 device
- "renesas,vin-r8a77965" for the R8A77965 device
- "renesas,vin-r8a77970" for the R8A77970 device
+ - "renesas,vin-r8a77980" for the R8A77980 device
- "renesas,vin-r8a77995" for the R8A77995 device
- "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible
device.
Index: media_tree/drivers/media/platform/rcar-vin/rcar-core.c
===================================================================
--- media_tree.orig/drivers/media/platform/rcar-vin/rcar-core.c
+++ media_tree/drivers/media/platform/rcar-vin/rcar-core.c
@@ -1097,6 +1097,34 @@ static const struct rvin_info rcar_info_
.routes = rcar_info_r8a77995_routes,
};
+static const struct rvin_group_route rcar_info_r8a77980_routes[] = {
+ { .csi = RVIN_CSI40, .channel = 0, .vin = 0, .mask = BIT(0) | BIT(3) },
+ { .csi = RVIN_CSI40, .channel = 1, .vin = 0, .mask = BIT(2) },
+ { .csi = RVIN_CSI40, .channel = 0, .vin = 1, .mask = BIT(2) },
+ { .csi = RVIN_CSI40, .channel = 1, .vin = 1, .mask = BIT(1) | BIT(3) },
+ { .csi = RVIN_CSI40, .channel = 0, .vin = 2, .mask = BIT(1) },
+ { .csi = RVIN_CSI40, .channel = 2, .vin = 2, .mask = BIT(3) },
+ { .csi = RVIN_CSI40, .channel = 1, .vin = 3, .mask = BIT(0) },
+ { .csi = RVIN_CSI40, .channel = 3, .vin = 3, .mask = BIT(3) },
+ { .csi = RVIN_CSI41, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
+ { .csi = RVIN_CSI41, .channel = 1, .vin = 4, .mask = BIT(2) },
+ { .csi = RVIN_CSI41, .channel = 0, .vin = 5, .mask = BIT(2) },
+ { .csi = RVIN_CSI41, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
+ { .csi = RVIN_CSI41, .channel = 0, .vin = 6, .mask = BIT(1) },
+ { .csi = RVIN_CSI41, .channel = 2, .vin = 6, .mask = BIT(3) },
+ { .csi = RVIN_CSI41, .channel = 1, .vin = 7, .mask = BIT(0) },
+ { .csi = RVIN_CSI41, .channel = 3, .vin = 7, .mask = BIT(3) },
+ { /* Sentinel */ }
+};
+
+static const struct rvin_info rcar_info_r8a77980 = {
+ .model = RCAR_GEN3,
+ .use_mc = true,
+ .max_width = 4096,
+ .max_height = 4096,
+ .routes = rcar_info_r8a77980_routes,
+};
+
static const struct of_device_id rvin_of_id_table[] = {
{
.compatible = "renesas,vin-r8a7778",
@@ -1143,6 +1171,10 @@ static const struct of_device_id rvin_of
.data = &rcar_info_r8a77970,
},
{
+ .compatible = "renesas,vin-r8a77980",
+ .data = &rcar_info_r8a77980,
+ },
+ {
.compatible = "renesas,vin-r8a77995",
.data = &rcar_info_r8a77995,
},
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rcar-vin: add R8A77980 support
2018-08-06 17:45 [PATCH] rcar-vin: add R8A77980 support Sergei Shtylyov
@ 2018-08-06 18:10 ` Niklas Söderlund
0 siblings, 0 replies; 4+ messages in thread
From: Niklas Söderlund @ 2018-08-06 18:10 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Mauro Carvalho Chehab, linux-media, linux-renesas-soc,
Rob Herring, devicetree, Mark Rutland
Hi Sergei,
Thanks for your work.
On 2018-08-06 20:45:01 +0300, Sergei Shtylyov wrote:
> Add the R8A77980 SoC support to the R-Car VIN driver.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> ---
> This patch is against the 'media_tree.git' repo's 'master' branch.
>
> Documentation/devicetree/bindings/media/rcar_vin.txt | 1
> drivers/media/platform/rcar-vin/rcar-core.c | 32 +++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> Index: media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
> ===================================================================
> --- media_tree.orig/Documentation/devicetree/bindings/media/rcar_vin.txt
> +++ media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
> @@ -23,6 +23,7 @@ on Gen3 platforms to a CSI-2 receiver.
> - "renesas,vin-r8a7796" for the R8A7796 device
> - "renesas,vin-r8a77965" for the R8A77965 device
> - "renesas,vin-r8a77970" for the R8A77970 device
> + - "renesas,vin-r8a77980" for the R8A77980 device
> - "renesas,vin-r8a77995" for the R8A77995 device
> - "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible
> device.
> Index: media_tree/drivers/media/platform/rcar-vin/rcar-core.c
> ===================================================================
> --- media_tree.orig/drivers/media/platform/rcar-vin/rcar-core.c
> +++ media_tree/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -1097,6 +1097,34 @@ static const struct rvin_info rcar_info_
> .routes = rcar_info_r8a77995_routes,
> };
>
> +static const struct rvin_group_route rcar_info_r8a77980_routes[] = {
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 0, .mask = BIT(0) | BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 0, .mask = BIT(2) },
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 1, .mask = BIT(2) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 1, .mask = BIT(1) | BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 2, .mask = BIT(1) },
> + { .csi = RVIN_CSI40, .channel = 2, .vin = 2, .mask = BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 3, .mask = BIT(0) },
> + { .csi = RVIN_CSI40, .channel = 3, .vin = 3, .mask = BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 4, .mask = BIT(2) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 5, .mask = BIT(2) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 6, .mask = BIT(1) },
> + { .csi = RVIN_CSI41, .channel = 2, .vin = 6, .mask = BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 7, .mask = BIT(0) },
> + { .csi = RVIN_CSI41, .channel = 3, .vin = 7, .mask = BIT(3) },
> + { /* Sentinel */ }
> +};
> +
> +static const struct rvin_info rcar_info_r8a77980 = {
> + .model = RCAR_GEN3,
> + .use_mc = true,
> + .max_width = 4096,
> + .max_height = 4096,
> + .routes = rcar_info_r8a77980_routes,
> +};
> +
Could you move this chunk so it fits the numerical sorting order of this
part of the code? That is move the chunk between the r8a77970 and
r8a77995 structs :-) With that fixed feel free to add
Acked-by: Niklas S�derlund <niklas.soderlund+renesas@ragnatech.se>
> static const struct of_device_id rvin_of_id_table[] = {
> {
> .compatible = "renesas,vin-r8a7778",
> @@ -1143,6 +1171,10 @@ static const struct of_device_id rvin_of
> .data = &rcar_info_r8a77970,
> },
> {
> + .compatible = "renesas,vin-r8a77980",
> + .data = &rcar_info_r8a77980,
> + },
> + {
> .compatible = "renesas,vin-r8a77995",
> .data = &rcar_info_r8a77995,
> },
--
Regards,
Niklas S�derlund
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rcar-vin: add R8A77980 support
@ 2018-08-06 18:10 ` Niklas Söderlund
0 siblings, 0 replies; 4+ messages in thread
From: Niklas Söderlund @ 2018-08-06 18:10 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Mauro Carvalho Chehab, linux-media, linux-renesas-soc,
Rob Herring, devicetree, Mark Rutland
Hi Sergei,
Thanks for your work.
On 2018-08-06 20:45:01 +0300, Sergei Shtylyov wrote:
> Add the R8A77980 SoC support to the R-Car VIN driver.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> ---
> This patch is against the 'media_tree.git' repo's 'master' branch.
>
> Documentation/devicetree/bindings/media/rcar_vin.txt | 1
> drivers/media/platform/rcar-vin/rcar-core.c | 32 +++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> Index: media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
> ===================================================================
> --- media_tree.orig/Documentation/devicetree/bindings/media/rcar_vin.txt
> +++ media_tree/Documentation/devicetree/bindings/media/rcar_vin.txt
> @@ -23,6 +23,7 @@ on Gen3 platforms to a CSI-2 receiver.
> - "renesas,vin-r8a7796" for the R8A7796 device
> - "renesas,vin-r8a77965" for the R8A77965 device
> - "renesas,vin-r8a77970" for the R8A77970 device
> + - "renesas,vin-r8a77980" for the R8A77980 device
> - "renesas,vin-r8a77995" for the R8A77995 device
> - "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible
> device.
> Index: media_tree/drivers/media/platform/rcar-vin/rcar-core.c
> ===================================================================
> --- media_tree.orig/drivers/media/platform/rcar-vin/rcar-core.c
> +++ media_tree/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -1097,6 +1097,34 @@ static const struct rvin_info rcar_info_
> .routes = rcar_info_r8a77995_routes,
> };
>
> +static const struct rvin_group_route rcar_info_r8a77980_routes[] = {
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 0, .mask = BIT(0) | BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 0, .mask = BIT(2) },
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 1, .mask = BIT(2) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 1, .mask = BIT(1) | BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 0, .vin = 2, .mask = BIT(1) },
> + { .csi = RVIN_CSI40, .channel = 2, .vin = 2, .mask = BIT(3) },
> + { .csi = RVIN_CSI40, .channel = 1, .vin = 3, .mask = BIT(0) },
> + { .csi = RVIN_CSI40, .channel = 3, .vin = 3, .mask = BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 4, .mask = BIT(2) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 5, .mask = BIT(2) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 0, .vin = 6, .mask = BIT(1) },
> + { .csi = RVIN_CSI41, .channel = 2, .vin = 6, .mask = BIT(3) },
> + { .csi = RVIN_CSI41, .channel = 1, .vin = 7, .mask = BIT(0) },
> + { .csi = RVIN_CSI41, .channel = 3, .vin = 7, .mask = BIT(3) },
> + { /* Sentinel */ }
> +};
> +
> +static const struct rvin_info rcar_info_r8a77980 = {
> + .model = RCAR_GEN3,
> + .use_mc = true,
> + .max_width = 4096,
> + .max_height = 4096,
> + .routes = rcar_info_r8a77980_routes,
> +};
> +
Could you move this chunk so it fits the numerical sorting order of this
part of the code? That is move the chunk between the r8a77970 and
r8a77995 structs :-) With that fixed feel free to add
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> static const struct of_device_id rvin_of_id_table[] = {
> {
> .compatible = "renesas,vin-r8a7778",
> @@ -1143,6 +1171,10 @@ static const struct of_device_id rvin_of
> .data = &rcar_info_r8a77970,
> },
> {
> + .compatible = "renesas,vin-r8a77980",
> + .data = &rcar_info_r8a77980,
> + },
> + {
> .compatible = "renesas,vin-r8a77995",
> .data = &rcar_info_r8a77995,
> },
--
Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rcar-vin: add R8A77980 support
2018-08-06 18:10 ` Niklas Söderlund
(?)
@ 2018-08-06 18:29 ` Sergei Shtylyov
-1 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2018-08-06 18:29 UTC (permalink / raw)
To: Niklas Söderlund
Cc: Mauro Carvalho Chehab, linux-media, linux-renesas-soc,
Rob Herring, devicetree, Mark Rutland
On 08/06/2018 09:10 PM, Niklas Söderlund wrote:
>> Add the R8A77980 SoC support to the R-Car VIN driver.
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[...]
>> --- media_tree.orig/drivers/media/platform/rcar-vin/rcar-core.c
>> +++ media_tree/drivers/media/platform/rcar-vin/rcar-core.c
>> @@ -1097,6 +1097,34 @@ static const struct rvin_info rcar_info_
>> .routes = rcar_info_r8a77995_routes,
>> };
>>
>> +static const struct rvin_group_route rcar_info_r8a77980_routes[] = {
>> + { .csi = RVIN_CSI40, .channel = 0, .vin = 0, .mask = BIT(0) | BIT(3) },
>> + { .csi = RVIN_CSI40, .channel = 1, .vin = 0, .mask = BIT(2) },
>> + { .csi = RVIN_CSI40, .channel = 0, .vin = 1, .mask = BIT(2) },
>> + { .csi = RVIN_CSI40, .channel = 1, .vin = 1, .mask = BIT(1) | BIT(3) },
>> + { .csi = RVIN_CSI40, .channel = 0, .vin = 2, .mask = BIT(1) },
>> + { .csi = RVIN_CSI40, .channel = 2, .vin = 2, .mask = BIT(3) },
>> + { .csi = RVIN_CSI40, .channel = 1, .vin = 3, .mask = BIT(0) },
>> + { .csi = RVIN_CSI40, .channel = 3, .vin = 3, .mask = BIT(3) },
>> + { .csi = RVIN_CSI41, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
>> + { .csi = RVIN_CSI41, .channel = 1, .vin = 4, .mask = BIT(2) },
>> + { .csi = RVIN_CSI41, .channel = 0, .vin = 5, .mask = BIT(2) },
>> + { .csi = RVIN_CSI41, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
>> + { .csi = RVIN_CSI41, .channel = 0, .vin = 6, .mask = BIT(1) },
>> + { .csi = RVIN_CSI41, .channel = 2, .vin = 6, .mask = BIT(3) },
>> + { .csi = RVIN_CSI41, .channel = 1, .vin = 7, .mask = BIT(0) },
>> + { .csi = RVIN_CSI41, .channel = 3, .vin = 7, .mask = BIT(3) },
>> + { /* Sentinel */ }
>> +};
>> +
>> +static const struct rvin_info rcar_info_r8a77980 = {
>> + .model = RCAR_GEN3,
>> + .use_mc = true,
>> + .max_width = 4096,
>> + .max_height = 4096,
>> + .routes = rcar_info_r8a77980_routes,
>> +};
>> +
>
> Could you move this chunk so it fits the numerical sorting order of this
> part of the code? That is move the chunk between the r8a77970 and
> r8a77995 structs :-) With that fixed feel free to add
Ugh, I've noticed the newly added SoC when rebasing to media_tree.git but
failed to updated all chunks... Sorry, will respin/repost.
> Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Thanks!
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-06 20:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-06 17:45 [PATCH] rcar-vin: add R8A77980 support Sergei Shtylyov
2018-08-06 18:10 ` Niklas Söderlund
2018-08-06 18:10 ` Niklas Söderlund
2018-08-06 18:29 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.