diff options
-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 bd7c66141207..c18b80ce0b53 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 57194678bc29..b7082b6c08ee 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. */ |