Commit 207f4162 authored by Daniel Scally's avatar Daniel Scally Committed by Mauro Carvalho Chehab
Browse files

media: i2c: Add pm_runtime support to ov7251 



Add pm_runtime support to the ov7251 driver.

Signed-off-by: default avatarDaniel Scally <djrscally@gmail.com>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent e92932c3

drivers/media/i2c/ov7251.c

+60 −21
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>

#include <linux/types.h>
@@ -883,8 +884,11 @@ static int ov7251_set_register_array(struct ov7251 *ov7251, 
	return 0;

}



static int ov7251_set_power_on(struct ov7251 *ov7251)

static int ov7251_set_power_on(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct ov7251 *ov7251 = to_ov7251(sd);

	int ret;

	u32 wait_us;
@@ -909,11 +913,17 @@ static int ov7251_set_power_on(struct ov7251 *ov7251) 
	return 0;

}



static void ov7251_set_power_off(struct ov7251 *ov7251)

static int ov7251_set_power_off(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct v4l2_subdev *sd = i2c_get_clientdata(client);

	struct ov7251 *ov7251 = to_ov7251(sd);



	clk_disable_unprepare(ov7251->xclk);

	gpiod_set_value_cansleep(ov7251->enable_gpio, 0);

	ov7251_regulators_disable(ov7251);



	return 0;

}



static int ov7251_s_power(struct v4l2_subdev *sd, int on)
@@ -928,7 +938,7 @@ static int ov7251_s_power(struct v4l2_subdev *sd, int on) 
		goto exit;



	if (on) {

		ret = ov7251_set_power_on(ov7251);

		ret = ov7251_set_power_on(ov7251->dev);

		if (ret < 0)

			goto exit;
@@ -937,13 +947,13 @@ static int ov7251_s_power(struct v4l2_subdev *sd, int on) 
					ARRAY_SIZE(ov7251_global_init_setting));

		if (ret < 0) {

			dev_err(ov7251->dev, "could not set init registers\n");

			ov7251_set_power_off(ov7251);

			ov7251_set_power_off(ov7251->dev);

			goto exit;

		}



		ov7251->power_on = true;

	} else {

		ov7251_set_power_off(ov7251);

		ov7251_set_power_off(ov7251->dev);

		ov7251->power_on = false;

	}
@@ -1017,7 +1027,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl) 


	/* v4l2_ctrl_lock() locks our mutex */



	if (!ov7251->power_on)

	if (!pm_runtime_get_if_in_use(ov7251->dev))

		return 0;



	switch (ctrl->id) {
@@ -1041,6 +1051,8 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl) 
		break;

	}



	pm_runtime_put(ov7251->dev);



	return ret;

}
@@ -1283,10 +1295,15 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable) 
	mutex_lock(&ov7251->lock);



	if (enable) {

		ret = pm_runtime_get_sync(ov7251->dev);

		if (ret < 0)

			goto unlock_out;



		ret = ov7251_pll_configure(ov7251);

		if (ret)

			return dev_err_probe(ov7251->dev, ret,

					     "error configuring PLLs\n");

		if (ret) {

			dev_err(ov7251->dev, "error configuring PLLs\n");

			goto err_power_down;

		}



		ret = ov7251_set_register_array(ov7251,

					ov7251->current_mode->data,
@@ -1295,23 +1312,29 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable) 
			dev_err(ov7251->dev, "could not set mode %dx%d\n",

				ov7251->current_mode->width,

				ov7251->current_mode->height);

			goto exit;

			goto err_power_down;

		}

		ret = __v4l2_ctrl_handler_setup(&ov7251->ctrls);

		if (ret < 0) {

			dev_err(ov7251->dev, "could not sync v4l2 controls\n");

			goto exit;

			goto err_power_down;

		}

		ret = ov7251_write_reg(ov7251, OV7251_SC_MODE_SELECT,

				       OV7251_SC_MODE_SELECT_STREAMING);

		if (ret)

			goto err_power_down;

	} else {

		ret = ov7251_write_reg(ov7251, OV7251_SC_MODE_SELECT,

				       OV7251_SC_MODE_SELECT_SW_STANDBY);

		pm_runtime_put(ov7251->dev);

	}



