On Gen3 there might be a CSI2 bridge between the video source and the VIN. Add helpers to check for this and to fetch the bridge subdevice. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx> --- drivers/media/platform/rcar-vin/rcar-core.c | 19 +++++++++++++++++++ drivers/media/platform/rcar-vin/rcar-vin.h | 2 ++ 2 files changed, 21 insertions(+) diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index f382f91..a409157 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -369,6 +369,11 @@ static int rvin_group_vin_to_csi(struct rvin_dev *vin) return csi; } +bool vin_have_bridge(struct rvin_dev *vin) +{ + return vin->digital.subdev == NULL; +} + struct rvin_graph_entity *vin_to_entity(struct rvin_dev *vin) { int csi; @@ -399,6 +404,20 @@ struct v4l2_subdev *vin_to_source(struct rvin_dev *vin) return vin->group->source[csi].subdev; } +struct v4l2_subdev *vin_to_bridge(struct rvin_dev *vin) +{ + int csi; + + if (vin->digital.subdev) + return NULL; + + csi = rvin_group_vin_to_csi(vin); + if (csi < 0) + return NULL; + + return vin->group->bridge[csi].subdev; +} + /* ----------------------------------------------------------------------------- * Async notifier helpers */ diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h index 2f1e087..acaed2b 100644 --- a/drivers/media/platform/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/rcar-vin/rcar-vin.h @@ -206,8 +206,10 @@ struct rvin_dev { struct v4l2_rect compose; }; +bool vin_have_bridge(struct rvin_dev *vin); struct rvin_graph_entity *vin_to_entity(struct rvin_dev *vin); struct v4l2_subdev *vin_to_source(struct rvin_dev *vin); +struct v4l2_subdev *vin_to_bridge(struct rvin_dev *vin); /* Debug */ #define vin_dbg(d, fmt, arg...) dev_dbg(d->dev, fmt, ##arg) -- 2.10.2 -- 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