[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, 21 insertions, 2 deletions

diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/platform/vsp1/vsp1_entity.h
index f6fd6988aeb0..3c6a5c831bcf 100644
--- a/drivers/media/platform/vsp1/vsp1_entity.h
+++ b/drivers/media/platform/vsp1/vsp1_entity.h
@@ -30,13 +30,31 @@ enum vsp1_entity_type {
         VSP1_ENTITY_WPF,
 };
 
+/*
+ * struct vsp1_route - Entity routing configuration
+ * @type: Entity type this routing entry is associated with
+ * @index: Entity index this routing entry is associated with
+ * @reg: Output routing configuration register
+ * @inputs: Target node value for each input
+ *
+ * Each $vsp1_route entry describes routing configuration for the entity
+ * specified by the entry's @type and @index. @reg indicates the register that
+ * holds output routing configuration for the entity, and the @inputs array
+ * store the target node value for each input of the entity.
+ */
+struct vsp1_route {
+        enum vsp1_entity_type type;
+        unsigned int index;
+        unsigned int reg;
+        unsigned int inputs[4];
+};
+
 struct vsp1_entity {
         struct vsp1_device *vsp1;
 
         enum vsp1_entity_type type;
         unsigned int index;
-        unsigned int id;
-        unsigned int route;
+        const struct vsp1_route *route;
 
         struct list_head list_dev;
         struct list_head list_pipe;
@@ -45,6 +63,7 @@ struct vsp1_entity {
         unsigned int source_pad;
 
         struct media_entity *sink;
+        unsigned int sink_pad;
 
         struct v4l2_subdev subdev;
         struct v4l2_mbus_framefmt *formats;