ENGR00305598-4 ARM: dts: imx6sx: add new DTS file to enable LCDIF1

Due to the CSI and LCDIF1 shares the same pin MX6SX_PAD_LCD1_ENABLE.

Signed-off-by: Robby Cai <R63905@freescale.com>

2 files changed, 26 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index fd80bf32d6a4..ce7306833c26 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -138,6 +138,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6sl-evk-pf200.dtb \
         imx6sx-17x17-arm2.dtb \
         imx6sx-19x19-arm2.dtb \
+        imx6sx-19x19-arm2-lcdif1.dtb \
         imx6sx-sdb.dtb \
         imx6sx-sdb-lcdif1.dtb \
         vf610-twr.dtb
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts
new file mode 100644
index 000000000000..d715fd5067dc
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 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 "imx6sx-19x19-arm2.dts"
+
+/ {
+        csi1_v4l2_cap {
+                status = "disabled";
+        };
+};
+
+&i2c2 {
+        ov564x: ov564x@3c {
+                status = "disabled";
+        };
+};
+
+&lcdif1 {
+        status = "okay";
+};