Commit 1e583b56 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: ov5670: Support device probe in non-zero ACPI D state 



Tell ACPI device PM code that the driver supports the device being in
non-zero ACPI D state when the driver's probe function is entered.

Also do identification on the first access of the device, whether in probe
or when starting streaming.

Signed-off-by: default avatarBingbu Cao <bingbu.cao@intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 0e014f1a

drivers/media/i2c/ov5670.c

+46 −32
Original line number Diff line number Diff line
@@ -1833,6 +1833,8 @@ struct ov5670 { 


	/* Streaming on/off */

	bool streaming;

	/* True if the device has been identified */

	bool identified;

};



#define to_ov5670(_sd)	container_of(_sd, struct ov5670, sd)
@@ -2273,6 +2275,32 @@ static int ov5670_get_skip_frames(struct v4l2_subdev *sd, u32 *frames) 
	return 0;

}



/* Verify chip ID */

static int ov5670_identify_module(struct ov5670 *ov5670)

{

	struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);

	int ret;

	u32 val;



	if (ov5670->identified)

		return 0;



	ret = ov5670_read_reg(ov5670, OV5670_REG_CHIP_ID,

			      OV5670_REG_VALUE_24BIT, &val);

	if (ret)

		return ret;



	if (val != OV5670_CHIP_ID) {

		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",

			OV5670_CHIP_ID, val);

		return -ENXIO;

	}



	ov5670->identified = true;



	return 0;

}



/* Prepare streaming by writing default values and customized values */

static int ov5670_start_streaming(struct ov5670 *ov5670)

{
@@ -2281,6 +2309,10 @@ static int ov5670_start_streaming(struct ov5670 *ov5670) 
	int link_freq_index;

	int ret;



	ret = ov5670_identify_module(ov5670);

	if (ret)

		return ret;



	/* Get out of from software reset */

	ret = ov5670_write_reg(ov5670, OV5670_REG_SOFTWARE_RST,

			       OV5670_REG_VALUE_08BIT, OV5670_SOFTWARE_RST);
@@ -2400,27 +2432,6 @@ static int __maybe_unused ov5670_resume(struct device *dev) 
	return 0;

}



/* Verify chip ID */

static int ov5670_identify_module(struct ov5670 *ov5670)

{

	struct i2c_client *client = v4l2_get_subdevdata(&ov5670->sd);

	int ret;

	u32 val;



	ret = ov5670_read_reg(ov5670, OV5670_REG_CHIP_ID,

			      OV5670_REG_VALUE_24BIT, &val);

	if (ret)

		return ret;



	if (val != OV5670_CHIP_ID) {

		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",

			OV5670_CHIP_ID, val);

		return -ENXIO;

	}



	return 0;

}



static const struct v4l2_subdev_core_ops ov5670_core_ops = {

	.log_status = v4l2_ctrl_subdev_log_status,

	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
@@ -2462,6 +2473,7 @@ static int ov5670_probe(struct i2c_client *client) 
	struct ov5670 *ov5670;

	const char *err_msg;

	u32 input_clk = 0;

	bool full_power;

	int ret;



	device_property_read_u32(&client->dev, "clock-frequency", &input_clk);
@@ -2478,12 +2490,15 @@ static int ov5670_probe(struct i2c_client *client) 
	/* Initialize subdev */

	v4l2_i2c_subdev_init(&ov5670->sd, client, &ov5670_subdev_ops);



	full_power = acpi_dev_state_d0(&client->dev);

	if (full_power) {

		/* Check module identity */

		ret = ov5670_identify_module(ov5670);

		if (ret) {

			err_msg = "ov5670_identify_module() error";

			goto error_print;

		}

	}



	mutex_init(&ov5670->mutex);
@@ -2519,10 +2534,8 @@ static int ov5670_probe(struct i2c_client *client) 


	ov5670->streaming = false;



	/*

	 * Device is already turned on by i2c-core with ACPI domain PM.

	 * Enable runtime PM and turn off the device.

	 */

	/* Set the device's state to active if it's in D0 state. */

	if (full_power)

		pm_runtime_set_active(&client->dev);

	pm_runtime_enable(&client->dev);

	pm_runtime_idle(&client->dev);
@@ -2580,6 +2593,7 @@ static struct i2c_driver ov5670_i2c_driver = { 
	},

	.probe_new = ov5670_probe,

	.remove = ov5670_remove,

	.flags = I2C_DRV_ACPI_WAIVE_D0_PROBE,

};



module_i2c_driver(ov5670_i2c_driver);