summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6sl-evk-csi.dts
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2013-11-15 17:21:16 +0800
committerNitin Garg <nitin.garg@freescale.com>2015-01-15 21:18:17 -0600
commitc8aa875d9b5e9e3bf56c0f5f27808fd6bcf09081 (patch)
tree65f4453b76ff1d7358408df56125091daa0d82d4 /arch/arm/boot/dts/imx6sl-evk-csi.dts
parent7d1920267d450c3a77ade8604139a675ff577d28 (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-csi.dts')
-rw-r--r--arch/arm/boot/dts/imx6sl-evk-csi.dts27
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk-csi.dts b/arch/arm/boot/dts/imx6sl-evk-csi.dts
new file mode 100644
index 000000000000..795be40b5e30
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sl-evk-csi.dts
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sl-evk.dts"
+
+/ {
+ csi_v4l2_cap {
+ status = "okay";
+ };
+};
+
+&csi {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
+
+&epdc {
+ status = "disabled";
+};