|
@@ -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);
|