git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://github.com/openrisc/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-icore-mipi.dts
diff --git
a/arch/arm/boot/dts/imx6q-icore-mipi.dts
b/arch/arm/boot/dts/imx6q-icore-mipi.dts
index acd3d33476d42e4e332ec7d6a5c21ab9d6ee867f..95b2efda17b42ebb6cb0203a941c8ebd3b4be8b7 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-icore-mipi.dts
+++ b/
arch/arm/boot/dts/imx6q-icore-mipi.dts
@@
-20,6
+20,14
@@
status = "okay";
};
+&mipi_csi {
+ status = "okay";
+};
+
+&ov5640 {
+ status = "okay";
+};
+
&usdhc3 {
status = "okay";
};