media: v4l: omap3isp: Get the parallel bus type from DT

The OMAP3 ISP supports both external and embedded BT.656 synchronization
for parallel buses. It currently gets the bus type information from the
source subdev through the .g_mbus_config() operation, but should instead
get it from DT as that's the authoritative source of bus configuration
information.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 2de7a27bb0e5edf83f68731fed4e2a5e3168c44c..79aff6b989a15cd729903da22532904ce715b67b 100644 (file)
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2042,6 +2042,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
                        !!(vep.bus.parallel.flags & V4L2_MBUS_FIELD_EVEN_LOW);
                buscfg->bus.parallel.data_pol =
                        !!(vep.bus.parallel.flags & V4L2_MBUS_DATA_ACTIVE_LOW);
+               buscfg->bus.parallel.bt656 = vep.bus_type == V4L2_MBUS_BT656;
                break;
 
        case ISP_OF_PHY_CSIPHY1:

diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 7207558d722c8325c93793cff9c33a9a0bfe2a15..4947876cfadf90676f955ebfd3bcade0c4994971 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -1139,15 +1139,9 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
        pad = media_entity_remote_pad(&ccdc->pads[CCDC_PAD_SINK]);
        sensor = media_entity_to_v4l2_subdev(pad->entity);
        if (ccdc->input == CCDC_INPUT_PARALLEL) {
-               struct v4l2_mbus_config cfg;
-               int ret;
-
-               ret = v4l2_subdev_call(sensor, video, g_mbus_config, &cfg);
-               if (!ret)
-                       ccdc->bt656 = cfg.type == V4L2_MBUS_BT656;
-
                parcfg = &((struct isp_bus_cfg *)sensor->host_priv)
                        ->bus.parallel;
+               ccdc->bt656 = parcfg->bt656;
        }
 
        /* CCDC_PAD_SINK */

diff --git a/drivers/media/platform/omap3isp/omap3isp.h b/drivers/media/platform/omap3isp/omap3isp.h
index 3c26f9a3f508f65ca22325bbae1cc4a85c4832f6..dfd3cbe26ccdcf95c1ea153839df2f6db58bf573 100644 (file)
--- a/drivers/media/platform/omap3isp/omap3isp.h
+++ b/drivers/media/platform/omap3isp/omap3isp.h
@@ -46,6 +46,7 @@ enum isp_interface_type {
  *             0 - Positive, 1 - Negative
  * @data_pol: Data polarity
  *             0 - Normal, 1 - One's complement
+ * @bt656: Data contain BT.656 embedded synchronization
  */
 struct isp_parallel_cfg {
        unsigned int data_lane_shift:3;
@@ -54,6 +55,7 @@ struct isp_parallel_cfg {
        unsigned int vs_pol:1;
        unsigned int fld_pol:1;
        unsigned int data_pol:1;
+       unsigned int bt656:1;
 };
 
 enum {