Commit 8a47d09e authored by Tommaso Merciai's avatar Tommaso Merciai Committed by Mauro Carvalho Chehab
Browse files

media: ov5693: rename clk into xvclk 



Rename clk pdata pointer into xvclk (system clock input).
Same for clk_rate into xvclk_rate. This is more explicit

Signed-off-by: default avatarTommaso Merciai <tommaso.merciai@amarulasolutions.com>
Reviewed-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@kernel.org>
parent 6ae8701f

drivers/media/i2c/ov5693.c

+10 −10
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ struct ov5693_device { 
	struct gpio_desc *reset;

	struct gpio_desc *powerdown;

	struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES];

	struct clk *clk;

	struct clk *xvclk;



	struct ov5693_mode {

		struct v4l2_rect crop;
@@ -794,7 +794,7 @@ static void ov5693_sensor_powerdown(struct ov5693_device *ov5693) 


	regulator_bulk_disable(OV5693_NUM_SUPPLIES, ov5693->supplies);



	clk_disable_unprepare(ov5693->clk);

	clk_disable_unprepare(ov5693->xvclk);

}



static int ov5693_sensor_powerup(struct ov5693_device *ov5693)
@@ -804,7 +804,7 @@ static int ov5693_sensor_powerup(struct ov5693_device *ov5693) 
	gpiod_set_value_cansleep(ov5693->reset, 1);

	gpiod_set_value_cansleep(ov5693->powerdown, 1);



	ret = clk_prepare_enable(ov5693->clk);

	ret = clk_prepare_enable(ov5693->xvclk);

	if (ret) {

		dev_err(ov5693->dev, "Failed to enable clk\n");

		goto fail_power;
@@ -1390,7 +1390,7 @@ static int ov5693_check_hwcfg(struct ov5693_device *ov5693) 
static int ov5693_probe(struct i2c_client *client)

{

	struct ov5693_device *ov5693;

	u32 clk_rate;

	u32 xvclk_rate;

	int ret = 0;



	ov5693 = devm_kzalloc(&client->dev, sizeof(*ov5693), GFP_KERNEL);
@@ -1408,16 +1408,16 @@ static int ov5693_probe(struct i2c_client *client) 


	v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops);



	ov5693->clk = devm_clk_get(&client->dev, "xvclk");

	if (IS_ERR(ov5693->clk)) {

	ov5693->xvclk = devm_clk_get(&client->dev, "xvclk");

	if (IS_ERR(ov5693->xvclk)) {

		dev_err(&client->dev, "Error getting clock\n");

		return PTR_ERR(ov5693->clk);

		return PTR_ERR(ov5693->xvclk);

	}



	clk_rate = clk_get_rate(ov5693->clk);

	if (clk_rate != OV5693_XVCLK_FREQ)

	xvclk_rate = clk_get_rate(ov5693->xvclk);

	if (xvclk_rate != OV5693_XVCLK_FREQ)

		dev_warn(&client->dev, "Found clk freq %u, expected %u\n",

			 clk_rate, OV5693_XVCLK_FREQ);

			 xvclk_rate, OV5693_XVCLK_FREQ);



	ret = ov5693_configure_gpios(ov5693);

	if (ret)