media: i2c: imx214: Check number of lanes from device tree

The imx214 camera is capable of either two-lane or four-lane operation.

Currently only the four-lane mode is supported, as proper pixel rates
and link frequences for the two-lane mode are unknown.

Acked-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: André Apitzsch <git@apitzsch.eu>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c
index c924d411760b7bc149e7059c85a290bd6812dd5d..6077d44149f25ddb0ca61017b1b4f20f276125bd 100644 (file)
--- a/drivers/media/i2c/imx214.c
+++ b/drivers/media/i2c/imx214.c
@@ -197,7 +197,6 @@ struct imx214 {
 
 /*From imx214_mode_tbls.h*/
 static const struct cci_reg_sequence mode_4096x2304[] = {
-       { IMX214_REG_CSI_LANE_MODE, IMX214_CSI_4_LANE_MODE },
        { IMX214_REG_HDR_MODE, IMX214_HDR_MODE_OFF },
        { IMX214_REG_HDR_RES_REDUCTION, IMX214_HDR_RES_REDU_THROUGH },
        { IMX214_REG_EXPOSURE_RATIO, 1 },
@@ -270,7 +269,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = {
 };
 
 static const struct cci_reg_sequence mode_1920x1080[] = {
-       { IMX214_REG_CSI_LANE_MODE, IMX214_CSI_4_LANE_MODE },
        { IMX214_REG_HDR_MODE, IMX214_HDR_MODE_OFF },
        { IMX214_REG_HDR_RES_REDUCTION, IMX214_HDR_RES_REDU_THROUGH },
        { IMX214_REG_EXPOSURE_RATIO, 1 },
@@ -787,6 +785,13 @@ static int imx214_start_streaming(struct imx214 *imx214)
                return ret;
        }
 
+       ret = cci_write(imx214->regmap, IMX214_REG_CSI_LANE_MODE,
+                       IMX214_CSI_4_LANE_MODE, NULL);
+       if (ret) {
+               dev_err(imx214->dev, "failed to configure lanes\n");
+               return ret;
+       }
+
        state = v4l2_subdev_get_locked_active_state(&imx214->sd);
        fmt = v4l2_subdev_state_get_format(state, 0);
        mode = v4l2_find_nearest_size(imx214_modes, ARRAY_SIZE(imx214_modes),
@@ -951,6 +956,13 @@ static int imx214_parse_fwnode(struct device *dev)
                goto done;
        }
 
+       /* Check the number of MIPI CSI2 data lanes */
+       if (bus_cfg.bus.mipi_csi2.num_data_lanes != 4) {
+               ret = dev_err_probe(dev, -EINVAL,
+                                   "only 4 data lanes are currently supported\n");
+               goto done;
+       }
+
        for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++)
                if (bus_cfg.link_frequencies[i] == IMX214_DEFAULT_LINK_FREQ)
                        break;