Commit 8e823f5c authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: ov5640: Add ov5640_is_csi2() function 



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: default avatarJacopo Mondi <jacopo@jmondi.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8409d017

drivers/media/i2c/ov5640.c

+8 −3
Original line number Diff line number Diff line
@@ -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);