diff mbox

[v10,29/30] rcar-vin: enable support for r8a7796

Message ID 20180129163435.24936-30-niklas.soderlund+renesas@ragnatech.se (mailing list archive)
State New, archived
Headers show

Commit Message

Niklas Söderlund Jan. 29, 2018, 4:34 p.m. UTC 
Add the SoC specific information for Renesas r8a7796.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 drivers/media/platform/rcar-vin/rcar-core.c | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

Comments

Laurent Pinchart Feb. 13, 2018, 9:54 p.m. UTC | #1 
Hi Niklas,

Thank you for the patch.

On Monday, 29 January 2018 18:34:34 EET Niklas Söderlund wrote:
> Add the SoC specific information for Renesas r8a7796.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
>  drivers/media/platform/rcar-vin/rcar-core.c | 44 ++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
> 
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c
> b/drivers/media/platform/rcar-vin/rcar-core.c index
> 43d2fa83875817f0..2305fedd293db241 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -914,6 +914,46 @@ static const struct rvin_info rcar_info_r8a7795es1 = {
>  	.routes = rcar_info_r8a7795es1_routes,
>  };
> 
> +static const struct rvin_group_route rcar_info_r8a7796_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 = 1, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
> +	{ .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 = 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) },
> +	{ .vin = 3, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
> +	{ .vin = 3, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
> +	{ .vin = 4, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(0) | BIT(3) },
> +	{ .vin = 4, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
> +	{ .vin = 5, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
> +	{ .vin = 5, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(2) },
> +	{ .vin = 5, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(3) },
> +	{ .vin = 5, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
> +	{ .vin = 6, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(1) },
> +	{ .vin = 6, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
> +	{ .vin = 6, .csi = RVIN_CSI40, .chan = 2, .mask = BIT(3) },
> +	{ .vin = 6, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
> +	{ .vin = 7, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(0) },
> +	{ .vin = 7, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) },
> +	{ .vin = 7, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
> +	{ .vin = 7, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
> +	{ /* Sentinel */ }
> +};
> +
> +static const struct rvin_info rcar_info_r8a7796 = {
> +	.model = RCAR_GEN3,
> +	.use_mc = true,
> +	.max_width = 4096,
> +	.max_height = 4096,
> +	.routes = rcar_info_r8a7796_routes,
> +};
> +
>  static const struct of_device_id rvin_of_id_table[] = {
>  	{
>  		.compatible = "renesas,vin-r8a7778",
> @@ -947,6 +987,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,
> +	},
>  	{ /* Sentinel */ },
>  };
>  MODULE_DEVICE_TABLE(of, rvin_of_id_table);
Laurent Pinchart Feb. 13, 2018, 9:55 p.m. UTC | #2 
On Tuesday, 13 February 2018 23:54:55 EET Laurent Pinchart wrote:
> Hi Niklas,
> 
> Thank you for the patch.
> 
> On Monday, 29 January 2018 18:34:34 EET Niklas Söderlund wrote:
> > Add the SoC specific information for Renesas r8a7796.
> > 
> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

And also

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> > ---
> > 
> >  drivers/media/platform/rcar-vin/rcar-core.c | 44
> >  ++++++++++++++++++++++++++
> >  1 file changed, 44 insertions(+)
> > 
> > diff --git a/drivers/media/platform/rcar-vin/rcar-core.c
> > b/drivers/media/platform/rcar-vin/rcar-core.c index
> > 43d2fa83875817f0..2305fedd293db241 100644
> > --- a/drivers/media/platform/rcar-vin/rcar-core.c
> > +++ b/drivers/media/platform/rcar-vin/rcar-core.c
> > @@ -914,6 +914,46 @@ static const struct rvin_info rcar_info_r8a7795es1 =
> > {
> > 
> >  	.routes = rcar_info_r8a7795es1_routes,
> >  
> >  };
> > 
> > +static const struct rvin_group_route rcar_info_r8a7796_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 = 1, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
> > +	{ .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 = 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) },
> > +	{ .vin = 3, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
> > +	{ .vin = 3, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
> > +	{ .vin = 4, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(0) | BIT(3) },
> > +	{ .vin = 4, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
> > +	{ .vin = 5, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
> > +	{ .vin = 5, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(2) },
> > +	{ .vin = 5, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(3) },
> > +	{ .vin = 5, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
> > +	{ .vin = 6, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(1) },
> > +	{ .vin = 6, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
> > +	{ .vin = 6, .csi = RVIN_CSI40, .chan = 2, .mask = BIT(3) },
> > +	{ .vin = 6, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
> > +	{ .vin = 7, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(0) },
> > +	{ .vin = 7, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) },
> > +	{ .vin = 7, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
> > +	{ .vin = 7, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
> > +	{ /* Sentinel */ }
> > +};
> > +
> > +static const struct rvin_info rcar_info_r8a7796 = {
> > +	.model = RCAR_GEN3,
> > +	.use_mc = true,
> > +	.max_width = 4096,
> > +	.max_height = 4096,
> > +	.routes = rcar_info_r8a7796_routes,
> > +};
> > +
> > 
> >  static const struct of_device_id rvin_of_id_table[] = {
> >  
> >  	{
> >  	
> >  		.compatible = "renesas,vin-r8a7778",
> > 
> > @@ -947,6 +987,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,
> > +	},
> > 
> >  	{ /* Sentinel */ },
> >  
> >  };
> >  MODULE_DEVICE_TABLE(of, rvin_of_id_table);
diff mbox

Patch

diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 43d2fa83875817f0..2305fedd293db241 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -914,6 +914,46 @@  static const struct rvin_info rcar_info_r8a7795es1 = {
 	.routes = rcar_info_r8a7795es1_routes,
 };
 
+static const struct rvin_group_route rcar_info_r8a7796_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 = 1, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+	{ .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 = 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) },
+	{ .vin = 3, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
+	{ .vin = 3, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+	{ .vin = 4, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(0) | BIT(3) },
+	{ .vin = 4, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(1) | BIT(4) },
+	{ .vin = 5, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(0) },
+	{ .vin = 5, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(2) },
+	{ .vin = 5, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(3) },
+	{ .vin = 5, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(4) },
+	{ .vin = 6, .csi = RVIN_CSI40, .chan = 0, .mask = BIT(1) },
+	{ .vin = 6, .csi = RVIN_CSI20, .chan = 0, .mask = BIT(2) },
+	{ .vin = 6, .csi = RVIN_CSI40, .chan = 2, .mask = BIT(3) },
+	{ .vin = 6, .csi = RVIN_CSI20, .chan = 2, .mask = BIT(4) },
+	{ .vin = 7, .csi = RVIN_CSI40, .chan = 1, .mask = BIT(0) },
+	{ .vin = 7, .csi = RVIN_CSI20, .chan = 1, .mask = BIT(1) },
+	{ .vin = 7, .csi = RVIN_CSI40, .chan = 3, .mask = BIT(3) },
+	{ .vin = 7, .csi = RVIN_CSI20, .chan = 3, .mask = BIT(4) },
+	{ /* Sentinel */ }
+};
+
+static const struct rvin_info rcar_info_r8a7796 = {
+	.model = RCAR_GEN3,
+	.use_mc = true,
+	.max_width = 4096,
+	.max_height = 4096,
+	.routes = rcar_info_r8a7796_routes,
+};
+
 static const struct of_device_id rvin_of_id_table[] = {
 	{
 		.compatible = "renesas,vin-r8a7778",
@@ -947,6 +987,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,
+	},
 	{ /* Sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, rvin_of_id_table);