From: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
Extend the VIN driver with experimental r8a77990 support.
Not-Signed-off-by: Magnus Damm <damm+renesas@xxxxxxxxxxxxx>
---
drivers/media/platform/rcar-vin/rcar-core.c | 21 +++++++++++++++++++++
drivers/media/platform/rcar-vin/rcar-csi2.c | 8 ++++++++
2 files changed, 29 insertions(+)
--- 0001/drivers/media/platform/rcar-vin/rcar-core.c
+++ work/drivers/media/platform/rcar-vin/rcar-core.c 2018-06-19 20:54:34.180607110 +0900
@@ -1037,6 +1037,23 @@ static const struct rvin_info rcar_info_
.routes = _rcar_info_r8a77970_routes,
};
+
+static const struct rvin_group_route _rcar_info_r8a77990_routes[] = {
+ { .csi = RVIN_CSI40, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
+ { .csi = RVIN_CSI40, .channel = 0, .vin = 5, .mask = BIT(2) },
+ { .csi = RVIN_CSI40, .channel = 1, .vin = 4, .mask = BIT(2) },
+ { .csi = RVIN_CSI40, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
+ { /* Sentinel */ }
+};
+
+static const struct rvin_info rcar_info_r8a77990 = {
+ .model = RCAR_GEN3,
+ .use_mc = true,
+ .max_width = 4096,
+ .max_height = 4096,
+ .routes = _rcar_info_r8a77990_routes,
+};
+
static const struct of_device_id rvin_of_id_table[] = {
{
.compatible = "renesas,vin-r8a7778",
@@ -1082,6 +1099,10 @@ static const struct of_device_id rvin_of
.compatible = "renesas,vin-r8a77970",
.data = &rcar_info_r8a77970,
},
+ {
+ .compatible = "renesas,vin-r8a77990",
+ .data = &rcar_info_r8a77990,
+ },
{ /* Sentinel */ },
};
MODULE_DEVICE_TABLE(of, rvin_of_id_table);
--- 0001/drivers/media/platform/rcar-vin/rcar-csi2.c
+++ work/drivers/media/platform/rcar-vin/rcar-csi2.c 2018-06-19 20:54:34.180607110 +0900
@@ -951,6 +951,10 @@ static const struct rcar_csi2_info rcar_
.init_phtw = rcsi2_init_phtw_v3m_e3,
};
+static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = {
+ .init_phtw = rcsi2_init_phtw_v3m_e3,
+};
+
static const struct of_device_id rcar_csi2_of_table[] = {
{
.compatible = "renesas,r8a7795-csi2",
@@ -968,6 +972,10 @@ static const struct of_device_id rcar_cs
.compatible = "renesas,r8a77970-csi2",
.data = &rcar_csi2_info_r8a77970,
},
+ {
+ .compatible = "renesas,r8a77990-csi2",
+ .data = &rcar_csi2_info_r8a77990,
+ },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, rcar_csi2_of_table);
