media: v4l: Support obtaining link frequency via get_mbus_config

Add link_freq field to struct v4l2_mbus_config in order to pass the link
frequency to the receiving sub-device.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 9fe74c7e064f491916f1a8cc8b5918e7ea176a8d..e4b2de3833ee3d440493f94fca5ee2049b013ef0 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -508,12 +508,23 @@ EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_ctrl);
 s64 __v4l2_get_link_freq_pad(struct media_pad *pad, unsigned int mul,
                             unsigned int div)
 {
+       struct v4l2_mbus_config mbus_config = {};
        struct v4l2_subdev *sd;
+       int ret;
 
        sd = media_entity_to_v4l2_subdev(pad->entity);
-       if (!sd)
-               return -ENODEV;
+       ret = v4l2_subdev_call(sd, pad, get_mbus_config, pad->index,
+                              &mbus_config);
+       if (ret < 0 && ret != -ENOIOCTLCMD)
+               return ret;
+
+       if (mbus_config.link_freq)
+               return mbus_config.link_freq;
 
+       /*
+        * Fall back to using the link frequency control if the media bus config
+        * doesn't provide a link frequency.
+        */
        return __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div);
 }
 EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_pad);

diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index e7f019f68c8dc85e79ff96cfbff5a52de2de1086..24c738cd78940fa7f6118d78595fe221689a39e7 100644 (file)
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -169,6 +169,7 @@ enum v4l2_mbus_type {
 /**
  * struct v4l2_mbus_config - media bus configuration
  * @type: interface type
+ * @link_freq: The link frequency. See also V4L2_CID_LINK_FREQ control.
  * @bus: bus configuration data structure
  * @bus.parallel: embedded &struct v4l2_mbus_config_parallel.
  *               Used if the bus is parallel or BT.656.
@@ -183,6 +184,7 @@ enum v4l2_mbus_type {
  */
 struct v4l2_mbus_config {
        enum v4l2_mbus_type type;
+       u64 link_freq;
        union {
                struct v4l2_mbus_config_parallel parallel;
                struct v4l2_mbus_config_mipi_csi1 mipi_csi1;