csi2rx_async_bound() passes the bound subdev's sd->fwnode to
media_entity_get_fwnode_pad(). This is likely not an endpoint
fwnode as required by media_entity_get_fwnode_pad(), for most
subdevices it is the port parent of endpoint fwnode(s). This has only
worked before because no entities have implemented the .get_fwnode_pad()
op yet, and the default behavior of media_entity_get_fwnode_pad()
was to ignore the passed fwnode and return the first pad that matches
the given direction flags.
Fix this by replacing the calls to media_entity_get_fwnode_pad() and
media_create_pad_link() with a call to media_create_fwnode_pad_links().
Fixes: 1fc3b37f34f69 ("media: v4l: cadence: Add Cadence MIPI-CSI2 RX driver")
Signed-off-by: Steve Longerbeam <slongerbeam@xxxxxxxxx>
---
drivers/media/platform/cadence/cdns-csi2rx.c | 27 ++++++++------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 31ace114eda1..d478800a3859 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -83,7 +83,6 @@ struct csi2rx_priv {
/* Remote source */
struct v4l2_async_subdev asd;
struct v4l2_subdev *source_subdev;
- int source_pad;
};
static inline
@@ -251,26 +250,20 @@ static int csi2rx_async_bound(struct v4l2_async_notifier *notifier,
{
struct v4l2_subdev *subdev = notifier->sd;
struct csi2rx_priv *csi2rx = v4l2_subdev_to_csi2rx(subdev);
+ int ret;
- csi2rx->source_pad = media_entity_get_fwnode_pad(&s_subdev->entity,
- s_subdev->fwnode,
- MEDIA_PAD_FL_SOURCE);
- if (csi2rx->source_pad < 0) {
- dev_err(csi2rx->dev, "Couldn't find output pad for subdev %s\n",
- s_subdev->name);
- return csi2rx->source_pad;
- }
+ ret = media_create_fwnode_pad_links(&csi2rx->subdev.entity.pads[0],
+ dev_fwnode(csi2rx->dev),
+ &s_subdev->entity,
+ dev_fwnode(s_subdev->dev),
+ MEDIA_LNK_FL_ENABLED |
+ MEDIA_LNK_FL_IMMUTABLE);
+ if (ret)
+ return ret;
csi2rx->source_subdev = s_subdev;
- dev_dbg(csi2rx->dev, "Bound %s pad: %d\n", s_subdev->name,
- csi2rx->source_pad);
-
- return media_create_pad_link(&csi2rx->source_subdev->entity,
- csi2rx->source_pad,
- &csi2rx->subdev.entity, 0,
- MEDIA_LNK_FL_ENABLED |
- MEDIA_LNK_FL_IMMUTABLE);
+ return 0;
}
static const struct v4l2_async_notifier_operations csi2rx_notifier_ops = {
--
2.17.1
