public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: Jacopo Mondi <jacopo@jmondi.org>,
	Steve Longerbeam <slongerbeam@gmail.com>,
	laurent.pinchart@ideasonboard.com, hverkuil-cisco@xs4all.nl,
	mirela.rabulea@nxp.com, xavier.roumegue@oss.nxp.com,
	tomi.valkeinen@ideasonboard.com, hugues.fruchet@st.com,
	prabhakar.mahadev-lad.rj@bp.renesas.com, aford173@gmail.com,
	festevam@gmail.com, Eugen.Hristev@microchip.com,
	jbrunet@baylibre.com, paul.elder@ideasonboard.com,
	eddy.khan@vergesense.com,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Subject: [PATCH v7 03/28] media: ov5640: Add ov5640_is_csi2() function
Date: Fri, 13 May 2022 17:15:23 +0300	[thread overview]
Message-ID: <20220513141548.6344-4-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20220513141548.6344-1-sakari.ailus@linux.intel.com>

From: Jacopo Mondi <jacopo@jmondi.org>

Checking if the sensor is used in DVP or MIPI CSI-2 mode is a repeated
pattern which is about to be repeated more often.

Provide an inline function to shortcut that.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
Tested-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/ov5640.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 1f3cb84c284eb..0697c9bf03ed9 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -294,6 +294,11 @@ static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)
 			     ctrls.handler)->sd;
 }
 
+static inline bool ov5640_is_csi2(const struct ov5640_dev *sensor)
+{
+	return sensor->ep.bus_type == V4L2_MBUS_CSI2_DPHY;
+}
+
 /*
  * FIXME: all of these register tables are likely filled with
  * entries that set the register to their power-on default values,
@@ -1208,7 +1213,7 @@ static int ov5640_load_regs(struct ov5640_dev *sensor,
 		/* remain in power down mode for DVP */
 		if (regs->reg_addr == OV5640_REG_SYS_CTRL0 &&
 		    val == OV5640_REG_SYS_CTRL0_SW_PWUP &&
-		    sensor->ep.bus_type != V4L2_MBUS_CSI2_DPHY)
+		    !ov5640_is_csi2(sensor))
 			continue;
 
 		if (mask)
@@ -1843,7 +1848,7 @@ static int ov5640_set_mode(struct ov5640_dev *sensor)
 	 * the same rate than YUV, so we can just use 16 bpp all the time.
 	 */
 	rate = ov5640_calc_pixel_rate(sensor) * 16;
-	if (sensor->ep.bus_type == V4L2_MBUS_CSI2_DPHY) {
+	if (ov5640_is_csi2(sensor)) {
 		rate = rate / sensor->ep.bus.mipi_csi2.num_data_lanes;
 		ret = ov5640_set_mipi_pclk(sensor, rate);
 	} else {
@@ -3020,7 +3025,7 @@ static int ov5640_s_stream(struct v4l2_subdev *sd, int enable)
 			sensor->pending_fmt_change = false;
 		}
 
-		if (sensor->ep.bus_type == V4L2_MBUS_CSI2_DPHY)
+		if (ov5640_is_csi2(sensor))
 			ret = ov5640_set_stream_mipi(sensor, enable);
 		else
 			ret = ov5640_set_stream_dvp(sensor, enable);
-- 
2.30.2


  parent reply	other threads:[~2022-05-13 14:16 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-13 14:15 [PATCH v7 00/28] media: ov5640: Rework the clock tree programming for MIPI Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 01/28] media: ov5640: Add pixel rate to modes Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 02/28] media: ov5640: Re-arrange modes definition Sakari Ailus
2022-05-13 14:15 ` Sakari Ailus [this message]
2022-05-13 14:15 ` [PATCH v7 04/28] media: ov5640: Associate bpp with formats Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 05/28] media: ov5640: Add LINK_FREQ control Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 06/28] media: ov5640: Update pixel_rate and link_freq Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 07/28] media: ov5640: Rework CSI-2 clock tree Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 08/28] media: ov5640: Rework timings programming Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 09/28] media: ov5640: Fix 720x480 in RGB888 mode Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 10/28] media: ov5640: Split DVP and CSI-2 timings Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 11/28] media: ov5640: Provide timings accessor Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 12/28] media: ov5640: Re-sort per-mode register tables Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 13/28] media: ov5640: Remove duplicated mode settings Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 14/28] media: ov5640: Remove ov5640_mode_init_data Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 15/28] media: ov5640: Add HBLANK control Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 16/28] media: ov5640: Add VBLANK control Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 17/28] media: ov5640: Adjust vblank with s_frame_interval Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 18/28] media: ov5640: Remove frame rate check from find_mode() Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 19/28] media: ov5640: Change CSI-2 timings to comply with FPS Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 20/28] media: ov5640: Implement init_cfg Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 21/28] media: ov5640: Implement get_selection Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 22/28] media: ov5640: Register device properties Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 23/28] media: ov5640: Add RGB565_1X16 format Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 24/28] media: ov5640: Add BGR888 format Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 25/28] media: ov5640: Restrict sizes to mbus code Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 26/28] media: ov5640: Adjust format to bpp in s_fmt Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 27/28] media: ov5640: Split DVP and CSI-2 formats Sakari Ailus
2022-05-13 14:15 ` [PATCH v7 28/28] media: ov5640: Move format mux config in format Sakari Ailus
2022-05-13 14:24 ` [PATCH v7 00/28] media: ov5640: Rework the clock tree programming for MIPI Jacopo Mondi
  -- strict thread matches above, loose matches on Subject: below --
2022-05-13 14:13 Jacopo Mondi
2022-05-13 14:13 ` [PATCH v7 03/28] media: ov5640: Add ov5640_is_csi2() function Jacopo Mondi

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=20220513141548.6344-4-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=Eugen.Hristev@microchip.com \
    --cc=aford173@gmail.com \
    --cc=eddy.khan@vergesense.com \
    --cc=festevam@gmail.com \
    --cc=hugues.fruchet@st.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=jacopo@jmondi.org \
    --cc=jbrunet@baylibre.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=mirela.rabulea@nxp.com \
    --cc=paul.elder@ideasonboard.com \
    --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
    --cc=slongerbeam@gmail.com \
    --cc=tomi.valkeinen@ideasonboard.com \
    --cc=xavier.roumegue@oss.nxp.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