summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/imx6sl-evk-csi.dts27
-rw-r--r--arch/arm/boot/dts/imx6sl-evk.dts6
3 files changed, 31 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index af6db267095e..f43b68b9c0ef 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -132,6 +132,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6q-sabresd-ldo.dtb \
imx6q-sbc6x.dtb \
imx6sl-evk.dtb \
+ imx6sl-evk-csi.dtb \
imx6sl-evk-ldo.dtb \
vf610-twr.dtb
dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
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";
+};
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 9a89087363cb..a055f3884925 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -84,7 +84,7 @@
csi_v4l2_cap {
compatible = "fsl,imx6sl-csi-v4l2";
- status = "okay";
+ status = "disabled";
};
pxp_v4l2_out {
@@ -134,7 +134,7 @@
};
&csi {
- status = "okay";
+ status = "disabled";
};
&ecspi1 {
@@ -417,7 +417,7 @@
clock-frequency = <100000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3_1>;
- status = "okay";
+ status = "disabled";
ov564x: ov564x@3c {
compatible = "ovti,ov564x";