From: "Jernej Škrabec" <jernej.skrabec@gmail.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>
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>,
Samuel Holland <samuel@sholland.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [PATCH v4 29/45] media: sun6i-csi: Tidy capture configure code
Date: Wed, 27 Apr 2022 21:35:18 +0200 [thread overview]
Message-ID: <3605808.MHq7AAxBmi@jernej-laptop> (raw)
In-Reply-To: <20220415152811.636419-30-paul.kocialkowski@bootlin.com>
Dne petek, 15. april 2022 ob 17:27:55 CEST je Paul Kocialkowski napisal(a):
> Some misc code cleanups and preparation for upcoming changes.
>
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Best regards,
Jernej
> ---
> .../sunxi/sun6i-csi/sun6i_csi_capture.c | 105 ++++++++----------
> 1 file changed, 46 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index
> e2070353f93f..9488c7c26f13 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
> @@ -353,133 +353,120 @@ static enum csi_input_seq get_csi_input_seq(struct
> sun6i_csi_device *csi_dev, static void
> sun6i_csi_capture_configure_interface(struct sun6i_csi_device *csi_dev)
> {
> + struct device *dev = csi_dev->dev;
> + struct regmap *regmap = csi_dev->regmap;
> struct v4l2_fwnode_endpoint *endpoint =
> &csi_dev->bridge.source_parallel.endpoint;
> + unsigned char bus_width = endpoint->bus.parallel.bus_width;
> + unsigned int flags = endpoint->bus.parallel.flags;
> u32 pixelformat, field;
> - unsigned char bus_width;
> - u32 flags;
> - u32 cfg = 0;
> - bool input_interlaced = false;
> + u32 value = SUN6I_CSI_IF_CFG_IF_CSI;
>
> sun6i_csi_capture_format(csi_dev, &pixelformat, &field);
>
> if (field == V4L2_FIELD_INTERLACED ||
> field == V4L2_FIELD_INTERLACED_TB ||
> field == V4L2_FIELD_INTERLACED_BT)
> - input_interlaced = true;
> -
> - bus_width = endpoint->bus.parallel.bus_width;
> -
> - if (input_interlaced)
> - cfg |= SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED |
> - SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT(1) |
> - SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC;
> + value |= SUN6I_CSI_IF_CFG_SRC_TYPE_INTERLACED |
> + SUN6I_CSI_IF_CFG_FIELD_DT_PCLK_SHIFT(1) |
> + SUN6I_CSI_IF_CFG_FIELD_DT_FIELD_VSYNC;
> else
> - cfg |= SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE;
> + value |= SUN6I_CSI_IF_CFG_SRC_TYPE_PROGRESSIVE;
>
> switch (endpoint->bus_type) {
> case V4L2_MBUS_PARALLEL:
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI;
> -
> - flags = endpoint->bus.parallel.flags;
> -
> if (bus_width == 16)
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED;
> + value |=
SUN6I_CSI_IF_CFG_IF_CSI_YUV_COMBINED;
> else
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW;
> + value |= SUN6I_CSI_IF_CFG_IF_CSI_YUV_RAW;
>
> if (flags & V4L2_MBUS_FIELD_EVEN_LOW)
> - cfg |= SUN6I_CSI_IF_CFG_FIELD_NEGATIVE;
> + value |= SUN6I_CSI_IF_CFG_FIELD_NEGATIVE;
> else
> - cfg |= SUN6I_CSI_IF_CFG_FIELD_POSITIVE;
> + value |= SUN6I_CSI_IF_CFG_FIELD_POSITIVE;
>
> if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
> - cfg |= SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE;
> + value |= SUN6I_CSI_IF_CFG_VREF_POL_NEGATIVE;
> else
> - cfg |= SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE;
> + value |= SUN6I_CSI_IF_CFG_VREF_POL_POSITIVE;
>
> if (flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
> - cfg |= SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE;
> + value |= SUN6I_CSI_IF_CFG_HREF_POL_NEGATIVE;
> else
> - cfg |= SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE;
> + value |= SUN6I_CSI_IF_CFG_HREF_POL_POSITIVE;
>
> if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
> - cfg |= SUN6I_CSI_IF_CFG_CLK_POL_RISING;
> + value |= SUN6I_CSI_IF_CFG_CLK_POL_RISING;
> else
> - cfg |= SUN6I_CSI_IF_CFG_CLK_POL_FALLING;
> + value |= SUN6I_CSI_IF_CFG_CLK_POL_FALLING;
> break;
> case V4L2_MBUS_BT656:
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI;
> -
> - flags = endpoint->bus.parallel.flags;
> -
> if (bus_width == 16)
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI_BT1120;
> + value |= SUN6I_CSI_IF_CFG_IF_CSI_BT1120;
> else
> - cfg |= SUN6I_CSI_IF_CFG_IF_CSI_BT656;
> + value |= SUN6I_CSI_IF_CFG_IF_CSI_BT656;
>
> if (flags & V4L2_MBUS_FIELD_EVEN_LOW)
> - cfg |= SUN6I_CSI_IF_CFG_FIELD_NEGATIVE;
> + value |= SUN6I_CSI_IF_CFG_FIELD_NEGATIVE;
> else
> - cfg |= SUN6I_CSI_IF_CFG_FIELD_POSITIVE;
> + value |= SUN6I_CSI_IF_CFG_FIELD_POSITIVE;
>
> if (flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
> - cfg |= SUN6I_CSI_IF_CFG_CLK_POL_RISING;
> + value |= SUN6I_CSI_IF_CFG_CLK_POL_RISING;
> else
> - cfg |= SUN6I_CSI_IF_CFG_CLK_POL_FALLING;
> + value |= SUN6I_CSI_IF_CFG_CLK_POL_FALLING;
> break;
> default:
> - dev_warn(csi_dev->dev, "Unsupported bus type: %d\n",
> - endpoint->bus_type);
> + dev_warn(dev, "unsupported bus type: %d\n", endpoint-
>bus_type);
> break;
> }
>
> switch (bus_width) {
> case 8:
> - cfg |= SUN6I_CSI_IF_CFG_DATA_WIDTH_8;
> + /* 16-bit YUV formats use a doubled width in 8-bit mode. */
> + case 16:
> + value |= SUN6I_CSI_IF_CFG_DATA_WIDTH_8;
> break;
> case 10:
> - cfg |= SUN6I_CSI_IF_CFG_DATA_WIDTH_10;
> + value |= SUN6I_CSI_IF_CFG_DATA_WIDTH_10;
> break;
> case 12:
> - cfg |= SUN6I_CSI_IF_CFG_DATA_WIDTH_12;
> - break;
> - case 16: /* No need to configure DATA_WIDTH for 16bit */
> + value |= SUN6I_CSI_IF_CFG_DATA_WIDTH_12;
> break;
> default:
> - dev_warn(csi_dev->dev, "Unsupported bus width: %u\n",
bus_width);
> + dev_warn(dev, "unsupported bus width: %u\n", bus_width);
> break;
> }
>
> - regmap_write(csi_dev->regmap, SUN6I_CSI_IF_CFG_REG, cfg);
> + regmap_write(regmap, SUN6I_CSI_IF_CFG_REG, value);
> }
>
> static void sun6i_csi_capture_configure_format(struct sun6i_csi_device
> *csi_dev) {
> + struct regmap *regmap = csi_dev->regmap;
> u32 mbus_code, pixelformat, field;
> - u32 cfg = 0;
> - u32 val;
> + u8 input_format, input_yuv_seq, output_format;
> + u32 value = 0;
>
> sun6i_csi_capture_format(csi_dev, &pixelformat, &field);
> sun6i_csi_bridge_format(csi_dev, &mbus_code, NULL);
>
> - val = get_csi_input_format(csi_dev, mbus_code, pixelformat);
> - cfg |= SUN6I_CSI_CH_CFG_INPUT_FMT(val);
> -
> - val = get_csi_output_format(csi_dev, pixelformat, field);
> - cfg |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(val);
> + input_format = get_csi_input_format(csi_dev, mbus_code,
pixelformat);
> + input_yuv_seq = get_csi_input_seq(csi_dev, mbus_code, pixelformat);
> + output_format = get_csi_output_format(csi_dev, pixelformat, field);
>
> - val = get_csi_input_seq(csi_dev, mbus_code, pixelformat);
> - cfg |= SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ(val);
> + value |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(output_format);
> + value |= SUN6I_CSI_CH_CFG_INPUT_FMT(input_format);
> + value |= SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ(input_yuv_seq);
>
> if (field == V4L2_FIELD_TOP)
> - cfg |= SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0;
> + value |= SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD0;
> else if (field == V4L2_FIELD_BOTTOM)
> - cfg |= SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1;
> + value |= SUN6I_CSI_CH_CFG_FIELD_SEL_FIELD1;
> else
> - cfg |= SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER;
> + value |= SUN6I_CSI_CH_CFG_FIELD_SEL_EITHER;
>
> - regmap_write(csi_dev->regmap, SUN6I_CSI_CH_CFG_REG, cfg);
> + regmap_write(regmap, SUN6I_CSI_CH_CFG_REG, value);
> }
>
> static void sun6i_csi_capture_configure_window(struct sun6i_csi_device
> *csi_dev)
next prev parent reply other threads:[~2022-04-27 19:36 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 [this message]
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 ` [PATCH v4 43/45] media: sun6i-csi: Detect the availability of the ISP Paul Kocialkowski
2022-04-27 20:07 ` 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=3605808.MHq7AAxBmi@jernej-laptop \
--to=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=paul.kocialkowski@bootlin.com \
--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;
as well as URLs for NNTP newsgroup(s).