mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
[media] v4l2-clk: v4l2_clk_get() also need to find the of_fullname clock
The soc-camera host will be probed and register a v4l2_clk, but if at that moment, the i2c device is not available, then the registered v4l2_clk name is an OF string not a I2C string. So when i2c sensor probes and calls v4l2_clk_get(), it only searches a clock with I2C string, like "1-0030". This patch will search the clock with OF string name if no clock with I2C string name could be found. Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
3d83078a08
commit
dc51b7d015
1 changed files with 9 additions and 0 deletions
|
@ -15,6 +15,7 @@
|
|||
#include <linux/list.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
|
@ -39,6 +40,7 @@ struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id)
|
|||
{
|
||||
struct v4l2_clk *clk;
|
||||
struct clk *ccf_clk = clk_get(dev, id);
|
||||
char clk_name[V4L2_CLK_NAME_SIZE];
|
||||
|
||||
if (PTR_ERR(ccf_clk) == -EPROBE_DEFER)
|
||||
return ERR_PTR(-EPROBE_DEFER);
|
||||
|
@ -57,6 +59,13 @@ struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id)
|
|||
mutex_lock(&clk_lock);
|
||||
clk = v4l2_clk_find(dev_name(dev));
|
||||
|
||||
/* if dev_name is not found, try use the OF name to find again */
|
||||
if (PTR_ERR(clk) == -ENODEV && dev->of_node) {
|
||||
v4l2_clk_name_of(clk_name, sizeof(clk_name),
|
||||
of_node_full_name(dev->of_node));
|
||||
clk = v4l2_clk_find(clk_name);
|
||||
}
|
||||
|
||||
if (!IS_ERR(clk))
|
||||
atomic_inc(&clk->use_count);
|
||||
mutex_unlock(&clk_lock);
|
||||
|
|
Loading…
Reference in a new issue