summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojciech Bieganski <wbieganski@antmicro.com>2015-05-21 14:01:47 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-10 23:11:45 +0100
commitb34325c7f99d3f323214e8b0f121711330769646 (patch)
treed0e80dc0477fec1eca2fddb90981052226ca32f6
parent8a1b5317925da32f0e8eaccb5317225d42dfb5ce (diff)
OmniVision ov5640 MIPI-CSI2 camera support
gst-inspect mfw_v4lsrc gst-launch mfw_v4lsrc capture-mode=5 device=/dev/video2 ! mfw_v4lsink Signed-off-by: Wojciech Bieganski <wbieganski@antmicro.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 4f4528cf031a4c6585bfcefd66607780de064de8)
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi38
-rw-r--r--drivers/media/platform/mxc/capture/ov5640_mipi.c2
2 files changed, 39 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
index bd7c661..c18b80c 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi
@@ -78,6 +78,44 @@
status = "okay";
};
};
+
+ v4l2_cap_0 {
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <0>;
+ csi_id = <0>;
+ mclk_source = <0>;
+ status = "okay";
+ };
+
+ v4l2_cap_1 { // second parallel camera
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <1>;
+ csi_id = <1>;
+ mclk_source = <0>;
+ status = "okay";
+ };
+
+ v4l2_cap_2 { // mipi-csi2 camera
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <0>;
+ csi_id = <1>;
+ mclk_source = <0>;
+ status = "okay";
+ };
+#if 0
+ v4l2_out {
+ compatible = "fsl,mxc_v4l2_output";
+ status = "okay";
+ };
+#endif
+};
+
+&mipi_csi {
+ ipu_id = <0>;
+ csi_id = <1>;
+ v_channel = <0>;
+ lanes = <2>;
+ status = "okay";
};
&backlight {
diff --git a/drivers/media/platform/mxc/capture/ov5640_mipi.c b/drivers/media/platform/mxc/capture/ov5640_mipi.c
index 5719467..b7082b6 100644
--- a/drivers/media/platform/mxc/capture/ov5640_mipi.c
+++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c
@@ -2076,7 +2076,7 @@ static int ov5640_probe(struct i2c_client *client,
"ov5640_mipi_reset");
if (retval < 0) {
dev_warn(dev, "request of ov5640_mipi_reset failed");
- return retval;
+ //return retval;
}
/* Set initial values for the sensor struct. */