diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-02 11:10:57 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-07-04 16:40:25 +0200 |
| commit | a983e2580162bb99bcc7c7496af0483bff1e8376 (patch) | |
| tree | 569f8162c7858370567935b89e240fbaea73857c /drivers | |
| parent | 03bf5215907bec5f4c83d9ea3e8c2c6d9c43fa7d (diff) | |
Revert "imx8: csi: Fix off-by-one error in sensors enumeration"
With the 4.14 kernel code change this makes the camera not work at all.
However one needs to provide a correct reg=<xxx>; property to the
mipi_csi node in the device-tree.
This reverts commit 610cbf4c446f377854bb973d99ee141ca72781dc.
Related to: #32172
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/imx8/mxc-media-dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/imx8/mxc-media-dev.c b/drivers/media/platform/imx8/mxc-media-dev.c index e9f3dd25dd75..b3300ad8eb0f 100644 --- a/drivers/media/platform/imx8/mxc-media-dev.c +++ b/drivers/media/platform/imx8/mxc-media-dev.c @@ -236,7 +236,7 @@ static int mxc_md_create_links(struct mxc_md *mxc_md) v4l2_info(&mxc_md->v4l2_dev, "created link [%s] => [%s]\n", sensor->sd->entity.name, pcsidev->sd.entity.name); } else if (mxc_md->mipi_csi2) { - mipi_csi2 = mxc_md->mipi_csi2[sensor->id + 1]; + mipi_csi2 = mxc_md->mipi_csi2[sensor->id]; if (mipi_csi2 == NULL) continue; source = &sensor->sd->entity; @@ -447,7 +447,7 @@ static int register_mipi_csi2_entity(struct mxc_md *mxc_md, sd->grp_id = GRP_ID_MXC_MIPI_CSI2; ret = v4l2_device_register_subdev(&mxc_md->v4l2_dev, sd); if (!ret) - mxc_md->mipi_csi2[mipi_csi2->id +1] = mipi_csi2; + mxc_md->mipi_csi2[mipi_csi2->id] = mipi_csi2; else v4l2_err(&mxc_md->v4l2_dev, "Failed to register MIPI-CSIS.%d (%d)\n", mipi_csi2->id, ret); |