Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 916219c5 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Greg Kroah-Hartman
Browse files

media: i2c: ov5640: Configure HVP lines in s_power callback 



[ Upstream commit 311a6408f8d46d47e35d3bf598dced39af4ce087 ]

Configure HVP lines in s_power callback instead of configuring everytime
in ov5640_set_stream_dvp().

Alongside also disable MIPI in DVP mode.

Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Tested-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: 98cb72d3b9c5 ("media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 93c518d2

drivers/media/i2c/ov5640.c

+58 −65
Original line number Diff line number Diff line
@@ -1206,71 +1206,6 @@ static int ov5640_set_autogain(struct ov5640_dev *sensor, bool on) 


static int ov5640_set_stream_dvp(struct ov5640_dev *sensor, bool on)

{

	int ret;

	unsigned int flags = sensor->ep.bus.parallel.flags;

	u8 pclk_pol = 0;

	u8 hsync_pol = 0;

	u8 vsync_pol = 0;



	/*

	 * Note about parallel port configuration.

	 *

	 * When configured in parallel mode, the OV5640 will

	 * output 10 bits data on DVP data lines [9:0].

	 * If only 8 bits data are wanted, the 8 bits data lines

	 * of the camera interface must be physically connected

	 * on the DVP data lines [9:2].

	 *

	 * Control lines polarity can be configured through

	 * devicetree endpoint control lines properties.

	 * If no endpoint control lines properties are set,

	 * polarity will be as below:

	 * - VSYNC:	active high

	 * - HREF:	active low

	 * - PCLK:	active low

	 */



	if (on) {

		/*

		 * configure parallel port control lines polarity

		 *

		 * POLARITY CTRL0

		 * - [5]:	PCLK polarity (0: active low, 1: active high)

		 * - [1]:	HREF polarity (0: active low, 1: active high)

		 * - [0]:	VSYNC polarity (mismatch here between

		 *		datasheet and hardware, 0 is active high

		 *		and 1 is active low...)

		 */

		if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)

			pclk_pol = 1;

		if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)

			hsync_pol = 1;

		if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)

			vsync_pol = 1;



		ret = ov5640_write_reg(sensor,

				       OV5640_REG_POLARITY_CTRL00,

				       (pclk_pol << 5) |

				       (hsync_pol << 1) |

				       vsync_pol);



		if (ret)

			return ret;

	}



	/*

	 * powerdown MIPI TX/RX PHY & disable MIPI

	 *

	 * MIPI CONTROL 00

	 * 4:	 PWDN PHY TX

	 * 3:	 PWDN PHY RX

	 * 2:	 MIPI enable

	 */

	ret = ov5640_write_reg(sensor,

			       OV5640_REG_IO_MIPI_CTRL00, on ? 0x18 : 0);

	if (ret)

		return ret;



	return ov5640_write_reg(sensor, OV5640_REG_SYS_CTRL0, on ?

				OV5640_REG_SYS_CTRL0_SW_PWUP :

				OV5640_REG_SYS_CTRL0_SW_PWDN);
@@ -2029,15 +1964,73 @@ static int ov5640_set_power_mipi(struct ov5640_dev *sensor, bool on) 


static int ov5640_set_power_dvp(struct ov5640_dev *sensor, bool on)

{

	unsigned int flags = sensor->ep.bus.parallel.flags;

	u8 pclk_pol = 0;

	u8 hsync_pol = 0;

	u8 vsync_pol = 0;

	int ret;



	if (!on) {

		/* Reset settings to their default values. */

		ov5640_write_reg(sensor, OV5640_REG_IO_MIPI_CTRL00, 0x58);

		ov5640_write_reg(sensor, OV5640_REG_POLARITY_CTRL00, 0x20);

		ov5640_write_reg(sensor, OV5640_REG_PAD_OUTPUT_ENABLE01, 0x00);

		ov5640_write_reg(sensor, OV5640_REG_PAD_OUTPUT_ENABLE02, 0x00);

		return 0;

	}



	/*

	 * Note about parallel port configuration.

	 *

	 * When configured in parallel mode, the OV5640 will

	 * output 10 bits data on DVP data lines [9:0].

	 * If only 8 bits data are wanted, the 8 bits data lines

	 * of the camera interface must be physically connected

	 * on the DVP data lines [9:2].

	 *

	 * Control lines polarity can be configured through

	 * devicetree endpoint control lines properties.

	 * If no endpoint control lines properties are set,

	 * polarity will be as below:

	 * - VSYNC:	active high

	 * - HREF:	active low

	 * - PCLK:	active low

	 */

	/*

	 * configure parallel port control lines polarity

	 *

	 * POLARITY CTRL0

	 * - [5]:	PCLK polarity (0: active low, 1: active high)

	 * - [1]:	HREF polarity (0: active low, 1: active high)

	 * - [0]:	VSYNC polarity (mismatch here between

	 *		datasheet and hardware, 0 is active high

	 *		and 1 is active low...)

	 */

	if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)

		pclk_pol = 1;

	if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)

		hsync_pol = 1;

	if (flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)

		vsync_pol = 1;



	ret = ov5640_write_reg(sensor, OV5640_REG_POLARITY_CTRL00,

			       (pclk_pol << 5) | (hsync_pol << 1) | vsync_pol);



	if (ret)

		return ret;



	/*

	 * powerdown MIPI TX/RX PHY & disable MIPI

	 *

	 * MIPI CONTROL 00

	 * 4:	 PWDN PHY TX

	 * 3:	 PWDN PHY RX

	 * 2:	 MIPI enable

	 */

	ret = ov5640_write_reg(sensor, OV5640_REG_IO_MIPI_CTRL00, 0x18);

	if (ret)

		return ret;



	/*

	 * enable VSYNC/HREF/PCLK DVP control lines

	 * & D[9:6] DVP data lines