media: stm32: dcmipp: add has_csi2 & needs_mclk in match data

Introduce two variable has_csi and has_mclk within the
match data of the driver in order to know, depending on
the compatible if CSI-2 interface is available and if
the mclk clk should be retrieved.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
index 5a04018a6a9dc27d8bbdf2dda0bf0d1993c31710..1b7bae3266c8db1b095ff1616ca6ae777835d0c1 100644 (file)
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
@@ -89,6 +89,8 @@ struct dcmipp_pipeline_config {
        const struct dcmipp_ent_link *links;
        size_t num_links;
        u32 hw_revision;
+       bool has_csi2;
+       bool needs_mclk;
 };
 
 /* --------------------------------------------------------------------------
@@ -164,7 +166,9 @@ static const struct dcmipp_pipeline_config stm32mp25_pipe_cfg = {
        .num_ents       = ARRAY_SIZE(stm32mp25_ent_config),
        .links          = stm32mp25_ent_links,
        .num_links      = ARRAY_SIZE(stm32mp25_ent_links),
-       .hw_revision    = DCMIPP_STM32MP25_VERR
+       .hw_revision    = DCMIPP_STM32MP25_VERR,
+       .has_csi2       = true,
+       .needs_mclk     = true
 };
 
 #define LINK_FLAG_TO_STR(f) ((f) == 0 ? "" :\
@@ -296,7 +300,7 @@ static int dcmipp_graph_notify_bound(struct v4l2_async_notifier *notifier,
                                     struct v4l2_async_connection *asd)
 {
        struct dcmipp_device *dcmipp = notifier_to_dcmipp(notifier);
-       int ret;
+       int ret = -EINVAL;
        int src_pad, i;
        struct dcmipp_ent_device *sink;
        struct v4l2_fwnode_endpoint vep = { 0 };
@@ -304,15 +308,9 @@ static int dcmipp_graph_notify_bound(struct v4l2_async_notifier *notifier,
        enum v4l2_mbus_type supported_types[] = {
                V4L2_MBUS_PARALLEL, V4L2_MBUS_BT656, V4L2_MBUS_CSI2_DPHY
        };
-       int supported_types_nb = ARRAY_SIZE(supported_types);
 
        dev_dbg(dcmipp->dev, "Subdev \"%s\" bound\n", subdev->name);
 
-       /* Only MP25 supports CSI input */
-       if (!of_device_is_compatible(dcmipp->dev->of_node,
-                                    "st,stm32mp25-dcmipp"))
-               supported_types_nb--;
-
        /*
         * Link this sub-device to DCMIPP, it could be
         * a parallel camera sensor or a CSI-2 to parallel bridge
@@ -330,7 +328,12 @@ static int dcmipp_graph_notify_bound(struct v4l2_async_notifier *notifier,
        }
 
        /* Check for supported MBUS type */
-       for (i = 0; i < supported_types_nb; i++) {
+       for (i = 0; i < ARRAY_SIZE(supported_types); i++) {
+               /* Only MP25 supports CSI input */
+               if (supported_types[i] == V4L2_MBUS_CSI2_DPHY &&
+                   !dcmipp->pipe_cfg->has_csi2)
+                       continue;
+
                vep.bus_type = supported_types[i];
                ret = v4l2_fwnode_endpoint_parse(ep, &vep);
                if (!ret)
@@ -529,7 +532,7 @@ static int dcmipp_probe(struct platform_device *pdev)
                                     "Unable to get kclk\n");
        dcmipp->kclk = kclk;
 
-       if (!of_device_is_compatible(pdev->dev.of_node, "st,stm32mp13-dcmipp")) {
+       if (dcmipp->pipe_cfg->needs_mclk) {
                mclk = devm_clk_get(&pdev->dev, "mclk");
                if (IS_ERR(mclk))
                        return dev_err_probe(&pdev->dev, PTR_ERR(mclk),