media: imx-mipi-csis: Add num_data_lanes to mipi_csis_device

Add the num_data_lanes field to the mipi_csis_device struct, and set it
equal to csis->bus.num_data_lanes. This is in preparation to support
cases when the data lanes actively used differs from the maximum
supported data lanes.

No functional changes intended by this commit.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Isaac Scott <isaac.scott@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c
index 04c586aa9efc89dbeab567f81e1f0783f29c823a..1569299be4ec16924cfb089a5fe6b907b308caab 100644 (file)
--- a/drivers/media/platform/nxp/imx-mipi-csis.c
+++ b/drivers/media/platform/nxp/imx-mipi-csis.c
@@ -351,6 +351,8 @@ struct mipi_csis_device {
        u32 hs_settle;
        u32 clk_settle;
 
+       unsigned int num_data_lanes;
+
        spinlock_t slock;       /* Protect events */
        struct mipi_csis_event events[MIPI_CSIS_NUM_EVENTS];
        struct dentry *debugfs_root;
@@ -573,7 +575,7 @@ static void mipi_csis_system_enable(struct mipi_csis_device *csis, int on)
        val = mipi_csis_read(csis, MIPI_CSIS_DPHY_CMN_CTRL);
        val &= ~MIPI_CSIS_DPHY_CMN_CTRL_ENABLE;
        if (on) {
-               mask = (1 << (csis->bus.num_data_lanes + 1)) - 1;
+               mask = (1 << (csis->num_data_lanes + 1)) - 1;
                val |= (mask & MIPI_CSIS_DPHY_CMN_CTRL_ENABLE);
        }
        mipi_csis_write(csis, MIPI_CSIS_DPHY_CMN_CTRL, val);
@@ -623,7 +625,7 @@ static int mipi_csis_calculate_params(struct mipi_csis_device *csis,
 
        /* Calculate the line rate from the pixel rate. */
        link_freq = v4l2_get_link_freq(csis->source.pad, csis_fmt->width,
-                                      csis->bus.num_data_lanes * 2);
+                                      csis->num_data_lanes * 2);
        if (link_freq < 0) {
                dev_err(csis->dev, "Unable to obtain link frequency: %d\n",
                        (int)link_freq);
@@ -668,7 +670,7 @@ static void mipi_csis_set_params(struct mipi_csis_device *csis,
                                 const struct v4l2_mbus_framefmt *format,
                                 const struct csis_pix_format *csis_fmt)
 {
-       int lanes = csis->bus.num_data_lanes;
+       int lanes = csis->num_data_lanes;
        u32 val;
 
        val = mipi_csis_read(csis, MIPI_CSIS_CMN_CTRL);
@@ -1366,8 +1368,9 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis)
        }
 
        csis->bus = vep.bus.mipi_csi2;
+       csis->num_data_lanes = csis->bus.num_data_lanes;
 
-       dev_dbg(csis->dev, "data lanes: %d\n", csis->bus.num_data_lanes);
+       dev_dbg(csis->dev, "max data lanes: %d\n", csis->bus.num_data_lanes);
        dev_dbg(csis->dev, "flags: 0x%08x\n", csis->bus.flags);
 
        asd = v4l2_async_nf_add_fwnode_remote(&csis->notifier, ep,