Hi, Ben
On 3/31/2014 6:10 PM, Ben Dooks wrote:
On 31/03/14 10:28, Josh Wu wrote:
Hi, Ben
Thanks for the patch, I just test atmel-isi with the your patch,
I find the "mclk" registered in soc-camera driver cannot be find
by the soc-camera sensors. See comment in below:
Ok, I guess that the driver I have does not need the
mclk clock.
... ...
+#ifdef CONFIG_OF
+static int soc_of_bind(struct soc_camera_host *ici,
+ struct device_node *ep,
+ struct device_node *remote)
+{
+ struct soc_camera_device *icd;
+ struct soc_camera_desc sdesc = {.host_desc.bus_id = ici->nr,};
+ struct soc_camera_async_client *sasc;
+ struct soc_camera_async_subdev *sasd;
+ struct v4l2_async_subdev **asd_array;
+ char clk_name[V4L2_SUBDEV_NAME_SIZE];
+ int ret;
+
+ /* alloacte a new subdev and add match info to it */
+ sasd = devm_kzalloc(ici->v4l2_dev.dev, sizeof(*sasd), GFP_KERNEL);
+ if (!sasd)
+ return -ENOMEM;
+
+ asd_array = devm_kzalloc(ici->v4l2_dev.dev,
+ sizeof(struct v4l2_async_subdev **),
+ GFP_KERNEL);
+ if (!asd_array)
+ return -ENOMEM;
+
+ sasd->asd.match.of.node = remote;
+ sasd->asd.match_type = V4L2_ASYNC_MATCH_OF;
+ asd_array[0] = &sasd->asd;
+
+ /* Or shall this be managed by the soc-camera device? */
+ sasc = devm_kzalloc(ici->v4l2_dev.dev, sizeof(*sasc), GFP_KERNEL);
+ if (!sasc)
+ return -ENOMEM;
+
+ /* HACK: just need a != NULL */
+ sdesc.host_desc.board_info = ERR_PTR(-ENODATA);
+
+ ret = soc_camera_dyn_pdev(&sdesc, sasc);
+ if (ret < 0)
+ return ret;
+
+ sasc->sensor = &sasd->asd;
+
+ icd = soc_camera_add_pdev(sasc);
+ if (!icd) {
+ platform_device_put(sasc->pdev);
+ return -ENOMEM;
+ }
+
+ //sasc->notifier.subdevs = asd;
+ sasc->notifier.subdevs = asd_array;
+ sasc->notifier.num_subdevs = 1;
+ sasc->notifier.bound = soc_camera_async_bound;
+ sasc->notifier.unbind = soc_camera_async_unbind;
+ sasc->notifier.complete = soc_camera_async_complete;
+
+ icd->sasc = sasc;
+ icd->parent = ici->v4l2_dev.dev;
+
+ snprintf(clk_name, sizeof(clk_name), "of-%s",
+ of_node_full_name(remote));
The clk_name you register here is a OF string, but for the i2c
sensors, which
call the v4l2_clk_get by using dev_name(&client->dev). It is format
like:
"1-0030", combined i2c adaptor ID and addr.
So the i2c sensor can not find this registered mclk as the name is
not match.
Hmm, this sounds like something that really should go
away and be handled by the clk system instead.
Since the v4l2 clk (mclk) is just a temperory solution and it will be
removed if all use common clk framework.
(See the commit message of ff5430de70).
So IMHO we can live with this, just simply add the code in soc_of_bind():
+ struct i2c_client *client;
... ...
client = of_find_i2c_device_by_node(remote);
+ if (!client)
+ goto eclkreg;
- snprintf(clk_name, sizeof(clk_name), "of-%s",
- of_node_full_name(remote));
+ snprintf(clk_name, sizeof(clk_name), "%d-%04x",
+ client->adapter->nr, client->addr);
icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name,
"mclk", icd);
[snip]
Best Regards,
Josh Wu
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
