Commit e5d363ca authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: i2c: imx290: Factor out clock initialization to separate function

Move the external clock initialization code from probe() to a separate
function to improve readability. No functional change intended.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 63127235
...@@ -1120,6 +1120,34 @@ static int imx290_get_regulators(struct device *dev, struct imx290 *imx290) ...@@ -1120,6 +1120,34 @@ static int imx290_get_regulators(struct device *dev, struct imx290 *imx290)
imx290->supplies); imx290->supplies);
} }
static int imx290_init_clk(struct imx290 *imx290)
{
u32 xclk_freq;
int ret;
ret = fwnode_property_read_u32(dev_fwnode(imx290->dev),
"clock-frequency", &xclk_freq);
if (ret) {
dev_err(imx290->dev, "Could not get xclk frequency\n");
return ret;
}
/* external clock must be 37.125 MHz */
if (xclk_freq != 37125000) {
dev_err(imx290->dev, "External clock frequency %u is not supported\n",
xclk_freq);
return -EINVAL;
}
ret = clk_set_rate(imx290->xclk, xclk_freq);
if (ret) {
dev_err(imx290->dev, "Could not set xclk frequency\n");
return ret;
}
return 0;
}
/* /*
* Returns 0 if all link frequencies used by the driver for the given number * Returns 0 if all link frequencies used by the driver for the given number
* of MIPI data lanes are mentioned in the device tree, or the value of the * of MIPI data lanes are mentioned in the device tree, or the value of the
...@@ -1204,7 +1232,6 @@ static int imx290_probe(struct i2c_client *client) ...@@ -1204,7 +1232,6 @@ static int imx290_probe(struct i2c_client *client)
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct imx290 *imx290; struct imx290 *imx290;
u32 xclk_freq;
int ret; int ret;
imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL); imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL);
...@@ -1222,32 +1249,12 @@ static int imx290_probe(struct i2c_client *client) ...@@ -1222,32 +1249,12 @@ static int imx290_probe(struct i2c_client *client)
if (ret) if (ret)
return ret; return ret;
/* get system clock (xclk) */ /* Acquire resources. */
imx290->xclk = devm_clk_get(dev, "xclk"); imx290->xclk = devm_clk_get(dev, "xclk");
if (IS_ERR(imx290->xclk)) if (IS_ERR(imx290->xclk))
return dev_err_probe(dev, PTR_ERR(imx290->xclk), return dev_err_probe(dev, PTR_ERR(imx290->xclk),
"Could not get xclk"); "Could not get xclk");
ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
&xclk_freq);
if (ret) {
dev_err(dev, "Could not get xclk frequency\n");
return ret;
}
/* external clock must be 37.125 MHz */
if (xclk_freq != 37125000) {
dev_err(dev, "External clock frequency %u is not supported\n",
xclk_freq);
return -EINVAL;
}
ret = clk_set_rate(imx290->xclk, xclk_freq);
if (ret) {
dev_err(dev, "Could not set xclk frequency\n");
return ret;
}
ret = imx290_get_regulators(dev, imx290); ret = imx290_get_regulators(dev, imx290);
if (ret < 0) if (ret < 0)
return dev_err_probe(dev, ret, "Cannot get regulators\n"); return dev_err_probe(dev, ret, "Cannot get regulators\n");
...@@ -1258,8 +1265,14 @@ static int imx290_probe(struct i2c_client *client) ...@@ -1258,8 +1265,14 @@ static int imx290_probe(struct i2c_client *client)
return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio), return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
"Cannot get reset gpio\n"); "Cannot get reset gpio\n");
/* Initialize external clock frequency. */
ret = imx290_init_clk(imx290);
if (ret)
return ret;
mutex_init(&imx290->lock); mutex_init(&imx290->lock);
/* Initialize and register subdev. */
ret = imx290_subdev_init(imx290); ret = imx290_subdev_init(imx290);
if (ret) if (ret)
goto err_mutex; goto err_mutex;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment