media: rcar-vin: prepare for media controller mode initialization

Prepare for media controller by calling a different initialization then
when running in device centric mode. Add trivial configuration of
the mbus and creation of the media pad for the video device entity.

While we are at it clearly mark the digital device centric notifier
functions with a comment.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index c0e0412e2ecd9487f57e1fd6b81f74d6ac8c9f3b..e0a33d372c500ccd297d1cece8758d67a988dbb9 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -46,6 +46,10 @@ static int rvin_find_pad(struct v4l2_subdev *sd, int direction)
        return -EINVAL;
 }
 
+/* -----------------------------------------------------------------------------
+ * Digital async notifier
+ */
+
 /* The vin lock should be held when calling the subdevice attach and detach */
 static int rvin_digital_subdevice_attach(struct rvin_dev *vin,
                                         struct v4l2_subdev *subdev)
@@ -243,6 +247,16 @@ static int rvin_digital_graph_init(struct rvin_dev *vin)
        return 0;
 }
 
+static int rvin_mc_init(struct rvin_dev *vin)
+{
+       /* All our sources are CSI-2 */
+       vin->mbus_cfg.type = V4L2_MBUS_CSI2;
+       vin->mbus_cfg.flags = 0;
+
+       vin->pad.flags = MEDIA_PAD_FL_SINK;
+       return media_entity_pads_init(&vin->vdev.entity, 1, &vin->pad);
+}
+
 /* -----------------------------------------------------------------------------
  * Platform Device Driver
  */
@@ -331,8 +345,10 @@ static int rcar_vin_probe(struct platform_device *pdev)
                return ret;
 
        platform_set_drvdata(pdev, vin);
-
-       ret = rvin_digital_graph_init(vin);
+       if (vin->info->use_mc)
+               ret = rvin_mc_init(vin);
+       else
+               ret = rvin_digital_graph_init(vin);
        if (ret < 0)
                goto error;
 

diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h
index e5668c1120a678990a3f78f5479e487a06be2887..5102ad254bff515b4b8a72c55162bf6e3f582b9b 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-vin.h
+++ b/drivers/media/platform/rcar-vin/rcar-vin.h
@@ -99,6 +99,8 @@ struct rvin_info {
  * @notifier:          V4L2 asynchronous subdevs notifier
  * @digital:           entity in the DT for local digital subdevice
  *
+ * @pad:               media pad for the video device entity
+ *
  * @lock:              protects @queue
  * @queue:             vb2 buffers queue
  * @scratch:           cpu address for scratch buffer
@@ -131,6 +133,8 @@ struct rvin_dev {
        struct v4l2_async_notifier notifier;
        struct rvin_graph_entity *digital;
 
+       struct media_pad pad;
+
        struct mutex lock;
        struct vb2_queue queue;
        void *scratch;