diff mbox

[v11,31/32] rcar-vin: enable support for r8a7796

Message ID 20180302015751.25596-32-niklas.soderlund+renesas@ragnatech.se (mailing list archive)
State Not Applicable
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Niklas Söderlund March 2, 2018, 1:57 a.m. UTC 
Add the SoC specific information for Renesas r8a7796.

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

Patch

diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 8017d386fc9bc545..f631a66e9cb69265 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -931,6 +931,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",
@@ -964,6 +1004,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);