From 4e6d2aedb2b1ad110dc2839bc5115a788bacf87f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 2 Apr 2015 15:00:06 +0200 Subject: mxc_v4l2_capture: let the camera driver set mipi/parallel The camera driver knows if it uses mipi or parallel, and in case a camera can do both it makes sense that this is in the device tree node for the camera and not the generic mxc_v4l2_capture. (cherry picked from commit 09d5f1a3ad615b96d9f01bca0622d41f20c3011b) --- drivers/media/platform/mxc/capture/mxc_v4l2_capture.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h index 9283102e8511..f4a92a4892b1 100644 --- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h +++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.h @@ -258,6 +258,7 @@ struct sensor_data { struct clk *sensor_clk; int ipu_id; int csi; + int mipi_camera; /* 0: parallel camera hw if, != 0: mipi csi hw if */ void (*io_init)(void); }; -- cgit v1.2.3