Skip to content

Commit d2180e0

Browse files
Javi Merinomchehab
authored andcommitted
[media] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay
In asds configured with V4L2_ASYNC_MATCH_OF, the v4l2 subdev can be part of a devicetree overlay, for example: &media_bridge { ... my_port: port@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; ep: endpoint@0 { remote-endpoint = <&camera0>; }; }; }; / { fragment@0 { target = <&i2c0>; __overlay__ { my_cam { compatible = "foo,bar"; port { camera0: endpoint { remote-endpoint = <&my_port>; ... }; }; }; }; }; }; Each time the overlay is applied, its of_node pointer will be different. We are not interested in matching the pointer, what we want to match is that the path is the one we are expecting. Change to use of_node_cmp() so that we continue matching after the overlay has been removed and reapplied. Cc: Mauro Carvalho Chehab <[email protected]> Cc: Sakari Ailus <[email protected]> Signed-off-by: Javi Merino <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Reviewed-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 2ce8994 commit d2180e0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/media/v4l2-core/v4l2-async.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ static bool match_devname(struct v4l2_subdev *sd,
4242

4343
static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
4444
{
45-
return sd->of_node == asd->match.of.node;
45+
return !of_node_cmp(of_node_full_name(sd->of_node),
46+
of_node_full_name(asd->match.of.node));
4647
}
4748

4849
static bool match_custom(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)

0 commit comments

Comments
 (0)