Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6dl-colibri-eval-v3.dts

diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index dcf9206..ea184d1 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -53,6 +53,11 @@
        compatible = "toradex,colibri_imx6dl-eval-v3", "toradex,colibri_imx6dl",
                     "fsl,imx6dl";
 
+       /* Will be filled by the bootloader */
+       memory@10000000 {
+               reg = <0x10000000 0>;
+       };
+
        aliases {
                i2c0 = &i2c2;
                i2c1 = &i2c3;
@@ -63,6 +68,10 @@
                rtc1 = &snvs_rtc;
        };
 
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
        clocks {
                /* Fixed crystal dedicated to mcp251x */
                clk16m: clk@1 {