From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
linux-phy@lists.infradead.org, linux-clk@vger.kernel.org,
linux-staging@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Maxime Ripard <mripard@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Helen Koike <helen.koike@collabora.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v2 54/66] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code
Date: Sat, 5 Feb 2022 19:54:17 +0100 [thread overview]
Message-ID: <20220205185429.2278860-55-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220205185429.2278860-1-paul.kocialkowski@bootlin.com>
Introduce MIPI CSI-2 support to the bridge with a new port, source
and hardware configuration helper.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
.../platform/sunxi/sun6i-csi/sun6i_csi.h | 1 +
.../sunxi/sun6i-csi/sun6i_csi_bridge.c | 35 +++++++++++++++++--
.../sunxi/sun6i-csi/sun6i_csi_bridge.h | 1 +
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
index d7082e951b06..3c08b2712215 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
@@ -21,6 +21,7 @@
enum sun6i_csi_port {
SUN6I_CSI_PORT_PARALLEL = 0,
+ SUN6I_CSI_PORT_MIPI_CSI2 = 1,
};
struct sun6i_csi_buffer {
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
index f5303842d169..b631220dd682 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
@@ -226,7 +226,7 @@ static void sun6i_csi_bridge_disable(struct sun6i_csi_device *csi_dev)
}
static void
-sun6i_csi_bridge_configure_interface(struct sun6i_csi_device *csi_dev)
+sun6i_csi_bridge_configure_parallel(struct sun6i_csi_device *csi_dev)
{
struct device *dev = csi_dev->dev;
struct regmap *regmap = csi_dev->regmap;
@@ -316,6 +316,25 @@ sun6i_csi_bridge_configure_interface(struct sun6i_csi_device *csi_dev)
regmap_write(regmap, SUN6I_CSI_IF_CFG_REG, value);
}
+static void
+sun6i_csi_bridge_configure_mipi_csi2(struct sun6i_csi_device *csi_dev)
+{
+ struct regmap *regmap = csi_dev->regmap;
+ u32 value = SUN6I_CSI_IF_CFG_IF_MIPI;
+ u32 field;
+
+ sun6i_csi_bridge_format(csi_dev, NULL, &field);
+
+ if (field == V4L2_FIELD_INTERLACED ||
+ field == V4L2_FIELD_INTERLACED_TB ||
+ field == V4L2_FIELD_INTERLACED_BT)
+ value |= SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED;
+ else
+ value |= SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE;
+
+ regmap_write(regmap, SUN6I_CSI_IF_CFG_REG, value);
+}
+
static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev)
{
struct regmap *regmap = csi_dev->regmap;
@@ -369,7 +388,11 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev)
static void sun6i_csi_bridge_configure(struct sun6i_csi_device *csi_dev)
{
- sun6i_csi_bridge_configure_interface(csi_dev);
+ if (csi_dev->bridge.source == &csi_dev->bridge.source_parallel)
+ sun6i_csi_bridge_configure_parallel(csi_dev);
+ else if (csi_dev->bridge.source == &csi_dev->bridge.source_mipi_csi2)
+ sun6i_csi_bridge_configure_mipi_csi2(csi_dev);
+
sun6i_csi_bridge_configure_format(csi_dev);
}
@@ -552,6 +575,8 @@ static int sun6i_csi_bridge_link_validate(struct media_link *link)
if (source_subdev == bridge->source_parallel.subdev)
bridge->source = &bridge->source_parallel;
+ else if (source_subdev == bridge->source_mipi_csi2.subdev)
+ bridge->source = &bridge->source_mipi_csi2;
else
return -EINVAL;
@@ -638,6 +663,10 @@ sun6i_csi_bridge_notifier_bound(struct v4l2_async_notifier *notifier,
source = &bridge->source_parallel;
enabled = true;
break;
+ case SUN6I_CSI_PORT_MIPI_CSI2:
+ source = &bridge->source_mipi_csi2;
+ enabled = !bridge->source_parallel.expected;
+ break;
default:
break;
}
@@ -784,6 +813,8 @@ int sun6i_csi_bridge_setup(struct sun6i_csi_device *csi_dev)
sun6i_csi_bridge_source_setup(csi_dev, &bridge->source_parallel,
SUN6I_CSI_PORT_PARALLEL,
parallel_mbus_types);
+ sun6i_csi_bridge_source_setup(csi_dev, &bridge->source_mipi_csi2,
+ SUN6I_CSI_PORT_MIPI_CSI2, NULL);
ret = v4l2_async_nf_register(v4l2_dev, notifier);
if (ret) {
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
index 079227c02482..e59c40611872 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.h
@@ -40,6 +40,7 @@ struct sun6i_csi_bridge {
struct v4l2_mbus_framefmt mbus_format;
struct sun6i_csi_bridge_source source_parallel;
+ struct sun6i_csi_bridge_source source_mipi_csi2;
struct sun6i_csi_bridge_source *source;
};
--
2.34.1
next prev parent reply other threads:[~2022-02-05 18:58 UTC|newest]
Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 18:53 [PATCH v2 00/66] Allwinner A31/A83T MIPI CSI-2 Support and A31 ISP Support Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 01/66] ARM: dts: sun8i: v3s: Move the csi1 block to follow address order Paul Kocialkowski
2022-02-07 9:24 ` (subset) " Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 02/66] dt-bindings: interconnect: sunxi: Add V3s mbus compatible Paul Kocialkowski
2022-02-05 20:14 ` Samuel Holland
2022-02-07 8:43 ` Paul Kocialkowski
2022-02-07 8:50 ` Jernej Škrabec
2022-02-07 9:44 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 03/66] clk: sunxi-ng: v3s: Export the MBUS clock to the public header Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 04/66] ARM: dts: sun8i: v3s: Add mbus node to represent the interconnect Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 05/66] dt-bindings: sun6i-a31-mipi-dphy: Add optional direction property Paul Kocialkowski
2022-02-11 15:03 ` Rob Herring
2022-02-11 15:12 ` Paul Kocialkowski
2022-02-11 20:47 ` Laurent Pinchart
2022-02-05 18:53 ` [PATCH v2 06/66] phy: allwinner: phy-sun6i-mipi-dphy: Support D-PHY Rx mode for MIPI CSI-2 Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 07/66] dt-bindings: media: sun6i-a31-csi: Add MIPI CSI-2 input port Paul Kocialkowski
2022-02-07 16:03 ` Laurent Pinchart
2022-02-11 16:10 ` Paul Kocialkowski
2022-02-11 20:56 ` Laurent Pinchart
2022-02-14 16:10 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 08/66] dt-bindings: media: Add Allwinner A31 MIPI CSI-2 bindings documentation Paul Kocialkowski
2022-02-07 16:09 ` Laurent Pinchart
2022-02-11 16:03 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 09/66] media: sunxi: Add support for the A31 MIPI CSI-2 controller Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 10/66] MAINTAINERS: Add entry for the Allwinner A31 MIPI CSI-2 bridge driver Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 11/66] ARM: dts: sun8i: v3s: Add nodes for MIPI CSI-2 support Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 12/66] dt-bindings: media: Add Allwinner A83T MIPI CSI-2 bindings documentation Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 13/66] media: sunxi: Add support for the A83T MIPI CSI-2 controller Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 14/66] MAINTAINERS: Add entry for the Allwinner A83T MIPI CSI-2 bridge Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 15/66] ARM: dts: sun8i: a83t: Add MIPI CSI-2 controller node Paul Kocialkowski
2022-02-05 18:53 ` [PATCH NOT FOR MERGE v2 16/66] ARM: dts: sun8i: a83t: bananapi-m3: Enable MIPI CSI-2 with OV8865 Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 17/66] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-02-07 9:10 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 18/66] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-02-07 9:11 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 19/66] media: sun6i-csi: Grab bus clock instead of passing it to regmap Paul Kocialkowski
2022-02-09 9:20 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 20/66] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-02-07 9:13 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 21/66] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-02-07 9:14 ` Maxime Ripard
2022-02-11 16:29 ` Paul Kocialkowski
2022-02-14 16:31 ` Sakari Ailus
2022-03-01 15:39 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 22/66] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-02-09 9:22 ` Maxime Ripard
2022-02-11 16:01 ` Paul Kocialkowski
2022-02-11 16:41 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 23/66] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-02-07 9:55 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 24/66] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-02-07 9:56 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 25/66] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-02-07 9:58 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 26/66] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 27/66] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-02-14 16:40 ` Sakari Ailus
2022-02-15 10:01 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 28/66] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 29/66] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-02-09 9:23 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 30/66] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-02-09 9:24 ` Maxime Ripard
2022-02-11 15:43 ` Paul Kocialkowski
2022-02-11 16:44 ` Maxime Ripard
2022-02-14 18:12 ` Sakari Ailus
2022-03-02 14:59 ` Paul Kocialkowski
2022-03-03 22:43 ` Sakari Ailus
2022-03-04 9:00 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 31/66] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-02-09 9:25 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 32/66] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-02-09 9:26 ` Maxime Ripard
2022-02-11 15:40 ` Paul Kocialkowski
2022-02-11 16:45 ` Maxime Ripard
2022-02-05 18:53 ` [PATCH v2 33/66] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-02-09 9:39 ` Maxime Ripard
2022-02-11 15:17 ` Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 34/66] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 35/66] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-02-05 18:53 ` [PATCH v2 36/66] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 37/66] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-02-14 18:30 ` Sakari Ailus
2022-02-15 9:56 ` Paul Kocialkowski
2022-02-15 10:04 ` Laurent Pinchart
2022-02-15 10:21 ` Paul Kocialkowski
2022-02-15 21:21 ` Sakari Ailus
2022-02-05 18:54 ` [PATCH v2 38/66] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 39/66] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 40/66] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 41/66] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 42/66] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 43/66] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 44/66] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 45/66] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 46/66] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 47/66] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 48/66] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 49/66] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 50/66] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 51/66] media: sun6i-csi: Unset bridge source on capture streamon fail Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 52/66] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 53/66] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-02-05 18:54 ` Paul Kocialkowski [this message]
2022-02-05 18:54 ` [PATCH v2 55/66] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 56/66] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 57/66] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 58/66] media: sun6i-csi: Detect the availability of the ISP Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 59/66] media: sun6i-csi: Add support for hooking to the isp devices Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 60/66] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 61/66] dt-bindings: media: Add Allwinner A31 ISP bindings documentation Paul Kocialkowski
2022-02-07 15:51 ` Laurent Pinchart
2022-02-11 15:13 ` Rob Herring
2022-02-11 20:52 ` Laurent Pinchart
2022-02-14 16:28 ` Paul Kocialkowski
2022-02-14 17:10 ` Laurent Pinchart
2022-02-14 16:18 ` Paul Kocialkowski
2022-02-14 17:09 ` Laurent Pinchart
2022-02-15 10:10 ` Paul Kocialkowski
2022-02-15 10:16 ` Laurent Pinchart
2022-03-01 15:38 ` Paul Kocialkowski
2022-03-04 12:01 ` Laurent Pinchart
2022-03-04 13:57 ` Paul Kocialkowski
2022-03-04 14:09 ` Laurent Pinchart
2022-03-11 14:17 ` Paul Kocialkowski
2022-03-13 16:15 ` Laurent Pinchart
2022-03-15 9:49 ` Paul Kocialkowski
2022-03-15 10:13 ` Laurent Pinchart
2022-02-05 18:54 ` [PATCH v2 62/66] dt-bindings: media: sun6i-a31-csi: Add ISP output port Paul Kocialkowski
2022-02-07 16:04 ` Laurent Pinchart
2022-02-11 15:16 ` Rob Herring
2022-02-05 18:54 ` [PATCH v2 63/66] staging: media: Add support for the Allwinner A31 ISP Paul Kocialkowski
2022-02-07 16:16 ` Laurent Pinchart
2022-03-01 15:58 ` Paul Kocialkowski
2022-03-02 8:51 ` Laurent Pinchart
2022-03-02 13:23 ` Paul Kocialkowski
2022-03-02 13:33 ` Laurent Pinchart
2022-03-02 15:10 ` Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 64/66] MAINTAINERS: Add entry for the Allwinner A31 ISP driver Paul Kocialkowski
2022-02-05 18:54 ` [PATCH v2 65/66] ARM: dts: sun8i: v3s: Add support for the ISP Paul Kocialkowski
2022-02-05 18:54 ` [PATCH NOT FOR MERGE v2 66/66] of: Mark interconnects property supplier as optional Paul Kocialkowski
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=20220205185429.2278860-55-paul.kocialkowski@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hans.verkuil@cisco.com \
--cc=helen.koike@collabora.com \
--cc=jernej.skrabec@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--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;
as well as URLs for NNTP newsgroup(s).