iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: ov6650: Use the generic clock framework

Browse Source 
Commit ce548396a433 ("media: mach-omap1: board-ams-delta.c: remove soc_camera dependencies")
removed the last in-tree user of this sensor. New users
will be required to use the generic clock framework,
so it's possible to convert the driver to use it.

Convert the driver to use the CCF, and drop the legacy
v4l2-clk API.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Reviewed-by: Petr Cvek <petrcvekcz@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Ezequiel Garcia 2021-01-12 20:49:18 +01:00 committed by Mauro Carvalho Chehab
parent ea6300cdf1
commit 01747ab9ca
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/i2c/ov6650.c
View File

@ -22,13 +22,13 @@
*/ */
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/v4l2-mediabus.h> #include <linux/v4l2-mediabus.h>
#include <linux/module.h> #include <linux/module.h>
#include <media/v4l2-clk.h>
#include <media/v4l2-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
@ -194,7 +194,7 @@ struct ov6650 {
struct v4l2_ctrl *blue; struct v4l2_ctrl *blue;
struct v4l2_ctrl *red; struct v4l2_ctrl *red;
}; };
struct v4l2_clk *clk; struct clk *clk;
bool half_scale; /* scale down output by 2 */ bool half_scale; /* scale down output by 2 */
struct v4l2_rect rect; /* sensor cropping window */ struct v4l2_rect rect; /* sensor cropping window */
struct v4l2_fract tpf; /* as requested with s_frame_interval */ struct v4l2_fract tpf; /* as requested with s_frame_interval */
@ -459,9 +459,9 @@ static int ov6650_s_power(struct v4l2_subdev *sd, int on)
int ret = 0; int ret = 0;
if (on) if (on)
ret = v4l2_clk_enable(priv->clk); ret = clk_prepare_enable(priv->clk);
else else
v4l2_clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
return ret; return ret;
} }
@ -821,14 +821,14 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)
u8 pidh, pidl, midh, midl; u8 pidh, pidl, midh, midl;
int i, ret = 0; int i, ret = 0;
priv->clk = v4l2_clk_get(&client->dev, NULL); priv->clk = devm_clk_get(&client->dev, NULL);
if (IS_ERR(priv->clk)) { if (IS_ERR(priv->clk)) {
ret = PTR_ERR(priv->clk); ret = PTR_ERR(priv->clk);
dev_err(&client->dev, "v4l2_clk request err: %d\n", ret); dev_err(&client->dev, "clk request err: %d\n", ret);
return ret; return ret;
} }
rate = v4l2_clk_get_rate(priv->clk); rate = clk_get_rate(priv->clk);
for (i = 0; rate && i < ARRAY_SIZE(ov6650_xclk); i++) { for (i = 0; rate && i < ARRAY_SIZE(ov6650_xclk); i++) {
if (rate != ov6650_xclk[i].rate) if (rate != ov6650_xclk[i].rate)
continue; continue;
@ -839,8 +839,8 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)
break; break;
} }
for (i = 0; !xclk && i < ARRAY_SIZE(ov6650_xclk); i++) { for (i = 0; !xclk && i < ARRAY_SIZE(ov6650_xclk); i++) {
ret = v4l2_clk_set_rate(priv->clk, ov6650_xclk[i].rate); ret = clk_set_rate(priv->clk, ov6650_xclk[i].rate);
if (ret || v4l2_clk_get_rate(priv->clk) != ov6650_xclk[i].rate) if (ret || clk_get_rate(priv->clk) != ov6650_xclk[i].rate)
continue; continue;
xclk = &ov6650_xclk[i]; xclk = &ov6650_xclk[i];
@ -852,12 +852,12 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)
dev_err(&client->dev, "unable to get supported clock rate\n"); dev_err(&client->dev, "unable to get supported clock rate\n");
if (!ret) if (!ret)
ret = -EINVAL; ret = -EINVAL;
goto eclkput; return ret;
} }
ret = ov6650_s_power(sd, 1); ret = ov6650_s_power(sd, 1);
if (ret < 0) if (ret < 0)
goto eclkput; return ret;
msleep(20); msleep(20);
@ -899,11 +899,6 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)
done: done:
ov6650_s_power(sd, 0); ov6650_s_power(sd, 0);
if (!ret)
return 0;
eclkput:
v4l2_clk_put(priv->clk);
return ret; return ret;
} }
@ -1089,7 +1084,6 @@ static int ov6650_remove(struct i2c_client *client)
{ {
struct ov6650 *priv = to_ov6650(client); struct ov6650 *priv = to_ov6650(client);
v4l2_clk_put(priv->clk);
v4l2_async_unregister_subdev(&priv->subdev); v4l2_async_unregister_subdev(&priv->subdev);
v4l2_ctrl_handler_free(&priv->hdl); v4l2_ctrl_handler_free(&priv->hdl);
return 0; return 0;