diff options
author | Sandor Yu <R01008@freescale.com> | 2014-05-16 02:11:15 -0400 |
---|---|---|
committer | Sandor Yu <R01008@freescale.com> | 2014-05-18 23:25:20 -0400 |
commit | 13b97fd98fb5006c02b2e90cb535c9f502676d64 (patch) | |
tree | b5d0624de996180f32ba1b8c03067fe666a5e6e6 /arch/arm/boot | |
parent | a303de79cbc8473ee4fff0f60fe473449bb7cd23 (diff) |
ENGR00313889 ARM DTS: Enable v4l2 capture function for imx6sx lcdif1 dts
LCDIF1 pin conflict with camera, ov5640 driver is disabled in
imx6sx 19x19 arm2 lcdif1 dts file,
v4l2 capture function shouldn't disabled in the dts,
remove the disable code.
Signed-off-by: Sandor Yu <R01008@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts index d715fd5067dc..cf8cb57589f3 100644 --- a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts | |||
@@ -8,12 +8,6 @@ | |||
8 | 8 | ||
9 | #include "imx6sx-19x19-arm2.dts" | 9 | #include "imx6sx-19x19-arm2.dts" |
10 | 10 | ||
11 | / { | ||
12 | csi1_v4l2_cap { | ||
13 | status = "disabled"; | ||
14 | }; | ||
15 | }; | ||
16 | |||
17 | &i2c2 { | 11 | &i2c2 { |
18 | ov564x: ov564x@3c { | 12 | ov564x: ov564x@3c { |
19 | status = "disabled"; | 13 | status = "disabled"; |