diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-10-26 18:02:09 -0700 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-13 16:04:32 +0200 |
| commit | 1df89eeaa4c62cb2bc3b4e3002eb290e20a01020 (patch) | |
| tree | 97938408d1db8e8ef47ea2c3fcc6bd1c4d760e26 /drivers/media | |
| parent | b2016fa50fbe286bf6eb7ffbf6087cf73254ddc9 (diff) | |
mxc_v4l2_capture: add ipu_id to sensor_data
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit e1f8812a4c5155d190f85156f66f11d6771433f3)
(cherry picked from commit e2954c501e13fe57d228682b43fccb701fe138c7)
(cherry picked from commit b6cb38281072ae1b76dd029a10dbfab999361fa1)
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/mxc/capture/mxc_v4l2_capture.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/mxc/capture/mxc_v4l2_capture.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c index d31b0cc7e3c4..588b6c091b77 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c @@ -3047,6 +3047,10 @@ static int mxc_v4l2_master_attach(struct v4l2_int_device *slave) return -1; } + if (sdata->ipu_id != cam->ipu_id) { + pr_debug("%s: ipu doesn't match\n", __func__); + return -1; + } if (sdata->csi != cam->csi) { pr_debug("%s: csi doesn't match\n", __func__); return -1; diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h index b5bf32b6271d..acace3b47baf 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h @@ -249,6 +249,7 @@ struct sensor_data { u32 mclk; u8 mclk_source; struct clk *sensor_clk; + int ipu_id; int csi; void (*io_init)(void); |