Re: [PATCH v4 29/45] media: sun6i-csi: Tidy capture configure code

From: Jernej Škrabec
Date: Wed Apr 27 2022 - 15:36:32 EST

Next message: Steven Rostedt: "[for-next][PATCH 01/21] tracing: Cleanup double word in comment"
Previous message: Johannes Weiner: "[PATCH 1/7] Documentation: filesystems: proc: update meminfo section"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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@xxxxxxxxxxx>

Acked-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>

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 message: Steven Rostedt: "[for-next][PATCH 01/21] tracing: Cleanup double word in comment"
Previous message: Johannes Weiner: "[PATCH 1/7] Documentation: filesystems: proc: update meminfo section"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]