exit:

unlock_out:

	mutex_unlock(&ov7251->lock);

	return ret;



err_power_down:

	pm_runtime_put_noidle(ov7251->dev);

	return ret;

}
@@ -1612,23 +1635,24 @@ static int ov7251_probe(struct i2c_client *client) 
		goto free_ctrl;

	}



	ret = ov7251_s_power(&ov7251->sd, true);

	if (ret < 0) {

		dev_err(dev, "could not power up OV7251\n");

	ret = ov7251_set_power_on(ov7251->dev);

	if (ret)

		goto free_entity;

	}



	ret = ov7251_detect_chip(ov7251);

	if (ret)

		goto power_down;



	pm_runtime_set_active(&client->dev);

	pm_runtime_get_noresume(&client->dev);

	pm_runtime_enable(&client->dev);



	ret = ov7251_read_reg(ov7251, OV7251_PRE_ISP_00,

			      &ov7251->pre_isp_00);

	if (ret < 0) {

		dev_err(dev, "could not read test pattern value\n");

		ret = -ENODEV;

		goto power_down;

		goto err_pm_runtime;

	}



	ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT1,
@@ -1636,7 +1660,7 @@ static int ov7251_probe(struct i2c_client *client) 
	if (ret < 0) {

		dev_err(dev, "could not read vflip value\n");

		ret = -ENODEV;

		goto power_down;

		goto err_pm_runtime;

	}



	ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT2,
@@ -1644,10 +1668,12 @@ static int ov7251_probe(struct i2c_client *client) 
	if (ret < 0) {

		dev_err(dev, "could not read hflip value\n");

		ret = -ENODEV;

		goto power_down;

		goto err_pm_runtime;

	}



	ov7251_s_power(&ov7251->sd, false);

	pm_runtime_set_autosuspend_delay(&client->dev, 1000);

	pm_runtime_use_autosuspend(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);



	ret = v4l2_async_register_subdev(&ov7251->sd);

	if (ret < 0) {
@@ -1659,8 +1685,11 @@ static int ov7251_probe(struct i2c_client *client) 


	return 0;



err_pm_runtime:

	pm_runtime_disable(ov7251->dev);

	pm_runtime_put_noidle(ov7251->dev);

power_down:

	ov7251_s_power(&ov7251->sd, false);

	ov7251_set_power_off(ov7251->dev);

free_entity:

	media_entity_cleanup(&ov7251->sd.entity);

free_ctrl:
@@ -1680,9 +1709,18 @@ static int ov7251_remove(struct i2c_client *client) 
	v4l2_ctrl_handler_free(&ov7251->ctrls);

	mutex_destroy(&ov7251->lock);



	pm_runtime_disable(ov7251->dev);

	if (!pm_runtime_status_suspended(ov7251->dev))

		ov7251_set_power_off(ov7251->dev);

	pm_runtime_set_suspended(ov7251->dev);



	return 0;

}



static const struct dev_pm_ops ov7251_pm_ops = {

	SET_RUNTIME_PM_OPS(ov7251_set_power_off, ov7251_set_power_on, NULL)

};



static const struct of_device_id ov7251_of_match[] = {

	{ .compatible = "ovti,ov7251" },

	{ /* sentinel */ }
@@ -1700,6 +1738,7 @@ static struct i2c_driver ov7251_i2c_driver = { 
		.of_match_table = ov7251_of_match,

		.acpi_match_table = ov7251_acpi_match,

		.name  = "ov7251",

		.pm = &ov7251_pm_ops,

	},

	.probe_new  = ov7251_probe,

	.remove = ov7251_remove,