diff options
author | Robby Cai <R63905@freescale.com> | 2013-11-15 17:21:16 +0800 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:18:17 -0600 |
commit | c8aa875d9b5e9e3bf56c0f5f27808fd6bcf09081 (patch) | |
tree | 65f4453b76ff1d7358408df56125091daa0d82d4 /arch/arm/boot/dts/imx6sl-evk.dts | |
parent | 7d1920267d450c3a77ade8604139a675ff577d28 (diff) |
ENGR00288196 ARM: dts: fix epdc and csi conflict on imx6sl evk
There is pinmux conflict for EPDC and I2C3 on imx6sl soc.
While on imx6sl evk board, the camera is attached on I2C3 bus, so the
EPDC function and CSI function can not be used at same time.
This patch removes the conflict in imx6sl-evk.dts file for EPDC function
and adds a new dts file for CSI function.
Signed-off-by: Robby Cai <R63905@freescale.com>
(cherry picked from commit eb6ffc9b8104c84a7a26295e9be89b8cce82a6a1)
Diffstat (limited to 'arch/arm/boot/dts/imx6sl-evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6sl-evk.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index a8fe9fb5e13b..5018eeec243f 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -92,7 +92,7 @@ csi_v4l2_cap { compatible = "fsl,imx6sl-csi-v4l2"; - status = "okay"; + status = "disabled"; }; pxp_v4l2_out { @@ -148,7 +148,7 @@ }; &csi { - status = "okay"; + status = "disabled"; }; &cpu0 { |