@@ -808,6 +808,41 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv,
return 0;
}
+static bool rcsi2_asd_match(struct device *dev,
+ struct v4l2_async_subdev *async_sd)
+{
+ struct rcar_csi2 *priv = (struct rcar_csi2 *)
+ async_sd->match.custom.priv;
+ struct fwnode_handle *endpoint;
+ struct fwnode_handle *remote;
+ struct fwnode_handle *parent;
+ struct device_node *np;
+ bool matched = false;
+
+ np = of_graph_get_endpoint_by_regs(priv->dev->of_node, 0, 0);
+ if (!np) {
+ dev_err(priv->dev, "Not connected to subdevice\n");
+ return -EINVAL;
+ }
+
+ endpoint = of_fwnode_handle(np);
+ remote = fwnode_graph_get_remote_endpoint(endpoint);
+ parent = fwnode_graph_get_remote_port_parent(endpoint);
+ if (parent) {
+ if (parent == dev->fwnode ||
+ parent == &dev->of_node->fwnode)
+ matched = true;
+ } else if (remote && !matched) {
+ if (remote == dev->fwnode ||
+ remote == &dev->of_node->fwnode)
+ matched = true;
+ }
+
+ of_node_put(np);
+
+ return matched;
+}
+
static int rcsi2_parse_dt(struct rcar_csi2 *priv)
{
struct device_node *ep;
@@ -833,9 +868,9 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)
return ret;
}
- priv->asd.match.fwnode =
- fwnode_graph_get_remote_endpoint(of_fwnode_handle(ep));
- priv->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
+ priv->asd.match.custom.match = &rcsi2_asd_match;
+ priv->asd.match.custom.priv = priv;
+ priv->asd.match_type = V4L2_ASYNC_MATCH_CUSTOM;
of_node_put(ep);
The rcar-csi2 driver uses the v4l2-async framework to do endpoint matching instead of node matching. This is needed as it needs to work with the adv748x driver which register it self in v4l2-async using endpoints instead of nodes. The reason for this is that from a single DT node it creates multiple subdevices, one for each endpoint. But when using subdevs which register itself in v4l2-async using nodes, the rcar-csi2 driver failed to find the matching endpoint because the match.fwnode was pointing to remote endpoint instead of remote parent port. This commit adds support in rcar-csi2 driver to handle both the cases where subdev registers in v4l2-async using endpoints/nodes, by using match_type as V4L2_ASYNC_MATCH_CUSTOM and implementing the match() callback to compare the fwnode of either remote/parent. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- drivers/media/platform/rcar-vin/rcar-csi2.c | 41 ++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-)