diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-10-26 18:02:09 -0700 |
|---|---|---|
| committer | Troy Kisky <troy.kisky@boundarydevices.com> | 2014-04-24 18:59:17 -0700 |
| commit | e03570c72907ad909dd8608526010c9d140a5267 (patch) | |
| tree | 0d015fab42dea6f913bee5a7587504ba5adc0be2 | |
| parent | abab652e748af3a19909a9bad5f8437f53d29dd0 (diff) | |
mxc_v4l2_capture: add ipu_id to sensor_data
| -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 b8cb9bc801d7..7d802d433f22 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c @@ -3038,6 +3038,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 5044eef51faa..48fa4fd3eb83 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h @@ -253,6 +253,7 @@ struct sensor_data { u32 mclk; u8 mclk_source; struct clk *sensor_clk; + int ipu_id; int csi; void (*io_init)(void); |