media: rkisp1: Make the internal CSI-2 receiver optional

Not all ISP versions integrate a MIPI CSI-2 receiver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index bc278b49fefc82c0f5adad9bb29ef71a817bebcb..f2475c6235ea7cd0d5250c1ad9cd508e5b4a726d 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -205,6 +205,14 @@ static int rkisp1_subdev_notifier_register(struct rkisp1_device *rkisp1)
 
                switch (reg) {
                case 0:
+                       /* MIPI CSI-2 port */
+                       if (!(rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2)) {
+                               dev_err(rkisp1->dev,
+                                       "internal CSI must be available for port 0\n");
+                               ret = -EINVAL;
+                               break;
+                       }
+
                        vep.bus_type = V4L2_MBUS_CSI2_DPHY;
                        break;
 
@@ -330,13 +338,16 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1)
        unsigned int i;
        int ret;
 
-       /* Link the CSI receiver to the ISP. */
-       ret = media_create_pad_link(&rkisp1->csi.sd.entity, RKISP1_CSI_PAD_SRC,
-                                   &rkisp1->isp.sd.entity,
-                                   RKISP1_ISP_PAD_SINK_VIDEO,
-                                   MEDIA_LNK_FL_ENABLED);
-       if (ret)
-               return ret;
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) {
+               /* Link the CSI receiver to the ISP. */
+               ret = media_create_pad_link(&rkisp1->csi.sd.entity,
+                                           RKISP1_CSI_PAD_SRC,
+                                           &rkisp1->isp.sd.entity,
+                                           RKISP1_ISP_PAD_SINK_VIDEO,
+                                           MEDIA_LNK_FL_ENABLED);
+               if (ret)
+                       return ret;
+       }
 
        /* create ISP->RSZ->CAP links */
        for (i = 0; i < 2; i++) {
@@ -379,7 +390,8 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1)
 
 static void rkisp1_entities_unregister(struct rkisp1_device *rkisp1)
 {
-       rkisp1_csi_unregister(rkisp1);
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2)
+               rkisp1_csi_unregister(rkisp1);
        rkisp1_params_unregister(rkisp1);
        rkisp1_stats_unregister(rkisp1);
        rkisp1_capture_devs_unregister(rkisp1);
@@ -411,9 +423,11 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1)
        if (ret)
                goto error;
 
-       ret = rkisp1_csi_register(rkisp1);
-       if (ret)
-               goto error;
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) {
+               ret = rkisp1_csi_register(rkisp1);
+               if (ret)
+                       goto error;
+       }
 
        ret = rkisp1_create_links(rkisp1);
        if (ret)
@@ -576,9 +590,11 @@ static int rkisp1_probe(struct platform_device *pdev)
                goto err_unreg_v4l2_dev;
        }
 
-       ret = rkisp1_csi_init(rkisp1);
-       if (ret)
-               goto err_unreg_media_dev;
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) {
+               ret = rkisp1_csi_init(rkisp1);
+               if (ret)
+                       goto err_unreg_media_dev;
+       }
 
        ret = rkisp1_entities_register(rkisp1);
        if (ret)
@@ -595,7 +611,8 @@ static int rkisp1_probe(struct platform_device *pdev)
 err_unreg_entities:
        rkisp1_entities_unregister(rkisp1);
 err_cleanup_csi:
-       rkisp1_csi_cleanup(rkisp1);
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2)
+               rkisp1_csi_cleanup(rkisp1);
 err_unreg_media_dev:
        media_device_unregister(&rkisp1->media_dev);
 err_unreg_v4l2_dev:
@@ -613,7 +630,8 @@ static int rkisp1_remove(struct platform_device *pdev)
        v4l2_async_nf_cleanup(&rkisp1->notifier);
 
        rkisp1_entities_unregister(rkisp1);
-       rkisp1_csi_cleanup(rkisp1);
+       if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2)
+               rkisp1_csi_cleanup(rkisp1);
        rkisp1_debug_cleanup(rkisp1);
 
        media_device_unregister(&rkisp1->media_dev);