public inbox for linux-sunxi@lists.linux.dev
 help / color / mirror / Atom feed
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-sunxi@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
	Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Chen-Yu Tsai <wens@csie.org>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Samuel Holland <samuel@sholland.org>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v4 43/45] media: sun6i-csi: Detect the availability of the ISP
Date: Fri, 15 Apr 2022 17:28:09 +0200	[thread overview]
Message-ID: <20220415152811.636419-44-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220415152811.636419-1-paul.kocialkowski@bootlin.com>

Add a helper to detect whether the ISP is available and connected
and store the indication in a driver-wide variable.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 .../platform/sunxi/sun6i-csi/sun6i_csi.c      | 33 +++++++++++++++++++
 .../platform/sunxi/sun6i-csi/sun6i_csi.h      |  3 ++
 2 files changed, 36 insertions(+)

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index a88deb8ba1e7..f185cbd113c7 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -25,6 +25,35 @@
 #include "sun6i_csi_capture.h"
 #include "sun6i_csi_reg.h"
 
+/* ISP */
+
+static bool sun6i_csi_isp_detect(struct sun6i_csi_device *csi_dev)
+{
+	struct device *dev = csi_dev->dev;
+	struct fwnode_handle *handle = NULL;
+
+	/* ISP is not available if disabled in kernel config. */
+	if (!IS_ENABLED(CONFIG_VIDEO_SUN6I_ISP))
+		return 0;
+
+	/*
+	 * ISP is not available if not connected via fwnode graph.
+	 * This weill also check that the remote parent node is available.
+	 */
+	handle = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev),
+						 SUN6I_CSI_PORT_ISP, 0,
+						 FWNODE_GRAPH_ENDPOINT_NEXT);
+	if (!handle)
+		return 0;
+
+	fwnode_handle_put(handle);
+
+	dev_info(dev, "ISP link is available\n");
+	csi_dev->isp_available = true;
+
+	return 0;
+}
+
 /* Media */
 
 static const struct media_device_ops sun6i_csi_media_ops = {
@@ -306,6 +335,10 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)
 	if (ret)
 		return ret;
 
+	ret = sun6i_csi_isp_detect(csi_dev);
+	if (ret)
+		goto error_resources;
+
 	ret = sun6i_csi_v4l2_setup(csi_dev);
 	if (ret)
 		goto error_resources;
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index 6aa83dd11684..9b105c341047 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -22,6 +22,7 @@
 enum sun6i_csi_port {
 	SUN6I_CSI_PORT_PARALLEL		= 0,
 	SUN6I_CSI_PORT_MIPI_CSI2	= 1,
+	SUN6I_CSI_PORT_ISP		= 2,
 };
 
 struct sun6i_csi_buffer {
@@ -46,6 +47,8 @@ struct sun6i_csi_device {
 	struct clk			*clock_mod;
 	struct clk			*clock_ram;
 	struct reset_control		*reset;
+
+	bool				isp_available;
 };
 
 struct sun6i_csi_variant {
-- 
2.35.2


  parent reply	other threads:[~2022-04-15 15:29 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-15 15:27 [PATCH v4 00/45] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 01/45] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 02/45] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 03/45] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 04/45] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 05/45] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 06/45] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-04-27 18:31   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 07/45] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-04-27 18:32   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 08/45] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 09/45] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 10/45] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 11/45] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-04-27 18:40   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 12/45] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-04-27 18:42   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 13/45] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-04-27 18:50   ` Jernej Škrabec
2022-04-28  8:04     ` Paul Kocialkowski
2022-04-28  8:11       ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 14/45] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 15/45] media: media-entity: Add helper to get a single enabled link Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 16/45] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 17/45] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 18/45] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-04-15 15:27 ` [PATCH v4 19/45] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-04-27 18:56   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 20/45] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-04-27 18:57   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 21/45] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-04-27 19:16   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 22/45] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-04-27 19:19   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 23/45] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-04-27 19:21   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 24/45] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-04-27 19:25   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 25/45] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-04-27 19:28   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 26/45] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-04-27 19:30   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 27/45] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-04-27 19:31   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 28/45] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-04-27 19:32   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 29/45] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-04-27 19:35   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 30/45] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-04-27 19:36   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 31/45] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-04-27 19:38   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 32/45] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-04-27 19:40   ` Jernej Škrabec
2022-04-15 15:27 ` [PATCH v4 33/45] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-04-27 19:43   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 34/45] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-04-27 19:45   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 35/45] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-04-27 19:47   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 36/45] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-04-15 15:28 ` [PATCH v4 37/45] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-04-27 19:50   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 38/45] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-04-27 19:52   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 39/45] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-04-27 19:54   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 40/45] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-04-27 19:56   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 41/45] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-04-27 19:57   ` Jernej Škrabec
2022-04-15 15:28 ` [PATCH v4 42/45] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-04-27 19:02   ` Jernej Škrabec
2022-04-15 15:28 ` Paul Kocialkowski [this message]
2022-04-27 20:07   ` [PATCH v4 43/45] media: sun6i-csi: Detect the availability of the ISP Jernej Škrabec
2022-04-28  7:55     ` Paul Kocialkowski
2022-04-28  8:09       ` Jernej Škrabec
2022-04-28 11:39         ` Paul Kocialkowski
2022-04-28  8:11       ` Maxime Ripard
2022-04-28 11:43         ` Paul Kocialkowski
2022-04-29 14:24           ` Maxime Ripard
2022-04-15 15:28 ` [PATCH v4 44/45] media: sun6i-csi: Add support for hooking to the isp devices Paul Kocialkowski
2022-04-15 15:28 ` [PATCH v4 45/45] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-04-27 20:01   ` Jernej Škrabec

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=20220415152811.636419-44-paul.kocialkowski@bootlin.com \
    --to=paul.kocialkowski@bootlin.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-sunxi@lists.linux.dev \
    --cc=mchehab@kernel.org \
    --cc=mripard@kernel.org \
    --cc=samuel@sholland.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=wens@csie.org \
    --cc=yong.deng@magewell.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox