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

media: ov5647: Program mode at s_stream(1) time 



Rename __sensor_init() function to ov5647_set_mode() as the function
is a regular one and the double underscores prefix shall be removed, and
then move it to program the mode at s_stream(1) time, not at sensor power
up.

Break out from __sensor_init() the stream_off() operation call at sensor
power up to coax the lanes in LP-11 state.

Signed-off-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>
parent 2b18cbcf

drivers/media/i2c/ov5647.c

+44 −37
Original line number Diff line number Diff line
@@ -265,12 +265,54 @@ static int ov5647_set_virtual_channel(struct v4l2_subdev *sd, int channel) 
			    channel_id | (channel << 6));

}



static int ov5647_set_mode(struct v4l2_subdev *sd)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	u8 resetval, rdval;

	int ret;



	ret = ov5647_read(sd, OV5647_SW_STANDBY, &rdval);

	if (ret < 0)

		return ret;



	ret = ov5647_write_array(sd, ov5647_640x480,

				 ARRAY_SIZE(ov5647_640x480));

	if (ret < 0) {

		dev_err(&client->dev, "write sensor default regs error\n");

		return ret;

	}



	ret = ov5647_set_virtual_channel(sd, 0);

	if (ret < 0)

		return ret;



	ret = ov5647_read(sd, OV5647_SW_STANDBY, &resetval);

	if (ret < 0)

		return ret;



	if (!(resetval & 0x01)) {

		dev_err(&client->dev, "Device was in SW standby");

		ret = ov5647_write(sd, OV5647_SW_STANDBY, 0x01);

		if (ret < 0)

			return ret;

	}



	return 0;

}



static int ov5647_stream_on(struct v4l2_subdev *sd)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct ov5647 *ov5647 = to_state(sd);

	u8 val = MIPI_CTRL00_BUS_IDLE;

	int ret;



	ret = ov5647_set_mode(sd);

	if (ret) {

		dev_err(&client->dev, "Failed to program sensor mode: %d\n", ret);

		return ret;

	}



	if (ov5647->clock_ncont)

		val |= MIPI_CTRL00_CLOCK_LANE_GATE |

		       MIPI_CTRL00_LINE_SYNC_ENABLE;
@@ -320,42 +362,6 @@ static int set_sw_standby(struct v4l2_subdev *sd, bool standby) 
	return ov5647_write(sd, OV5647_SW_STANDBY, rdval);

}



static int __sensor_init(struct v4l2_subdev *sd)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	u8 resetval, rdval;

	int ret;



	ret = ov5647_read(sd, OV5647_SW_STANDBY, &rdval);

	if (ret < 0)

		return ret;



	ret = ov5647_write_array(sd, ov5647_640x480,

				 ARRAY_SIZE(ov5647_640x480));

	if (ret < 0) {

		dev_err(&client->dev, "write sensor default regs error\n");

		return ret;

	}



	ret = ov5647_set_virtual_channel(sd, 0);

	if (ret < 0)

		return ret;



	ret = ov5647_read(sd, OV5647_SW_STANDBY, &resetval);

	if (ret < 0)

		return ret;



	if (!(resetval & 0x01)) {

		dev_err(&client->dev, "Device was in SW standby");

		ret = ov5647_write(sd, OV5647_SW_STANDBY, 0x01);

		if (ret < 0)

			return ret;

	}



	/* Stream off to make the clock lane into LP-11 state. */

	return ov5647_stream_off(sd);

}



static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -387,7 +393,8 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on) 
			goto out;

		}



		ret = __sensor_init(sd);

		/* Stream off to coax lanes into LP-11 state. */

		ret = ov5647_stream_off(sd);

		if (ret < 0) {

			clk_disable_unprepare(ov5647->xclk);

			dev_err(&client->dev,