Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-sabreauto.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 0e28e36ddbb2d2431c8c815a0bdd6c4ac116481f..9f11f1fcc3e6caac35c38c5b81038b3a1a152078 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -6,6 +6,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+       chosen {
+               stdout-path = &uart4;
+       };
+
        memory@10000000 {
                reg = <0x10000000 0x80000000>;
        };
@@ -155,6 +159,27 @@
                                gpio-controller;
                                #gpio-cells = <2>;
                        };
+
+                       light-sensor@44 {
+                               compatible = "isil,isl29023";
+                               reg = <0x44>;
+                               interrupt-parent = <&gpio5>;
+                               interrupts = <17 IRQ_TYPE_EDGE_FALLING>;
+                       };
+
+                       magnetometer@e {
+                               compatible = "fsl,mag3110";
+                               reg = <0x0e>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <29 IRQ_TYPE_EDGE_RISING>;
+                       };
+
+                       accelerometer@1c {
+                               compatible = "fsl,mma8451";
+                               reg = <0x1c>;
+                               interrupt-parent = <&gpio6>;
+                               interrupts = <31 IRQ_TYPE_LEVEL_LOW>;
+                       };
                };
        };
 };