diff options
| author | Wojciech Bieganski <wbieganski@antmicro.com> | 2015-05-21 14:01:47 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:27:14 +0100 |
| commit | 014b0edb5e056ae0f83924164c3515c0a4902f7b (patch) | |
| tree | d40c45484ef5fe6f179bcd49747b8d4275a024bc | |
| parent | c862badb18f22881bfe32ba01a586f75b9f0a8b0 (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)
(cherry picked from commit b34325c7f99d3f323214e8b0f121711330769646)
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 38 | ||||
| -rw-r--r-- | drivers/media/platform/mxc/capture/ov5640_mipi.c | 2 |
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 5292e4e2580e..50831201cca6 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -46,6 +46,44 @@ gpio-key,wakeup; }; }; + + 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 8d600afc063b..270b496d9c7f 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. */ |