[media] v4l: vsp1: Support multi-input entities

Rework the route configuration code to support entities with multiple
sink pads.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index a0595c17700f..1ef875d521da 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -461,7 +461,7 @@ static int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
 
         list_for_each_entry(entity, &pipe->entities, list_pipe) {
                 if (entity->route)
-                        vsp1_write(entity->vsp1, entity->route,
+                        vsp1_write(entity->vsp1, entity->route->reg,
                                    VI6_DPR_NODE_UNUSED);
 
                 v4l2_subdev_call(&entity->subdev, video, s_stream, 0);
@@ -680,11 +680,12 @@ static void vsp1_entity_route_setup(struct vsp1_entity *source)
 {
         struct vsp1_entity *sink;
 
-        if (source->route == 0)
+        if (source->route->reg == 0)
                 return;
 
         sink = container_of(source->sink, struct vsp1_entity, subdev.entity);
-        vsp1_write(source->vsp1, source->route, sink->id);
+        vsp1_write(source->vsp1, source->route->reg,
+                   sink->route->inputs[source->sink_pad]);
 }
 
 static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)