From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: linux-media@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, Dafna Hirschfeld <dafna@fastmail.com>, Heiko Stuebner <heiko@sntech.de>, Helen Koike <helen.koike@collabora.com>, Paul Elder <paul.elder@ideasonboard.com> Subject: [PATCH v3 45/46] media: rkisp1: Make the internal CSI-2 receiver optional Date: Mon, 11 Jul 2022 15:42:47 +0300 [thread overview] Message-ID: <20220711124248.2683-46-laurent.pinchart@ideasonboard.com> (raw) In-Reply-To: <20220711124248.2683-1-laurent.pinchart@ideasonboard.com> 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> --- .../platform/rockchip/rkisp1/rkisp1-dev.c | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index bc278b49fefc..f2475c6235ea 100644 --- 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); -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: linux-media@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, Dafna Hirschfeld <dafna@fastmail.com>, Heiko Stuebner <heiko@sntech.de>, Helen Koike <helen.koike@collabora.com>, Paul Elder <paul.elder@ideasonboard.com> Subject: [PATCH v3 45/46] media: rkisp1: Make the internal CSI-2 receiver optional Date: Mon, 11 Jul 2022 15:42:47 +0300 [thread overview] Message-ID: <20220711124248.2683-46-laurent.pinchart@ideasonboard.com> (raw) In-Reply-To: <20220711124248.2683-1-laurent.pinchart@ideasonboard.com> 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> --- .../platform/rockchip/rkisp1/rkisp1-dev.c | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index bc278b49fefc..f2475c6235ea 100644 --- 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); -- Regards, Laurent Pinchart _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-07-11 12:45 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-11 12:42 [PATCH v3 00/46] media: rkisp1: Cleanups to prepare for i.MX8MP support Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 01/46] media: v4l2-async: Add notifier operation to destroy asd instances Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 02/46] media: mc-entity: Rename media_entity_remote_pad() to media_pad_remote_pad_first() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-15 14:41 ` [PATCH v3.1 " Laurent Pinchart 2022-07-15 14:41 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 03/46] media: mc-entity: Add a new helper function to get a remote pad Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 04/46] media: mc-entity: Add a new helper function to get a remote pad for a pad Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 05/46] media: rkisp1: Enable compilation on ARCH_MXC Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 06/46] media: rkisp1: Disable runtime PM in probe error path Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 07/46] media: rkisp1: Read the ID register at probe time instead of streamon Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 08/46] media: rkisp1: Rename rkisp1_match_data to rkisp1_info Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 09/46] media: rkisp1: Save info pointer in rkisp1_device Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 10/46] media: rkisp1: Access ISP version from info pointer Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 11/46] media: rkisp1: Make rkisp1_isp_mbus_info common Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 12/46] media: rkisp1: cap: Print debug message on failed link validation Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 13/46] media: rkisp1: Move sensor .s_stream() call to ISP Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 14/46] media: rkisp1: Reject sensors without pixel rate control at bound time Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 15/46] media: rkisp1: Create link from sensor to ISP at notifier " Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 16/46] media: rkisp1: Create internal links at probe time Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 17/46] media: rkisp1: Rename rkisp1_subdev_notifier() to rkisp1_subdev_notifier_register() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 18/46] media: rkisp1: Fix sensor source pad retrieval at bound time Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 19/46] media: rkisp1: Split CSI handling to separate file Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 20/46] media: rkisp1: isp: Start CSI-2 receiver before ISP Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 21/46] media: rkisp1: csi: Handle CSI-2 RX configuration fully in rkisp1-csi.c Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-16 19:01 ` Laurent Pinchart 2022-07-16 19:01 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 22/46] media: rkisp1: csi: Rename CSI functions with a common rkisp1_csi prefix Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 23/46] media: rkisp1: csi: Move start delay to rkisp1_csi_start() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 24/46] media: rkisp1: csi: Pass sensor pointer to rkisp1_csi_config() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 25/46] media: rkisp1: csi: Constify argument to rkisp1_csi_start() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 26/46] media: rkisp1: isp: Don't initialize ret to 0 in rkisp1_isp_s_stream() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 27/46] media: rkisp1: isp: Pass mbus type and flags to rkisp1_config_cif() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 28/46] media: rkisp1: isp: Rename rkisp1_device.active_sensor to source Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 29/46] media: rkisp1: isp: Add container_of wrapper to cast subdev to rkisp1_isp Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 30/46] media: rkisp1: isp: Add rkisp1_device backpointer " Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 31/46] media: rkisp1: isp: Pass rkisp1_isp pointer to internal ISP functions Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 32/46] media: rkisp1: isp: Move input configuration to rkisp1_config_isp() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 33/46] media: rkisp1: isp: Merge ISP_ACQ_PROP configuration in single variable Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 34/46] media: rkisp1: isp: Initialize some variables at declaration time Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 35/46] media: rkisp1: isp: Fix whitespace issues Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 36/46] media: rkisp1: isp: Constify various local variables Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 37/46] media: rkisp1: isp: Rename rkisp1_get_remote_source() Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 38/46] media: rkisp1: isp: Disallow multiple active sources Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-12 18:40 ` Dafna Hirschfeld 2022-07-12 18:40 ` Dafna Hirschfeld 2022-07-12 19:18 ` Laurent Pinchart 2022-07-12 19:18 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 39/46] media: rkisp1: csi: Implement a V4L2 subdev for the CSI receiver Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-12 18:31 ` Dafna Hirschfeld 2022-07-12 18:31 ` Dafna Hirschfeld 2022-07-11 12:42 ` [PATCH v3 40/46] media: rkisp1: csi: Plumb the CSI RX subdev Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 41/46] media: rkisp1: Use fwnode_graph_for_each_endpoint Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 42/46] dt-bindings: media: rkisp1: Add port for parallel interface Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 43/46] media: rkisp1: Support the ISP parallel input Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 44/46] media: rkisp1: Add infrastructure to support ISP features Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-11 16:37 ` Michael Riesch 2022-07-11 16:37 ` Michael Riesch 2022-07-11 16:50 ` Laurent Pinchart 2022-07-11 16:50 ` Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart [this message] 2022-07-11 12:42 ` [PATCH v3 45/46] media: rkisp1: Make the internal CSI-2 receiver optional Laurent Pinchart 2022-07-11 12:42 ` [PATCH v3 46/46] media: rkisp1: debug: Add dump file in debugfs for MI main path registers Laurent Pinchart 2022-07-11 12:42 ` Laurent Pinchart 2022-07-12 18:42 ` Dafna Hirschfeld 2022-07-12 18:42 ` Dafna Hirschfeld
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220711124248.2683-46-laurent.pinchart@ideasonboard.com \ --to=laurent.pinchart@ideasonboard.com \ --cc=dafna@fastmail.com \ --cc=heiko@sntech.de \ --cc=helen.koike@collabora.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=paul.elder@ideasonboard.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.